kicker 4.0.0.p1 → 4.0.0.p2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3f1b8e56a45f76314daaf713f764f37228d42b4
-  data.tar.gz: 4867e2dbf6f21d39ecd0f7367c6d87bb0b94a9d7
+SHA256:
+  metadata.gz: 2c59242935451e5929112dc5421520c5042442b6a9cb268e1e3190b52b2265d9
+  data.tar.gz: 779c659ae41efc2e4f7b34170d214fd2341e67d6fff142d00fd8cdd51df5550d
 SHA512:
-  metadata.gz: 1ed6e797ccff80a9a4cbd9d056ac6ae205907fef59c94b72c61c811576caa678df63b82eb043b657fe08e48438b24e5ea8e49eee62839cbc66ca5a97b2eecf2f
-  data.tar.gz: f23d431352c3eea377adee626ae6a76001151585e3a2a50d5f6203a2426a68fd79ebe65eff3781969bafa5ba4c6b351b9ecf033ef7ee9990c2f0a9f9f1b942df
+  metadata.gz: a647c2913d8861809b590e7dbb9f95c0f7bb80d48835a1b39ca99a7f0e80ebac73d09e381ec922206bb3876bd178bc837dfd1bd210738c772388a0b97495f326
+  data.tar.gz: 62d524f1c8ce3dff5200b52d3ed4b513358779abc3439829f68197bfee9e1837a445f8c76ac6821b5dca1538e5552dd57798caa56f0d5a306905218169e7de68

data/lib/kicker.rb

@@ -1,5 +1,4 @@
 require 'tidings'
-require 'kicker/core_ext/array'
 
 class Kicker
   autoload :CLI,          'kicker/cli'

data/lib/kicker/core_ext/array.rb

@@ -36,5 +36,3 @@ class Kicker
     end
   end
 end
-
-Array.send(:include, Kicker::CoreExt::Array)

data/lib/kicker/script.rb

@@ -1,70 +1,39 @@
 class Kicker
   class Script
-    class Context
-      attr_accessor :cwd, :watcher, :script
-
-      include Kicker::Deprecated
-
-      def initialize(cwd: Dir.pwd, watcher: nil, script: nil)
-        @cwd = cwd
-        @watcher = watcher
-        @script = script
-      end
-
-      def recipe(name)
-        filename = File.join(::Kicker::Script.recipes_path, name.to_s + '.rb')
-        if File.exist?(filename)
-          ::Kicker.debug("Loading recipe: #{filename}")
-          load(filename)
-        else
-          ::Kicker.debug("Unknown recipe: #{name}")
-        end
-      end
-
-      def load(filename)
-        eval(File.read(filename), binding, filename)
-      end
-
-      def process(callable=nil, &block)
-        processor = callable || block
-        ::Kicker.debug("Adding processor: #{processor}")
-        script.processors << processor
-      end
-    end
+    autoload :Context,           'script/context'
+    autoload :DeprecatedContext, 'script/deprecated_context'
 
     class << self
       attr_accessor :recipes_path
     end
     self.recipes_path = File.expand_path('recipe', __dir__)
 
-    attr_accessor :cwd, :watcher, :recipes, :processors
+    attr_accessor :cwd, :watcher, :recipes, :contexts
 
     def initialize(cwd: Dir.pwd, watcher: nil)
       @cwd = cwd
       @watcher = watcher
       @recipes = []
-      @processors = []
-      @context = Kicker::Script::Context.new(cwd: @cwd, watcher: @watcher, script: self)
+      @contexts = []
+    end
+
+    def create_context
+      context = Kicker::Script::Context.new(cwd: cwd, watcher: watcher, script: self)
+      @contexts << context
+      context
     end
 
     def recipe(name)
-      @context.recipe(name)
+      create_context.recipe(name)
     end
 
     def load(filename)
-      @context.load(filename)
+      create_context.load(filename)
     end
 
     def call(file_or_path, flags)
