spud 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2253281ad17fa26000da387d071fca88fe39e6c01913573bf1aa78148c9302
-  data.tar.gz: 449e2aead6ea9686659c8b928ca9f4fa07f582156d30e2ae24bbc5680382cd58
+  metadata.gz: 70f9d7ff9fce7b159e20ad827c5de7edbaa7eded1cb6be6b31359857558a9c24
+  data.tar.gz: c536674d162d71fa1d348f79d365c6b11e4059049d1f9ffc73a4d7b6450c5859
 SHA512:
-  metadata.gz: 3f29e51971b0f78eb223e0561bc28a641fa167d72a5e10f996752fffefe8ead8c8fbb09707a24b2192c72b341dd039711808cfe2d6b7dbe78e5cb416c71075a8
-  data.tar.gz: 244352f4d935f8f00bc307b88f810743358e1eed079c9f7ef8ffabaca55df1929e9eb7933c5ae76a29bdfa4f9037a519b1ee205e592e49ed3e49f1207a1d4f51
+  metadata.gz: 31eadcc43318c65a7be3e88e8e477b0064c0b8b8e7763cf197f29a4ba96323095f0b7ed99770a15ece2a10c568e6caa9a90d1078cc8c165c76d4b5678884ee27
+  data.tar.gz: 9453fe0ceb937c7ed989fb357db0665be4dde3ddf89d809adb969a74064c337ca752beb23fe6a4b17463261dde4415c13d1dca660f390001ba01fadeefed4418

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

data/lib/build_tools/spud/rule_context.rb

@@ -5,49 +5,50 @@ require_relative '../../error'
 module Spud::BuildTools
   module SpudBuild
     class RuleContext
-      attr_reader :__process
-
       def initialize(spud, file_context)
         @__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, silent: false)
+        @__spud.watch_process = Spud::Shell.(cmd, silent: silent, wait: @__spud.wait?)
+      end
+
       def sh(cmd)
         out = sh?(cmd)
-        raise ShellError unless out.status.exitstatus.zero?
+        raise ShellError, cmd unless out.status.exitstatus.zero?
 
         out
       end
 
       def sh?(cmd)
         puts cmd
-        Spud::Shell.new(cmd)
+        __shell(cmd)
       end
 
       def shh(cmd)
         out = shh?(cmd)
-        raise ShellError unless out.status.exitstatus.zero?
+        raise ShellError, cmd unless out.status.exitstatus.zero?
 
         out
       end
 
       def shh?(cmd)
-        Spud::Shell.new(cmd)
+        __shell(cmd)
       end
 
       def shhh(cmd)
         out = shhh?(cmd)
-        raise ShellError, out unless out.status.exitstatus.zero?
+        raise ShellError, cmd unless out.status.exitstatus.zero?
 
         out
       end
 
       def shhh?(cmd)
-        Spud::Shell.new(cmd, silent: true)
+        __shell(cmd, silent: true)
       end
 
       def invoke(name, *args, **kwargs)

data/lib/shell.rb

@@ -3,7 +3,11 @@ require 'open3'
 
 module Spud
   class Shell < String
-    def initialize(cmd, silent: false, wait: false)
+    def self.call(cmd, silent: false, wait: false)
+      new(cmd, silent, wait)
+    end
+
+    def initialize(cmd, silent = false, wait = false)
       output = StringIO.new
 
       stdin, out, @status = Open3.popen2e(cmd)

data/lib/spud.rb

@@ -1,6 +1,7 @@
 require 'stringio'
 require_relative 'args'
 require_relative 'version'
+require_relative 'shell'
 require_relative 'build_tools/build_tools'
 require_relative 'build_tools/spud/shell_error'
 
@@ -10,33 +11,39 @@ module Spud
   end
 
   class Spud
+    attr_accessor :watch_process
+
     def run!
-      if options[:help]
+      puts options if debug?
+      puts watches_present: watches_present? if debug?
+      puts wait: wait? if debug?
+
+      if help?
         print_help!
         return
       end
 
-      if options[:version]
+      if version?
         puts VERSION
         return
       end
 
-      unless rule_name
+      unless rule_present?
         print_rules!
         return
       end
 
-      unless options[:watches].empty?
+      if watches_present?
         watch(options[:watches], rule_name, *args[:positional], **args[:keyword])
         return
       end
 
       invoke(rule_name, *args[:positional], **args[:keyword])
     rescue BuildTools::SpudBuild::ShellError => e
-      raise e if options[:debug]
+      raise e if debug?
 
     rescue => e
-      raise e if options[:debug]
+      raise e if debug?
       puts e.message
     end
 
@@ -62,7 +69,9 @@ module Spud
             if !old_timestamp || new_timestamp > old_timestamp
               timestamps[filename] = new_timestamp
 
+              watch_process.kill! if watch_process
               thread.kill if thread
+
               thread = Thread.new { invoke(name, *args, **kwargs) }
               break
             end
@@ -71,11 +80,16 @@ module Spud
           sleep 0.1
         rescue Interrupt
           thread.kill if thread
+          watch_process.kill! if watch_process
           break
         end
       end
     end
 
+    def wait?
+      @wait ||= !watches_present?
+    end
+
     private
 
     # Rules
@@ -91,8 +105,6 @@ module Spud
     end
 
     def print_rules!
-      #table = rules.map { |name, rule| { name: name, filename: rule.filename } }
-
       longest_name = 0
       longest_filename = 0
       longest_positional = 0
@@ -120,34 +132,6 @@ module Spud
 
         puts fields.join('  ')
       end
-
-      return
-
-      longest_rule = 0
-      longest_filename = 0
-      longest_positional = 0
-      longest_keyword = 0
-      table.each do |(rule, filename)|
-        longest_rule = rule.length if rule.length > longest_rule
-        longest_filename = filename.length if filename.length > longest_filename
-
-        positional = rule.positional_params.map(&method(:wrap_param)).join(' ')
-        longest_positional = positional.length if positional.length > longest_positional
-
-        keyword = rule.keyword_params.map(&method(:prefix_param)).join(' ')
-        longest_keyword = keyword.length if keyword.length > longest_keyword
-      end
-
-      table.each do |(rule, filename)|
-        [
-          [rule, longest_rule],
-          [positional, longest_positional],
-          [filename, longest_filename],
-          [filename, longest_filename],
-        ]
-
-        puts "#{rule.ljust(longest_rule)}  #{filename.ljust(longest_filename)}"
-      end
     end
 
     def wrap_param(name)
@@ -176,7 +160,18 @@ module Spud
       puts help.string
     end
 
+    # Options
+    def watches_present?
+      @watches_present ||= !options[:watches].empty?
+    end
+
+    %i[help version debug].each { |option| define_method("#{option}?") { options[option] } }
+
     # Args
+    def rule_present?
+      rule_name
+    end
+
     def options
       @options ||= args[:options]
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Spud
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

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