hairballs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d253d151df5fdf784c216a8785627d1f0881cb01
-  data.tar.gz: 45bce4a52cd3d2e01f48a3765b9fef39fffb36bc
+  metadata.gz: d1465ffb77e5a3cca642251d686e9a764ece6c02
+  data.tar.gz: 5cb9166c6199254d83dab384669178216a554680
 SHA512:
-  metadata.gz: 0ca0f9c162b224b218184fd8afd15731ed52d220ff24032e75896cca7ed3bae272e6da15016f2556cbdcf7ec251e0dddbc01361b5dfd2f6fe1db076dadf1d3ff
-  data.tar.gz: baff3f4a22ebfe513bba046a54486bf67da351bee1b8ea7f4365a7a21d9ef7e7f8c63f74775cb0c109b756fce5d28aae93389e368647dee838bb8e00fe38e8a1
+  metadata.gz: 2653b127751f63dd739dc0fe08fe088b89fe5f798c7d0658ea29aefb73278647ad2bd8ea5eea7d1088c5bb5e66c88c6ea48ff6cd75346ba6f59e8dee144c1ef8
+  data.tar.gz: 27bdc77f19a8737921fd7f0e6649b24d33beb67c140a2a250b56539a130122e7f7a40994c64ef85f942a10fd6ab949711d988ea370f86c6d520d5fc473e91b03

data/History.md

@@ -1,13 +1,21 @@
+### 0.1.1 / 2015-04-06
+
+* Bug Fixes
+    * Fixed #root_by_git when not in a git director. This would result in
+      `NoMethodError: undefined method 'strip' for nil:NilClass`.
+    * Plugin: *irb_history* Fixed IRB history for non-project sessions. All IRB 
+      sessions that don't belong to a project are saved to `~/.irb_history`.
+
 ### 0.1.0 / 2015-02-18
 
 * Improvements
     * Added `Hairballs.project_root`, which tries to determine the root
       directory for the project you're working in.
-    * Refactored configuration to Hairballs::Configuration.
+    * Refactored configuration to `Hairballs::Configuration`.
 * Bug Fixes
-    * Fixed nested file completion for the `tab_completion_for_files` plugin.
     * Fixed `Hairballs::LibraryHelpers#find_latest_gem` to find the latest
       instead of the earliest.
+    * Plugin: *tab_completion_for_files* Fixed nested file completion.
 
 ### 0.0.1 / 2014-12-19
 

data/lib/hairballs/configuration.rb

@@ -35,9 +35,6 @@ class Hairballs
     # @return [String]
     attr_reader :project_name
 
-    # @return [String]
-    attr_reader :project_root
-
     def initialize
       @themes = []
       @current_theme = nil
@@ -53,24 +50,27 @@ class Hairballs
       Hairballs::VERSION
     end
 
-    # Is IRB getting loaded for a rails console?
+    # Is IRB getting loaded for a Rails console?
     #
     # @return [Boolean]
     def rails?
       ENV.has_key?('RAILS_ENV') || !!defined?(Rails)
     end
 
-    # Name of the relative directory.
+    # Name of the project, if it can be determined. If not, defaults to "irb".
     #
     # @return [String]
     def project_name
-      @project_name ||= File.basename(project_root)
+      @project_name ||= project_root ? project_root.basename : nil
     end
 
+    # @return [Pathname]
     def project_root
       @project_root ||= find_project_root
     end
 
+    # @param [String] path
+    # @return [Boolean]
     def project_root?(path)
       File.expand_path(path) == project_root
     end
@@ -137,6 +137,7 @@ class Hairballs
 
     private
 
+    # @return [Pathname]
     def find_project_root
       if rails?
         ::Rails.root
@@ -145,12 +146,15 @@ class Hairballs
       end
     end
 
+    # @return [Pathname, nil]
     def root_by_git
       _stdin, stdout, _stderr = Open3.popen3('git rev-parse --show-toplevel')
-
-      stdout.gets.strip
+      result = stdout.gets
+      
+      result.nil? ? nil : Pathname.new(result.strip)
     end
 
+    # @return [Pathname, nil]
     def root_by_lib_dir
       cwd = Pathname.new(Dir.pwd)
       root = nil
@@ -159,7 +163,7 @@ class Hairballs
         lib_dir = File.join(dir.to_s, 'lib')
 
         if dir.children.find { |c| c.to_s =~ /#{lib_dir}/ && File.exist?(lib_dir) }
-          root = dir.to_s
+          root = Pathname.new(dir.to_s)
           break
         end
       end

data/lib/hairballs/plugins/irb_history.rb

@@ -7,8 +7,12 @@ Hairballs.add_plugin(:irb_history, save_history: 1000, eval_history: 20, global_
     IRB.conf[:SAVE_HISTORY] = plugin.save_history
     IRB.conf[:EVAL_HISTORY] = plugin.eval_history
 
-    unless plugin.global_history_file
-      IRB.conf[:HISTORY_FILE] = "#{Dir.home}/.irb_history-#{Hairballs.project_name}"
+    unless plugin.global_history_file && Hairballs.project_name
+      IRB.conf[:HISTORY_FILE] = "#{Dir.home}/.irb_history"
+
+      if Hairballs.project_name
+        IRB.conf[:HISTORY_FILE] << Hairballs.project_name.to_s
+      end
     end
 
     Object.class_eval do

data/lib/hairballs/themes/turboladen.rb

@@ -21,7 +21,11 @@ Hairballs.add_theme(:turboladen) do |theme|
 
   theme.prompt do |prompt|
     preface = proc do |status = '  '|
-      "⟪#{Hairballs.project_name.light_blue}⟫#{status}%03n"
+      if Hairballs.project_name
+        "⟪#{Hairballs.project_name.to_s.light_blue}⟫#{status}%03n"
+      else
+        "❨#{'irb'.light_blue}❩#{status}%03n"
+      end
     end
 
     prompt.auto_indent = true

data/lib/hairballs/version.rb

@@ -1,3 +1,3 @@
 class Hairballs
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairballs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Like oh-my-zsh, but for IRB.
@@ -124,4 +124,3 @@ test_files:
 - spec/hairballs/theme_spec.rb
 - spec/hairballs_spec.rb
 - spec/spec_helper.rb
-has_rdoc: