choice 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzIxY2UxYzVhYWQ3M2MyMmJjMTU4OTRkNTA5MmM5N2I2YWI3OTk0YQ==
+  data.tar.gz: !binary |-
+    M2I0MjZhZjM5MTY5YjFlZTJlNmY4NTQxN2U1MzQ1YmJiNmZjNDA2NA==
+SHA512:
+  metadata.gz: !binary |-
+    YzY2YzlmOGNlNTBkOTFjOWEzMzY3Y2QwN2Q2MjVmMTliNWE5ZDY5ZTdjYWZj
+    YjcwMDJkMjlhZDA5NzNiYjBkYTgwMGI5MWVmYWYyNTM4Nzg5OWNhNmQyNTlk
+    NzVhZDRiZGQ3NDQxY2U1YjNhYzllN2I0MWUxMzdkMjQ5YjM2YWU=
+  data.tar.gz: !binary |-
+    NWFlMzYyMGM0OWUzMWZjMTc1NTU1MjMyZGQ1ZDQxM2NlOGQ4OWE2MzViNzhh
+    ZWNjYjY1NWViZWY3MzVjNGE0NGUyZjljN2U5YjI2NmRkYjUzMTE1MjFhNjYy
+    MWUwMzhhNzI0YTgwNDM0ODYxODUzOGUyMjRlYzc1M2VmMTgwYzI=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx-2
+  - jruby

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.1.7:
+  - Fix bug related to NilClass#to_h
+  - Simplified packaging process: Now possible to package with an up-to-date system.
+0.1.6:
+  - Use Array on a value that can be a string or an array.
+  - Wrap the banner/footer/header defining method with a method with a default param.
+  - Fixed expectation that Choice.parse returns an empty hash. It really returns a nil.
+
 0.1.4:
   - Monkeypatch to Hash for #index deprecation. Only applied on RUBY_VERSION < "1.9"
   - Fixed rake file for README filename change
@@ -5,7 +13,7 @@
 
 0.1.3:
   - Added args_of method to retrieve the arguments of an option
-  
+
 0.1.2:
   - Made validate directive accept block and validate against its boolean value.
   - Created shorthand format for defining options directly with a hash.

data/README.rdoc

@@ -1,7 +1,7 @@
 = Welcome to Choice
 
 Choice is a small library for defining and parsing command line options.  It 
-works awesomely with Highline[http://highline.rubyforge.org/] or other command 
+works awesomely with Highline[https://github.com/JEG2/highline] or other command 
 line interface libraries.
 
 Choice was written by Chris Wanstrath as an exercise in test driving development 
@@ -11,9 +11,7 @@ is appreciated.
 Installing is easy, with RubyGems.  Give it a shot:
  $ gem install choice
 
-If you are lost, you can find Choice at http://choice.rubyforge.org or 
-http://rubyforge.org/projects/choice/.  E-mail inquiries can be directed to
-mailto:chris[at]ozmm[dot]org.
+E-mail inquiries can be directed to mailto:chris[at]ozmm[dot]org.
 
 Of course, Choice is licensed under the MIT License, which you can find included
 in the LICENSE file or by surfing your World Wide Web browser of choice towards 

data/Rakefile

@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'rake'
+require 'rake/testtask'
+require 'rdoc/task'
+require './lib/choice/version'
+
+PACKAGE_VERSION = Choice::Version::STRING
+
+desc "Default task"
+task :default => [ :test ]
+
+Rake::TestTask.new :test do |t|
+  t.test_files = [ "test/test*" ]
+end
+
+desc "Clean generated files"
+task :clean do
+  rm_rf "choice-#{PACKAGE_VERSION}.gem"
+end
+
+desc "Prepackage warnings and reminders"
+task :prepackage do
+  unless ENV["OK"] == "yes"
+    puts "========================================================="
+    puts " Please check that the following files have been updated"
+    puts " in preparation for release #{PACKAGE_VERSION}:"
+    puts
+    puts "   README.rdoc (with latest info)"
+    puts "   CHANGELOG (with the recent changes)"
+    puts "   lib/choice/version.rb (with current version number)"
+    puts
+    puts " Did you remember to 'rake tag'?"
+    puts
+    puts " If you are sure these have all been taken care of, re-run"
+    puts " rake with 'OK=yes'."
+    puts "========================================================="
+    puts
+
+    abort
+  end
+end
+
+desc "Tag the current trunk with the current release version"
+task :tag do
+  tag = "v#{PACKAGE_VERSION}"
+  warn "WARNING: this will tag using the tag #{tag} and push the ref to git://www.github.com/defunkt/choice"
+  warn "If you do not wish to continue, you have 5 seconds to cancel by pressing CTRL-C..."
+  5.times { |i| print "#{5-i} "; $stdout.flush; sleep 1 }
+  system "git tag -a #{tag} -m \"Tagging the #{tag} release\""
+  system "git push origin #{tag}"
+end
+
+task :gem do
+  system "gem build choice.gemspec"
+end
+
+desc "Build all packages"
+task :package => [ :prepackage, :test, :gem ]

data/TODO

@@ -0,0 +1,7 @@
+1. Add support for defining the number of arguments an option takes.
+2. Use a static gemspec.
+3. Add a Gemfile to help with consistency in development.
+4. Simplify anything in the Rakefile that has a more common current practice.
+5. Either make everything work on 1.8.6+ or start deprecating older interpreters.
+6. Publish docs similar to how we used to pub to RubyForge
+7. Convert these to Github Issues

data/choice.gemspec

@@ -0,0 +1,20 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'choice/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "choice"
+  spec.version       = Choice::Version::STRING
+  spec.authors       = ["Grant Austin", "Chris Wanstrath"]
+  spec.email         = ["gaustin@gmail.com", "chris@ozmm.org"]
+  spec.summary       = "Choice is a command line option parser."
+  spec.description   = "Choice is a simple little gem for easily defining and parsing command line options with a friendly DSL."
+  spec.homepage      = "http://www.github.com/defunkt/choice"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+end

data/lib/choice/version.rb

@@ -2,7 +2,7 @@ module Choice
   module Version #:nodoc:
     MAJOR  = 0
     MINOR  = 1
-    TINY   = 6 
+    TINY   = 7
     STRING = [MAJOR, MINOR, TINY] * '.'
   end
 end

data/lib/choice/writer.rb

@@ -63,7 +63,7 @@ module Choice
         # If the option is a hash, run it through option_line.  Otherwise
         # just print it out as is.
         options.each do |name, option|
-          if option.respond_to?(:to_h)
+          if !option.nil? && option.respond_to?(:to_h)
             option_line(option.to_h)          
           else
             puts name

data/test/test_choice.rb

@@ -5,13 +5,13 @@ require 'choice'
 $VERBOSE = nil
 
 class TestChoice < Test::Unit::TestCase
-  
+
   def setup
     Choice.reset!
     Choice.dont_exit_on_help = true
     Choice.send(:class_variable_set, '@@choices', {})
   end
-    
+
   def test_choices
     Choice.options do
       header "Tell me about yourself?"
@@ -63,10 +63,10 @@ class TestChoice < Test::Unit::TestCase
         short '-m'
         desc 'Your favorite meal.'
       end
-      
+
       separator ""
       separator "And you eat it with..."
-      
+
       option :utencil do
         short "-u"
         long "--utencil[=UTENCIL]"
@@ -75,7 +75,7 @@ class TestChoice < Test::Unit::TestCase
     end
 
     Choice.args = ['-m', 'lunch', '--help']
-    
+
     help_string = <<-HELP
 Usage: choice [-mu]
 
@@ -83,15 +83,15 @@ Usage: choice [-mu]
 
 And you eat it with...
     -u, --utencil[=UTENCIL]          Your favorite eating utencil.
-HELP
+    HELP
 
     assert_equal help_string, HELP_STRING
   end
-  
+
   UNKNOWN_STRING = ''
   def test_unknown_argument
     Choice.output_to(UNKNOWN_STRING)
-    
+
     Choice.options do
       banner "Usage: choice [-mu]"
       header ""
@@ -99,10 +99,10 @@ HELP
         short '-m'
         desc 'Your favorite meal.'
       end
-      
+
       separator ""
       separator "And you eat it with..."
-      
+
       option :utencil do
         short "-u"
         long "--utencil[=UTENCIL]"
@@ -111,7 +111,7 @@ HELP
     end
 
     Choice.args = ['-m', 'lunch', '--motorcycles']
-    
+
     help_string = <<-HELP
 Usage: choice [-mu]
 
@@ -119,15 +119,15 @@ Usage: choice [-mu]
 
 And you eat it with...
     -u, --utencil[=UTENCIL]          Your favorite eating utencil.
-HELP
-    
+    HELP
+
     assert_equal help_string, UNKNOWN_STRING
   end
-  
+
   REQUIRED_STRING = ''
   def test_required_argument
     Choice.output_to(REQUIRED_STRING)
-    
+
     Choice.options do
       banner "Usage: choice [-mu]"
       header ""
@@ -135,10 +135,10 @@ HELP
         short '-m'
         desc 'Your favorite meal.'
       end
-      
+
       separator ""
       separator "And you eat it with..."
-      
+
       option :utencil do
         short "-u"
         long "--utencil[=UTENCIL]"
@@ -147,7 +147,7 @@ HELP
     end
 
     Choice.args = ['-u', 'spork']
-    
+
     help_string = <<-HELP
 Usage: choice [-mu]
 
@@ -155,8 +155,8 @@ Usage: choice [-mu]
 
 And you eat it with...
     -u, --utencil[=UTENCIL]          Your favorite eating utencil.
-HELP
-    
+    HELP
+
     assert_equal help_string, REQUIRED_STRING
   end
 
@@ -165,25 +165,25 @@ HELP
       header "Tell me about yourself?"
       header ""
       options :band => { :short => "-b", :long => "--band=BAND", :cast => String, :desc => ["Your favorite band.", "Something cool."],
-                        :validate => /\w+/ },
-              :animal => { :short => "-a", :long => "--animal=ANIMAL", :cast => String, :desc => "Your favorite animal." }
-      
+                         :validate => /\w+/ },
+                         :animal => { :short => "-a", :long => "--animal=ANIMAL", :cast => String, :desc => "Your favorite animal." }
+
       footer ""
       footer "--help This message"
     end
-    
+
     band = 'LedZeppelin'
     animal = 'Reindeer'
-    
+
     args = ['-b', band, "--animal=#{animal}"]
     Choice.args = args
-    
+
     assert_equal band, Choice.choices['band']
     assert_equal animal, Choice.choices[:animal]
     assert_equal ["Tell me about yourself?", ""], Choice.header
     assert_equal ["", "--help This message"], Choice.footer
   end
-  
+
   def test_args_of
     suits = %w[clubs diamonds spades hearts]
     stringed_numerics = (1..13).to_a.map { |a| a.to_s }
@@ -191,7 +191,7 @@ HELP
     cards = {}
     stringed_numerics.each { |n| cards[n] = n }
     cards.merge!('1' => 'ace', '11' => 'jack', '12' => 'queen', '13' => 'king')
-    
+
     Choice.options do
       header "Gambling is fun again!  Pick a card and a suit (or two), then see if you win!"
       header ""
@@ -215,7 +215,7 @@ HELP
         valid valid_cards
         cast String
       end
-      
+
       #cheat! to test --option=
       option :autowin do
         short '-a'
@@ -224,7 +224,7 @@ HELP
         desc 'Beware: raises the suspitions of other players'
       end
     end
-    
+
     args = ["-c", "king", "--suit", "clubs", "diamonds", "spades", "hearts", "--autowin", "Grant"]
     Choice.args = args
     assert_equal ["king"], Choice.args_of("-c")

metadata

@@ -1,61 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: choice
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
+- Grant Austin
 - Chris Wanstrath
-autorequire: choice
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies: []
 description: Choice is a simple little gem for easily defining and parsing command
   line options with a friendly DSL.
-email: chris@ozmm.org
+email:
+- gaustin@gmail.com
+- chris@ozmm.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
+- .travis.yml
 - CHANGELOG
 - LICENSE
+- README.rdoc
+- Rakefile
+- TODO
+- choice.gemspec
+- examples/ftpd.rb
+- examples/gamble.rb
+- lib/choice.rb
 - lib/choice/lazyhash.rb
 - lib/choice/option.rb
 - lib/choice/parser.rb
 - lib/choice/version.rb
 - lib/choice/writer.rb
-- lib/choice.rb
 - test/test_choice.rb
 - test/test_lazyhash.rb
 - test/test_option.rb
 - test/test_parser.rb
 - test/test_writer.rb
-- examples/ftpd.rb
-- examples/gamble.rb
-homepage: http://choice.rubyforge.org/
-licenses: []
+homepage: http://www.github.com/defunkt/choice
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Choice is a command line option parser.
-test_files: []
+test_files:
+- test/test_choice.rb
+- test/test_lazyhash.rb
+- test/test_option.rb
+- test/test_parser.rb
+- test/test_writer.rb
+has_rdoc: