spud 0.2.1 → 0.2.6

data/lib/spud/task_runners/task_runners.rb

@@ -0,0 +1,25 @@
+# typed: strict
+require 'sorbet-runtime'
+require 'spud/task_runners/task'
+require 'spud/task_runners/spud_task_runner/task'
+require 'spud/task_runners/make/task'
+require 'spud/task_runners/package.json/task'
+
+module Spud
+  module TaskRunners
+    extend T::Sig
+
+    sig {returns(T::Array[T.class_of(Task)])}
+    def self.get
+      # Ordered by priority
+      T.let(
+        [
+          T.let(SpudTaskRunner::Task, T.class_of(Task)),
+          T.let(Make::Task, T.class_of(Task)),
+          T.let(PackageJSON::Task, T.class_of(Task)),
+        ],
+        T::Array[T.class_of(Task)]
+      )
+    end
+  end
+end

data/lib/spud/version.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Spud
-  VERSION = '0.2.1'
+  VERSION = '0.2.6'
 end

data/lib/spud/watch.rb

@@ -0,0 +1,73 @@
+# typed: true
+require 'sorbet-runtime'
+require 'spud/driver'
+
+module Spud
+  class Watch
+    extend T::Sig
+
+    sig do
+      params(
+        driver: Driver,
+        task: String,
+        ordered: T::Array[String],
+        named: T::Hash[String, String],
+        watches: T::Array[String],
+      ).void
+    end
+    def self.run!(driver:, task:, ordered:, named:, watches:)
+      new(driver: driver, task: task, ordered: ordered, named: named, watches: watches).run!
+    end
+
+    sig do
+      params(
+        driver: Driver,
+        task: String,
+        ordered: T::Array[String],
+        named: T::Hash[String, String],
+        watches: T::Array[String],
+      ).void
+    end
+    def initialize(driver:, task:, ordered:, named:, watches:)
+      @driver = driver
+      @task = task
+      @ordered = ordered
+      @named = named
+      @watches = watches
+
+      @last_changed = Time.at(0)
+    end
+
+    sig {void}
+    def run!
+      thread = T.let(nil, T.nilable(Thread))
+
+      loop do
+        if watches_changed?
+          thread&.kill
+          Process.kill('SIGKILL', T.must(@driver.subprocess_pid)) if @driver.subprocess_pid
+
+          @last_changed = latest_watch_change
+          thread = Thread.new { @driver.invoke(@task, @ordered, @named) }
+        end
+
+        sleep(0.1)
+      end
+    rescue Interrupt => error
+      puts "handled interrupt #{error}" if @driver.debug?
+    end
+
+    sig {returns(T::Boolean)}
+    def watches_changed?
+      @last_changed < latest_watch_change
+    end
+
+    sig {returns(Time)}
+    def latest_watch_change
+      T.unsafe(Dir)[*@watches]
+        .map(&File.method(:stat))
+        .map(&:mtime)
+        .max
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Andrew Booth
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sorbet-runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6100
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6100
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-description:
+- !ruby/object:Gem::Dependency
+  name: sorbet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6100
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6100
+description: 
 email: andrew@andrewbooth.xyz
 executables:
 - spud
@@ -61,31 +89,33 @@ extra_rdoc_files: []
 files:
 - bin/spud
 - lib/spud.rb
-- lib/spud/build_tools/build_tools.rb
-- lib/spud/build_tools/make/task.rb
-- lib/spud/build_tools/package.json/task.rb
-- lib/spud/build_tools/spud/block_param_info.rb
-- lib/spud/build_tools/spud/dsl/file.rb
-- lib/spud/build_tools/spud/dsl/task.rb
-- lib/spud/build_tools/spud/shell/command.rb
-- lib/spud/build_tools/spud/shell/result.rb
-- lib/spud/build_tools/spud/task.rb
-- lib/spud/build_tools/task.rb
+- lib/spud/block_param_info.rb
+- lib/spud/cli/options.rb
 - lib/spud/cli/parser.rb
 - lib/spud/cli/results.rb
