hairballs 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f595d5cee9832427199aed6d743fa45841ba0f4
-  data.tar.gz: d9b4e863b96a0916fa18b213b42928cfa990457f
+  metadata.gz: d9c07d71797efa04ae268dab627d876ec9beab89
+  data.tar.gz: 68a2551742e779b78f0f083589c87a97106fad08
 SHA512:
-  metadata.gz: ba2513e8c762e7bb9c58fa08309833a083b50374a61723c8386c08ee76af1a4b6a0214dc095c7f456fdc3dc616886eced84cff2ab53b0c91392e44eef8080aa9
-  data.tar.gz: ffa35bc7c5760a6874594fc50605baf34334292dabaa78d3a30f1e908318613c0d5b68be606e5fccae843632d3eecad77b3936119a6096621e16b67c377c3b6f
+  metadata.gz: 63b2faef4e1ec3e6f5afcbbd0197884e7da1c959cb37081efba7bb813f4a6359ce8e19ae2cf3d2a6c4009fff853ec43a9069a4279f754f71540bea016aff5693
+  data.tar.gz: aed0e385878f195ef71130c84761fcf38d23bb949d80c114270c9a456e33ad76490769b35992a98fa0d78f45828ed4b398327574563f802bcc0c83687464b632

data/.gitignore

@@ -14,3 +14,7 @@
 mkmf.log
 
 tags
+
+*.gem
+
+.byebug_history

data/.rubocop.yml

@@ -16,6 +16,12 @@ Style/Documentation:
 Style/DotPosition:
   Enabled: false
 
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '[]'
+    '%w': '[]'
+    '%W': '[]'
+
 Style/RescueModifier:
   Exclude:
     - lib/hairballs/plugins/colorize_json.rb

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - ruby-2.2.0
+before_install:
+  - gem install bundler

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hairballs.gemspec
 gemspec
+
+gem 'rake', group: :test

data/History.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [unreleased] / yyyy-mm-dd
+
+### Improvements
+
+* For `Plugin`s, only try to require libraries if some are given for the plugin.
+* Changed `quick_benchmark` default to 20 iterations (from 100).
+* Changed `Hairballs::LibraryHelpers` to use Fibers instead of Threads for
+  installing dependecies. Threaded installing was proving to be problematic.
+
+### Bug Fixes
+
+* Removed `Prompt#auto_indent`; it never worked. To do auto-indenting, just use
+  `IRB.conf[:AUTO_INDENT]` directly.
+* Fixed incorrect uses of Yard.
+
 ## 0.1.3 / 2015-07-13
 
 ### Improvements

data/lib/hairballs/configuration.rb

@@ -88,7 +88,7 @@ class Hairballs
       yield theme
 
       themes << theme
-      vputs "Added theme: #{name}"
+      vputs "[config] Added theme: #{name}"
 
       theme
     end
@@ -99,7 +99,7 @@ class Hairballs
     def use_theme(theme_name)
       switch_to = themes.find { |theme| theme.name == theme_name }
       fail ThemeUseFailure, theme_name unless switch_to
-      vputs "Switched to theme: #{theme_name}"
+      vputs "[config] Switched to theme: #{theme_name}"
 
       switch_to.use!
       @current_theme = switch_to
@@ -115,12 +115,17 @@ class Hairballs
     #   passed along the the Hairballs::Plugin object and are used as attributes
     #   of the plugin.
     def add_plugin(name, **options)
+      vputs "[config] Adding plugin: #{name}"
       plugin = Plugin.new(name, options)
       yield plugin
       plugins << plugin
-      vputs "Added plugin: #{name}"
+      vputs "[config] Added plugin: #{name}"
 
       plugin
+    rescue => ex
+      # rubocop:disable Metrics/LineLength
+      vputs "[config] Exception adding plugin: #{ex.class}: #{ex.message}\n#{ex.backtrace[0]}"
+      # rubocop:enable Metrics/LineLength
     end
 
     # Searches for the Hairballs::Plugin by the +plugin_name+, then loads it.
