spirit_hands 2.1.3-java → 2.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf4e29fb380244925af561c3cb6e58d61412760
-  data.tar.gz: 414d1f2d040fc219a4f41cb778fbcaeb82d39c02
+  metadata.gz: 560cafdaa5899c8592507655984ace52fdcc9445
+  data.tar.gz: 9ee4cec080fe6ac7c18f4222dafd7f15a5ddbf9d
 SHA512:
-  metadata.gz: d3986e5f47635c92f224da7223f3b7ac380aaf5c9b04f60fb93e1227d673cd4ddbebc46a15c2534b7842315e28fa5a9b31fa30fd0b998c8a4158d64b4bc40969
-  data.tar.gz: 6b378a73457a0a0531225786b2a664d8dfd720b06409925f4450c484b5cede512c2d73a0ff66f9098eaeed7ea05b9cbf90e9575411a06e732ec4e015a9e67bc1
+  metadata.gz: 36a88845e2e296298e18a7cb655a761bcbab7779de1bb41e4fcf2ea3006fa7b73c11177f8d77cd502de95fa0f0d22c41072ae557b7024b3f3bc1a35b96f90643
+  data.tar.gz: 7a0f3d0c9835e13ea9f32bd722caf05dbffb935c89b24d6a550675a571748bd9ecfa622d3b70b6f7bc973bba6df7352489657f5f14f8511e11064ec496983987

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: java
 authors:
 - Barry Allard