spud 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e92e76786c206e34c509f3a8829ecdb81b3773af
-  data.tar.gz: 1220524f9bcc66630f76b1829a1e07d4c0fbb136
+SHA256:
+  metadata.gz: 9e652aed39adb3e3628284a91a99a667a28bef656910b92a95d8b70dc65243e7
+  data.tar.gz: df1335045f4539dd82290561d183ff296995027c2d609c232b7d0d92a60cb535
 SHA512:
-  metadata.gz: c9865feae31740c55283771181008caa50f5b9e9530c016d09df7f29b3103add24838396e4003d12691438f4cc34d0bca9931c2aedbf11aa6da48587ccce4cfd
-  data.tar.gz: e95e09f69e0218b6b19ab18502ace805686e78f1503da48f735781c6a7884e210c17f8d13ab6ee5320c0a19b020f4af5d3dbffce9abb8bc5ed003f4f79793fad
+  metadata.gz: 2dbca45c10d578522152d312cb1b7918488361699242e5295a81109fd089ff9d854920a3d1278b9c957fb03014ca1cc7a21b45e2be4a7df1c08ffadb8800a508
+  data.tar.gz: 9503fb318c69e8608d0577160a8b639d61cefd5f0921562b4acea5f39ba4dab639a3266eac073c7d13ffa87208eecfe87d61b52f6e116e358d4a41f240f49acb

data/lib/args.rb

@@ -9,9 +9,10 @@ module Spud
 
       def default_options
         {
+          help: false,
+          version: false,
+          watches: [],
           debug: false,
-          list: false,
-          version: false
         }
       end
 
@@ -19,8 +20,9 @@ module Spud
         arg = args[index]
 
         case arg
+        when '-h', '--help' then [options.merge(help: true), index + 1]
         when '-v', '--version' then [options.merge(version: true), index + 1]
-        when '-l', '--list' then [options.merge(list: true), index + 1]
+        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/build_rule.rb

@@ -4,6 +4,10 @@ module Spud
       def invoke(*args, **kwargs)
         raise NotImplementedError
       end
+
+      def filename
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/build_tools/make/make.rb

@@ -25,5 +25,9 @@ module Spud::BuildTools
     def invoke(*args, **kwargs)
       system('make', @name, *args)
     end
+
+    def filename
+      'Makefile'
+    end
   end
 end

data/lib/build_tools/spud/file_context.rb

@@ -5,21 +5,30 @@ module Spud::BuildTools
     class FileContext
       attr_reader :rules
 
-      def initialize(spud)
+      def initialize(spud, filename)
         @spud = spud
+        @filename = filename
         @rules = {}
       end
 
       def rule(name, *args, &block)
-        name = name.to_s
         files = args.select { |arg| arg.is_a?(String) }
         deps = args.select { |arg| arg.is_a?(Hash) }.reduce({}) { |hash, dep| hash.merge(dep) }
