spud 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdf078402c01167bdfbb089bc310d340deea9ba
-  data.tar.gz: ba7a5d0943d295d04b6f5de0cbe6a1cad477f697
+  metadata.gz: e92e76786c206e34c509f3a8829ecdb81b3773af
+  data.tar.gz: 1220524f9bcc66630f76b1829a1e07d4c0fbb136
 SHA512:
-  metadata.gz: 950a5a0a493c2fbe2b231a0ec472abd40d550887131ce02e741cd765ebffa9577735d06a266eafbb5918f257a58a6fa50b3a65cf62cb91dfc81db9de49014a0d
-  data.tar.gz: c4c79b47c14e4892345e98cca7c3e6c8d9e08202ab62155aed53ade30eaabc64268f065bdba3db3a08e8c64922292879c15aad0a75eeefa4a719bc2af4dc08ac
+  metadata.gz: c9865feae31740c55283771181008caa50f5b9e9530c016d09df7f29b3103add24838396e4003d12691438f4cc34d0bca9931c2aedbf11aa6da48587ccce4cfd
+  data.tar.gz: e95e09f69e0218b6b19ab18502ace805686e78f1503da48f735781c6a7884e210c17f8d13ab6ee5320c0a19b020f4af5d3dbffce9abb8bc5ed003f4f79793fad

data/lib/build_tools/make/make.rb

@@ -23,7 +23,7 @@ module Spud::BuildTools
     end
 
     def invoke(*args, **kwargs)
-      system('make', name, *args)
+      system('make', @name, *args)
     end
   end
 end

data/lib/build_tools/spud/file_context.rb

@@ -10,12 +10,15 @@ module Spud::BuildTools
         @rules = {}
       end
 
-      def rule(name, deps = {}, &block)
+      def rule(name, *args, &block)
         name = name.to_s
-        @rules[name] = Rule.new(@spud, self, name, deps, &block)
+        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)
       end
 
       def method_missing(method_name, *args, &block)
+        method_name = method_name.to_s
         rule(method_name, *args, &block)
       end
     end

data/lib/build_tools/spud/rule.rb

@@ -1,20 +1,116 @@
 require_relative 'file_context'
 require_relative 'rule_context'
 require_relative '../build_rule'
+require_relative '../../error'
 
 module Spud::BuildTools
   module SpudBuild
     class Rule < BuildRule
-      def initialize(spud, file_context, name, deps = {}, &block)
+      def initialize(spud, file_context, name, files, deps, block)
         @spud = spud
         @file_context = file_context
         @name = name
+        @files = files
         @deps = deps
         @block = block
       end
 
       def invoke(*args, **kwargs)
-        RuleContext.new(@spud, @file_context).instance_exec(*args, **kwargs, &@block)
+        raise Spud::Error, "'#{@name}' is up to date" if up_to_date?
+
+        missing = required_params.length - args.length
+        if missing > 0
+          names = required_params.map { |name| "'#{name}'" }.join(', ')
+          arguments = missing > 1 ? 'arguments' : 'argument'
+          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
+
+        begin
+          RuleContext.new(@spud, @file_context).instance_exec(*args, **kwargs, &@block)
+        rescue ArgumentError => e
+          raise Spud::Error, "invocation of '#{@name}' with #{e.message}"
+        end
+      end
+
+      private
+
+      # Up to date checking
+      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?
+        return nil if all_files.empty?
+        all_files_exist?
+      end
+
+      def all_files_exist?
+        all_files.all?(&File.method(:exist?))
+      end
+
+      def all_files
+        @files.map(&Dir.method(:glob)).flatten
+      end
+
+      def deps_up_to_date?
+        return nil if @deps.empty?
+
+        @deps.all? do |deps, targets|
+          targets = [targets].flatten
+          deps = [deps].flatten
+
+          latest_target = targets
+            .map(&Dir.method(:glob))
+            .flatten
+            .map(&File.method(:mtime))
+            .sort
+            .last
+
+          latest_dep = deps
+            .map(&Dir.method(:glob))
+            .flatten
+            .map(&File.method(:mtime))
+            .sort
+            .last
+
+          return false unless latest_target && latest_dep
+          latest_target > latest_dep
+        end
+      end
+
+      # Lambda
+      def key_params?
+        lam.parameters.map(&:first).include?(:key)
+      end
+
+      def required_params
+        lam.parameters.select { |p| p.first == :req }.map(&:last)
+      end
+
+      def lam
+        @lam ||= build_lam
+      end
+
+      def build_lam
+        line = @block.source_location.last - 1
+        line = File.read(filename).split("\n")[line]
+
+        match = /(do|{)\s*\|(?<params>[^|]+)\|/.match(line)
+        return -> {} unless match
+
+        param_source = match[:params]
+        eval("-> (#{param_source}) {}")
+      end
+
+      def filename
+        'Spudfile'
       end
     end
   end

data/lib/build_tools/spud/rule_context.rb

@@ -4,6 +4,10 @@ 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
@@ -16,10 +20,12 @@ module Spud::BuildTools
       def sh(*args)
         out = sh?(*args)
         raise ShellError unless out.status.exitstatus.zero?
+
+        out
       end
 
       def sh?(*args)
-        cmd = args.join(' ')
+        cmd = SpudBuild.join_args(*args)
         puts cmd
 
         out = Spud::Shell.cmd(cmd)
@@ -31,10 +37,12 @@ module Spud::BuildTools
       def shh(*args)
         out = shh?(*args)
         raise ShellError unless out.status.exitstatus.zero?
+
+        out
       end
 
       def shh?(*args)
-        out = Spud::Shell.cmd(args.join(' '))
+        out = Spud::Shell.cmd(SpudBuild.join_args(*args))
         puts out
 
         out
@@ -43,19 +51,34 @@ module Spud::BuildTools
       def shhh(*args)
         out = shhh?(*args)
         raise ShellError, out unless out.status.exitstatus.zero?
+
+        out
       end
 
       def shhh?(*args)
-        Spud::Shell.cmd(args.join(' '))
+        Spud::Shell.cmd(SpudBuild.join_args(*args))
       end
 
       def invoke(rule_name, *args, **kwargs)
         @spud.invoke_rule(rule_name.to_s, *args, **kwargs)
       end
 
-      def die(message = nil, code: 1)
-        puts message if message
-        raise Spud::Error, code
+      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
       end
     end
   end

data/lib/build_tools/spud/spudfile.rb

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

data/lib/shell.rb

@@ -1,10 +1,9 @@
 module Spud
   class Shell < String
-    attr_reader :cmd
-    attr_reader :status
+    attr_accessor :status
 
     def self.cmd(cmd)
-      new( `#{cmd}`, $?)
+      new(`#{cmd}`, $?)
     end
 
     def initialize(output, status)

data/lib/spud.rb

@@ -25,6 +25,7 @@ module Spud
       raise e if options[:debug]
 
     rescue Error => e
+      raise e if options[:debug]
       puts e.message
       exit(1)
 
@@ -47,7 +48,10 @@ module Spud
     end
 
     def build_tools
-      @build_tools ||= BuildTools::BUILD_TOOLS.map { |tool| tool.new(self) }.each(&:mount!)
+      @build_tools ||= BuildTools::BUILD_TOOLS
+        .reverse
+        .map { |tool| tool.new(self) }
+        .each(&:mount!)
     end
 
     # Args

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Booth
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +54,7 @@ files:
 - 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/spud/file_context.rb
 - lib/build_tools/spud/shell_error.rb
 - lib/build_tools/node/node.rb