spirit_hands 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a188f19cfea293256ed5686225cf5a4e5a8940e2
-  data.tar.gz: 66d00406a3c10f1f56553e00f8e93f4ac730ba74
+  metadata.gz: 56112730b29566ec4a0c76171ba938507c392886
+  data.tar.gz: 37e937d2d03c449577918cd048254802c5ae18dd
 SHA512:
-  metadata.gz: 2bff4bf6b2745acc52008d68c67f9e97421f0f0031d2b68a94c07ee9a9b702b64e6cbc32c76f1fbe1c1231ddef9200f62ec63ab729833019dbf5666b273a58c0
-  data.tar.gz: 8d8ca39c9aa492b4c11f1fc77fc3c7f06d909df5084369445db83537abb12a8b28ce4dd97a833fbfced9635c7cfe700575db1f6df4c2801aa6e6072a774cab20
+  metadata.gz: 5fbdffcd9a2efd3523737d6e0afd3db7fee6375fccb89512e0e21f9ce476b7ab44ba83fc669e69598b77306fa2493eb7fcab6f2e50a689c8e8ec20c87cbe9be3
+  data.tar.gz: 8717444bbbc828137b363f903f0764de87edef30e45c3850549339a6dba0606d37d0a02558bfced14f073b8ebcff7ec4fe1f3ba80dc71a0b483006b7787d3bcd

data/lib/spirit_hands/options/coolline.rb

@@ -1,63 +1,56 @@
 module SpiritHands
   class << self
-    # Is cooline enabled?
+    # Is coolline enabled?
     def coolline
       @coolline = DEFAULT_COOLLINE if @coolline.nil?
       @coolline
     end
 
     # Set whether hirb is enabled (default: true)
-    def coolline=(c)
-      c = DEFAULT_COOLLINE if c.nil?
-      @coolline = !!c
-    end
+    attr_writer :coolline
 
   protected
 
     def install_coolline!
       return if coolline_installed?
-      @orig_input ||= Pry.input
-      @orig_completer ||= Pry.config.completer
-      require 'pry-coolline'
       Pry.plugins['coolline'].activate!
-      begin
-        require 'pry-bond'
-        Pry.plugins['bond'].activate!
-      rescue LoadError
-      end
-      @coolline_input ||= Pry.input
-      @coolline_completer ||= Pry.config.completer
-      Pry.config.completer = @coolline_completer
-      Pry.input = @coolline_input
+      self.input_config = @coolline_input
     end
 
     def uninstall_coolline!
       return unless coolline_installed?
       Pry.plugins['coolline'].disable!
-      if !Pry.plugins['bond'].is_a? Pry::PluginManager::NoPlugin
-        Pry.plugins['bond'].disable!
-      end
-      Pry.config.completer = @orig_completer
-      Pry.input = @orig_input
+      self.input_config = @orig_input
     end
 
     def coolline_installed?
-      !@orig_input.nil? && @orig_input != Pry.input
+      Pry.input == @coolline_input[0]
     end
 
     def setup_coolline!
-      if SpiritHands.coolline
-        SpiritHands.install_coolline!
+      if coolline
+        install_coolline!
       else
-        SpiritHands.uninstall_coolline!
+        uninstall_coolline!
       end
     end
 
+    def input_config=(args)
+      Pry.input, Pry.config.completer = args
+    end
+
+    def input_config
+      [Pry.input, Pry.config.completer]
+    end
+
     def setup_coolline
-      Pry.hooks.add_hook(:after_read, "setup_coolline0") do |code, pry|
+      @orig_input = input_config
+      require 'pry-coolline'
+      @coolline_input = input_config
+      Pry.hooks.add_hook(:before_session, "setup_coolline_before") do |output, binding, pry|
         setup_coolline!
       end
-      Pry.hooks.add_hook(:before_session, "setup_coolline1") do |output, binding, pry|
+      Pry.hooks.add_hook(:after_eval, "setup_coolline_after") do |code, pry|
         setup_coolline!
       end
     end

data/lib/spirit_hands/version.rb

@@ -1,3 +1,3 @@
 module SpiritHands
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spirit_hands
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Barry Allard
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Exercise those fingers. Pry-based enhancements for the default Rails console.