-      @processors.each do |processor|
-        case processor.method(:call).arity
-        when 0
-          processor.call
-        when 1
-          processor.call([file_or_path])
-        else
-          processor.call(file_or_path, flags)
-        end
+      contexts.each do |context|
+        context.call(file_or_path, flags)
       end
     end
 

data/lib/kicker/version.rb

@@ -1,3 +1,3 @@
 class Kicker
-  VERSION = '4.0.0.p1'
+  VERSION = '4.0.0.p2'
 end

data/lib/kicker/watcher.rb

@@ -97,6 +97,7 @@ class Kicker
         while(buffer = master.read(@buffer_size))
           write(buffer)
         end
+        Process.waitpid(pid)
       end
       write("\n")
     end

data/lib/script/context.rb

@@ -0,0 +1,40 @@
+class Kicker
+  class Script
+    class Context
+      attr_accessor :cwd, :watcher, :script
+
+      def initialize(cwd: Dir.pwd, watcher: nil, script: nil)
+        @cwd = cwd
+        @watcher = watcher
+        @script = script
+        @processors = []
+      end
+
+      def recipe(name)
+        filename = File.join(::Kicker::Script.recipes_path, name.to_s + '.rb')
+        if File.exist?(filename)
+          ::Kicker.debug("Loading recipe: #{filename}")
+          load(filename)
+        else
+          ::Kicker.debug("Unknown recipe: #{name}")
+        end
+      end
+
+      def load(filename)
+        eval(File.read(filename), binding, filename)
+      end
+
+      def process(callable=nil, &block)
+        processor = callable || block
+        ::Kicker.debug("Adding processor: #{processor}")
+        @processors << processor
+      end
+
+      def call(file_or_path, flags)
+        @processors.each do |processor|
+          processor.call(file_or_path, flags)
+        end
+      end
+    end
+  end
+end

data/lib/script/deprecated_context.rb

@@ -0,0 +1,24 @@
+class Kicker
+  class Script
+    class DeprecatedContext < Kicker::Script::Context
+      def execute(command)
+        Kicker.debug("[DEPRECATED] Calling `execute' directly is deprecated, instead use `watcher.execute'. Called from #{_last_caller(caller)}.")
+        watcher.execute(command)
+      end
+
+      def call(file_or_path, flags)
+        files = [file_or_path]
+        files.extend(Kicker::CoreExt::Array)
+        @processors.each do |processor|
+          processor.call(files)
+        end
+      end
+
+      private
+
+      def _last_caller(stack)
+        stack[0]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kicker
 version: !ruby/object:Gem::Version
-  version: 4.0.0.p1
+  version: 4.0.0.p2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tidings
@@ -44,7 +44,6 @@ files:
 - lib/kicker/cli.rb
 - lib/kicker/core_ext/array.rb
 - lib/kicker/debug.rb
-- lib/kicker/deprecated.rb
 - lib/kicker/formatter.rb
 - lib/kicker/option_parser.rb
 - lib/kicker/recipe/ignore.rb
@@ -54,6 +53,8 @@ files:
 - lib/kicker/script.rb
 - lib/kicker/version.rb
 - lib/kicker/watcher.rb
+- lib/script/context.rb
+- lib/script/deprecated_context.rb
 homepage: http://github.com/Manfred/kicker
 licenses: []
 metadata: {}
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A lean, agnostic, flexible file-change watcher.

data/lib/kicker/deprecated.rb

@@ -1,14 +0,0 @@
-class Kicker
-  module Deprecated
-    def execute(command)
-      Kicker.debug("[DEPRECATED] Calling `execute' directly is deprecated, instead use `watcher.execute'. Called from #{_last_caller(caller)}.")
-      watcher.execute(command)
-    end
-
-    private
-
-    def _last_caller(stack)
-      stack[0]
-    end
-  end
-end