hsume2-hirb 0.6.1 → 0.6.2

data/lib/hirb/menu.rb

@@ -12,6 +12,7 @@ module Hirb
     CHOSEN_REGEXP = /^(\d([^:]+)?)(?::)?(\S+)?/
     CHOSEN_ARG = '%s'
     ALL_ARG = '*'
+    ALL_REGEXP = /^(\*)(?::)?(\S+)?/
     DIRECTIONS = "Specify individual choices (4,7), range of choices (1-3) or all choices (*)."
 
 
@@ -141,9 +142,12 @@ module Hirb
     end
 
     def map_all_args(tokens)
-      tokens.map { |t| t == ALL_ARG ? @output : t }
       tokens.map { |arr,f|
-        arr == ALL_ARG ? @output : yield(arr, f)
+        if arr == ALL_ARG
+          f.nil? ? @output : yield(@output, f)
+        else
+          yield(arr, f)
+        end
       }.flatten
     end
 
@@ -167,10 +171,10 @@ module Hirb
         @new_args << CHOSEN_ARG
         field = $3 ? unalias_field($3) : default_field ||
           raise(Error, "No default field/column found. Fields must be explicitly picked.")
-        [Util.choose_from_array(@output, word), field ]
-      elsif word.index(ALL_ARG)
+        [Util.choose_from_array(@output, word), field]
+      elsif word[ALL_REGEXP]
         @new_args << CHOSEN_ARG
-        ALL_ARG
+        $2 ? [ALL_ARG, unalias_field($2)] : ALL_ARG
       else
         @new_args << word
         nil

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/test/menu_test.rb

@@ -36,7 +36,7 @@ describe "Menu" do
     it "with block renders" do
       menu_input "1,2"
       expected_result = [1,2]
-      capture_stdout { 
+      capture_stdout {
         menu([1,2,3]) {|e| e.should == expected_result }.should == expected_result
       }
     end
@@ -202,6 +202,11 @@ describe "Menu" do
       two_d_menu(:action=>true, :invoke=>[[{:a => 1, :bro => 2}, {:a => 3, :bro => 4}, {:a => 1, :bro => 2}, {:a => 3, :bro => 4}, 4]])
     end
 
+    it "with all choices with field" do
+      menu_input "p *:bro"
+      two_d_menu(:action=>true, :invoke=>[[2, 4]])
+    end
+
     it "with no command given prints error" do
       menu_input "1"
       capture_stderr { two_d_menu(:action=>true) }.should =~ /No command given/
@@ -252,4 +257,4 @@ describe "Menu" do
       }.should =~ /Default.*required/
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hsume2-hirb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Gabriel Horner