spud 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c375bdd21d64dcddbdb86e7d3aef2c8e04abd0b5
-  data.tar.gz: 26d2be23293edfa1305ab3b28684e04a3d2d98ec
+  metadata.gz: d0b081b3d20c3a0b253e2383b4a514aac28edcf8
+  data.tar.gz: da8443efc8c52b187e84158075cee7d5875de020
 SHA512:
-  metadata.gz: 8689e8cbf001ad043337b556a7e6c981c67481eac17c10810da3d9d5f851fb0def39cb5a828d0d96022b722828447412cc3f3a730d599f756d59098df32a5a21
-  data.tar.gz: 033f5a3b43d2d1d99247cf75d1aa98c9d42e69f99cfaa50201f66253681388b8f55c80c1f008691cabb9e23aef4f6d5daed418d2958c6b3b4714e98121de279b
+  metadata.gz: 3798ff8d115c5c1cdafcca5f134531f5df5932a7bbfafd1d33b07486dd132cf49674888fa45c1708d058a9f2b6653f2ce8e642c93112313cec684a31b6ebde7d
+  data.tar.gz: e0f7c61cfc28af1d0f4b821fb904731240e842f35846c6d3257153223d814adc6875cf49241d046cfa0dd1c24d33f39fc59abe009a99c6ad6acb22e9493e4e04

data/lib/spud/driver.rb

@@ -8,6 +8,7 @@ require 'spud/cli/parser'
 require 'spud/cli/options'
 require 'spud/task_runners/task'
 require 'spud/task_runners/task_runners'
+require 'spud/task_runners/spud_task_runner/task'
 
 module Spud
   class Driver
@@ -39,18 +40,12 @@ module Spud
         return
       end
 
-      task = T.must(args.task)
       if options.inspect?
-        puts get_task(task).details
+        inspect!
         return
       end
 
-      unless options.watches.empty?
-        watch!
-        return
-      end
-
-      invoke(task, args.ordered, args.named)
+      invoke!
     rescue Error => error
       puts error.message
       raise error if debug?
@@ -61,9 +56,7 @@ module Spud
       raise error if debug?
     end
 
-    sig do
-      params(name: String, ordered: T::Array[String], named: T::Hash[T.any(String, Symbol), String]).returns(T.untyped)
-    end
+    sig {params(name: String, ordered: T::Array[String], named: T::Hash[T.any(String, Symbol), String]).returns(T.untyped)}
     def invoke(name, ordered, named)
       get_task(name).invoke(ordered, stringify_keys(named))
     end
@@ -81,14 +74,31 @@ module Spud
     private
 
     sig {void}
-    def watch!
-      Watch.run!(
-        driver: self,
-        task: T.must(args.task),
-        ordered: args.ordered,
-        named: args.named,
-        watches: options.watches,
-      )
+    def invoke!
+      task_name = T.must(args.task)
+      task = get_task(task_name)
+
+      watches = options.watches
+      watches = task.watches if watches.empty?
+
+      if watches.empty?
+        invoke(task_name, args.ordered, args.named)
+      else
+        raise Error, "watches only supported for Spud tasks" unless task.is_a?(TaskRunners::SpudTaskRunner::Task)
+
+        Watch.run!(
+          driver: self,
+          task: task_name,
+          ordered: args.ordered,
+          named: args.named,
+          watches: watches,
+        )
+      end
+    end
+
+    sig {void}
+    def inspect!
+      puts get_task(T.must(args.task)).details
     end
 
     sig {params(task_name: String).returns(TaskRunners::Task)}

data/lib/spud/task_runners/spud_task_runner/file_dsl.rb

@@ -33,16 +33,23 @@ module Spud
         sig do
           params(
             name: T.any(String, Symbol),
-            dependencies: T::Hash[T.any(String, T::Array[String]), T.any(String, T::Array[String])],
+            opts: T::Hash[T.any(Symbol, String, T::Array[String]), T.any(String, T::Array[String])],
             block: Proc,
           ).void
         end
-        def task(name, dependencies = {}, &block)
+        def task(name, opts = {}, &block)
+          watches = opts.delete(:watch)
+          dependencies = T.cast(
+            opts.reject { |key, _| key.is_a?(Symbol) },
+            T::Hash[T.any(String, T::Array[String]), T.any(String, T::Array[String])],
+          )
+
           @__tasks << Task.new(
             driver: @__driver,
             name: Task.qualified_name(@__filename, name.to_s),
             filename: @__filename,
             dependencies: dependencies,
+            watches: [watches].flatten.compact,
             file_dsl: self,
             &block
           )

data/lib/spud/task_runners/spud_task_runner/task.rb

@@ -26,6 +26,9 @@ module Spud
         sig {returns(T::Array[Dependency])}
         attr_reader :dependencies
 
+        sig {override.returns(T::Array[String])}
+        attr_reader :watches
+
         sig {override.params(driver: Driver).returns(T::Array[TaskRunners::Task])}
         def self.tasks(driver)
           Dir['Spudfile', '*.spud'].flat_map { |filename| FileDSL.run(driver, filename) }
@@ -50,15 +53,16 @@ module Spud
             name: String,
             filename: String,
             dependencies: T::Hash[T.any(String, T::Array[String]), T.any(String, T::Array[String])],
+            watches: T::Array[String],
             file_dsl: FileDSL,
             block: Proc,
-          )
-          .void
+          ).void
         end
-        def initialize(driver:, name:, filename:, dependencies:, file_dsl:, &block)
+        def initialize(driver:, name:, filename:, dependencies:, watches:, file_dsl:, &block)
           @driver = driver
           @name = name
           @filename = filename
+          @watches = watches
           @dependencies = dependencies.map { |to, from| Dependency.new(to, from) }
           @file_dsl = file_dsl
           @block = block

data/lib/spud/task_runners/task.rb

@@ -22,6 +22,11 @@ module Spud
       sig {abstract.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
       def invoke(ordered, named); end
 
+      sig {overridable.returns(T::Array[String])}
+      def watches
+        []
+      end
+
       sig {overridable.returns(TaskArgs)}
       def args
         TaskArgs.new([])

data/lib/spud/version.rb

@@ -1,4 +1,4 @@
 # typed: strict
 module Spud
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/lib/spud/watch.rb

@@ -42,6 +42,7 @@ module Spud
     def run!
       thread = T.let(nil, T.nilable(Thread))
 
+      puts "running '#{@task}' on changes to #{@watches.map { |glob| "'#{glob}'" }.join(', ')}"
       loop do
         if watches_changed?
           thread&.kill

metadata

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