methadone 0.3.2 → 0.3.3

data/features/step_definitions/readme_steps.rb

@@ -1,26 +1,26 @@
 Then /^a README should not be generated$/ do
-  Then %(the file "tmp/newgem/README.rdoc" should not exist)
+  step %(the file "tmp/newgem/README.rdoc" should not exist)
 end
 
 Then /^a README should be generated in RDoc$/ do
-  Then %(a file named "tmp/newgem/README.rdoc" should exist)
+  step %(a file named "tmp/newgem/README.rdoc" should exist)
 end
 
 Then /^the README should contain the project name$/ do
-  Then %(the file "tmp/newgem/README.rdoc" should match /newgem/)
+  step %(the file "tmp/newgem/README.rdoc" should match /newgem/)
 end
 
 Then /^the README should contain my name$/ do
-  Then %(the file "tmp/newgem/README.rdoc" should match /Author::  YOUR NAME \\\(YOUR EMAIL\\\)/)
+  step %(the file "tmp/newgem/README.rdoc" should match /Author::  YOUR NAME \\\(YOUR EMAIL\\\)/)
 end
 
 Then /^the README should contain links to Github and RDoc.info$/ do
-  Then %(the file "tmp/newgem/README.rdoc" should match /\\\* \\\{Source on Github\\\}\\\[LINK TO GITHUB\\\]/)
-  Then %(the file "tmp/newgem/README.rdoc" should match /RDoc\\\[LINK TO RDOC.INFO\\\]/)
+  step %(the file "tmp/newgem/README.rdoc" should match /\\\* \\\{Source on Github\\\}\\\[LINK TO GITHUB\\\]/)
+  step %(the file "tmp/newgem/README.rdoc" should match /RDoc\\\[LINK TO RDOC.INFO\\\]/)
 end
 
 Then /^the README should contain empty sections for common elements of a README$/ do
-  Then %(the file "tmp/newgem/README.rdoc" should match /^== Install/)
-  Then %(the file "tmp/newgem/README.rdoc" should match /^== Examples/)
-  Then %(the file "tmp/newgem/README.rdoc" should match /^== Contributing/)
+  step %(the file "tmp/newgem/README.rdoc" should match /^== Install/)
+  step %(the file "tmp/newgem/README.rdoc" should match /^== Examples/)
+  step %(the file "tmp/newgem/README.rdoc" should match /^== Contributing/)
 end

data/lib/methadone/cucumber.rb

@@ -1,25 +1,25 @@
 When /^I get help for "([^"]*)"$/ do |app_name|
   @app_name = app_name
-  When %(I run `#{app_name} --help`)
+  step %(I run `#{app_name} --help`)
 end
 
 Then /^the following options should be documented:$/ do |options|
   options.raw.each do |option|
-    Then %(the option "#{option[0]}" should be documented)
+    step %(the option "#{option[0]}" should be documented)
   end
 end
 
 Then /^the option "([^"]*)" should be documented$/ do |option|
