optitron 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    optitron (0.1.7)
-      callsite (= 0.0.4)
-      ruby2ruby (= 1.2.4)
-      ruby_parser (>= 2.0)
-      sexp_processor (= 3.0.4)
+    optitron (0.1.8)
+      callsite (~> 0.0.4)
+      ruby2ruby (~> 1.2.4)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0.4)
 
 GEM
   remote: http://rubygems.org/
@@ -13,22 +13,22 @@ GEM
     callsite (0.0.4)
     rake (0.8.7)
     rspec (1.3.0)
-    ruby2ruby (1.2.4)
+    ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.4)
+    ruby_parser (2.0.5)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.4)
+    sexp_processor (3.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0.rc.3)
-  callsite (= 0.0.4)
+  bundler (~> 1.0.0)
+  callsite (~> 0.0.4)
   optitron!
   rake
   rspec
-  ruby2ruby (= 1.2.4)
-  ruby_parser (>= 2.0)
-  sexp_processor (= 3.0.4)
+  ruby2ruby (~> 1.2.4)
+  ruby_parser (~> 2.0)
+  sexp_processor (~> 3.0.4)

data/lib/optitron/class_dsl.rb

@@ -25,9 +25,26 @@ class Optitron
 
     def process_class(exp)
       exp.shift
-      @current_class << exp.first.to_sym
-      process(exp)
-      @current_class.pop
+      current_class_size = @current_class.size
+      case exp.first
+      when Symbol
+        @current_class << exp.first.to_sym
+        process(exp)
+      else
+        if exp.first.first == :colon2
+          exp.first.shift
+          class_exp = exp.shift
+          class_exp[0, class_exp.size - 1].each do |const|
+            @current_class << const.last
+          end
+          @current_class << class_exp.last
+        else
+          raise
+        end
+        exp.shift
+        process(exp.first)
+      end
+      @current_class.slice!(current_class_size, @current_class.size)
       exp.clear
       exp
     end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/optitron.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "optitron"
 
-  s.add_dependency "ruby_parser", ">= 2.0"
-  s.add_dependency "callsite", "= 0.0.4"
-  s.add_dependency "ruby2ruby", "= 1.2.4"
-  s.add_dependency "sexp_processor", "= 3.0.4"
-  s.add_development_dependency "bundler", ">= 1.0.0.rc.3"
+  s.add_dependency "ruby_parser", "~> 2.0"
+  s.add_dependency "callsite", "~> 0.0.4"
+  s.add_dependency "ruby2ruby", "~> 1.2.4"
+  s.add_dependency "sexp_processor", "~> 3.0.4"
+  s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
 

data/spec/cli_spec.rb

@@ -77,6 +77,18 @@ class CLIExampleWithArgHinting < Optitron::CLI
   end
 end
 
+module Nested; end
+class Nested::NestedExample < Optitron::CLI
+
+  class_opt 'verbose'
+
+  desc "Use this too"
+  opt 'another_opt'
+  def use_too(one, two = 'three')
+    puts "using this too #{one} #{two} #{params['another_opt']} #{@env}"
+  end
+end
+
 
 describe "Optitron::Parser defaults" do
   it "should generate the correct help" do
@@ -118,4 +130,9 @@ describe "Optitron::Parser defaults" do
     AModule::CLIInAModule.build
     AModule::CLIInAModule.optitron_parser.help.should == "Commands\n\nmethod [arg1]       # a method\n\nGlobal options\n\n-?/--help           # Print help message"
   end
+  
+  it "should dispatch from within a different sort of module" do
+    Nested::NestedExample.build
+    AModule::CLIInAModule.optitron_parser.help.should == "Commands\n\nmethod [arg1]       # a method\n\nGlobal options\n\n-?/--help           # Print help message"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -07:00
+date: 2010-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -39,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -55,7 +55,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -71,7 +71,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -87,16 +87,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424051
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc
-        - 3
-        version: 1.0.0.rc.3
+        version: 1.0.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency