highline 2.0.0.pre.develop.15 → 2.0.0.pre.develop.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6f0077459b346ac0550722ee90fe5bab80bdab266d7fd109400593d0e44494
-  data.tar.gz: 0ae39b4928822060ec41ffa58619f450996feddde22d3b56bc710fe7748b1b0e
+  metadata.gz: 8d1af4546ccbd56901aee7db32d287c0a599a2ae06cb96d5ab4e10293735c0c0
+  data.tar.gz: 167e3f5567b04dcc76a0276b0596800bfb0c67c33b22d8abff6f897789d33edd
 SHA512:
-  metadata.gz: f52b6371cfc81e28f87dd8771ba7ac1c9e6b80404b14a4c6741be0b7c1e2395dd76855aed167520dc6e88692371cb4b0ecaf376fa0080a7cffbcebc121af7766
-  data.tar.gz: 64a65b6dd14cf5ac70cc3fdb3a7038f322f412a9b72ca2f3c32c4059f31a4c7543ddcf6ed1371a0e1eaee34c0b85419e83633c0d4b8868c0f850e4d3c0fd5e16
+  metadata.gz: b4c016dfdd3d1d3af5e81747597d20166886c26bc8713855238c947ecdd71c80e425759273b6624c3c3ed2c90dac07e770e380d8d6ce058ed3c61bfad6109c57
+  data.tar.gz: cf388f1550ade7cbcd06477dda3d550e11b45089d1959aedea57849dc76d9424b21024743e76cbaa646e59a7b6d01fccfe8bbe1e73f5570648676a15a199127b

data/Changelog.md

@@ -2,6 +2,10 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+### 2.0.0-develop.16 / 2018-05-12
+* PR #231 - Deprecate safe_level of ERB.new in Ruby 2.6 (@koic)
+* PR #230 - Fix behavior when shell and gather options are selected together
+
 ### 2.0.0-develop.15 / 2017-12-28
 * PR #229 - Update .travis.yml. Add Ruby 2.5 to matrix (@abinoam)
 

data/lib/highline.rb

@@ -257,7 +257,16 @@ class HighLine
     return unless selected
 
     if menu.shell
-      selection, details = selected
+      if menu.gather
+        selection = []
+        details = []
+        selected.each do |value|
+          selection << value[0]
+          details << value[1]
+        end
+      else
+        selection, details = selected
+      end
     else
       selection = selected
     end
@@ -533,9 +542,11 @@ class HighLine
         break if ["\n", "\r"].include? character
 
         # honor backspace and delete
-        if character == "\b"
+        if character == "\b" || character == "\u007F"
           chopped = line.chop!
           output_erase_char if chopped && question.echo
+        elsif character == "\e"
+          ignore_arrow_key
         else
           line << character
           say_last_char_or_echo_char(line, question)
@@ -561,6 +572,12 @@ class HighLine
     end
   end
 
+  def ignore_arrow_key
+    2.times do
+      terminal.get_character
+    end
+  end
+
   def say_last_char_or_echo_char(line, question)
     @output.print(line[-1]) if question.echo == true
     @output.print(question.echo) if question.echo && question.echo != true

data/lib/highline/list_renderer.rb

@@ -92,7 +92,11 @@ class HighLine
     def render_list_items(items)
       items.to_ary.map do |item|
         item = String(item)
-        template = ERB.new(item, nil, "%")
+        template = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+          ERB.new(item, trim_mode: "%")
+        else
+          ERB.new(item, nil, "%")
+        end
         template_renderer =
           HighLine::TemplateRenderer.new(template, self, highline)
         template_renderer.render

data/lib/highline/menu.rb

@@ -472,16 +472,22 @@ class HighLine
       selected_items = selections.map do |selection|
         find_item_from_selection(items, selection)
       end
+      index = 0
       selected_items.map do |selected_item|
-        value_for_selected_item(selected_item, details)
+        value = value_for_selected_item(selected_item, self.shell ? details[index] : nil)
+        index += 1
+        value
       end
     end
 
     def value_for_hash_selections(items, selections, details)
       # Find the selected items and return in hash form
+      index = 0
       selections.each_with_object({}) do |(key, selection), memo|
         selected_item = find_item_from_selection(items, selection)
-        memo[key] = value_for_selected_item(selected_item, details)
+        value = value_for_selected_item(selected_item, self.shell ? details[index] : nil)
+        index += 1
+        memo[key] = value
       end
     end
 

data/lib/highline/question.rb

@@ -548,7 +548,11 @@ class HighLine
       else
         # evaluate ERb under initial scope, so it will have
         # access to question and answer
-        template = ERB.new(confirm, nil, "%")
+        template = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+          ERB.new(confirm, trim_mode: "%")
+        else
+          ERB.new(confirm, nil, "%")
+        end
         template_renderer = TemplateRenderer.new(template, self, highline)
         template_renderer.render
       end

data/lib/highline/statement.rb

@@ -78,7 +78,11 @@ class HighLine
     end
 
     def template
-      @template ||= ERB.new(template_string, nil, "%")
+      @template ||= if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+        ERB.new(template_string, trim_mode: "%")
+      else
+        ERB.new(template_string, nil, "%")
+      end
     end
   end
 end

data/lib/highline/version.rb

@@ -2,5 +2,5 @@
 
 class HighLine
   # The version of the installed library.
-  VERSION = "2.0.0-develop.15".freeze
+  VERSION = "2.0.0-develop.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.develop.15
+  version: 2.0.0.pre.develop.16
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler