hirb 0.3.3 → 0.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.4
+* Added auto format of array-like objects i.e. ActiveRecord::Relation and Set.
+* Fixed bug when Hirb::Console#table is used without Hirb enabled.
+* Fixed bug when hirb is running within cron and uses tput.
+
 == 0.3.3
 * Added ignore_errors option to ignore view errors and continue with original view.
 * Added support for array menu items.

data/lib/bond/completions/hirb.rb

@@ -10,5 +10,6 @@ complete(:method=>"Hirb::Helpers::Tree.render") {
   %w{type validate indent limit description multi_line_nodes value_method children_method}
 }
 complete(:methods=>%w{Hirb::Menu.render menu}) {
-  %w{helper_class prompt ask directions readline two_d default_field action multi_action action_object command}
+  %w{helper_class prompt ask directions readline two_d default_field action multi_action} +
+    %w{action_object command reopen}
 }

data/lib/hirb/formatter.rb

@@ -75,7 +75,7 @@ module Hirb
     end
 
     def determine_output_class(output)
-      output.is_a?(Array) ? output[0].class : output.class
+      output.respond_to?(:to_a) ? Array(output)[0].class : output.class
     end
 
     def call_output_method(output_method, output)
@@ -113,4 +113,4 @@ module Hirb
     end
     #:startdoc:
   end
-end
+end

data/lib/hirb/menu.rb

@@ -32,6 +32,8 @@ module Hirb
     # [*:multi_action*] Execute action menu multiple times iterating over the menu choices. Default is false.
     # [*:action_object*] Object that takes method/command calls. Default is main.
     # [*:command*] Default method/command to call when no command given.
+    # [*:reopen*] Reopens $stdin with given file or with /dev/tty when set to true. Use when
+    #             $stdin is already reading in piped data.
     # Examples:
     #     >> extend Hirb::Console
     #     => self
@@ -47,6 +49,7 @@ module Hirb
     def initialize(options={})
       @options = {:helper_class=>Hirb::Helpers::AutoTable, :prompt=>"Choose: ", :ask=>true,
         :directions=>true}.merge options
+      @options[:reopen] = '/dev/tty' if @options[:reopen] == true
     end
 
     def render(output, &block)
@@ -60,6 +63,7 @@ module Hirb
     def get_input
       prompt = pre_prompt + @options[:prompt]
       prompt = DIRECTIONS+"\n"+prompt if @options[:directions]
+      $stdin.reopen @options[:reopen] if @options[:reopen]
 
       if @options[:readline] && readline_loads?
         get_readline_input(prompt)
@@ -214,4 +218,4 @@ module Hirb
     end
     #:startdoc:
   end
-end
+end

data/lib/hirb/util.rb

@@ -61,10 +61,12 @@ module Hirb
     def detect_terminal_size
       if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
         [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
-      elsif (RUBY_PLATFORM =~ /java/ || !STDIN.tty?) && command_exists?('tput')
+      elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
         [`tput cols`.to_i, `tput lines`.to_i]
+      elsif STDIN.tty? && command_exists?('stty')
+        `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse
       else
-        command_exists?('stty') ? `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse : nil
+        nil
       end
     rescue
       nil
@@ -91,4 +93,4 @@ module Hirb
       File::ALT_SEPARATOR ? "C:/" : "/"
     end
   end
-end
+end

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/lib/hirb/view.rb

@@ -154,12 +154,12 @@ module Hirb
       
       # Current console width
       def width
-        config ? config[:width] : DEFAULT_WIDTH
+        config && config[:width] ? config[:width] : DEFAULT_WIDTH
       end
 
       # Current console height
       def height
-        config ? config[:height] : DEFAULT_HEIGHT
+        config && config[:height] ? config[:height] : DEFAULT_HEIGHT
       end
 
       # Current formatter config, storing a hash of all static views

data/test/console_test.rb

@@ -1,7 +1,24 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-describe "parse_input" do
-  it "config is set if it wasn't before" do
+describe "Console" do
+  it "#table is called without Hirb enabled" do
+    extend Hirb::Console
+    reset_config
+    expected_table = <<-TABLE.unindent
+    +-------+
+    | value |
+    +-------+
+    | 5     |
+    | 3     |
+    +-------+
+    2 rows in set
+    TABLE
+    capture_stdout {
+      table([5,3], :fields=>[:to_s])
+    }.should == expected_table +"\n"
+  end
+
+  it ".render_output sets config if it wasn't before" do
     reset_config
     View.expects(:render_output)
     Console.render_output('blah')

data/test/formatter_test.rb

@@ -84,7 +84,7 @@ describe "Formatter" do
     before_all {
       eval %[module ::Commify
         def self.render(strings)
-          strings = [strings] unless strings.is_a?(Array)
+          strings = Array(strings)
           strings.map {|e| e.split('').join(',')}.join("\n")
         end
       end]
@@ -112,11 +112,18 @@ describe "Formatter" do
       view_output('dude')
     end
 
-    it "formats output array" do
+    it "formats arrays" do
       enable_with_output "String"=>{:class=>"Commify"}
       render_method.expects(:call).with('d,u,d,e')
       view_output(['dude'])
     end
+
+    it "formats array-like objects" do
+      enable_with_output "String"=>{:class=>"Commify"}
+      render_method.expects(:call).with('d,u,d,e')
+      require 'set'
+      view_output Set.new(['dude'])
+    end
     
     it "formats with options option" do
       eval "module ::Blahify; def self.render(*args); end; end"

data/test/menu_test.rb

@@ -98,6 +98,16 @@ describe "Menu" do
       menu_input('blah')
       capture_stdout { menu([1], :directions=>false) }.should.not =~ /range.*all/
     end
+
+    it "with true reopen option reopens" do
+      $stdin.expects(:reopen).with('/dev/tty')
+      basic_menu [1], :reopen=>true
+    end
+
+    it "with string reopen option reopens" do
+      $stdin.expects(:reopen).with('/dev/blah')
+      basic_menu [1], :reopen=>'/dev/blah'
+    end
   end
 
   def two_d_menu(options={})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hirb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -04:00
+date: 2010-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency