gli 2.0.0.rc6 → 2.0.0.rc7

data/gli.gemspec

@@ -8,8 +8,8 @@ spec = Gem::Specification.new do |s|
   s.email = 'davidcopeland@naildrivin5.com'
   s.homepage = 'http://davetron5000.github.com/gli'
   s.platform = Gem::Platform::RUBY
-  s.summary = 'A Git Like Interface for building command line apps'
-  s.description = 'An application and API for describing command line interfaces that can be used to quickly create a shell for executing command-line tasks.  The command line user interface is similar to Git''s, in that it takes global options, a command, command-specific options, and arguments'
+  s.summary = 'Build command-suite CLI apps that are awesome.'
+  s.description = 'Build command-suite CLI apps that are awesome.  Bootstrap your app, add commands, options and documentation while maintaining a well-tested idiomatic command-line app'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gli.rb

@@ -20,4 +20,8 @@ require 'gli/commands/rdoc_document_listener'
 require 'gli/commands/doc'
 
 module GLI
+  include GLI::App
+  def self.included(klass)
+    warn "You should include GLI::App instead"
+  end
 end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.0.0.rc6' #:nodoc:
+    VERSION = '2.0.0.rc7' #:nodoc:
   end
 end

data/test/apps/todo/bin/todo

@@ -8,7 +8,11 @@ require 'gli'
 require 'todo/version'
 
 
+if ENV['GLI1_COMPATIBILITY']
+include GLI
+else
 include GLI::App
+end
 
 program_desc 'Manages tasks'
 

data/test/tc_flag.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 
 class TC_testFlag < Clean::Test::TestCase
   include TestHelper
-  include GLI
 
   def test_basics_simple
     Given flag_with_names(:f)
@@ -38,7 +37,7 @@ class TC_testFlag < Clean::Test::TestCase
         :must_match => /foobar/,
         :type => Float,
       }
-      @flag = Flag.new(names,@options)
+      @flag = GLI::Flag.new(names,@options)
       @cli_option = @flag
     end
   end

data/test/tc_gli.rb

@@ -14,7 +14,6 @@ require 'test_helper'
 
 class TC_testGLI < Clean::Test::TestCase
   include TestHelper
-  include GLI
 
   def setup
     @fake_stdout = FakeStdOut.new
@@ -41,7 +40,7 @@ class TC_testGLI < Clean::Test::TestCase
   def test_flag_create
     @app.reset
     do_test_flag_create(@app)
-    do_test_flag_create(Command.new(:names => :f))
+    do_test_flag_create(GLI::Command.new(:names => :f))
   end
 
   def test_create_commands_using_strings
@@ -226,13 +225,13 @@ class TC_testGLI < Clean::Test::TestCase
   def test_switch_create
     @app.reset
     do_test_switch_create(@app)
-    do_test_switch_create(Command.new(:names => :f))
+    do_test_switch_create(GLI::Command.new(:names => :f))
   end
 
   def test_switch_create_twice
     @app.reset
     do_test_switch_create_twice(@app)
-    do_test_switch_create_twice(Command.new(:names => :f))
+    do_test_switch_create_twice(GLI::Command.new(:names => :f))
   end
 
   def test_all_aliases_in_options
@@ -459,7 +458,7 @@ class TC_testGLI < Clean::Test::TestCase
     @app.on_error { true }
     @app.command(:foo) do |c|
       c.action do |g,o,a|
-        raise CustomExit.new("Problem",45)
+        raise GLI::CustomExit.new("Problem",45)
       end
     end
     assert_equal 45,@app.run(['foo'])
@@ -522,7 +521,7 @@ class TC_testGLI < Clean::Test::TestCase
       end
     end
 
-    assert_raises(CustomExit) { @app.run(['foo']) }
+    assert_raises(GLI::CustomExit) { @app.run(['foo']) }
   end
 
   class ConvertMe

data/test/tc_options.rb

@@ -2,10 +2,9 @@ require 'test_helper'
 
 class TC_testOptions < Clean::Test::TestCase
   include TestHelper
-  include GLI
 
   def test_by_method
-    o = Options.new
+    o = GLI::Options.new
     o.name = 'verbose'
     assert_equal 'verbose', o.name
     assert_equal 'verbose', o[:name]
@@ -13,7 +12,7 @@ class TC_testOptions < Clean::Test::TestCase
   end
   
   def test_by_string
-    o = Options.new
+    o = GLI::Options.new
     o['name'] = 'verbose'
     assert_equal 'verbose', o.name
     assert_equal 'verbose', o[:name]
@@ -21,7 +20,7 @@ class TC_testOptions < Clean::Test::TestCase
   end
   
   def test_by_symbol
-    o = Options.new
+    o = GLI::Options.new
     o[:name] = 'verbose'
     assert_equal 'verbose', o.name
     assert_equal 'verbose', o[:name]
@@ -29,7 +28,7 @@ class TC_testOptions < Clean::Test::TestCase
   end
 
   def test_map_defers_to_underlying_map
-    o = Options.new
+    o = GLI::Options.new
     o[:foo] = 'bar'
     o[:blah] = 'crud'
 

data/test/tc_switch.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 
 class TC_testSwitch < Clean::Test::TestCase
   include TestHelper
-  include GLI
 
   def test_basics_simple
     Given switch_with_names(:filename)
@@ -29,8 +28,8 @@ class TC_testSwitch < Clean::Test::TestCase
   end
 
   def test_includes_negatable
-    assert_equal '-a',Switch.name_as_string('a')
-    assert_equal '--[no-]foo',Switch.name_as_string('foo')
+    assert_equal '-a',GLI::Switch.name_as_string('a')
+    assert_equal '--[no-]foo',GLI::Switch.name_as_string('foo')
   end
 
   private 
@@ -41,7 +40,7 @@ class TC_testSwitch < Clean::Test::TestCase
         :desc => 'Filename',
         :long_desc => 'The Filename',
       }
-      @switch = Switch.new(names,@options)
+      @switch = GLI::Switch.new(names,@options)
       @cli_option = @switch
     end
   end

data/test/tc_terminal.rb

@@ -2,11 +2,10 @@ require 'test_helper'
 
 class TC_testTerminal < Clean::Test::TestCase
   include TestHelper
-  include GLI
 
   def test_command_exists
-    assert Terminal.instance.command_exists?('ls')
-    assert !Terminal.instance.command_exists?('asdfasfasdf')
+    assert GLI::Terminal.instance.command_exists?('ls')
+    assert !GLI::Terminal.instance.command_exists?('asdfasfasdf')
   end
 
   def setup
@@ -17,23 +16,23 @@ class TC_testTerminal < Clean::Test::TestCase
   def teardown
     ENV['COLUMNS'] = @old_columns 
     ENV['LINES'] = @old_lines
-    Terminal.default_size = [80,24]
+    GLI::Terminal.default_size = [80,24]
   end
 
   def test_shared_instance_is_same
-    assert_equal Terminal.instance,Terminal.instance
+    assert_equal GLI::Terminal.instance,GLI::Terminal.instance
   end
 
   def test_size_based_on_columns
     ENV['COLUMNS'] = '666'
     ENV['LINES'] = '777'
-    assert_equal [666,777],Terminal.instance.size
+    assert_equal [666,777],GLI::Terminal.instance.size
   end
 
   def test_size_using_tput
-    terminal = Terminal.new
+    terminal = GLI::Terminal.new
     terminal.make_unsafe!
-    Terminal.instance_eval do
+    GLI::Terminal.instance_eval do
       def run_command(command)
         if command == 'tput cols'
           return '888'
@@ -51,9 +50,9 @@ class TC_testTerminal < Clean::Test::TestCase
   end
 
   def test_size_using_stty
-    terminal = Terminal.new
+    terminal = GLI::Terminal.new
     terminal.make_unsafe!
-    Terminal.instance_eval do
+    GLI::Terminal.instance_eval do
       def run_command(command)
 
         if RUBY_PLATFORM == 'java'
@@ -73,22 +72,22 @@ class TC_testTerminal < Clean::Test::TestCase
   end
 
   def test_size_using_default
-    terminal = Terminal.new
+    terminal = GLI::Terminal.new
     terminal.make_unsafe!
-    Terminal.instance_eval do
+    GLI::Terminal.instance_eval do
       def command_exists?(command); false; end
       def jruby?; false; end
     end
     ENV['COLUMNS'] = 'foo'
     assert_equal [80,24],terminal.size
     # While we have this set up, lets make sure the default change falls through
-    Terminal.default_size = [90,45]
+    GLI::Terminal.default_size = [90,45]
     assert_equal [90,45],terminal.size
   end
 
   def test_size_using_default_when_exception
-    terminal = Terminal.new
-    Terminal.instance_eval do
+    terminal = GLI::Terminal.new
+    GLI::Terminal.instance_eval do
       def jruby?; raise "Problem"; end
     end
     ENV['COLUMNS'] = 'foo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc6
+  version: 2.0.0.rc7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,10 +155,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: An application and API for describing command line interfaces that can
-  be used to quickly create a shell for executing command-line tasks.  The command
-  line user interface is similar to Gits, in that it takes global options, a command,
-  command-specific options, and arguments
+description: Build command-suite CLI apps that are awesome.  Bootstrap your app, add
+  commands, options and documentation while maintaining a well-tested idiomatic command-line
+  app
 email: davidcopeland@naildrivin5.com
 executables:
 - gli
@@ -355,7 +354,7 @@ rubyforge_project: gli
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Git Like Interface for building command line apps
+summary: Build command-suite CLI apps that are awesome.
 test_files:
 - !binary |-
   ZmVhdHVyZXMvZ2xpX2V4ZWN1dGFibGUuZmVhdHVyZQ==