+- lib/spud/driver.rb
 - lib/spud/error.rb
 - lib/spud/help.rb
 - lib/spud/lister.rb
-- lib/spud/options.rb
-- lib/spud/runtime.rb
+- lib/spud/shell/command.rb
+- lib/spud/shell/result.rb
 - lib/spud/task_arg.rb
 - lib/spud/task_args.rb
+- lib/spud/task_runners/make/task.rb
+- lib/spud/task_runners/package.json/task.rb
+- lib/spud/task_runners/spud_task_runner/dependency.rb
+- lib/spud/task_runners/spud_task_runner/file_dsl.rb
+- lib/spud/task_runners/spud_task_runner/task.rb
+- lib/spud/task_runners/spud_task_runner/task_dsl.rb
+- lib/spud/task_runners/task.rb
+- lib/spud/task_runners/task_runners.rb
 - lib/spud/version.rb
+- lib/spud/watch.rb
 homepage: https://github.com/broothie/spud#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,15 +123,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Spud is a task runner, in the form of a ruby DSL.
 test_files: []

data/lib/spud/build_tools/build_tools.rb

@@ -1,13 +0,0 @@
-require 'spud/build_tools/spud/task'
-require 'spud/build_tools/make/task'
-require 'spud/build_tools/package.json/task'
-
-module Spud
-  module BuildTools
-    BUILD_TOOLS = [
-      Spud::Task,
-      Make::Task,
-      PackageJSON::Task,
-    ]
-  end
-end

data/lib/spud/build_tools/make/task.rb

@@ -1,27 +0,0 @@
-require 'spud/build_tools/task'
-
-module Spud
-  module BuildTools
-    module Make
-      class Task < BuildTools::Task
-        def self.mount!
-          return unless File.exist?('Makefile')
-
-          if `command -v make`.empty?
-            puts 'Makefile detected, but no installation of `make` exists. Skipping make...'
-            return
-          end
-
-          source = File.read('Makefile')
-          source.scan(/^(\S+):.*/).map(&:first).each do |name|
-            new(name: name, filename: 'Makefile')
-          end
-        end
-
-        def invoke(*)
-          system('make', name)
-        end
-      end
-    end
-  end
-end

data/lib/spud/build_tools/package.json/task.rb

@@ -1,47 +0,0 @@
-require 'json'
-require 'spud/build_tools/task'
-
-module Spud
-  module BuildTools
-    module PackageJSON
-      class Task < BuildTools::Task
-        def self.mount!
-          return unless File.exist?('package.json')
-
-          opening_commands = %w[npm run]
-          if File.exist?('package.lock')
-            if `command -v npm`.empty?
-              puts 'package.json detected, but no installation of `npm` exists. Skipping npm...'
-              return
-            end
-          elsif File.exist?('yarn.lock')
-            if `command -v yarn`.empty?
-              puts 'package.json detected, but no installation of `yarn` exists. Skipping yarn...'
-              return
-            else
-              opening_commands = %w[yarn run]
-            end
-          end
-
-          source = File.read('package.json')
-          json = JSON.parse(source)
-          scripts = json['scripts']
-          return unless scripts
-
-          scripts.keys.each do |name|
-            new(name: name, filename: 'package.json', opening_commands: opening_commands)
-          end
-        end
-
-        def initialize(name:, filename:, opening_commands:)
-          super(name: name, filename: filename)
-          @opening_commands = opening_commands
-        end
-
-        def invoke(*)
-          system(*(@opening_commands + [name]))
-        end
-      end
-    end
-  end
-end

data/lib/spud/build_tools/spud/block_param_info.rb

