optix 1.0.3 → 1.1.0

data/README.md

@@ -8,7 +8,7 @@ Optix is an unobtrusive, composable command line parser based on Trollop.
 * Lightweight, unobtrusive syntax.
   No subclassing or introduction of dependencies.
 
-* Supports subcommands such as `git remote show origin` with arbitrary nesting.
+* Nested subcommands such as `git remote show origin` may be composed at runtime in arbitrary order.
 
 * Subcommands inherit from their parent. Common options (such as '--debug' or '--loglevel')
   need to be declared only once to make them available to an entire branch.
@@ -18,6 +18,8 @@ Optix is an unobtrusive, composable command line parser based on Trollop.
 
 * Automatic validation and help-screens.
 
+* Should work on all major Ruby versions (tested on 1.9.3, 1.9.2 and 1.8.7).
+
 * Strong test-suite.
 
 ## Installation

data/Rakefile

@@ -9,7 +9,7 @@ RSpec::Core::RakeTask.new("test:spec") do |t|
     t.pattern = 'spec/*_spec.rb'
     t.rcov = false
     #t.rspec_opts = '-b -c -f progress --tag ~benchmark'
-    t.rspec_opts = '-b -c -f documentation --tag ~benchmark'
+    t.rspec_opts = '--fail-fast -b -c -f documentation --tag ~benchmark'
 end
 
 RSpec::Core::RakeTask.new("test:benchmark") do |t|

data/lib/optix.rb

@@ -59,24 +59,21 @@ class Optix
       o[:params] = @@config[:text_param_subcommand]
     end
 
-    text = o[:header].gsub('%0', $0)
-                     .gsub('%command', cmdpath.join(' '))
-                     .gsub('%params', o[:params])
-                     .gsub(/ +/, ' ')
+    text = o[:header].gsub('%0', $0).gsub('%command', cmdpath.join(' ')).gsub('%params', o[:params]).gsub(/ +/, ' ')
 
     calls = []
-    calls << [:banner, [text], nil]
+    calls << [:nowrap, [text], nil]
 
     calls << [:banner, [' '], nil]
     unless o[:text].nil?
-      calls << [:banner, o[:text], nil]
+      calls << [:banner, [o[:text]], nil]
       calls << [:banner, [' '], nil]
     end
 
     # sort opts and move non-opt calls to the end
     non_opt = parent_calls.select {|x| x[0] != :opt }
-    parent_calls.select! {|x| x[0] == :opt }
-    parent_calls.sort! {|a,b| ; a[1][0] <=> b[1][0] }
+    parent_calls = parent_calls.select {|x| x[0] == :opt }
+    parent_calls.sort! {|a,b| ; a[1][0].to_s <=> b[1][0].to_s }
     parent_calls += non_opt
     parent_calls.unshift([:banner, [@@config[:text_header_options]], nil])
     calls += parent_calls

data/lib/optix/trollop.rb

@@ -246,6 +246,9 @@ class Parser
   def banner s; @order << [:text, s] end
   alias :text :banner
 
+  ## Adds text to the help display without wrapping.
+  def nowrap s; @order << [:nowrap, s] end
+
   ## Marks two (or more!) options as requiring each other. Only handles
   ## undirected (i.e., mutual) dependencies. Directed dependencies are
   ## better modeled with Trollop::die.
@@ -480,6 +483,11 @@ class Parser
         next
       end
 
+      if what == :nowrap
+        stream.puts opt
+        next
+      end
+
       spec = @specs[opt]
       #next if @no_help_help and opt == :help
       stream.printf "  %#{leftcol_width}s:   ", left[opt]

data/lib/optix/version.rb

@@ -1,3 +1,3 @@
-module Optix
-  VERSION = "1.0.3"
+class Optix
+  VERSION = "1.1.0"
 end

data/optix.gemspec

@@ -17,5 +17,8 @@ Gem::Specification.new do |gem|
   gem.version       = Optix::VERSION
 
   gem.add_dependency "chronic"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "simplecov"
 end

data/spec/spec_helper.rb

@@ -1,22 +1,6 @@
 require 'simplecov'
 SimpleCov.start
 
-RSpec::Matchers.define :have_stdout do |regex|
-  define_method :has_stdout? do |actual|
-    regex = /^#{Regexp.escape(regex)}$/ if regex.is_a?(String)
-
-    $stdout = StringIO.new
-    actual.call
-    $stdout.rewind
-    captured = $stdout.read
-
-    $stdout = STDOUT
-    captured =~ regex
-  end
-  match { |actual| has_stdout?(actual) }
-end
-
-
 def capture_streams(stdin_str = '')
   begin
     require 'stringio'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optix
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &16186640 !ruby/object:Gem::Requirement
+  requirement: &4581720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16186640
+  version_requirements: *4581720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &4580900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *4580900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &4579220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *4579220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16182560 !ruby/object:Gem::Requirement
+  requirement: &4594820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16182560
+  version_requirements: *4594820
 description: Optix is an unobtrusive, composable command line parser.
 email:
 - moe@busyloop.net
@@ -65,12 +87,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1556456279788703897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1556456279788703897
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -80,4 +108,3 @@ summary: Optix is an unobtrusive, composable command line parser.
 test_files:
 - spec/optix_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false