spud 0.2.0 → 0.2.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Andrew Booth
 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: rspec
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+- !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
+- !ruby/object:Gem::Dependency
+  name: sorbet-runtime
+  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:
@@ -61,26 +89,28 @@ 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
@@ -91,9 +121,9 @@ require_paths:
 - lib
 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:
   - - ">="

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

data/lib/spud/build_tools/spud/shell/command.rb

@@ -1,52 +0,0 @@
-require 'stringio'
-require 'open3'
-require 'spud/build_tools/spud/shell/result'
-
-module Spud
-  module BuildTools
-    module Spud
-      module Shell
-        class Command
-          attr_reader :result
-
-          # @param command [String]
-          # @param silent [Boolean]
-          # @param handle [IO]
-          def self.call(command, silent: false, handle: STDOUT)
-            cmd = new(command, silent: silent, handle: handle)
-            cmd.issue!
-            cmd.result
-          end
-
-          # @param command [String]
-          # @param silent [Boolean]
-          # @param handle [IO]
-          def initialize(command, silent: false, handle: STDOUT)
-            @command = command
-            @silent = silent
-            @handle = handle
-
-            @result = nil
-          end
-
-          # @return [void]
-          def issue!
-            capturer = StringIO.new
-
-            Open3.popen2e(@command) do |_stdin, stdout, thread|
-              loop do
-                line = stdout.gets
-                break unless line
-
-                @handle.write line unless @silent
-                capturer.puts line
-              end
-
-              @result = Result.new(capturer.string, thread.value)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spud/build_tools/spud/shell/result.rb

@@ -1,26 +0,0 @@
-module Spud
-  module BuildTools
-    module Spud
-      module Shell
-        class Result < String
-          attr_reader :status
-
-          # @param output [String]
-          # @param status [Process::Status]
-          def initialize(output, status)
-            super(output)
-            @status = status
-          end
-
-          def method_missing(symbol, *args)
-            status.respond_to?(symbol) ? status.send(symbol, *args) : super
-          end
-
-          def respond_to_missing?(symbol, *)
-            status.respond_to?(symbol) || super
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,125 +0,0 @@
-require 'spud/error'
-require 'spud/task_args'
-require 'spud/build_tools/task'
-require 'spud/build_tools/spud/task'
-require 'spud/build_tools/spud/dsl/file'
-require 'spud/build_tools/spud/dsl/task'
-
-module Spud
-  module BuildTools
-    module Spud
-      class Task < BuildTools::Task
-        # @return [void]
-        def self.mount!
-          Dir['**/Spudfile', '**/*.spud'].each do |filename|
-            @filename = filename
-            file_dsl.instance_eval(File.read(filename), filename)
-          end
-
-          @filename = nil
-        end
-
-        # @return [Spud::DSL::File]
-        def self.file_dsl
-          @file_dsl ||= DSL::File.new
-        end
-
-        # @param task [String]
-        # @param block [Proc]
-        # @return [void]
-        def self.add_task(task, &block)
-          raise "task '#{task}' somehow created without filename" unless @filename
-
-          qualified_name = [qualified_prefix(@filename), task.to_s].join('.').gsub(/^\./, '')
-          new(name: qualified_name, filename: @filename, &block)
-        end
-
-        # @param filename [String]
-        # @param task [String]
-        # @param positional [Array]
-        # @param named [Hash]
-        def self.invoke(filename, task, positional, named)
-          task = task.to_s
-          task_obj = task_for(filename, task)
-          if task_obj
-            Runtime.invoke(task_obj.name, positional, named)
-          else
-            Runtime.invoke(task, positional, named)
-          end
-        end
-
-        # @param filename [String]
-        # @param task [String]
-        def self.task_for(filename, task)
-          task = task.to_s
-          if task.include?('.')
-            Runtime.tasks[task]
-          else
-            Runtime.tasks[[qualified_prefix(filename), task.to_s].join('.').gsub(/^\./, '')]
-          end
-        end
-
-        # @param filename [String]
-        # @return [String]
-        def self.qualified_prefix(filename)
-          dirname = File.dirname(filename)
-          dirname = '' if dirname == '.'
-
-          basename = File.basename(filename, '.spud')
-          basename_array = basename == 'Spudfile' ? [] : [basename]
-
-          (dirname.split('/') + basename_array).join('.')
-        end
-
-        def initialize(name:, filename:, &block)
-          super
-          @block = block
-        end
-
-        # @param positional [Array]
-        # @param named [Hash]
-        # @return [Object]
-        def invoke(positional, named)
-          check_required!(positional)
-
-          return task_dsl.instance_exec(*positional, &@block) unless args.any_named?
-
-          task_dsl.instance_exec(*positional, **symbolize_keys(named), &@block)
-        rescue ArgumentError => error
-          raise Error, "invocation of '#{name}' with #{error.message}"
-        end
-
-        # @return [Spud::TaskArgs]
-        def args
-          @args ||= ::Spud::TaskArgs.from_block(filename, &@block)
-        end
-
-        private
-
-        # @param positional [Array<String>]
-        # @return [void]
-        def check_required!(positional)
-          required_positional = args.required_positional
-          missing_positional = required_positional.length - positional.length
-          if missing_positional > 0
-            arguments = required_positional.length - missing_positional > 1 ? 'arguments' : 'argument'
-            raise Error, "invocation of '#{name}' missing required #{arguments} #{required_positional.join(', ')}"
-          end
-        end
-
-        # @return [Spud::DSL::Task]
-        def task_dsl
-          @task_dsl ||= DSL::Task.new(filename)
-        end
-
-        # @param hash [Hash]
-        # @return [Hash]
-        def symbolize_keys(hash)
-          hash.each_with_object({}) do |(key, value), new_hash|
-            new_hash[key.is_a?(String) ? key.to_sym : key] = value
-          end
-        end
-      end
-    end
-  end
-end