optitron 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    optitron (0.1.3)
+    optitron (0.1.4)
       callsite (= 0.0.4)
       ruby2ruby (= 1.2.4)
       ruby_parser (>= 2.0)

data/README.rdoc

@@ -1,6 +1,6 @@
 = Optitron
 
-== Sensible options parsing
+== Sensible options parsing for Ruby!
 
 Optitron strives to be simple, minimal and to do the "right thing" most of the time. The structure is easy: you have global options, a list of commands, and each of those commands takes a number of arguments and options.
 

data/lib/optitron/class_dsl.rb

@@ -10,13 +10,24 @@ class Optitron
     def initialize(cls)
       @cls = cls
       @method_map = {}
+      @current_class = []
       super()
     end
 
+    def process_module(exp)
+      exp.shift
+      @current_class << exp.first.to_sym
+      process(exp)
+      @current_class.pop
+      exp.clear
+      exp
+    end
+
     def process_class(exp)
       exp.shift
-      @current_class = exp.first.to_sym
+      @current_class << exp.first.to_sym
       process(exp)
+      @current_class.pop
       exp.clear
       exp
     end
@@ -56,7 +67,8 @@ class Optitron
           end
         end
       end
-      @method_map[@current_method] = arg_list if @cls.name.to_sym == @current_class
+      @cls
+      @method_map[@current_method] = arg_list if @cls.name == @current_class.map{|c| c.to_s}.join('::')
     end
   end
   

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/cli_spec.rb

@@ -1,5 +1,14 @@
 require 'spec_helper'
 
+module AModule
+  class CLIInAModule < Optitron::CLI
+    desc "a method"
+    def method(arg1)
+      puts "calling with #{arg1}"
+    end
+  end
+end
+
 class CLIExample < Optitron::CLI
 
   def a_method_we_didnt_describe
@@ -101,4 +110,9 @@ describe "Optitron::Parser defaults" do
   it "should get type hinting from arg names" do
     capture(:stdout) { CLIExampleWithArgHinting.dispatch(%w(use_too asd 123)) }.should == "using this too \"asd\" 123\n"
   end
+  
+  it "should dispatch from within a module" 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
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Joshua Hull