clip 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.0.1 / 2009-01-06
+
+* Fixed a bug where generating help resulted in an infinite-loop
+
+=== 1.0.0 / 2008-09-19
+
+* Added support for mapping dashes to underscores for flags
+* Define Clip.hash.remainder as a singleton method instead of reopening Hash
+* remainder works with Clip.hash now
+* Reimplemented Clip.hash to use a parser.
+
 === 0.0.7 / 2008-07-14
 
 * remainder now works with Clip.hash method.

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.rdoc
+README.txt
 Rakefile
 clip.gemspec
 lib/clip.rb

data/Rakefile

@@ -7,7 +7,7 @@ require './lib/clip.rb'
 Hoe.new('clip', Clip::VERSION) do |p|
   p.name = 'clip'
   p.developer('Alex Vollmer', 'alex.vollmer@gmail.com')
-  p.description = p.paragraphs_of('README.rdoc', 5..5).join("\n\n")
+  p.description = p.paragraphs_of('README.txt', 5..5).join("\n\n")
   p.summary = 'Command-line parsing made short and sweet'
   p.url = 'http://clip.rubyforge.org'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")

data/clip.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
   s.description = %q{You like command-line parsing, but you hate all of the bloat. Why should you have to create a Hash, then create a parser, fill the Hash out then throw the parser away (unless you want to print out a usage message) and deal with a Hash? Why, for Pete's sake, should the parser and the parsed values be handled by two different objects?}
   s.email = ["alex.vollmer@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "clip.gemspec", "lib/clip.rb", "spec/clip_spec.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "clip.gemspec", "lib/clip.rb", "spec/clip_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://clip.rubyforge.org}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{clip}
   s.rubygems_version = %q{1.2.0}

data/lib/clip.rb

@@ -15,7 +15,7 @@ def Clip(args=ARGV)
 end
 
 module Clip
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
   ##
   # Indicates that the parser was incorrectly configured in the
@@ -247,7 +247,7 @@ module Clip
           i = 0
           while i < desc.length
             out << "\n" if i > 0
-            j = [i + rem, desc.length - 1].min
+            j = [i + rem, desc.length].min
             while desc[j..j] =~ /[\w\d]/
               j -= 1
             end

data/spec/clip_spec.rb

@@ -1,6 +1,7 @@
 require "#{File.dirname(__FILE__)}/../lib/clip"
 require "rubygems"
 require "spec"
+require "timeout"
 
 class HaveErrors
 
@@ -83,7 +84,7 @@ describe Clip do
       parser.should_not have_errors
     end
 
-    it "should set fields for options with the given values" do
+    it "should set fields for flags with the given values" do
       parser = parse('--server localhost --port 8080 --files foo')
       parser.server.should eql("localhost")
       parser.port.should eql("8080")
@@ -97,7 +98,7 @@ describe Clip do
       parser.should be_valid
       parser.should_not have_errors
     end
-    
+
     it "should map flags with '-' to methods with '_'" do
       parser = parse('--allow-dashes')
       parser.should be_allow_dashes
@@ -137,7 +138,7 @@ describe Clip do
     end
   end
 
-  describe "When options are marked as required" do
+  describe "When parameters are marked as required" do
 
     it "should be invalid when there are missing arguments" do
       parser = parse('--server localhost')
@@ -146,9 +147,10 @@ describe Clip do
     end
   end
 
-  describe "When options are marked with defaults" do
 
-    it "should provide default option values when none are parsed" do
+  describe "When parameters are marked with defaults" do
+
+    it "should provide default parameter values when none are parsed" do
       parser = parse('--files foo')
       parser.should be_valid
       parser.should_not have_errors
@@ -232,6 +234,23 @@ describe Clip do
       out[0].should == 'USAGE foo bar baz'
     end
 
+    it "should handle Travis' degenerate infinite-loop case" do
+     opts = Clip('-c') do |c|
+        c.flag('c',
+               'no-close-session',
+               :desc => 'Close the session after successful import?')
+        c.flag('l',
+               'live-site',
+               :desc => "Query live wikipedia site for wiki text instead of DB session")
+      end
+
+      help = Timeout.timeout(2) { opts.to_s.split("\n") }
+      help[0].should match(/Usage/)
+      help[1].should == "-c  --no-close-session  Close the session after successful import?"
+      help[2].should == "-l  --live-site         Query live wikipedia site for wiki text instead of DB"
+      help[3].should == "                        session"
+    end
+
     it "should support overriding help flags" do
       opts = Clip('-?') do |p|
         p.opt 'h', 'host', :desc => 'The hostname'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clip
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Alex Vollmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-19 00:00:00 -07:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: You like command-line parsing, but you hate all of the bloat. Why should you have to create a Hash, then create a parser, fill the Hash out then throw the parser away (unless you want to print out a usage message) and deal with a Hash? Why, for Pete's sake, should the parser and the parsed values be handled by two different objects?
 email: 
@@ -32,10 +32,11 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
+- README.txt
 - Rakefile
 - clip.gemspec
 - lib/clip.rb
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: clip
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Command-line parsing made short and sweet