commander 4.1.2 → 4.1.3

data/.travis.yml

@@ -4,7 +4,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
-# rspec 2.8.0 failing in jruby 1.9 mode
-#  - jruby-19mode
+  - jruby-19mode
   - rbx-18mode
+  - rbx-19mode

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 4.1.3 / 2012-12-15
+
+* Remove use of eval in Array.parse
+* Make generated template executable and set better defaults (@suan)
+* Fixed valid_command_names_from to match exact commands only (@fgalassi)
+
 === 4.1.2 / 2012-02-17
 
 * Improvement to `ask_editor` to be more portable across *nix variants. (thanks to Federico Galassi)
@@ -336,4 +342,4 @@
 
 === 1.0.0 / 2008-10-31
 
-* Initial release
+* Initial release

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/ggilder/commander.png?branch=master" alt="Build Status" />}[http://travis-ci.org/ggilder/commander]
+
 = Commander
 
 The complete solution for Ruby command-line executables. 

data/bin/commander

@@ -25,9 +25,8 @@ command :init do |c|
           
           require 'rubygems'
           require 'commander/import'
-          require '#{name}'
           
-          program :version, #{name.capitalize}::VERSION
+          program :version, '0.0.1'
           program :description, '#{description}'
            
         ...
@@ -47,6 +46,7 @@ command :init do |c|
           ...
         end
        end
+       File.chmod 0755, file
        say "Initialized template in #{file}"
      rescue Exception => e
        abort e

data/lib/commander/core_ext/array.rb

@@ -1,6 +1,6 @@
 
-class Array 
-  
+class Array
+
   ##
   # Split _string_ into an array. Used in
   # conjunction with Highline's #ask, or #ask_for_array
@@ -10,16 +10,17 @@ class Array
   # the arguments foo bar\ baz will become ['foo', 'bar baz']
   #
   # === Example
-  #  
+  #
   #   # ask invokes Array#parse
   #   list = ask 'Favorite cookies:', Array
   #
   #   # or use ask_for_CLASS
   #   list = ask_for_array 'Favorite cookies: '
   #
-  
+
   def self.parse string
-    eval "%w(#{string})"
+    # Using reverse + lookahead to work around Ruby 1.8's lack of lookbehind
+    string.reverse.split(/\s(?!\\)/).reverse.map { |s| s.reverse.gsub('\\ ', ' ') }
   end
-    
+
 end

data/lib/commander/runner.rb

@@ -223,7 +223,7 @@ module Commander
     
     def valid_command_names_from *args
       arg_string = args.delete_if { |value| value =~ /^-/ }.join ' '
-      commands.keys.find_all { |name| name if /^#{name}/.match arg_string }
+      commands.keys.find_all { |name| name if /^#{name}\b/.match arg_string }
     end
     
     ##

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '4.1.2'
-end
+  VERSION = '4.1.3'
+end

data/spec/core_ext/array_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
 
 describe Array do
-  
+
   describe "#parse" do
     it "should seperate a list of words into an array" do
       Array.parse('just a test').should eq(['just', 'a', 'test'])
     end
-    
+
     it "should preserve escaped whitespace" do
       Array.parse('just a\ test').should eq(['just', 'a test'])
     end
+
+    it "should match %w behavior with multiple backslashes" do
+      str = 'just a\\ test'
+      Array.parse(str).should eq(eval("%w(#{str})"))
+    end
   end
 
 end

data/spec/runner_spec.rb

@@ -361,6 +361,11 @@ describe Commander do
     it "should return empty array when no possible command names exist" do
       command_runner.valid_command_names_from('fake', 'command', 'name').should eq([])
     end
+
+    it "should match exact commands only" do
+      command('foo') {}
+      command_runner.valid_command_names_from('foobar').should eq([])
+    end
   end
   
   describe "#command_name_from_args" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70103334850040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70103334850040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103334849540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70103334849540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70103334849160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103334849160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70103334848700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103334848700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The complete solution for Ruby command-line executables. Commander bridges
   the gap between other terminal related libraries you know and love (OptionParser,
   HighLine), while providing many new features, and an elegant API.
@@ -123,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: commander
-rubygems_version: 1.8.16
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: The complete solution for Ruby command-line executables