hirb 0.7.1 → 0.7.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3c82103d6a98efbf7551286da42328fe06933713
+  data.tar.gz: 007e3755d06c41814d5b3e80731f55c4b4cd47ff
+SHA512:
+  metadata.gz: aad1ff6678f0a2b1a33aeeaf5ccf2cf647c96e9d0e4e077efec0e22c3c77ab3892534cba9810709b16b6f9729233658fe191ef206358f9c73e92db8b7677f938
+  data.tar.gz: 97a34adef83202ddfe42e989b8ef4ef639ce35b077258ca415af034f6cec0ba40be3786ffafd73030233ad4d82eabe23c8a31306a68627d7c6996d50cf0669cf

data/.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha', '~> 0.12.1'
   s.add_development_dependency 'mocha-on-bacon', '~> 0.2.1'
   s.add_development_dependency 'bacon-bits'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} {.,test,spec}/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc,md} ext/**/*.{rb,c}]) + %w{Rakefile .gemspec .travis.yml}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.7.3
+* Remove warnings
+
+== 0.7.2
+* Allow full paths on $PAGER
+* Fix AR tables with no id column
+
 == 0.7.1
 * Add :style option
 * Fix mocha dep issue

data/CONTRIBUTING.md

@@ -0,0 +1 @@
+Thanks for trying out this project! [See here for contribution guidelines.](http://tagaholic.me/contributing.html)

data/README.rdoc

@@ -161,8 +161,11 @@ Although views by default are printed to STDOUT, they can be easily modified to
 
 == Pager
 
-Hirb has both pager and formatter functionality enabled by default.
-If you want to turn off the functionality of either you can pass that in at startup:
+Hirb has both pager and formatter functionality enabled by default. Note - if you copy and paste
+into your ruby console and think that one of your lines will kick off the pager, be aware that subsequent
+characters will go to your pager and could cause side effects like saving a file.
+
+If you want to turn off the functionality of either pager or formatter, pass that in at startup:
 
   Hirb.enable :pager=>false
   Hirb.enable :formatter=>false
@@ -187,7 +190,8 @@ Table code from http://gist.github.com/72234 and {my console app's needs}[http:/
 * Chrononaut for vertical table helper.
 * janlelis for unicode table helper.
 * technogeeky and FND for markdown table helper.
-* hsume2, crafterm, spastorino, xaviershay, bogdan, asanghi, vwall, maxmeyer, jimjh and joshua for patches.
+* hsume2, crafterm, spastorino, xaviershay, bogdan, asanghi, vwall, maxmeyer, jimjh, ddoherty03,
+  rochefort and joshua for patches.
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/hirb/issues].

data/lib/hirb/formatter.rb

@@ -29,7 +29,7 @@ module Hirb
     # [*:options*] Options to pass the helper method or class.
     # [*:ancestor*] Boolean which when true causes subclasses of the output class to inherit its config. This doesn't effect the current
     #               output class. Defaults to false. This is used by ActiveRecord classes.
-    # 
+    #
     #   Examples:
     #     {'WWW::Delicious::Element'=>{:class=>'Hirb::Helpers::ObjectTable', :ancestor=>true, :options=>{:max_width=>180}}}
     #     {'Date'=>{:class=>:auto_table, :ancestor=>true}}
@@ -101,10 +101,10 @@ module Hirb
     def build_klass_config(output_class)
       output_ancestors = output_class.ancestors.map {|e| e.to_s}.reverse
       output_ancestors.pop
