commander 4.4.6 → 4.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 584705d6b59c75d49df6d2369763f91b5a5dbc5013575dbb2be575983b040f60
-  data.tar.gz: 0bab3911300bcc194406717c08ab1718608c86fe62703f0219a16a645bded947
+  metadata.gz: 9bb88c28e0d43c3616cceb161661a306fbcb74ef6c68ce67bc5aee8e820498cd
+  data.tar.gz: 9c5295c278179f4325c179b61a07182c45f3ed911b8228294cdf53e83cb6fe74
 SHA512:
-  metadata.gz: 1bb1d5703d53f0c6a140e7f24e0d4c9f0e80283425b2daf49d80da554a78122d4eb731bb9ee817c11e0636732938ffab81367312f599b40c3c8f8dc036ab9604
-  data.tar.gz: 1da0b8c354a4b0fc744e170c6d6e3393ddbb759ae9fecf50cf06274ee1611dd48d1f9c69e0414c3b28d2d810d56e0a6348c17eec3c58b084dd14f594a7f9a3b4
+  metadata.gz: 977685b95002c9e0dcaafd60da783473dc1e2d90f72eec6c1fc209d7ba6ff498f7941f2ac263244775d58d5f41b7bda7e57d7a39041963d8ec85852c20b99ee9
+  data.tar.gz: 2c2eb1a834b1446b61d0ac7dbeb8f0575f80ab10e57d432a6710c4e37eb24eb870a6312655be5f27f3d4250505320f04fb46c763f91ef688b9e6c96fa573b45e

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 4.4.7 / 2018-10-22
+
+* Update HighLine dependency to 2.0.0. (@rohitpaulk)
+
 === 4.4.6 / 2018-07-31
 
 * Fix unexpected internal behavior change introduced in 4.4.5.

data/commander.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('highline', '~> 1.7.2')
+  s.add_runtime_dependency('highline', '~> 2.0.0')
 
   s.add_development_dependency('rspec', '~> 3.2')
   s.add_development_dependency('rake')

data/lib/commander/core_ext/array.rb

@@ -1,7 +1,7 @@
 class Array
   ##
   # Split _string_ into an array. Used in
-  # conjunction with Highline's #ask, or #ask_for_array
+  # conjunction with HighLine's #ask, or #ask_for_array
   # methods, which must respond to #parse.
   #
   # This method allows escaping of whitespace. For example

data/lib/commander/help_formatters/terminal/command_help.erb

@@ -1,22 +1,22 @@
 
-  <%= $terminal.color "NAME", :bold %>:
+  <%= HighLine.default_instance.color "NAME", :bold %>:
 
     <%= @name %>
 <% if @syntax -%>
 
-  <%= $terminal.color "SYNOPSIS", :bold %>:
+  <%= HighLine.default_instance.color "SYNOPSIS", :bold %>:
 
     <%= @syntax -%>
 
 <% end -%>
 
-  <%= $terminal.color "DESCRIPTION", :bold %>:
+  <%= HighLine.default_instance.color "DESCRIPTION", :bold %>:
 
     <%= Commander::HelpFormatter.indent 4, (@description || @summary || 'No description.') -%>
 
 <% unless @examples.empty? -%>
 
-  <%= $terminal.color "EXAMPLES", :bold %>:
+  <%= HighLine.default_instance.color "EXAMPLES", :bold %>:
 	<% for description, command in @examples -%>
 
     # <%= description %>
@@ -25,10 +25,10 @@
 <% end -%>
 <% unless @options.empty? -%>
 
-  <%= $terminal.color "OPTIONS", :bold %>:
+  <%= HighLine.default_instance.color "OPTIONS", :bold %>:
 	<% for option in @options -%>
 
-    <%= option[:switches].join ', ' %> 
+    <%= option[:switches].join ', ' %>
         <%= Commander::HelpFormatter.indent 8, option[:description] %>
 	<% end -%>
 <% end -%>

data/lib/commander/help_formatters/terminal/help.erb

@@ -1,34 +1,34 @@
-  <%= $terminal.color "NAME", :bold %>:
+  <%= HighLine.default_instance.color "NAME", :bold %>:
 
     <%= program :name %>
 
-  <%= $terminal.color "DESCRIPTION", :bold %>:
+  <%= HighLine.default_instance.color "DESCRIPTION", :bold %>:
 
     <%= Commander::HelpFormatter.indent 4, program(:description) %>
 
-  <%= $terminal.color "COMMANDS", :bold %>:
+  <%= HighLine.default_instance.color "COMMANDS", :bold %>:
 <% for name, command in @commands.sort -%>
 	<% unless alias? name %>
     <%= "%-#{max_command_length}s %s" % [command.name, command.summary || command.description] -%>
 	<% end -%>
 <% end %>
 <% unless @aliases.empty? %>