-        @rules[name] = Rule.new(@spud, self, name, files, deps, block)
+
+        name = prefix_rule(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 method_missing(method_name, *args, &block)
-        method_name = method_name.to_s
-        rule(method_name, *args, &block)
+      def prefix
+        @prefix ||= @filename == 'Spudfile' ? '' : "#{File.basename(@filename, '.rb')}."
       end
     end
   end

data/lib/build_tools/spud/rule.rb

@@ -6,9 +6,12 @@ require_relative '../../error'
 module Spud::BuildTools
   module SpudBuild
     class Rule < BuildRule
-      def initialize(spud, file_context, name, files, deps, block)
+      attr_reader :filename
+
+      def initialize(spud, file_context, filename, name, files, deps, block)
         @spud = spud
         @file_context = file_context
+        @filename = filename
         @name = name
         @files = files
         @deps = deps
@@ -43,7 +46,6 @@ module Spud::BuildTools
       def up_to_date?
         return files_up_to_date? unless files_up_to_date?.nil?
         deps_up_to_date?
-        #files_up_to_date? && deps_up_to_date?
       end
 
       def files_up_to_date?
@@ -108,10 +110,6 @@ module Spud::BuildTools
         param_source = match[:params]
         eval("-> (#{param_source}) {}")
       end
-
-      def filename
-        'Spudfile'
-      end
     end
   end
 end

data/lib/build_tools/spud/rule_context.rb

@@ -4,10 +4,6 @@ require_relative '../../error'
 
 module Spud::BuildTools
   module SpudBuild
-    def self.join_args(*args)
-      args.join(' ')
-    end
-
     class RuleContext
       def initialize(spud, file_context)
         @spud = spud
@@ -17,68 +13,49 @@ module Spud::BuildTools
         end
       end
 
-      def sh(*args)
-        out = sh?(*args)
+      def sh(cmd)
+        out = sh?(cmd)
         raise ShellError unless out.status.exitstatus.zero?
 
         out
       end
 
-      def sh?(*args)
-        cmd = SpudBuild.join_args(*args)
+      def sh?(cmd)
         puts cmd
 
         out = Spud::Shell.cmd(cmd)
-        puts out
+        puts out unless out.empty?
 
         out
       end
 
-      def shh(*args)
-        out = shh?(*args)
+      def shh(cmd)
+        out = shh?(cmd)
         raise ShellError unless out.status.exitstatus.zero?
 
         out
       end
 
-      def shh?(*args)
-        out = Spud::Shell.cmd(SpudBuild.join_args(*args))
-        puts out
+      def shh?(cmd)
+        out = Spud::Shell.cmd(cmd)
+        puts out unless out.empty?
 
         out
       end
 
-      def shhh(*args)
-        out = shhh?(*args)
+      def shhh(cmd)
+        out = shhh?(cmd)
         raise ShellError, out unless out.status.exitstatus.zero?
 
         out
       end
 
-      def shhh?(*args)
-        Spud::Shell.cmd(SpudBuild.join_args(*args))
+      def shhh?(cmd)
+        Spud::Shell.cmd(cmd)
       end
 
-      def invoke(rule_name, *args, **kwargs)
-        @spud.invoke_rule(rule_name.to_s, *args, **kwargs)
-      end
-
-      def q(s)
-        %('#{s}')
-      end
-
-      def qq(s)
-        %("#{s}")
-      end
-
-      def method_missing(method_name, *args)
-        method_name = method_name.to_s
-
-        if method_name.end_with?('?')
-          sh?(method_name.chomp('?'), *args)
-        else
-          sh(method_name, *args)
-        end
+      def invoke(name, *args, **kwargs)
+        @spud.invoke(name, *args, **kwargs)
       end
     end
   end

data/lib/build_tools/spud/spud.rb

@@ -4,14 +4,20 @@ require_relative 'file_context'
 module Spud::BuildTools
   module SpudBuild
     class Build < BuildTool
+      attr_reader :rules
+
       def mount!
-        source = File.read('Spudfile')
-        @ctx = FileContext.new(@spud)
-        @ctx.instance_eval(source)
-      end
+        filenames = Dir.glob('Spudfile')
+        filenames += Dir.glob('spuds/*.rb')
+
+        @rules = {}
+        filenames.each do |filename|
+          source = File.read(filename)
+          @ctx = FileContext.new(@spud, filename)
+          @ctx.instance_eval(source)
 
-      def rules
-        @ctx.rules
+          @rules.merge!(@ctx.rules)
+        end
       end
     end
   end

data/lib/spud.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 require_relative 'args'
 require_relative 'version'
 require_relative 'build_tools/build_tools'
@@ -10,17 +12,27 @@ module Spud
 
   class Spud
     def run!
+      if options[:help]
+        print_help!
+        return
+      end
+
       if options[:version]
         puts VERSION
         return
       end
 
-      if !rule_name || options[:list]
-        rules.keys.each(&method(:puts))
+      unless rule_name
+        print_rules!
+        return
+      end
+
+      unless options[:watches].empty?
+        watch(options[:watches], rule_name, *args[:positional], **args[:keyword])
         return
       end
 
-      invoke_rule(rule_name, *args[:positional], **args[:keyword])
+      invoke(rule_name, *args[:positional], **args[:keyword])
     rescue BuildTools::SpudBuild::ShellError => e
       raise e if options[:debug]
 
@@ -34,12 +46,41 @@ module Spud
       puts e.message
     end
 
-    def invoke_rule(name, *args, **kwargs)
-      rule = rules[name]
-      raise Error, "no rule found for #{name}" unless rule
+    def invoke(name, *args, **kwargs)
+      rule = rules[name.to_s]
+      raise Error, "no rule found for '#{name}'" unless rule
       rule.invoke(*args, **kwargs)
     end
 
+    def watch(globs, name, *args, **kwargs)
+      rule = rules[name.to_s]
+      raise Error, "no rule found for '#{name}'" unless rule
+
+      timestamps = {}
+      loop do
+        begin
+          Dir.glob(*globs).each do |filename|
+            new_timestamp = File.mtime(filename)
+            old_timestamp = timestamps[filename]
+            unless old_timestamp
+              timestamps[filename] = new_timestamp
+              next
+            end
+
+            if new_timestamp > old_timestamp
+              timestamps[filename] = new_timestamp
+              invoke(name, *args, **kwargs)
+              break
+            end
+          end
+
+          sleep 0.1
+        rescue Interrupt
+          break
+        end
+      end
+    end
+
     private
 
     # Rules
@@ -54,6 +95,39 @@ module Spud
         .each(&:mount!)
     end
 
+    def print_rules!
+      table = rules.map { |name, rule| [name, rule.filename] }
+      table.unshift(%w[RULE FILENAME])
+
+      longest_rule = 'RULE'.length
+      longest_filename = 'FILENAME'.length
+      table.each do |(rule, filename)|
+        longest_rule = rule.length if rule.length > longest_rule
+        longest_filename = filename.length if filename.length > longest_filename
+      end
+
+      table.each do |(rule, filename)|
+        puts "#{rule.ljust(longest_rule)}  #{filename.ljust(longest_filename)}"
+      end
+    end
+
+    # Help
+    def print_help!
+      help = StringIO.new
+
+      help.puts "spud #{VERSION}"
+      help.puts
+      help.puts 'usage:'
+      help.puts '  spud [options] <rule> [args]'
+      help.puts
+      help.puts 'options:'
+      help.puts '  -h, --help     show this help dialog dialog'
+      help.puts '  -v, --version  show spud version'
+      help.puts '  --debug        run in debug mode'
+
+      puts help.string
+    end
+
     # Args
     def options
       @options ||= args[:options]

data/lib/version.rb

@@ -1,3 +1,3 @@
-    module Spud
-      VERSION = '0.1.3'
-    end
+module Spud
+  VERSION = '0.1.5'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Booth
@@ -14,28 +14,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Spud is a build tool, written as a ruby DSL
@@ -45,23 +45,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/spud.rb
+- bin/spud
 - lib/args.rb
-- lib/build_tools/build_tool.rb
 - lib/build_tools/build_rule.rb
+- lib/build_tools/build_tool.rb
 - lib/build_tools/build_tools.rb
 - lib/build_tools/make/make.rb
-- lib/build_tools/spud/rule_context.rb
-- lib/build_tools/spud/spud.rb
-- lib/build_tools/spud/rule.rb
-- lib/build_tools/spud/spudfile.rb
+- lib/build_tools/node/node.rb
 - lib/build_tools/spud/file_context.rb
+- lib/build_tools/spud/rule.rb
+- lib/build_tools/spud/rule_context.rb
 - lib/build_tools/spud/shell_error.rb
-- lib/build_tools/node/node.rb
+- lib/build_tools/spud/spud.rb
+- lib/error.rb
 - lib/shell.rb
+- lib/spud.rb
 - lib/version.rb
-- lib/error.rb
-- bin/spud
 homepage: https://github.com/broothie/spud#readme
 licenses:
 - MIT
@@ -72,17 +71,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A build tool

data/lib/build_tools/spud/spudfile.rb

@@ -1,12 +0,0 @@
-
-module Spud::BuildTools
-  module SpudBuild
-    class Spudfile
-      def initialize(spud, source)
-        @spud = spud
-        @file_context = FileContext.new(@spud)
-
-      end
-    end
-  end
-end