@@ -129,7 +134,7 @@ class Hairballs
     def load_plugin(plugin_name, **options)
       plugin_to_use = plugins.find { |plugin| plugin.name == plugin_name }
       fail PluginNotFound, plugin_name unless plugin_to_use
-      vputs "Using plugin: #{plugin_name}"
+      vputs "[config] Using plugin: #{plugin_name}"
 
       plugin_to_use.load!(options)
       loaded_plugins << plugin_to_use

data/lib/hairballs/ext/kernel_vputs.rb

@@ -3,6 +3,6 @@ module Kernel
   # Does a puts only if IRB is in verbose mode.
   def vputs(*messages)
     messages.map! { |m| "[Hairballs] #{m}" }
-    puts(*messages) if defined?(::IRB) && ::IRB.conf[:VERBOSE]
+    $stdout.puts(*messages) if defined?(::IRB) && ::IRB.conf[:VERBOSE]
   end
 end

data/lib/hairballs/library_helpers.rb

@@ -1,4 +1,6 @@
+require 'rubygems/commands/install_command'
 require 'hairballs/ext/kernel_vputs'
+require 'fiber'
 
 class Hairballs
   # Helpers specifying and requiring dependencies for Themes and Plugins.
@@ -7,11 +9,7 @@ class Hairballs
     def libraries(libs=nil)
       return @libraries if @libraries && libs.nil?
 
-      @libraries = if libs
-                     libs
-                   else
-                     yield([])
-                   end
+      @libraries = libs ? libs : yield([])
     end
 
     # Requires #libraries on load.  If they're not installed, install them.  If
@@ -19,20 +17,21 @@ class Hairballs
     def require_libraries
       return if @libraries.nil?
 
-      install_threads = []
-      require_threads = []
-      require_queue = Queue.new
+      missing_dependencies = []
 
       @libraries.each do |lib|
         begin
-          vputs "Requiring library: #{lib}"
-          require lib
+          vrequire(lib)
         rescue LoadError
-          puts "#{lib} not installed; installing now..."
-          install_threads << start_install_thread(lib, require_queue)
-          require_threads << start_require_thread(require_queue)
+          # rubocop:disable Metrics/LineLength
+          vputs "[**:#{@name}](#{lib}) Unable to require; adding to install list..."
+          # rubocop:enable Metrics/LineLength
+          missing_dependencies << lib
         end
       end
+
+      requirer = new_dependency_requirer(dependency_installer)
+      install_missing_dependencies(missing_dependencies, requirer).resume
     end
 
     # Path to the highest version of the gem with the given gem.
@@ -50,15 +49,23 @@ class Hairballs
     #
     # TODO: Use #find_latest_gem for each of #libraries.
     def do_bundler_extending
+      vputs "[**:#{@name}] #do_bundler_extending: #{@libraries}"
+
       if defined?(::Bundler)
+        vputs "[**:#{@name}] #do_bundler_extending: Libraries: #{@libraries}"
+
         all_global_gem_paths = Dir.glob("#{Gem.dir}/gems/*")
 
         all_global_gem_paths.each do |p|
+          next unless @libraries.any? { |l| p.include?(l) }
           gem_path = "#{p}/lib"
+          # rubocop:disable Metrics/LineLength
+          vputs "[**:#{@name}] #do_bundler_extending: Adding to $LOAD_PATH: #{gem_path}"
+          # rubocop:enable
           $LOAD_PATH.unshift(gem_path)
         end
       else
-        vputs 'Bundler not defined.  Skipping.'
+        vputs %([**:#{@name}] #do_bundler_extending: Bundler not defined. Skipping.)
       end
     end
 
@@ -74,7 +81,7 @@ class Hairballs
           $LOAD_PATH.delete(gem_path)
         end
       else
-        vputs 'Bundler not defined.  Skipping.'
+        vputs %([**:#{@name}] Bundler not defined.  Skipping.)
       end
     end
 
@@ -84,35 +91,83 @@ class Hairballs
 
     private
 
-    # @param [String] lib Gem to install.
-    # @param [Queue] require_queue Queue to push library names onto so the
-    #   require thread can do its requiring.
-    # @return [Thread]
-    def start_install_thread(lib, require_queue)
-      Thread.new do
-        result = Gem.install(lib)
-
-        if result.empty?
-          puts "Unable to install gem '#{lib}'. Moving on..."
-        else
-          require_queue << lib
+    # @param lib [String]
+    def vrequire(lib)
+      vputs "[**:#{@name}](#{lib}) Requiring library..."
+      require lib
+      vputs "[**:#{@name}](#{lib}) Successfully required library!"
+    end
+
+    # @param deps [Array<String>] Names of the gems to install.
+    # @param source [Fiber]
+    # @retrun [Fiber]
+    def install_missing_dependencies(deps, source)
+      Fiber.new do
+        deps.each do |lib|
+          vputs "[**:#{@name}] #install_missing_dependencies Main dep... #{lib}"
+          source.resume(lib)
         end
       end
     end
 
-    # @param [Queue] require_queue
-    # @return [Thread]
-    def start_require_thread(require_queue)
-      Thread.new do
-        lib = require_queue.pop
+    # @return [Fiber]
+    def dependency_installer
+      Fiber.new do |lib|
+        loop do
+          vputs "[**:#{@name}] #dependency_installer installing #{lib}"
+          result = install_gem(lib)
+
+          vputs "[**:#{@name}] #dependency_installer Gem install of #{lib} done."
+          puts "Unable to install gem '#{lib}'. Moving on..." if result > 0
 
-        if Hairballs.config.rails?
-          installed_gem = find_latest_gem(lib)
-          $LOAD_PATH.unshift("#{installed_gem}/lib")
+          lib = Fiber.yield
+          vputs "[**:#{@name}] #dependency_installer yield result: #{lib}"
         end
+      end
+    end
+
+    # @param lib [String]
+    # @return [Fixnum] Exit code from the Gem::Commands::InstallCommand.
+    def install_gem(lib)
+      cmd = Gem::Commands::InstallCommand.new
+      cmd.handle_options [lib]
+      result = 0
+
+      begin
+        cmd.execute
+      rescue Gem::SystemExitException, Gem::RemoveFetcher::FetchError => ex
+        puts "Got exception during '#{lib}' install: #{ex.class}: #{ex.message}"
+        result = ex.exit_code
+      end
 
-        require lib
-      end.join
+      result
+    end
+
+    # @param [Queue] installer
+    # @return [Fiber]
+    def new_dependency_requirer(installer)
+      Fiber.new do |lib|
+        loop do
+          vputs "[**:#{@name}] #new_dependency_requirer resumed for #{lib}"
+          installer.resume(lib)
+          vputs "[**:#{@name}] #new_dependency_requirer requiring lib #{lib}"
+
+          if Hairballs.config.rails?
+            installed_gem = find_latest_gem(lib)
+            vputs "[**:#{@name}] #new_dependency_requirer: Gem installed at #{installed_gem}"
+            $LOAD_PATH.unshift("#{installed_gem}/lib")
+          end
+
+          begin
+            require lib
+          rescue LoadError => ex
+            puts "Got exception during #{lib} require: #{ex}"
+          end
+
+          vputs %([**:#{@name}] #new_dependency_requirer yielding...)
+          lib = Fiber.yield
+        end
+      end
     end
   end
 end

data/lib/hairballs/plugin.rb

@@ -62,15 +62,16 @@ class Hairballs
         send("#{k}=".to_sym, v)
       end
 
-      require_libraries
+      if @libraries
+        vputs "[pl:#{@name}] Requiring libs..."
+        require_libraries
+        vputs "[pl:#{@name}] Done requiring libs."
+      end
 
       return unless @on_load
+      fail PluginLoadFailure, name unless @on_load.kind_of?(Proc)
 
-      if @on_load.kind_of?(Proc)
-        @on_load.call
-      else
-        fail PluginLoadFailure, name
-      end
+      @on_load.call
     end
   end
 end

data/lib/hairballs/plugins/awesome_print.rb

@@ -1,7 +1,7 @@
 require 'hairballs'
 
 Hairballs.add_plugin(:awesome_print) do |plugin|
-  plugin.libraries %w(awesome_print)
+  plugin.libraries %w[awesome_print]
 
   plugin.on_load do
     AwesomePrint.irb!

data/lib/hairballs/plugins/colorize_json.rb

@@ -8,7 +8,7 @@ require 'hairballs'
 #
 # TODO: fix to work with using/loading before Wirble.
 Hairballs.add_plugin(:colorize_json, color: :blue) do |plugin|
-  plugin.libraries %w(json colorize)
+  plugin.libraries %w[json colorize]
 
   plugin.on_load do
     IRB::Irb.class_eval do

data/lib/hairballs/plugins/irb_history.rb

@@ -3,7 +3,7 @@ require 'hairballs'
 Hairballs.add_plugin(:irb_history, save_history: 1000,
                                    eval_history: 20,
                                    global_history_file: true) do |plugin|
-  plugin.libraries %w(irb/ext/save-history)
+  plugin.libraries %w[irb/ext/save-history]
 
   plugin.on_load do
     IRB.conf[:SAVE_HISTORY] = plugin.save_history

data/lib/hairballs/plugins/object_ri.rb

@@ -3,13 +3,13 @@ require 'hairballs'
 # Directly lifted from rbates/dotfiles!  Adds +#ri+ to all Objects, letting you
 # get ri docs from within your IRB session.
 Hairballs.add_plugin(:object_ri) do |plugin|
-  plugin.libraries %w(rdoc)
+  plugin.libraries %w[rdoc]
 
   plugin.on_load do
     Object.class_eval do
       def ri(method=nil)
         unless method && method =~ /^[A-Z]/ # if class isn't specified
-          klass = self.kind_of?(Class) ? name : self.class.name
+          klass = kind_of?(Class) ? name : self.class.name
           method = [klass, method].compact.join('#')
         end
 

data/lib/hairballs/plugins/quick_benchmark.rb

@@ -4,11 +4,11 @@ require 'hairballs'
 #
 # @see http://stackoverflow.com/a/123834/172106
 Hairballs.add_plugin(:quick_benchmark) do |plugin|
-  plugin.libraries %w(benchmark)
+  plugin.libraries %w[benchmark]
 
   plugin.on_load do
     Kernel.module_eval do
-      def quick_benchmark(repetitions=100, &block)
+      def quick_benchmark(repetitions=20, &block)
         Benchmark.bmbm do |b|
           b.report { repetitions.times(&block) }
         end

data/lib/hairballs/plugins/wirble.rb

@@ -2,7 +2,7 @@ require 'hairballs'
 
 # Just loads Wirble.
 Hairballs.add_plugin(:wirble) do |plugin|
-  plugin.libraries %w(wirble)
+  plugin.libraries %w[wirble]
 
   plugin.on_load do
     Wirble.init

data/lib/hairballs/prompt.rb

@@ -4,61 +4,81 @@ class Hairballs
   #
   # TODO: Make it nicer to define Pry prompts.
   class Prompt
-    # @param [Boolean]
-    attr_accessor :auto_indent
-
-    # The normal prompt string.  Same as
-    # IRB.conf[:PROMPT][ prompt name ][:PROMPT_I]
+    # @!attribute irb_prompt_options [r]
+    #   After setting values using the Prompt's setter methods, this Hash will
+    #   represent those values using keys that correlate to
+    #   IRB.conf[:PROMPT][:MY_PROMPT].
     #
-    # @param [String]
-    attr_accessor :normal
-    alias_method :i, :normal
-    alias_method :i=, :normal=
+    #   @return [Hash]
+    attr_reader :irb_prompt_options
 
-    # The prompt for when strings wrap multiple lines.  Same as
-    # IRB.conf[:PROMPT][ prompt name ][:PROMPT_S]
+    def initialize
+      vputs 'Setting up prompt...'
+      @irb_prompt_options = IRB.conf[:PROMPT][:NULL].dup
+    end
+
+    # Wrapper for setting IRB.conf[:PROMPT][:MY_PROMPT][:PROMPT_C].
+    # The prompt for when statements wrap multiple lines.
     #
-    # @param [String]
-    attr_accessor :continued_string
-    alias_method :s, :continued_string
-    alias_method :s=, :continued_string=
+    # @param new_continued_statement [String]
+    def continued_statement=(new_continued_statement)
+      @irb_prompt_options[:PROMPT_C] = new_continued_statement
+    end
 
-    # The prompt for when statements wrap multiple lines.  Same as
-    # IRB.conf[:PROMPT][ prompt name ][:PROMPT_C]
+    # @return [String]
+    def continued_statement
+      @irb_prompt_options[:PROMPT_C]
+    end
+
+    # Wrapper for setting IRB.conf[:PROMPT][:MY_PROMPT][:PROMPT_S].
+    # The prompt for when strings wrap multiple lines.
     #
-    # @param [String]
-    attr_accessor :continued_statement
-    alias_method :c, :continued_statement
-    alias_method :c=, :continued_statement=
+    # @param new_continued_string [String]
+    def continued_string=(new_continued_string)
+      @irb_prompt_options[:PROMPT_S] = new_continued_string
+    end
+
+    # @return [String]
+    def continued_string
+      @irb_prompt_options[:PROMPT_S]
+    end
 
-    # The prompt for when statements include indentation.  Same as
-    # IRB.conf[:PROMPT][ prompt name ][:PROMPT_N]
+    # Wrapper for setting IRB.conf[:PROMPT][:MY_PROMPT][:PROMPT_N].
+    # The prompt for when statements include indentation.
     #
-    # @param [String]
-    attr_accessor :indented_code
-    alias_method :n, :indented_code
-    alias_method :n=, :indented_code=
+    # @param new_indented_code [String]
+    def indented_code=(new_indented_code)
+      @irb_prompt_options[:PROMPT_N] = new_indented_code
+    end
 
-    # The prompt for return values.  Same as
-    # IRB.conf[:PROMPT][ prompt name ][:RETURN]
+    # @return [String]
+    def indented_code
+      @irb_prompt_options[:PROMPT_N]
+    end
+
+    # Wrapper for setting IRB.conf[:PROMPT][:MY_PROMPT][:PROMPT_I].
     #
-    # @param [String]
-    attr_accessor :return_format
+    # @param new_normal [String]
+    def normal=(new_normal)
+      @irb_prompt_options[:PROMPT_I] = new_normal
+    end
 
-    # @return [Hash] A set of key/value pairs that can be used to pass to a
-    #   IRB.conf[:PROMPT][ prompt name ].
-    def irb_configuration
-      vputs 'Setting up prompt...'
+    # @return [String]
+    def normal
+      @irb_prompt_options[:PROMPT_I]
+    end
 
-      prompt_values = {}
-      prompt_values[:AUTO_INDENT] = @auto_indent if @auto_indent
-      prompt_values[:PROMPT_C] = continued_statement unless continued_statement.empty?
-      prompt_values[:PROMPT_I] = normal unless normal.empty?
-      prompt_values[:PROMPT_N] = indented_code unless indented_code.empty?
-      prompt_values[:PROMPT_S] = continued_string unless continued_string.empty?
-      prompt_values[:RETURN] = @return_format if @return_format
+    # Wrapper for setting IRB.conf[:PROMPT][:MY_PROMPT][:RETURN]. The prompt
+    # for how to display return values.
+    #
+    # @param new_return_format [String]
+    def return_format=(new_return_format)
+      @irb_prompt_options[:RETURN] = new_return_format
+    end
 
-      prompt_values
+    # @return [String]
+    def return_format
+      @irb_prompt_options[:RETURN]
     end
   end
 end

data/lib/hairballs/theme.rb

@@ -12,18 +12,20 @@ class Hairballs
   class Theme
     include Hairballs::LibraryHelpers
 
-    # Just an identifier for the Theme.  Don't name two themes the same
-    # name--that will cause problems.
+    # @!attribute name [rw]
+    #   Just an identifier for the Theme.  Don't name two themes the same
+    #   name--that will cause problems.
     #
-    # @param [Symbol]
+    #   @return [Symbol]
     attr_accessor :name
 
-    # Tells Hairballs to do some hackery to let Themes use gems that aren't
-    # specified in your app's Gemfile.  This alleviates you from having to
-    # declare gems in your Gemfile simply for the sake of managing your personal
-    # IRB preferences.
+    # @!attribute extend_bundler [rw]
+    #   Tells Hairballs to do some hackery to let Themes use gems that aren't
+    #   specified in your app's Gemfile.  This alleviates you from having to
+    #   declare gems in your Gemfile simply for the sake of managing your
+    #   personal IRB preferences.
     #
-    # @param [Boolean]
+    #   @return [Boolean]
     attr_accessor :extend_bundler
 
     # @param name [Symbol]
@@ -36,8 +38,10 @@ class Hairballs
     # Tell IRB to use this Theme.
     def use!
       do_bundler_extending if @extend_bundler
+      vputs "[th:#{@name}] Requiring libs..."
       require_libraries
       set_up_prompt
+      vputs "[th:#{@name}] Done setting up."
     end
 
     # The name of the Theme, but in the format that IRB.conf[:PROMPT] likes (an
@@ -79,7 +83,8 @@ class Hairballs
     end
 
     def set_up_irb_prompt
-      IRB.conf[:PROMPT][irb_name] = @prompt.irb_configuration
+      vputs "[th:#{@name}] Prompt options: #{@prompt.irb_prompt_options}"
+      IRB.conf[:PROMPT][irb_name] = @prompt.irb_prompt_options
       IRB.conf[:PROMPT_MODE] = irb_name
       IRB.CurrentContext.prompt_mode = irb_name if IRB.CurrentContext
     end
@@ -92,7 +97,9 @@ class Hairballs
       elsif @prompt.normal
         ::Pry.config.prompt = -> { @prompt.normal }
       else
-        vputs 'Neither "normal" nor "continued_statement" prompts configured.'
+        # rubocop:disable Metrics/LineLength
+        vputs %([th:#{@name}] Neither "normal" nor "continued_statement" prompts configured.)
+        # rubocop:enable
       end
     end
 
@@ -102,7 +109,7 @@ class Hairballs
           output.printf @prompt.return_format, value.inspect
         end
       else
-        vputs '"return_format" not configured.'
+        vputs %([th:#{@name}] "return_format" not configured.)
       end
     end
   end

data/lib/hairballs/themes/turboladen.rb

@@ -1,28 +1,30 @@
 require 'hairballs'
 
 Hairballs.add_theme(:turboladen) do |theme|
+  IRB.conf[:AUTO_INDENT] = true
+
   theme.libraries do |libs_to_require|
-    libs_to_require += %w(
+    libs_to_require += %w[
+      awesome_print
       irb/completion
       looksee
       colorize
-    )
+    ]
 
     libs_to_require +=
       case RUBY_PLATFORM
-      when /mswin32|mingw32/
-        %w(win32console)
-      when /darwin/
-        %w(terminal-notifier)
-      else
-        []
+      when /mswin32|mingw32/ then %w[win32console]
+      when /darwin/ then %w[terminal-notifier]
+      else []
       end
 
     libs_to_require
   end
 
   theme.prompt do |prompt|
-    preface = proc do |status = '  '|
+    status = '  '.freeze
+
+    preface = proc do
       if Hairballs.project_name
         "⟪#{Hairballs.project_name.light_blue}⟫#{status}%03n"
       else
@@ -30,11 +32,10 @@ Hairballs.add_theme(:turboladen) do |theme|
       end
     end
 
-    prompt.auto_indent = true
     prompt.normal = "#{preface.call}:%i> "
     prompt.continued_string = "#{preface.call('❊%l'.yellow)}:%i> "
     prompt.continued_statement = "#{preface.call('❊?'.yellow)}:%i> "
     prompt.indented_code = "#{preface.call('✚ '.yellow)}:%i> "
-    prompt.return_format = "➥ %s\n"
+    prompt.return_format = "➥ %s\n".freeze
   end
 end

data/lib/hairballs/themes/turboladen_rails.rb

@@ -2,20 +2,18 @@ require 'hairballs'
 
 Hairballs.add_theme(:turboladen_rails) do |theme|
   theme.libraries do |libs_to_require|
-    libs_to_require += %w(
+    libs_to_require += %w[
+      awesome_print
       irb/completion
       looksee
       colorize
-    )
+    ]
 
     libs_to_require +=
       case RUBY_PLATFORM
-      when /mswin32|mingw32/
-        %w(win32console)
-      when /darwin/
-        %w(terminal-notifier)
-      else
-        []
+      when /mswin32|mingw32/ then %w[win32console]
+      when /darwin/ then %w[terminal-notifier]
+      else []
       end
 
     libs_to_require
@@ -24,12 +22,11 @@ Hairballs.add_theme(:turboladen_rails) do |theme|
   theme.extend_bundler = true
 
   theme.prompt do |prompt|
-    prompt.auto_indent = true
-    preface = Hairballs.project_name.light_blue
-    prompt.normal = "#{preface}> "
+    preface = Hairballs.project_name.light_blue.freeze
+    prompt.normal = "#{preface}> ".freeze
     prompt.continued_string = "#{preface}#{'❊%l'.yellow}> "
     prompt.continued_statement = "#{preface}#{'⇥'.yellow} %i> "
     prompt.indented_code = "#{preface}#{'⇥'.yellow} %i> "
-    prompt.return_format = "➥ %s\n"
+    prompt.return_format = "➥ %s\n".freeze
   end
 end

data/lib/hairballs/version.rb

@@ -1,4 +1,4 @@
 class Hairballs
   # @return [String]
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'.freeze
 end

data/spec/hairballs/configuration_spec.rb

@@ -95,34 +95,22 @@ RSpec.describe Hairballs::Configuration do
   describe '#add_plugin' do
     let(:plugin) { double 'Hairballs::Plugin' }
 
-    context 'block given and name param is a Symbol' do
-      before do
-        expect(Hairballs::Plugin).to receive(:new).with(:test, {}).
-          and_return plugin
-      end
-
-      it 'yields the Plugin' do
-        expect { |b| subject.add_plugin(:test, &b) }.to yield_with_args(plugin)
-      end
-
-      it 'adds the Plugin to @plugins' do
-        expect(subject.plugins).to receive(:<<).with(plugin)
-        subject.add_plugin(:test) { |_| }
-      end
+    before do
+      expect(Hairballs::Plugin).to receive(:new).with(:test, {}).
+        and_return plugin
+    end
 
-      it 'returns the Plugin' do
-        expect(subject.add_plugin(:test) { |_| }).to eq plugin
-      end
+    it 'yields the Plugin' do
+      expect { |b| subject.add_plugin(:test, &b) }.to yield_with_args(plugin)
     end
 
-    context 'no block given' do
-      before do
-        allow(Hairballs::Plugin).to receive(:new).and_return plugin
-      end
+    it 'adds the Plugin to @plugins' do
+      expect(subject.plugins).to receive(:<<).with(plugin)
+      subject.add_plugin(:test) { |_| }
+    end
 
-      it 'raises a LocalJumpError' do
-        expect { subject.add_plugin(:test) }.to raise_exception(LocalJumpError)
-      end
+    it 'returns the Plugin' do
+      expect(subject.add_plugin(:test) { |_| }).to eq plugin
     end
   end
 

data/spec/hairballs/library_helpers_spec.rb

@@ -49,6 +49,8 @@ RSpec.describe Hairballs::LibraryHelpers do
 
     context '@libraries is not nil' do
       let(:lib_name) { 'asdfqwer' }
+      let(:dependency_requirer) { instance_double 'Fiber' }
+      let(:dependency_installer) { instance_double 'Fiber' }
 
       before do
         subject.instance_variable_set(:@libraries, [lib_name])
@@ -57,10 +59,12 @@ RSpec.describe Hairballs::LibraryHelpers do
 
       context 'libraries are not installed' do
         it 'tries two times to require then Gem.install' do
-          expect(subject).to receive(:start_install_thread).
-            with(lib_name, instance_of(Queue))
-          expect(subject).to receive(:start_require_thread).
-            with(instance_of(Queue))
+          expect(subject).to receive(:new_dependency_requirer).
+            with(instance_of(Fiber)).and_return(dependency_requirer)
+          expect(subject).to receive(:install_missing_dependencies).
+            with([lib_name], dependency_requirer).
+            and_return(dependency_installer)
+          expect(dependency_installer).to receive(:resume)
 
           subject.require_libraries
         end
@@ -74,63 +78,23 @@ RSpec.describe Hairballs::LibraryHelpers do
     end
   end
 
-  describe '#start_install_thread' do
-    before { allow(Thread).to receive(:new).and_yield }
-    let(:require_queue) { instance_double 'Queue' }
-    let(:lib_name) { 'some lib' }
+  describe '#install_missing_dependencies' do
+    let(:source) { instance_double 'Fiber' }
+    before { expect(Fiber).to receive(:new).and_yield }
 
-    context 'gem exists' do
-      let(:gem) { double 'Gem::Specification' }
+    context 'deps are empty' do
+      it 'never resumes the source fiber' do
+        expect(source).to_not receive(:resume)
 
-      it 'puts the library name on the require_queue' do
-        expect(Gem).to receive(:install).with(lib_name).and_return([gem])
-        expect(require_queue).to receive(:<<).with(lib_name)
-
-        subject.send(:start_install_thread, lib_name, require_queue)
+        subject.send(:install_missing_dependencies, [], source)
       end
     end
 
-    context 'gem does not exist' do
-      it 'does not put the library name on the require_queue' do
-        expect(Gem).to receive(:install).with(lib_name).and_return([])
-        expect(require_queue).to_not receive(:<<)
-
-        subject.send(:start_install_thread, lib_name, require_queue)
-      end
-    end
-  end
-
-  describe '#start_require_thread' do
-    let(:require_queue) { instance_double 'Queue' }
-    let(:lib_name) { 'test name' }
-    let(:thread) { instance_double('Thread', join: nil) }
-    before { allow(Thread).to receive(:new).and_yield.and_return(thread) }
-
-    context 'rails' do
-      before { expect(Hairballs.config).to receive(:rails?).and_return(true) }
-
-      it 'finds the latest gem and adds it to the load path' do
-        lib_path = 'path to lib'
-        expect(require_queue).to receive(:pop).and_return(lib_name)
-        expect(subject).to receive(:find_latest_gem).with(lib_name).
-          and_return(lib_path)
-        expect($LOAD_PATH).to receive(:unshift).with('path to lib/lib')
-        expect(subject).to receive(:require).with(lib_name)
-
-        subject.send(:start_require_thread, require_queue)
-      end
-    end
-
-    context 'not rails' do
-      before { expect(Hairballs.config).to receive(:rails?).and_return(false) }
-
-      it 'does not find the latest gem and add it to the load path' do
-        expect(require_queue).to receive(:pop).and_return(lib_name)
-        expect(subject).to_not receive(:find_latest_gem)
-        expect($LOAD_PATH).to_not receive(:unshift)
-        expect(subject).to receive(:require).with(lib_name)
+    context 'deps are not empty' do
+      it 'resumes the source fiber with the name of the dep' do
+        expect(source).to receive(:resume).with('meow')
 
-        subject.send(:start_require_thread, require_queue)
+        subject.send(:install_missing_dependencies, ['meow'], source)
       end
     end
   end

data/spec/hairballs/theme_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'hairballs/theme'
 
 RSpec.describe Hairballs::Theme do
+  let(:prompt) { instance_double 'Hairballs::Prompt' }
   subject(:theme) { described_class.new(:test) }
+  before { allow(Hairballs::Prompt).to receive(:new).and_return(prompt) }
 
   describe '#irb_name' do
     subject { theme.irb_name }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hairballs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Like oh-my-zsh, but for IRB.
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - History.md
 - LICENSE.txt
@@ -105,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Like oh-my-zsh, but for IRB.