Merge branch 'CLAide-Argument' : Migrating to new CLAide::Arguments syntax (see…

Merge branch 'CLAide-Argument' : Migrating to new CLAide::Arguments syntax (see CocoaPods/CLAide#33)

Gemfile.lock

 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: dc0824a1d7a03dc67b9e3dbfccdd4992241ddc0b
+  revision: c25117279c38d6fc0ed289e5ad946e1b225eb30f
   branch: master
   specs:
     claide (0.6.1)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 0d910d0f7ff7f83f12c79cb3ac8b4a2c568d2460
+  revision: 46542abf3e1a835e7862feff57e3e14a89e70dbc
   branch: master
   specs:
     xcodeproj (0.17.0)
@@ -27,14 +27,14 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-downloader.git
-  revision: 6b2fbda4342ced96df16a55dfa907636dc366b53
+  revision: 2ae40775be20a4e49b8662f47007ac7480aa7171
   branch: master
   specs:
     cocoapods-downloader (0.6.1)
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-plugins.git
-  revision: f03cfe8c39172ba1dd9b714a91e04e79a68d0711
+  revision: c38ce91f94a426109ffaa76d1317afd4a7e7b7c5
   branch: master
   specs:
     cocoapods-plugins (0.2.0)
@@ -42,17 +42,17 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-trunk.git
-  revision: 951bb3baf2c26aa5b0e3dd4b472271cf5a45b954
+  revision: 7489b03f144b9659ae0457bcdafc35f701a6775b
   branch: master
   specs:
-    cocoapods-trunk (0.1.1)
-      json (~> 1.8)
+    cocoapods-trunk (0.1.3)
+      json_pure (~> 1.8)
       nap (>= 0.6)
       netrc
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-try.git
-  revision: 40d716f925e7b9c3f014b93a0a78d7bf94e9a0b3
+  revision: fbdccaede69bb9a30195e92f050225bda0c5fb3a
   branch: master
   specs:
     cocoapods-try (0.3.0)
@@ -108,7 +108,6 @@ GEM
     github-markup (1.2.1)
       posix-spawn (~> 0.3.8)
     i18n (0.6.4)
-    json (1.8.1)
     json_pure (1.8.1)
     kicker (3.0.0)
       listen (~> 1.3.0)

lib/cocoapods/command/help.rb

@@ -3,7 +3,7 @@ module Pod
     class Help < Command
       self.summary = 'Show help for the given command.'
       self.arguments = [
-          ['COMMAND', :optional]
+          CLAide::Argument.new('COMMAND', false)
       ]
 
       def initialize(argv)

lib/cocoapods/command/init.rb

@@ -8,9 +8,9 @@ module Pod
       self.summary = 'Generate a Podfile for the current directory.'
       self.description = <<-DESC
         Creates a Podfile for the current directory if none currently exists. If
-        an Xcode project file is specified or if there is only a single project
-        file in the current directory, targets will be automatically generated
-        based on targets defined in the project.
+        an `XCODEPROJ` project file is specified or if there is only a single
+        project file in the current directory, targets will be automatically
+        generated based on targets defined in the project.
 
         It is possible to specify a list of dependencies which will be used by
         the template in the `Podfile.default` (normal targets) `Podfile.test`
@@ -18,7 +18,7 @@ module Pod
         `~/.cocoapods/templates` folder.
       DESC
       self.arguments = [
-          ['XCODEPROJ', :optional]
+          CLAide::Argument.new('XCODEPROJ', :false)
       ]
 
       def initialize(argv)

lib/cocoapods/command/inter_process_communication.rb

@@ -16,7 +16,7 @@ module Pod
         self.summary = 'Converts a podspec to JSON.'
         self.description = 'Converts a podspec to JSON and prints it to STDOUT.'
         self.arguments = [
-            ['PATH', :required]
+            CLAide::Argument.new('PATH', true)
         ]
 
         def initialize(argv)
@@ -43,7 +43,7 @@ module Pod
         self.summary = 'Converts a Podfile to YAML.'
         self.description = 'Converts a Podfile to YAML and prints it to STDOUT.'
         self.arguments = [
-            ['PATH', :required]
+            CLAide::Argument.new('PATH', true)
         ]
 
         def initialize(argv)

lib/cocoapods/command/lib.rb

@@ -10,13 +10,15 @@ module Pod
         self.summary = 'Creates a new Pod'
 
         self.description = <<-DESC
-          Creates a scaffold for the development of a new Pod according to the CocoaPods best practices.
-          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible template, is specified, it will be used in place of the default one.
+          Creates a scaffold for the development of a new Pod named `NAME`
+          according to the CocoaPods best practices.
+          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible
+          template, is specified, it will be used in place of the default one.
         DESC
 
         self.arguments = [
-            ['NAME',         :required],
-            ['TEMPLATE_URL', :optional]
+            CLAide::Argument.new('NAME', true),
+            CLAide::Argument.new('TEMPLATE_URL', false)
         ]
 
         def initialize(argv)

lib/cocoapods/command/project.rb

@@ -79,14 +79,15 @@ module Pod
       self.summary = 'Update outdated project dependencies'
 
       self.description = <<-DESC
-        Updates the Pods identified by the specified POD_NAMES. If no POD_NAMES are
-        specified it updates all the Pods ignoring the contents of the Podfile.lock.
-        This command is reserved to the update of dependencies and pod install should
-        be used to install changes to the Podfile.
+        Updates the Pods identified by the specified `POD_NAMES`. If no
+        `POD_NAMES` are specified it updates all the Pods ignoring the contents
+        of the Podfile.lock.
+        This command is reserved to the update of dependencies and pod install
+        should be used to install changes to the Podfile.
       DESC
 
       self.arguments = [
-          ['POD_NAMES...', :optional]
+        CLAide::Argument.new('POD_NAMES', false, true),
       ]
 
       def initialize(argv)

lib/cocoapods/command/repo.rb

@@ -19,9 +19,9 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME',   :required],
-            ['URL',    :required],
-            ['BRANCH', :optional]
+            CLAide::Argument.new('NAME',   true),
+            CLAide::Argument.new('URL',    true),
+            CLAide::Argument.new('BRANCH', false)
         ]
 
         def self.options
@@ -69,7 +69,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+            CLAide::Argument.new('NAME', false)
         ]
 
         def initialize(argv)
@@ -94,7 +94,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME | DIRECTORY', :optional]
+            CLAide::Argument.new(%w(NAME DIRECTORY), false)
         ]
 
         def self.options
@@ -162,7 +162,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :required]
+            CLAide::Argument.new('NAME', true)
         ]
 
         def initialize(argv)

lib/cocoapods/command/repo/push.rb

@@ -8,15 +8,15 @@ module Pod
         self.summary = 'Push new specifications to a spec-repo'
 
         self.description = <<-DESC
-        Validates NAME.podspec or `*.podspec' in the current working dir, creates
-        a directory and version folder for the pod in the local copy of
-        REPO (~/.cocoapods/repos/[REPO]), copies the podspec file into the version
-        directory, and finally it pushes REPO to its remote.
+        Validates `NAME.podspec` or `*.podspec` in the current working dir,
+        creates a directory and version folder for the pod in the local copy of
+        `REPO` (~/.cocoapods/repos/[REPO]), copies the podspec file into the
+        version directory, and finally it pushes `REPO` to its remote.
         DESC
 
         self.arguments = [
-          ['REPO',         :required],
-          ['NAME.podspec', :optional]
+            CLAide::Argument.new('REPO', true),
+            CLAide::Argument.new('NAME.podspec', false)
         ]
 
         def self.options

lib/cocoapods/command/search.rb

@@ -10,7 +10,7 @@ module Pod
       DESC
 
       self.arguments = [
-          ['QUERY', :required]
+          CLAide::Argument.new('QUERY', true)
       ]
 
       def self.options

lib/cocoapods/command/spec.rb

@@ -19,7 +19,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME | https://github.com/USER/REPO', :optional]
+            CLAide::Argument.new(%w(NAME https://github.com/USER/REPO), false)
         ]
 
         def initialize(argv)
@@ -53,13 +53,13 @@ module Pod
         self.summary = 'Validates a spec file.'
 
         self.description = <<-DESC
-          Validates `NAME.podspec'. If a directory is provided it validates
+          Validates `NAME.podspec`. If a `DIRECTORY` is provided, it validates
           the podspec files found, including subfolders. In case
           the argument is omitted, it defaults to the current working dir.
         DESC
 
         self.arguments = [
-            ['NAME.podspec | DIRECTORY | http://PATH/NAME.podspec, ...', :optional]
+          CLAide::Argument.new(%w(NAME.podspec DIRECTORY http://PATH/NAME.podspec), false, true),
         ]
 
         def self.options
@@ -153,7 +153,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+            CLAide::Argument.new('NAME', false)
         ]
 
         def self.options
@@ -187,7 +187,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+            CLAide::Argument.new('NAME', false)
         ]
 
         def self.options
@@ -229,7 +229,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+            CLAide::Argument.new('NAME', false)
         ]
 
         def self.options

spec/functional/command/help_spec.rb

@@ -15,7 +15,8 @@ module Pod
     end
 
     it "shows the right usage" do
-      Pod::Command::Help.arguments.should.equal [['COMMAND', :optional]]
+      args = [CLAide::Argument.new('COMMAND', false)]
+      Pod::Command::Help.arguments.should.equal args
     end
 
   end