-  <%= $terminal.color "ALIASES", :bold %>:
+  <%= HighLine.default_instance.color "ALIASES", :bold %>:
   <% for alias_name, args in @aliases.sort %>
     <%= "%-#{max_aliases_length}s %s %s" % [alias_name, command(alias_name).name, args.join(' ')] -%>
   <% end %>
 <% end %>
 <% unless @options.empty? -%>
-  <%= $terminal.color "GLOBAL OPTIONS", :bold %>:
+  <%= HighLine.default_instance.color "GLOBAL OPTIONS", :bold %>:
 	<% for option in @options -%>
 
-    <%= option[:switches].join ', ' %> 
+    <%= option[:switches].join ', ' %>
         <%= option[:description] %>
 	<% end -%>
 <% end -%>
 <% if program :help -%>
   <% for title, body in program(:help) %>
-  <%= $terminal.color title.to_s.upcase, :bold %>:
+  <%= HighLine.default_instance.color title.to_s.upcase, :bold %>:
 
     <%= body %>
   <% end -%>

data/lib/commander/methods.rb

@@ -4,8 +4,8 @@ module Commander
     include Commander::UI::AskForClass
     include Commander::Delegates
 
-    if $stdin.tty? && (cols = $terminal.output_cols) >= 40
-      $terminal.wrap_at = cols - 5
+    if $stdin.tty? && (cols = HighLine.default_instance.output_cols) >= 40
+      HighLine.default_instance.wrap_at = cols - 5
     end
   end
 end

data/lib/commander/runner.rb

@@ -448,7 +448,7 @@ module Commander
     end
 
     def say(*args) #:nodoc:
-      $terminal.say(*args)
+      HighLine.default_instance.say(*args)
     end
   end
 end

data/lib/commander/user_interaction.rb

@@ -66,7 +66,7 @@ module Commander
 
     def say_ok(*args)
       args.each do |arg|
-        say $terminal.color(arg, :green)
+        say HighLine.default_instance.color(arg, :green)
       end
     end
 
@@ -80,7 +80,7 @@ module Commander
 
     def say_warning(*args)
       args.each do |arg|
-        say $terminal.color(arg, :yellow)
+        say HighLine.default_instance.color(arg, :yellow)
       end
     end
 
@@ -94,7 +94,7 @@ module Commander
 
     def say_error(*args)
       args.each do |arg|
-        say $terminal.color(arg, :red)
+        say HighLine.default_instance.color(arg, :red)
       end
     end
 
@@ -113,7 +113,7 @@ module Commander
     #   * highligh: on_<color>
 
     def color(*args)
-      say $terminal.color(*args)
+      say HighLine.default_instance.color(*args)
     end
 
     ##
@@ -329,7 +329,7 @@ module Commander
       # define methods for common classes
       [Float, Integer, String, Symbol, Regexp, Array, File, Pathname].each do |klass|
         define_method "ask_for_#{klass.to_s.downcase}" do |prompt|
-          $terminal.ask(prompt, klass)
+          HighLine.default_instance.ask(prompt, klass)
         end
       end
 
@@ -351,7 +351,7 @@ module Commander
 
           klass = available_classes.find { |k| k.to_s.downcase == requested_class }
           if klass
-            $terminal.ask(prompt, klass)
+            HighLine.default_instance.ask(prompt, klass)
           else
             super
           end
@@ -509,9 +509,9 @@ module Commander
         return if finished?
         erase_line
         if completed?
-          $terminal.say UI.replace_tokens(@complete_message, generate_tokens) if @complete_message.is_a? String
+          HighLine.default_instance.say UI.replace_tokens(@complete_message, generate_tokens) if @complete_message.is_a? String
         else
-          $terminal.say UI.replace_tokens(@format, generate_tokens) << ' '
+          HighLine.default_instance.say UI.replace_tokens(@format, generate_tokens) << ' '
         end
       end
 
@@ -544,7 +544,7 @@ module Commander
 
       def erase_line
         # highline does not expose the output stream
-        $terminal.instance_variable_get('@output').print "\r\e[K"
+        HighLine.default_instance.instance_variable_get('@output').print "\r\e[K"
       end
     end
   end

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '4.4.6'.freeze
+  VERSION = '4.4.7'.freeze
 end

data/spec/methods_spec.rb

@@ -16,12 +16,12 @@ describe Commander::Methods do
 
       before do
         allow(terminal).to receive(:ask)
-        $_old_terminal = $terminal
-        $terminal = terminal
+        @old_highline = HighLine.default_instance
+        HighLine.default_instance = terminal
       end
 
       after do
-        $terminal = $_old_terminal
+        HighLine.default_instance = @old_highline
       end
 
       subject do

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ require 'commander/methods'
 def mock_terminal
   @input = StringIO.new
   @output = StringIO.new
-  $terminal = HighLine.new @input, @output
+  HighLine.default_instance = HighLine.new(@input, @output)
 end
 
 # Create test command for usage within several specs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 4.4.7
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement