commandable 0.3.1 → 0.3.2

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/README.md

@@ -21,9 +21,9 @@ You can now "use your words" to let people interact with your apps in a natural
 
 ## Latest version
 
-2012-02-07 - Version: 0.3.1  
+2013-03-04 - Version: 0.3.2  
 
-See change history for specific changes.  
+Verified works with Ruby 2.0
 
 ## Principle of Least Surprise
 
@@ -31,7 +31,7 @@ I've tried to follow the principle of least surprise so Commandable should just
 
 ## Requirements ##
 
-* Ruby 1.9.2 or greater
+* Ruby 1.9.3 or greater (Ruby 2.0 supported)
 * OS X or any Posix OS (It works, mostly, on Windows but it won't pass the tests because of some Unix commands I use in the tests but no in the code base)
 
 ## Installation  
@@ -418,6 +418,10 @@ Most of all it should be simple to use so if you have any problems please drop m
 
 ## Version History ##
 
+2013-04-04 - Version: 0.3.2
+
+* Works with Ruby 2.0
+
 2012-02-07 - Version: 0.3.1
 
 * Fixed bug where an error was raised if a non-commandable method was before a commandable method (uninitialized class variable @@command_options)

data/Rakefile

@@ -4,7 +4,6 @@ Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|

data/_spike/bug_fix.rb

@@ -0,0 +1,27 @@
+$:.unshift File.expand_path((File.dirname(__FILE__) + '/../lib'))
+require 'commandable'
+
+Commandable.color_output = true
+Commandable.app_exe = "bug_fix"
+Commandable.app_info =
+"""
+  Testing - Testing Commandable
+  Copyleft (c) 2012 Mike Bethany
+  http://mikeb.tk
+"""
+
+class TestIt
+  extend Commandable
+
+  def non_command_method
+    puts "test"
+  end
+  
+  command "A directory or file to convert", :default
+  def command_method(value="blah")
+    puts "value: #{value}"
+  end
+  
+end
+
+Commandable.execute

data/commandable.gemspec

@@ -19,9 +19,9 @@ EOF
 
   s.license = 'MIT'
 
-  s.add_dependency("term-ansicolor", "~>1.0.7")
+  s.add_dependency("term-ansicolor", "~>1.1")
   
-  s.add_development_dependency("rspec", "~>2.5")
+  s.add_development_dependency("rspec", "~>2.13")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec,autotest}/*`.split("\n")

data/lib/commandable/command_parser.rb

@@ -39,20 +39,15 @@ module Commandable
 
   private 
   
-  # This is where the magic happens!
-  # It lets you add a method to the list of command line methods
-  def command(*cmd_parameters)
-
+  def init_properties
     @@attribute = nil
     @@method_file = nil
     @@method_line = nil
-    @@command_options = {}
-    
-    # Include Commandable in singleton classes so class level methods work
-    include Commandable unless self.include? Commandable
-    
-    # parse command parameters
-    while (param = cmd_parameters.shift)
+    @@command_options = {}   
+  end
+  
+  def parse_parameters(params)
+    while (param = params.shift)
       case param
         when Symbol
           if param == :xor
@@ -67,6 +62,19 @@ module Commandable
       end
     end
     @@command_options[:priority] ||= 0
+  end
+  
+  # This is where the magic happens!
+  # It lets you add a method to the list of command line methods
+  def command(*cmd_parameters)
+
+    init_properties
+    
+    # Include Commandable in singleton classes so class level methods work
+    include Commandable unless self.include? Commandable
+    
+    # parse command parameters
+    parse_parameters(cmd_parameters)
     
     # only one default allowed
     raise ConfigurationError, "Only one default method is allowed."  if @@default_method and @@command_options[:default]
@@ -88,6 +96,7 @@ module Commandable
         raise SyntaxError, "A command was specified but no method follows"
       end
     }
+    
   end
 
   # Add a method to the list of available command line methods

data/lib/commandable/version.rb

@@ -3,7 +3,7 @@ module Commandable
   module VERSION
     MAJOR  = 0
     MINOR  = 3
-    TINY   = 1
+    TINY   = 2
     PRE    = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/commandable/00_run_first_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+# These tests MUST run first to be valid
+
+describe Commandable do
+
+  it 'should not raise an error if a non-command method is before a command method' do
+    load 'run_first.rb'
+    capture_output{Commandable.execute([])}.to_s.should_not match(/Error:/)
+  end
+
+  it 'should not raise an error if a non-command class method is before a command method' do
+    Commandable.reset_all
+    load 'run_first_class.rb'
+    capture_output{Commandable.execute([])}.to_s.should_not match(/Error:/)
+  end
+
+
+end

data/spec/commandable/execution_controller_spec.rb

@@ -9,7 +9,7 @@ describe Commandable do
     before(:each) { load 'test_class.rb' }
 
     it "should use ARGV by default" do
-      expect {capture_output{Commandable.execute()}}.should_not raise_error(ArgumentError)
+      expect {capture_output{Commandable.execute()}}.to_not raise_error(ArgumentError)
     end
 
   end

data/spec/source_code_examples/run_first.rb

@@ -0,0 +1,24 @@
+require "commandable"
+
+Commandable.color_output = true
+Commandable.app_exe = "bug_fix"
+Commandable.app_info =
+"""
+  Testing - Testing Commandable
+  Copyleft (c) 2012 Mike Bethany
+  http://mikeb.tk
+"""
+
+class RunFirst
+  extend Commandable
+
+  def non_command_method
+    puts "non_command_method"
+  end
+  
+  command "default method", :default
+  def command_method
+    puts "#command_method"
+  end
+  
+end

data/spec/source_code_examples/run_first_class.rb

@@ -0,0 +1,24 @@
+require "commandable"
+
+Commandable.color_output = true
+Commandable.app_exe = "bug_fix"
+Commandable.app_info =
+"""
+  Testing - Testing Commandable
+  Copyleft (c) 2012 Mike Bethany
+  http://mikeb.tk
+"""
+
+class RunFirstClass
+  extend Commandable
+
+  def self.non_command_method
+    puts "class non_command_method"
+  end
+  
+  command "default method", :default
+  def command_method
+    puts "#command_method"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commandable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70273995390760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70273995390760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273995389900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70273995389900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 description: ! 'The easiest way to add command line control to your Ruby app. You
   can add a single line above an existing method and that method will be available
   from the command line.
@@ -52,11 +62,12 @@ files:
 - .gemtest
 - .gitignore
 - .rbenv-gemsets
-- BUGS.txt
+- .ruby-version
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
+- _spike/bug_fix.rb
 - autotest/discover.rb
 - bin/commandable
 - commandable.gemspec
@@ -70,6 +81,7 @@ files:
 - lib/commandable/execution_controller.rb
 - lib/commandable/help_text.rb
 - lib/commandable/version.rb
+- spec/commandable/00_run_first_spec.rb
 - spec/commandable/app_controller_spec.rb
 - spec/commandable/attr_accessor_spec.rb
 - spec/commandable/coloring_spec.rb
@@ -103,6 +115,8 @@ files:
 - spec/source_code_examples/parameter_free.rb
 - spec/source_code_examples/required_default.rb
 - spec/source_code_examples/required_methods.rb
+- spec/source_code_examples/run_first.rb
+- spec/source_code_examples/run_first_class.rb
 - spec/source_code_examples/super_deep_class.rb
 - spec/source_code_examples/test_class.rb
 - spec/source_code_examples/xor_class.rb
@@ -131,12 +145,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The easiest way to add command line control to your Ruby apps.
 test_files:
 - autotest/discover.rb
+- spec/commandable/00_run_first_spec.rb
 - spec/commandable/app_controller_spec.rb
 - spec/commandable/attr_accessor_spec.rb
 - spec/commandable/coloring_spec.rb
@@ -170,6 +185,8 @@ test_files:
 - spec/source_code_examples/parameter_free.rb
 - spec/source_code_examples/required_default.rb
 - spec/source_code_examples/required_methods.rb
+- spec/source_code_examples/run_first.rb
+- spec/source_code_examples/run_first_class.rb
 - spec/source_code_examples/super_deep_class.rb
 - spec/source_code_examples/test_class.rb
 - spec/source_code_examples/xor_class.rb

data/BUGS.txt

@@ -1,2 +0,0 @@
-term-ansicolor-hi conflicts with term-ansicolor.
-