-  Then %(the output should match /^\\s*#{option}\\s+\\w\\w\\w+/)
+  step %(the output should match /^\\s*#{option}\\s+\\w\\w\\w+/)
 end
 
 Then /^the banner should be present$/ do
-  Then %(the output should match /Usage: #{@app_name}/)
+  step %(the output should match /Usage: #{@app_name}/)
 end
 
 Then /^the banner should document that this app takes options$/ do
-  Then %(the output should match /\[options\]/)
-  And %(the output should contain "Options")
+  step %(the output should match /\[options\]/)
+  step %(the output should contain "Options")
 end
 
 Then /^the banner should document that this app's arguments are:$/ do |table|
@@ -27,16 +27,16 @@ Then /^the banner should document that this app's arguments are:$/ do |table|
     option = row[0]
     option = "[#{option}]" if row[1] == 'optional' || row[1] == 'which is optional'
   }.join(' ')
-  Then %(the output should contain "#{expected_arguments}")
+  step %(the output should contain "#{expected_arguments}")
 end
 
 Then /^the banner should document that this app takes no options$/ do
-  Then %(the output should not contain "[options]")
-  And %(the output should not contain "Options")
+  step %(the output should not contain "[options]")
+  step %(the output should not contain "Options")
 end
 
 Then /^the banner should document that this app takes no arguments$/ do
-  Then %(the output should match /Usage: #{@app_name}\\s*$/)
+  step %(the output should match /Usage: #{@app_name}\\s*$/)
 end
 
 Then /^there should be a one line summary of what the app does$/ do

data/lib/methadone/main.rb

@@ -249,7 +249,10 @@ module Methadone
       else
         opt_names = option_names(*args)
         @option_parser.on(*args) do |value|
-          opt_names.each { |name| @options[name] = value }
+          opt_names.each do |name| 
+            @options[name] = value 
+            @options[name.to_s] = value 
+          end
         end
       end
       set_banner
@@ -316,11 +319,11 @@ module Methadone
 
     def option_names(*opts_on_args,&block)
       opts_on_args.map { |arg|
-        if arg =~ /^--\[no-\]([^-\s]*)/
+        if arg =~ /^--\[no-\]([^-\s][^\s]*)/
           $1.to_sym
-        elsif arg =~ /^--([^-\s]*)/
+        elsif arg =~ /^--([^-\s][^\s]*)/
           $1.to_sym
-        elsif arg =~ /^-([^-\s]*)/
+        elsif arg =~ /^-([^-\s][^\s]*)/
           $1.to_sym
         else
           nil

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/methadone.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency("bundler")
   s.add_development_dependency("rspec-expectations", "~> 2.6")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc","~> 3.9")
+  s.add_development_dependency("cucumber","~> 1.1.1")
   s.add_development_dependency("aruba")
   s.add_development_dependency("simplecov", "~> 0.5")
   s.add_development_dependency("test_unit-given", ">= 0.1.1")

data/test/test_main.rb

@@ -191,33 +191,45 @@ class TestMain < BaseTest
       @f = nil
       @other = nil
       @some_other = nil
+      @with_dashes = nil
       main do
-        @switch = options[:switch]
-        @flag = options[:flag]
-        @f = options[:f]
-        @negatable = options[:negatable]
-        @other = options[:other]
-        @some_other = options[:some_other]
+        @switch      = [options[:switch],options['switch']]
+        @flag        = [options[:flag],options['flag']]
+        @f           = [options[:f],options['f']]
+        @negatable   = [options[:negatable],options['negatable']]
+        @other       = [options[:other],options['other']]
+        @some_other  = [options[:some_other],options['some_other']]
+        @with_dashes = [options[:'flag-with-dashes'],options['flag-with-dashes']]
       end
 
       on("--switch")
       on("--[no-]negatable")
       on("--flag FLAG","-f","Some documentation string")
+      on("--flag-with-dashes FOO")
       on("--other") do 
         options[:some_other] = true
       end
 
-      set_argv %w(--switch --flag value --negatable --other)
+      set_argv %w(--switch --flag value --negatable --other --flag-with-dashes=BAR)
     }
 
     When run_go_safely
 
     Then {
-      @switch.should be true
-      @some_other.should be true
-      @other.should_not be true
-      @flag.should == 'value'
-      @f.should == 'value'
+      @switch[0].should be true
+      @some_other[0].should be true
+      @other[0].should_not be true
+      @flag[0].should == 'value'
+      @f[0].should == 'value'
+      @with_dashes[0].should == 'BAR'
+
+      @switch[1].should be true
+      @some_other[1].should be nil # ** this is set manually
+      @other[1].should_not be true
+      @flag[1].should == 'value'
+      @f[1].should == 'value'
+      @with_dashes[1].should == 'BAR'
+
       opts.to_s.should match /Some documentation string/
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70155090787300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155090787300
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70133473968220 !ruby/object:Gem::Requirement
+  requirement: &70155090786800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70133473968220
+  version_requirements: *70155090786800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70133473967800 !ruby/object:Gem::Requirement
+  requirement: &70155090786380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133473967800
+  version_requirements: *70155090786380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70133473967260 !ruby/object:Gem::Requirement
+  requirement: &70155090785840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,21 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *70133473967260
+  version_requirements: *70155090785840
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70155090785340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *70155090785340
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70133473966840 !ruby/object:Gem::Requirement
+  requirement: &70155090784960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133473966840
+  version_requirements: *70155090784960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70133473966300 !ruby/object:Gem::Requirement
+  requirement: &70155090784420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +87,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70133473966300
+  version_requirements: *70155090784420
 - !ruby/object:Gem::Dependency
   name: test_unit-given
-  requirement: &70133473965780 !ruby/object:Gem::Requirement
+  requirement: &70155090783920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *70133473965780
+  version_requirements: *70155090783920
 description: Methadone provides a lot of small but useful features for developing
   a command-line app, including an opinionated bootstrapping process, some helpful
   cucumber steps, and some classes to bridge logging and output into a simple, unified,