@@ -1,77 +0,0 @@
-require 'spud/task_arg'
-
-module Spud
-  module BuildTools
-    module Spud
-      class BlockParamInfo
-        # @param filename [String]
-        # @param block [Proc]
-        def initialize(filename, &block)
-          @filename = filename
-          @block = block
-        end
-
-        # @return [Array<Spud::TaskArg>]
-        def task_args
-          parameters.map do |type, name|
-            case type
-            when :req
-              TaskArg.new(name, 'positional')
-            when :opt
-              TaskArg.new(name, 'positional', default: arg_values[name])
-            when :keyreq
-              TaskArg.new(name, 'named')
-            when :key
-              TaskArg.new(name, 'named', default: arg_values[name])
-            end
-          end
-        end
-
-        # @return [Array]
-        def dummy_args
-          [dummy_positional_args, dummy_named_args]
-        end
-
-        # @return [Array<NilClass>]
-        def dummy_positional_args
-          Array.new(parameters.count { |p| p.first == :req })
-        end
-
-        # @return [Hash{Symbol->NilClass}]
-        def dummy_named_args
-          parameters.select { |p| p.first == :keyreq }.map(&:last).each_with_object({}) { |n, h| h[n] = nil }
-        end
-
-        # @return [String]
-        def arg_hash_string
-          "{ #{parameters.map(&:last).map { |n| "#{n}: #{n}" }.join(', ')} }"
-        end
-
-        # @return [Hash]
-        def arg_values
-          @arg_values ||= begin
-            positional, named = dummy_args
-            lambda(arg_hash_string).call(*positional, **named)
-          end
-        end
-
-        # @return [Array<Array<Symbol>>]
-        def parameters
-          @parameters ||= lambda.parameters
-        end
-
-        # @return [Proc]
-        def lambda(body = nil)
-          line = File.read(@filename).split("\n")[@block.source_location.last - 1]
-
-          match = /(do|{)\s*\|(?<params>[^|]+)\|/.match(line)
-          return -> {} unless match
-
-          param_source = match[:params]
-          param_source += ', _: nil, __: nil, ___: nil' if body
-          eval "-> (#{param_source}) { #{body} }"
-        end
-      end
-    end
-  end
-end

data/lib/spud/build_tools/spud/dsl/file.rb

@@ -1,23 +0,0 @@
-require 'spud/build_tools/spud/task'
-
-module Spud
-  module BuildTools
-    module Spud
-      module DSL
-        class File
-          def require_relative(name)
-            require("./#{name}")
-          end
-
-          def task(name, *, &block)
-            BuildTools::Spud::Task.add_task(name, &block)
-          end
-
-          def method_missing(name, *args, &block)
-            task(name, *args, &block)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spud/build_tools/spud/dsl/task.rb

@@ -1,63 +0,0 @@
-require 'spud/error'
-require 'spud/build_tools/spud/task'
-require 'spud/build_tools/spud/shell/command'
-
-module Spud
-  module BuildTools
-    module Spud
-      module DSL
-        class Task
-          def initialize(filename)
-            @filename = filename
-          end
-
-          def sh(command)
-            puts command
-            Shell::Command.(command)
-          end
-
-          def shh(command)
-            Shell::Command.(command)
-          end
-
-          def shhh(command)
-            Shell::Command.(command, silent: true)
-          end
-
-          def sh!(command)
-            puts command
-            result = Shell::Command.(command)
-            raise Error, "sh failed for '#{command}'" unless result.success?
-            result
-          end
-
-          def shh!(command)
-            result = Shell::Command.(command)
-            raise Error, "sh failed for '#{command}'" unless result.success?
-            result
-          end
-
-          def shhh!(command)
-            result = Shell::Command.(command, silent: true)
-            raise Error, "sh failed for '#{command}'" unless result.success?
-            result
-          end
-
-          def invoke(task, *positional, **named)
-            Spud::Task.invoke(@filename, task, positional, named)
-          rescue Error => error
-            puts "invoke failed for '#{task}': #{error}"
-          end
-
-          def invoke!(task, *positional, **named)
-            Spud::Task.invoke(@filename, task, positional, named)
-          end
-
-          def method_missing(symbol, *positional, **named)
-            Spud::Task.task_for(@filename, symbol) ? Spud::Task.invoke(@filename, symbol, positional, named) : super
-          end
-        end
-      end
-    end
-  end
-end