gli 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 682f0c39f5868ca9916a096f827f8b17a8da42ef
-  data.tar.gz: f30d788626a9e064a60c572a0d34de8af449868e
+  metadata.gz: 94f421bf818175143af61b7b8e7ae0a4f9d79254
+  data.tar.gz: 7edaeb9e3d2c98c0c9c5e15ca3688bcfd40acd57
 SHA512:
-  metadata.gz: e9186466da8fdb400d99bc8a720fb07b46dac8f1ed3fafc923fc57e36ef6476d05fb61a1574b59ab23a970f6f3b57aceeb15b31a8e46acfedfdbe4a3e6cf176c
-  data.tar.gz: 778bf6e7cff32246c3a9598a8b33b1ef594389053b8bab79e5a3e960f4aa9ce49af658c03e9250302ccdbd097f0f7562f533e15d8bcdee76e0c24ca742784847
+  metadata.gz: 30444e8c7f15e1eef0c2ea2c1761dfdcf7a3b307cfa965b4722d22eb0b7dcb3a1939b73119faaa81e3e4b67c8c04978e637311c48aee82314fba9d524be9913b
+  data.tar.gz: 039e7d4cf7331f676ed7bfc61f39d9f988a075758c1529760d5826af5f6b7dd2e33c10ae12363ed235ba6a55a2961fbcd5362fc45e517052ec8916ba2e35ff08

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1
+2.2.2

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
 branches:
   only:
     - 'gli-2'

data/Gemfile

@@ -6,3 +6,7 @@ gem "rcov", ">= 0.9.8", :platforms => :mri_18
 gem "simplecov", "~> 0.6.4", :platforms => :mri_19
 gem "psych", :platforms => :mri_19
 
+major,minor = RUBY_VERSION.split(/\./)
+if major.to_i >=2 && minor.to_i >= 2
+  gem "test-unit"
+end

data/gli.gemspec

@@ -27,7 +27,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('clean_test')
   s.add_development_dependency('cucumber')
   s.add_development_dependency('gherkin')
-  s.add_development_dependency('aruba')
+  s.add_development_dependency('aruba', '0.5.1')
   s.add_development_dependency('sdoc')
   s.add_development_dependency('faker','1.0.0')
 end

data/lib/gli/app.rb

@@ -94,7 +94,7 @@ module GLI
       @skips_around = true
     end
 
-    # Sets that this app uses a config file as well as the name of the config file.  
+    # Sets that this app uses a config file as well as the name of the config file.
     #
     # +filename+:: A String representing the path to the file to use for the config file.  If it's an absolute
     #              path, this is treated as the path to the file.  If it's *not*, it's treated as relative to the user's home
@@ -152,7 +152,7 @@ module GLI
     # Define a block to run if an error occurs.
     # The block will receive any Exception that was caught.
     # It should evaluate to false to avoid the built-in error handling (which basically just
-    # prints out a message). GLI uses a variety of exceptions that you can use to find out what 
+    # prints out a message). GLI uses a variety of exceptions that you can use to find out what
     # errors might've occurred during command-line parsing:
     # * GLI::CustomExit
     # * GLI::UnknownCommandArgument
@@ -165,7 +165,7 @@ module GLI
 
     # Indicate the version of your application
     #
-    # +version+:: String containing the version of your application.  
+    # +version+:: String containing the version of your application.
     def version(version)
       @version = version
       desc 'Display the program version'
@@ -191,7 +191,7 @@ module GLI
     end
 
     # Configure a type conversion not already provided by the underlying OptionParser.
-    # This works more or less like the OptionParser version.
+    # This works more or less like the OptionParser version. It's global.
     #
     # object:: the class (or whatever) that triggers the type conversion
     # block:: the block that will be given the string argument and is expected
@@ -201,7 +201,7 @@ module GLI
     #
     #     accept(Hash) do |value|
     #       result = {}
-    #       value.split(/,/) do |pair|
+    #       value.split(/,/).each do |pair|
     #         k,v = pair.split(/:/)
     #         result[k] = v
     #       end
@@ -213,7 +213,7 @@ module GLI
       accepts[object] = block
     end
 
-    # Simpler means of exiting with a custom exit code.  This will 
+    # Simpler means of exiting with a custom exit code.  This will
     # raise a CustomExit with the given message and exit code, which will ultimatley
     # cause your application to exit with the given exit_code as its exit status
     # Use #help_now! if you want to show the help in addition to the error message
@@ -291,7 +291,7 @@ module GLI
       @subcommand_option_handling_strategy = handling_strategy
     end
 
-    # How to handle argument validation. 
+    # How to handle argument validation.
     #
     # handling_strategy:: One of:
     #                     +:loose+:: no argument validation.  Use of `arg` or `arg_name` is for documentation purposes only.  (Default)

data/lib/gli/terminal.rb

@@ -78,7 +78,11 @@ module GLI
     #
     # Returns an Array of size two Ints representing the terminal width and height
     def size
-      SIZE_DETERMINERS.select { |(predicate,ignore)| predicate.call }.first[1].call
+      SIZE_DETERMINERS.each do |predicate, get_size|
+        next unless predicate.call
+        size = get_size.call
+        return size unless size == [0, 0]
+      end
     rescue Exception => ex
       raise ex if @unsafe
       Terminal.default_size

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.13.1'
+    VERSION = '2.13.2'
   end
 end

data/test/tc_terminal.rb

@@ -73,6 +73,30 @@ class TC_testTerminal < Clean::Test::TestCase
     assert_equal [5678,1234],terminal.size
   end
 
+  def test_size_using_stty_but_returns_0
+    terminal = GLI::Terminal.new
+    terminal.make_unsafe!
+    GLI::Terminal.instance_eval do
+      def run_command(command)
+
+        if RUBY_PLATFORM == 'java'
+          return '0' if command == 'tput cols'
+          return '0' if command == 'tput lines'
+        else 
+          return '0 0' if command == 'stty size'
+          return '0 0' if command == 'stty'
+        end
+
+        raise "Unexpected command called: #{command} for #{RUBY_PLATFORM}"
+      end
+      def command_exists?(command); true; end
+      def jruby?; false; end
+      def solaris?; false; end
+    end
+    ENV['COLUMNS'] = 'foo'
+    assert_equal [80,24],terminal.size
+  end
+
   def test_size_using_default
     terminal = GLI::Terminal.new
     terminal.make_unsafe!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.13.2
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,16 +98,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gli
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Build command-suite CLI apps that are awesome.