-      hash = output_ancestors.inject({}) {|h, klass|
-        add_klass_config_if_true(h, klass) {|c,klass| c[klass] && c[klass][:ancestor] }
+      hash = output_ancestors.inject({}) {|h, ancestor_klass|
+        add_klass_config_if_true(h, ancestor_klass) {|c, klass| c[klass] && c[klass][:ancestor] }
       }
-      add_klass_config_if_true(hash, output_class.to_s) {|c,klass| c[klass] }
+      add_klass_config_if_true(hash, output_class.to_s) {|c, klass| c[klass] }
     end
 
     def add_klass_config_if_true(hash, klass)

data/lib/hirb/helpers/table/resizer.rb

@@ -48,7 +48,7 @@ class Hirb::Helpers::Table
 
       # set all fields the same if relative doesn't work
       unless new_lengths.values.all? {|e| e > MIN_FIELD_LENGTH} && (sum(new_lengths.values) <= @width)
-        new_lengths = @field_lengths.inject({}) {|t,(k,v)| t[k] = @width / @field_size; t }
+        new_lengths = @field_lengths.inject({}) {|t,(k,_v)| t[k] = @width / @field_size; t }
       end
       @field_lengths.each {|k,v| @field_lengths[k] = new_lengths[k] }
     end

data/lib/hirb/helpers/table.rb

@@ -302,6 +302,7 @@ class Helpers::Table
     max_fields.each {|k,max| @field_lengths[k] = max if @field_lengths[k].to_i > max }
   end
 
+  undef :max_fields
   def max_fields
     @max_fields ||= (@options[:max_fields] ||= {}).each {|k,v|
       @options[:max_fields][k] = (actual_width * v.to_f.abs).floor if v.to_f.abs < 1
@@ -312,6 +313,7 @@ class Helpers::Table
     @actual_width ||= self.width - (@fields.size * BORDER_LENGTH + 1)
   end
 
+  undef :width
   def width
     @width ||= @options[:max_width] || View.width
   end

data/lib/hirb/menu.rb

@@ -89,7 +89,7 @@ module Hirb
     def choose_from_menu
       return unasked_choice if @output.size == 1 && !@options[:ask]
 
-      if (helper_class = Util.any_const_get(@options[:helper_class]))
+      if (Util.any_const_get(@options[:helper_class]))
         View.render_output(@output, :class=>@options[:helper_class], :options=>@options.merge(:number=>true))
       else
         @output.each_with_index {|e,i| puts "#{i+1}: #{e}" }

data/lib/hirb/pager.rb

@@ -8,9 +8,10 @@ module Hirb
       end
 
       def pager_command(*commands) #:nodoc:
-        @pager_command = (!@pager_command.nil? && commands.empty?) ? @pager_command : 
+        @pager_command = (!@pager_command.nil? && commands.empty?) ? @pager_command :
           begin
-            commands = [ENV['PAGER'], 'less', 'more', 'pager'] if commands.empty?
+            env_pager = ENV['PAGER'] ? File.basename(ENV['PAGER']) : nil
+            commands = [env_pager, 'less', 'more', 'pager'] if commands.empty?
             commands.compact.uniq.find {|e| Util.command_exists?(e[/\w+/]) }
           end
       end

data/lib/hirb/util.rb

@@ -13,7 +13,7 @@ module Hirb
         }
         klass
       rescue
-         nil
+        nil
       end
     end
 
@@ -53,7 +53,7 @@ module Hirb
 
     # Determines if a shell command exists by searching for it in ENV['PATH'].
     def command_exists?(command)
-      ENV['PATH'].split(File::PATH_SEPARATOR).any? {|d| File.exists? File.join(d, command) }
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? {|d| File.exist? File.join(d, command) }
     end
 
     # Returns [width, height] of terminal when detected, nil if not detected.

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.7.1'
+  VERSION = '0.7.3'
 end

data/lib/hirb/view.rb

@@ -22,7 +22,7 @@ module Hirb
   #   >> {:a=>1, :b=>{:c=>3}}
   #   ---
   #   :a : 1
-  #   :b : 
+  #   :b :
   #     :c : 3
   #   => true
   #
@@ -75,7 +75,7 @@ module Hirb
       # Examples:
       #   Hirb.enable
       #   Hirb.enable :formatter=>false
-      def enable(options={}, &block)
+      def enable(options={})
         Array(options.delete(:config_file)).each {|e|
           @new_config_file = true
           Hirb.config_files << e
@@ -115,9 +115,9 @@ module Hirb
         config[:width], config[:height] = determine_terminal_size(width, height)
         pager.resize(config[:width], config[:height])
       end
-      
+
       # This is the main method of this class. When view is enabled, this method searches for a formatter it can use for the output and if
-      # successful renders it using render_method(). The options this method takes are helper config hashes as described in 
+      # successful renders it using render_method(). The options this method takes are helper config hashes as described in
       # Hirb::Formatter.format_output(). Returns true if successful and false if no formatting is done or if not enabled.
       def view_output(output, options={})
         enabled? && config[:formatter] && render_output(output, options)
@@ -127,7 +127,7 @@ module Hirb
           false
         else
           index = (obj = e.backtrace.find {|f| f =~ /^\(eval\)/}) ? e.backtrace.index(obj) : e.backtrace.length
-          $stderr.puts "Hirb Error: #{e.message}", e.backtrace.slice(0,index).map {|e| "    " + e }
+          $stderr.puts "Hirb Error: #{e.message}", e.backtrace.slice(0,index).map {|_e| "    " + _e }
           true
         end
       end
@@ -140,6 +140,7 @@ module Hirb
       # A lambda or proc which handles the final formatted object.
       # Although this pages/puts the object by default, it could be set to do other things
       # i.e. write the formatted object to a file.
+      undef :render_method
       def render_method
         @render_method ||= default_render_method
       end
@@ -148,7 +149,7 @@ module Hirb
       def reset_render_method
         @render_method = default_render_method
       end
-      
+
       # Current console width
       def width
         config && config[:width] ? config[:width] : DEFAULT_WIDTH
@@ -253,10 +254,11 @@ module Hirb
 
       def config_loaded?; !!@config; end
 
+      undef :config
       def config
         @config
       end
-      
+
       def default_render_method
         lambda {|output| page_output(output) || puts(output) }
       end

data/lib/hirb/views/rails.rb

@@ -6,8 +6,8 @@ module Hirb::Views::Rails #:nodoc:
   def get_active_record_fields(obj)
     fields = obj.class.column_names.map {|e| e.to_sym }
     # if query used select
-    if obj.attributes.keys.sort != obj.class.column_names.sort
-      selected_columns = obj.attributes.keys
+    if obj.attributes.keys.compact.sort != obj.class.column_names.sort
+      selected_columns = obj.attributes.keys.compact
       sorted_columns = obj.class.column_names.dup.delete_if {|e| !selected_columns.include?(e) }
       sorted_columns += (selected_columns - sorted_columns)
       fields = sorted_columns.map {|e| e.to_sym}
@@ -16,4 +16,4 @@ module Hirb::Views::Rails #:nodoc:
   end
 end
 
-Hirb::DynamicView.add Hirb::Views::Rails, :helper=>:auto_table
+Hirb::DynamicView.add Hirb::Views::Rails, :helper=>:auto_table

data/lib/hirb.rb

@@ -34,8 +34,8 @@ module Hirb
     attr_accessor :config_files, :config
 
     # Enables view functionality. See Hirb::View.enable for details.
-    def enable(options={}, &block)
-      View.enable(options, &block)
+    def enable(options={})
+      View.enable(options)
     end
 
     # Disables view functionality. See Hirb::View.disable for details.
@@ -44,8 +44,8 @@ module Hirb
     end
 
     # Adds views. See Hirb::View.add for details.
-    def add_view(view, options, &block)
-      View.add(view, options, &block)
+    def add_view(view, options)
+      View.add(view, options)
     end
 
     # Adds views. See Hirb::DynamicView.add for details.
@@ -55,6 +55,7 @@ module Hirb
 
     # Array of config files which are merged sequentially to produce config.
     # Defaults to config/hirb.yml and ~/.hirb_yml
+    undef :config_files
     def config_files
       @config_files ||= default_config_files
     end
@@ -62,13 +63,14 @@ module Hirb
     #:stopdoc:
     def default_config_files
       [File.join(Util.find_home, ".hirb.yml")] +
-        (File.exists?('config/hirb.yml') ? ['config/hirb.yml'] : [])
+        (File.exist?('config/hirb.yml') ? ['config/hirb.yml'] : [])
     end
 
     def read_config_file(file=config_file)
-      File.exists?(file) ? YAML::load_file(file) : {}
+      File.exist?(file) ? YAML.load_file(file) : {}
     end
 
+    undef :config
     def config(reload=false)
       if (@config.nil? || reload)
         @config = config_files.inject({}) {|acc,e|

data/test/hirb_test.rb

@@ -6,17 +6,17 @@ describe "Hirb" do
 
   it "config converts yaml when config file exists" do
     yaml_data = {:blah=>'blah'}
-    File.stubs('exists?').returns(true)
+    File.stubs('exist?').returns(true)
     Hirb.config_files = ['ok']
-    YAML::expects(:load_file).returns(yaml_data)
+    YAML.expects(:load_file).returns(yaml_data)
     Hirb.config.should == yaml_data
   end
-  
+
   it "config defaults to hash when no config file" do
-    File.stubs('exists?').returns(false)
+    File.stubs('exist?').returns(false)
     Hirb.config.should == {}
   end
-  
+
   it "config reloads if given explicit reload" do
     Hirb.config
     Hirb.expects(:read_config_file).returns({})
@@ -36,4 +36,4 @@ describe "Hirb" do
     Hirb.config_files[0].class.should == String
     ENV["HOME"] = home
   end
-end
+end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: hirb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.3
 platform: ruby
 authors:
 - Gabriel Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bacon-bits
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hirb provides a mini view framework for console applications and uses
@@ -92,22 +83,30 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 files:
+- ".gemspec"
+- ".travis.yml"
+- CHANGELOG.rdoc
+- CONTRIBUTING.md
+- LICENSE.txt
+- README.rdoc
+- Rakefile
 - lib/bond/completions/hirb.rb
+- lib/hirb.rb
 - lib/hirb/console.rb
 - lib/hirb/dynamic_view.rb
 - lib/hirb/formatter.rb
+- lib/hirb/helpers.rb
 - lib/hirb/helpers/auto_table.rb
 - lib/hirb/helpers/markdown_table.rb
 - lib/hirb/helpers/object_table.rb
 - lib/hirb/helpers/parent_child_tree.rb
 - lib/hirb/helpers/tab_table.rb
+- lib/hirb/helpers/table.rb
 - lib/hirb/helpers/table/filters.rb
 - lib/hirb/helpers/table/resizer.rb
-- lib/hirb/helpers/table.rb
 - lib/hirb/helpers/tree.rb
 - lib/hirb/helpers/unicode_table.rb
 - lib/hirb/helpers/vertical_table.rb
-- lib/hirb/helpers.rb
 - lib/hirb/import_object.rb
 - lib/hirb/menu.rb
 - lib/hirb/pager.rb
@@ -115,13 +114,12 @@ files:
 - lib/hirb/util.rb
 - lib/hirb/version.rb
 - lib/hirb/view.rb
+- lib/hirb/views.rb
 - lib/hirb/views/couch_db.rb
 - lib/hirb/views/misc_db.rb
 - lib/hirb/views/mongo_db.rb
 - lib/hirb/views/orm.rb
 - lib/hirb/views/rails.rb
-- lib/hirb/views.rb
-- lib/hirb.rb
 - lib/ripl/hirb.rb
 - test/auto_table_test.rb
 - test/console_test.rb
@@ -139,37 +137,29 @@ files:
 - test/util_test.rb
 - test/view_test.rb
 - test/views_test.rb
-- LICENSE.txt
-- CHANGELOG.rdoc
-- README.rdoc
-- test/deps.rip
-- Rakefile
-- .gemspec
-- .travis.yml
 homepage: http://tagaholic.me/hirb/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A mini view framework for console/irb that's easy to use, even while under
   its influence.
 test_files: []

data/test/deps.rip

@@ -1,4 +0,0 @@
-bacon >=1.1.0
-mocha ~>0.12.1
-mocha-on-bacon ~>0.2.1
-bacon-bits >=0