spud 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11082937f67da737d314d222eccb34f438de26fa5d0bb94186b1f99d89d29705
-  data.tar.gz: 4f6965f11798cb8af28f4f298954efd5ba831e8c8387ce63f642f02cd112e7c6
+  metadata.gz: a9b52bb3b0a406042b1c0feaf8c6952974992b1c79586eb372417c03253367db
+  data.tar.gz: 366ce2813f418f1b0a5795a28c73f37128ef3a82c0dff95809877ab5dca5783e
 SHA512:
-  metadata.gz: fd4916032c22a3ea7268b38e418742fc265c7ef87c55acb2571cbfb74d7897035e2b819c945dde94c26931cd2766ef39e81cf9e5141745e26b430c096a9483d6
-  data.tar.gz: 9667b5d3c7f3baf7b0bdce2f2886ee501e00595478b76c40b7bd3106c6d5825eae4a28f8aaae941a759ff8f7e67b35f71a08220c96bfbe252b46b8f914e684d2
+  metadata.gz: 1fe21ca0d2b91d02c995deb4515382e5a59ee54160bcee71af23608cb634962b3beb16c764193ee9ff46314d8f7251d5fdc40ae1a535a5646362ba208784c7a7
+  data.tar.gz: e7f16245115ca30d84585c5fee030e1be064dff6e38fd67196f5423501699242a132f7dab0e58885d7f6d24c54f16828960a23b7cba9e65dfc648bfe835e8f02

data/lib/args.rb

@@ -22,7 +22,7 @@ module Spud
         case arg
         when '-h', '--help' then [options.merge(help: true), index + 1]
         when '-v', '--version' then [options.merge(version: true), index + 1]
-        when '-w', '--watch' then [options.merge(watches: options[:watches] + [args[index + 1]]), index + 2]
+        #when '-w', '--watch' then [options.merge(watches: options[:watches] + [args[index + 1]]), index + 2]
         when '--debug' then [options.merge(debug: true), index + 1]
         else raise Error, "invalid option '#{arg}'"
         end

data/lib/build_tools/spud/rule.rb

@@ -28,10 +28,7 @@ module Spud::BuildTools
           raise Spud::Error, "invocation of '#{@name}' missing required #{arguments} #{names}"
         end
 
-        unless key_params?
-          RuleContext.new(@spud, @file_context).instance_exec(*args, &@block)
-          return
-        end
+        return RuleContext.new(@spud, @file_context).instance_exec(*args, &@block) unless key_params?
 
         begin
           RuleContext.new(@spud, @file_context).instance_exec(*args, **kwargs, &@block)

data/lib/build_tools/spud/rule_context.rb

@@ -5,14 +5,21 @@ require_relative '../../error'
 module Spud::BuildTools
   module SpudBuild
     class RuleContext
+      attr_reader :__process
+
       def initialize(spud, file_context)
-        @spud = spud
+        @__spud = spud
+        @__process = nil
 
         file_context.singleton_methods.each do |method_name|
           define_singleton_method(method_name, &file_context.method(method_name))
         end
       end
 
+      def __shell(cmd, params = {})
+        @__process = Spud::Shell.new(cmd, params)
+      end
+
       def sh(cmd)
         out = sh?(cmd)
         raise ShellError unless out.status.exitstatus.zero?
@@ -22,7 +29,7 @@ module Spud::BuildTools
 
       def sh?(cmd)
         puts cmd
-        Spud::Shell.new(cmd)
+        __shell(cmd)
       end
 
       def shh(cmd)
@@ -33,7 +40,7 @@ module Spud::BuildTools
       end
 
       def shh?(cmd)
-        Spud::Shell.new(cmd)
+        __shell(cmd)
       end
 
       def shhh(cmd)
@@ -44,11 +51,11 @@ module Spud::BuildTools
       end
 
       def shhh?(cmd)
-        Spud::Shell.new(cmd, silent: true)
+        __shell(cmd, silent: true)
       end
 
       def invoke(name, *args, **kwargs)
-        @spud.invoke(name, *args, **kwargs)
+        @__spud.invoke(name, *args, **kwargs)
       end
     end
   end

data/lib/spud.rb

@@ -50,6 +50,7 @@ module Spud
       rule = rules[name.to_s]
       raise Error, "no rule found for '#{name}'" unless rule
 
+      thread = nil
       timestamps = {}
       loop do
         begin
@@ -60,13 +61,16 @@ module Spud
 
             if !old_timestamp || new_timestamp > old_timestamp
               timestamps[filename] = new_timestamp
-              invoke(name, *args, **kwargs)
+
+              thread.kill if thread
+              thread = Thread.new { invoke(name, *args, **kwargs) }
               break
             end
           end
 
           sleep 0.1
         rescue Interrupt
+          thread.kill if thread
           break
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Spud
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Andrew Booth