spud 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f882ef853548e61f484e4ad023504e4f009b47f996a82224ca80a98aa2a80543
-  data.tar.gz: 50872d4b06b981265215a8b799799045dbc2a063f64cbb751c1bbea0725f562c
+  metadata.gz: 11082937f67da737d314d222eccb34f438de26fa5d0bb94186b1f99d89d29705
+  data.tar.gz: 4f6965f11798cb8af28f4f298954efd5ba831e8c8387ce63f642f02cd112e7c6
 SHA512:
-  metadata.gz: 2d2b3e8a5cdf1e54d9a7963967d3e22dd59e7c8c1241c97adf9d9ba866ac9c1c0367f5c54c315b47b176740db4af4a176345c25eece992d20719b0a37cc46f64
-  data.tar.gz: bf6554a77f12d675e37abd67ecbdc8f3f18bdf019aeab63e8ce6df418c239d588517c1b6b1f2890480ac616c7d32876e0fd74a5e9672b3f51ea39e582c8d9309
+  metadata.gz: fd4916032c22a3ea7268b38e418742fc265c7ef87c55acb2571cbfb74d7897035e2b819c945dde94c26931cd2766ef39e81cf9e5141745e26b430c096a9483d6
+  data.tar.gz: 9667b5d3c7f3baf7b0bdce2f2886ee501e00595478b76c40b7bd3106c6d5825eae4a28f8aaae941a759ff8f7e67b35f71a08220c96bfbe252b46b8f914e684d2

data/lib/build_tools/spud/file_context.rb

@@ -3,33 +3,31 @@ require_relative 'rule'
 module Spud::BuildTools
   module SpudBuild
     class FileContext
-      attr_reader :rules
+      attr_reader :__rules
 
       def initialize(spud, filename)
-        @spud = spud
-        @filename = filename
-        @rules = {}
+        @__spud = spud
+        @__filename = filename
+        @__rules = {}
+      end
+
+      def require_relative(name)
+        require(name)
       end
 
       def rule(name, *args, &block)
         files = args.select { |arg| arg.is_a?(String) }
         deps = args.select { |arg| arg.is_a?(Hash) }.reduce({}) { |hash, dep| hash.merge(dep) }
 
-        name = prefix_rule(name)
-        @rules[name] = Rule.new(@spud, self, @filename, name, files, deps, block)
+        prefix = @__filename == 'Spudfile' ? '' : "#{File.basename(@__filename, '.rb')}."
+        name = "#{prefix}#{name}"
+
+        @__rules[name] = Rule.new(@__spud, self, @__filename, name, files, deps, block)
       end
 
       def method_missing(name, *args, &block)
         rule(name, *args, &block)
       end
-
-      def prefix_rule(name)
-        "#{prefix}#{name}"
-      end
-
-      def prefix
-        @prefix ||= @filename == 'Spudfile' ? '' : "#{File.basename(@filename, '.rb')}."
-      end
     end
   end
 end

data/lib/build_tools/spud/rule_context.rb

@@ -22,11 +22,7 @@ module Spud::BuildTools
 
       def sh?(cmd)
         puts cmd
-
-        out = Spud::Shell.cmd(cmd)
-        puts out unless out.empty?
-
-        out
+        Spud::Shell.new(cmd)
       end
 
       def shh(cmd)
@@ -37,10 +33,7 @@ module Spud::BuildTools
       end
 
       def shh?(cmd)
-        out = Spud::Shell.cmd(cmd)
-        puts out unless out.empty?
-
-        out
+        Spud::Shell.new(cmd)
       end
 
       def shhh(cmd)
@@ -51,7 +44,7 @@ module Spud::BuildTools
       end
 
       def shhh?(cmd)
-        Spud::Shell.cmd(cmd)
+        Spud::Shell.new(cmd, silent: true)
       end
 
       def invoke(name, *args, **kwargs)

data/lib/build_tools/spud/spud.rb

@@ -14,9 +14,12 @@ module Spud::BuildTools
         filenames.each do |filename|
           source = File.read(filename)
           @ctx = FileContext.new(@spud, filename)
+
+          $LOAD_PATH << File.dirname(filename)
           @ctx.instance_eval(source)
+          $LOAD_PATH.pop
 
-          @rules.merge!(@ctx.rules)
+          @rules.merge!(@ctx.__rules)
         end
       end
     end

data/lib/shell.rb

@@ -1,14 +1,33 @@
+require 'open3'
+
 module Spud
   class Shell < String
     attr_accessor :status
 
-    def self.cmd(cmd)
-      new(`#{cmd}`, $?)
+    def initialize(cmd, silent: false)
+      @pid = nil
+      @status = nil
+      output = StringIO.new
+
+      Open3.popen3(cmd) do |_, stdout, _, thread|
+        @pid = thread.pid
+
+        begin
+          while line = stdout.gets
+            puts line unless silent
+            output.puts line
+          end
+        rescue Interrupt
+          exit
+        end
+      end
+
+      @status = $?
+      super(output.string)
     end
 
-    def initialize(output, status)
-      super(output)
-      @status = status
+    def kill!
+      Process.kill('HUP', @pid)
     end
   end
 end

data/lib/spud.rb

@@ -35,11 +35,6 @@ module Spud
     rescue BuildTools::SpudBuild::ShellError => e
       raise e if options[:debug]
 
-    rescue Error => e
-      raise e if options[:debug]
-      puts e.message
-      exit 1
-
     rescue => e
       raise e if options[:debug]
       puts e.message
@@ -118,7 +113,7 @@ module Spud
       help.puts 'options:'
       help.puts '  -h, --help           show this help dialog dialog'
       help.puts '  -v, --version        show spud version'
-      help.puts '  -w, --watch <files>  show spud version'
+      help.puts '  -w, --watch <files>  watch files for changes'
       help.puts '  --debug              run in debug mode'
 
       puts help.string

data/lib/version.rb

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

metadata

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