spud 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea40b0df03085beb5350590ed0336f4bbac760ff
-  data.tar.gz: 93427f8d7a3d1906d8f5ac082b54ee7a343afbec
+  metadata.gz: c375bdd21d64dcddbdb86e7d3aef2c8e04abd0b5
+  data.tar.gz: 26d2be23293edfa1305ab3b28684e04a3d2d98ec
 SHA512:
-  metadata.gz: 9e5125c223b8e4733a018cbfc31239f6f9dc9a7b6912785f3167cebf67f07886f64106f64940e1f5fe50e7516d76b5c0dddbbfe4ed53d7b2edc837a08b193068
-  data.tar.gz: 052fb31ba933ffaf3520669830d37bf292f325c1d54072ce29642b20d3dac53d71f76ef9afb7eb5e6eb1ecd8d76da0a3dc7368c66b17b65cceaec387c1296a05
+  metadata.gz: 8689e8cbf001ad043337b556a7e6c981c67481eac17c10810da3d9d5f851fb0def39cb5a828d0d96022b722828447412cc3f3a730d599f756d59098df32a5a21
+  data.tar.gz: 033f5a3b43d2d1d99247cf75d1aa98c9d42e69f99cfaa50201f66253681388b8f55c80c1f008691cabb9e23aef4f6d5daed418d2958c6b3b4714e98121de279b

data/lib/spud/cli/options.rb

@@ -7,7 +7,6 @@ module Spud
       extend T::Sig
 
       attr_writer :help
-      attr_writer :files
       attr_writer :inspect
 
       sig {returns(T::Array[String])}
@@ -21,11 +20,6 @@ module Spud
         !!@help
       end
 
-      sig {returns(T::Boolean)}
-      def files?
-        !!@files
-      end
-
       sig {returns(T::Boolean)}
       def inspect?
         !!@inspect

data/lib/spud/cli/parser.rb

@@ -54,7 +54,6 @@ module Spud
         case flag
         when '-h', '--help' then options.help = true
         when '-w', '--watch' then options.watches << take!
-        when '-f', '--files' then options.files = true
         when '-i', '--inspect' then options.inspect = true
         else raise Error, "invalid option: '#{flag}'"
         end

data/lib/spud/driver.rb

@@ -34,11 +34,6 @@ module Spud
         return
       end
 
-      if options.files?
-        lister.list_filenames!
-        return
-      end
-
       unless args.task
         lister.list_tasks!
         return

data/lib/spud/error.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 require 'sorbet-runtime'
 
 module Spud

data/lib/spud/help.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 require 'sorbet-runtime'
 require 'stringio'
 require 'spud/version'
@@ -18,7 +18,6 @@ module Spud
         options:
           -h, --help          show this help dialog
           -w, --watch <glob>  re-run task any time glob changes
-          -f, --files         list parsed files
           -i, --inspect       show details about a task
       HELP
     end

data/lib/spud/lister.rb

@@ -7,6 +7,11 @@ module Spud
   class Lister
     extend T::Sig
 
+    TASKS_HEADER = T.let('TASK', String)
+    ORDERED_HEADER = T.let('ORDERED ARGS', String)
+    NAMED_HEADER = T.let('NAMED ARGS', String)
+    SOURCES_HEADER = T.let('SOURCE', String)
+
     sig {params(tasks: T::Array[TaskRunners::Task]).void}
     def initialize(tasks)
       @tasks = tasks
@@ -16,6 +21,27 @@ module Spud
     def list_tasks!
       builder = StringIO.new
 
+      if show_headers?
+        builder.write TASKS_HEADER.ljust(max_task_length)
+
+        if show_ordered_args?
+          builder.write '  '
+          builder.write ORDERED_HEADER.ljust(max_ordered_string_length)
+        end
+
+        if show_named_args?
+          builder.write '  '
+          builder.write NAMED_HEADER.ljust(max_named_string_length)
+        end
+
+        if show_sources?
+          builder.write '  '
+          builder.write SOURCES_HEADER
+        end
+
+        builder.write "\n"
+      end
+
       @tasks.each do |task|
         builder.write task.name.ljust(max_task_length)
 
@@ -29,9 +55,9 @@ module Spud
           builder.write task.args.named.join(' ').ljust(max_named_string_length)
         end
 
-        if show_filenames?
+        if show_sources?
           builder.write '  '
-          builder.write task.filename
+          builder.write task.source
         end
 
         builder.write "\n"
@@ -40,21 +66,19 @@ module Spud
       puts builder.string
     end
 
-    sig {void}
-    def list_filenames!
-      puts filenames.join("\n")
-    end
+    private
 
-    sig {returns(T::Array[String])}
-    def filenames
-      @filenames ||= @tasks.map(&:filename).uniq
+    sig {returns(T::Boolean)}
+    def show_headers?
+      @show_headers ||= show_ordered_args? || show_named_args? || show_sources?
     end
 
-    private
-
     sig {returns(Integer)}
     def max_task_length
-      @max_task_length ||= @tasks.map { |task| task.name.length }.max
+      @max_task_length ||= @tasks
+        .map { |task| task.name.length }
+        .tap { |lengths| lengths.push(TASKS_HEADER.length) if show_headers? }
+        .max
     end
 
     sig {returns(Integer)}
@@ -62,6 +86,7 @@ module Spud
       @max_ordered_string_length ||= @tasks
         .map { |task| task.args.ordered.join(' ') }
         .map(&:length)
+        .tap { |lengths| lengths.push(ORDERED_HEADER.length) if show_headers? }
         .max
     end
 
@@ -75,6 +100,7 @@ module Spud
       @max_named_string_length ||= @tasks
         .map { |task| task.args.named.join(' ') }
         .map(&:length)
+        .tap { |lengths| lengths.push(NAMED_HEADER.length) if show_headers? }
         .max
     end
 
@@ -84,8 +110,13 @@ module Spud
     end
 
     sig {returns(T::Boolean)}
-    def show_filenames?
-      filenames.length > 1
+    def show_sources?
+      sources.length > 1
+    end
+
+    sig {returns(T::Array[String])}
+    def sources
+      @filenames ||= @tasks.map(&:source).uniq
     end
   end
 end

data/lib/spud/task_runners/docker-compose/task.rb

@@ -0,0 +1,56 @@
+# typed: true
+require 'sorbet-runtime'
+require 'yaml'
+require 'spud/driver'
+require 'spud/shell/command'
+require 'spud/task_runners/task'
+
+module Spud
+  module TaskRunners
+    module DockerCompose
+      class Task < TaskRunners::Task
+        extend T::Sig
+
+        sig {override.returns(String)}
+        attr_reader :name
+
+        sig {override.params(driver: Driver).returns(T::Array[TaskRunners::Task])}
+        def self.tasks(driver)
+          return [] unless File.exist?('docker-compose.yml')
+
+          if `command -v docker-compose`.empty?
+            puts 'docker-compose.yml detected, but no installation of `docker-compose` exists. Skipping docker-compose...'
+            return []
+          end
+
+          source = File.read('docker-compose.yml')
+          contents = YAML.load(source)
+          services = contents['services']
+          services.map { |name, service| new(driver, name, service) }
+        end
+
+        sig {params(driver: Driver, name: String, service: T::Hash[String, T.untyped]).void}
+        def initialize(driver, name, service)
+          @driver = driver
+          @name = name
+          @service = service
+        end
+
+        sig {override.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
+        def invoke(ordered, named)
+          system("docker-compose up #{@name} #{ordered.join(' ')}")
+        end
+
+        sig {override.returns(String)}
+        def source
+          'docker-compose.yml'
+        end
+
+        sig {override.returns(String)}
+        def details
+          YAML.dump(@name => @service)
+        end
+      end
+    end
+  end
+end

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

@@ -25,30 +25,30 @@ module Spud
 
           source = File.read('Makefile')
           T.unsafe(source.scan(/^(\S+):.*/)).map(&:first).map do |name|
-            new(driver, name)
+            new(driver, name, source)
           end
         end
 
-        sig {params(driver: Driver, name: String).void}
-        def initialize(driver, name)
+        sig {params(driver: Driver, name: String, make_source: String).void}
+        def initialize(driver, name, make_source)
           @driver = driver
           @name = name
+          @make_source = make_source
         end
 
         sig {override.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
         def invoke(ordered, named)
-          Shell::Command.("make #{name}", driver: @driver)
+          system("make #{name}")
         end
 
         sig {override.returns(String)}
-        def filename
+        def source
           'Makefile'
         end
 
         sig {override.returns(String)}
         def details
-          source = File.read('Makefile')
-          lines = source.split("\n")
+          lines = @make_source.split("\n")
           cursor = 0
 
           cursor += 1 until lines[cursor]&.start_with?(name)

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

@@ -36,8 +36,8 @@ module Spud
           end
 
           source = File.read('package.json')
-          json = JSON.parse(source)
-          scripts = json['scripts']
+          contents = JSON.parse(source)
+          scripts = contents['scripts']
           return [] unless scripts
 
           scripts.keys.map { |name| new(driver, name, command, scripts) }
@@ -53,11 +53,11 @@ module Spud
 
         sig {override.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
         def invoke(ordered, named)
-          Shell::Command.("#{@command} run #{name}", driver: @driver)
+          system("#{@command} run #{name}")
         end
 
         sig {override.returns(String)}
-        def filename
+        def source
           'package.json'
         end
 

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

@@ -0,0 +1,59 @@
+# typed: true
+require 'sorbet-runtime'
+require 'rake'
+require 'spud/driver'
+require 'spud/task_arg'
+require 'spud/task_args'
+require 'spud/task_runners/task'
+
+module Spud
+  module TaskRunners
+    module RakeTaskRunner
+      class Task < TaskRunners::Task
+        extend T::Sig
+
+        sig {override.params(driver: Driver).returns(T::Array[TaskRunners::Task])}
+        def self.tasks(driver)
+          app = Rake.application
+          rakefile = app.find_rakefile_location&.first
+          return [] if rakefile.nil?
+
+          app.init('rake', [])
+          app.load_rakefile
+
+          app.tasks.map(&method(:new))
+        end
+
+        sig {params(task: Rake::Task).void}
+        def initialize(task)
+          @rake_task = task
+        end
+
+        sig {override.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
+        def invoke(ordered, named)
+          T.unsafe(@rake_task).invoke(*ordered)
+        end
+
+        sig {override.returns(String)}
+        def name
+          @rake_task.name
+        end
+
+        sig {override.returns(String)}
+        def source
+          'rake'
+        end
+
+        sig {override.returns(TaskArgs)}
+        def args
+          TaskArgs.new(@rake_task.arg_names.map { |arg_name| TaskArg.new(arg_name.to_s, 'ordered') })
+        end
+
+        sig {override.returns(String)}
+        def details
+          "#{@rake_task.name_with_args}"
+        end
+      end
+    end
+  end
+end

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

@@ -16,8 +16,9 @@ module Spud
       class Task < TaskRunners::Task
         extend T::Sig
 
-        sig {override.returns(String)}
+        sig {returns(String)}
         attr_reader :filename
+        alias source filename
 
         sig {override.returns(String)}
         attr_reader :name
@@ -27,7 +28,7 @@ module Spud
 
         sig {override.params(driver: Driver).returns(T::Array[TaskRunners::Task])}
         def self.tasks(driver)
-          Dir['**/Spudfile', '**/*.spud'].flat_map { |filename| FileDSL.run(driver, filename) }
+          Dir['Spudfile', '*.spud'].flat_map { |filename| FileDSL.run(driver, filename) }
         end
 
         sig {params(filename: String, name: String).returns(String)}

data/lib/spud/task_runners/task.rb

@@ -17,13 +17,9 @@ module Spud
       def name; end
 
       sig {abstract.returns(String)}
-      def filename; end
+      def source; end
 
-      sig do
-        abstract
-          .params(ordered: T::Array[String], named: T::Hash[String, String])
-          .returns(T.untyped)
-      end
+      sig {abstract.params(ordered: T::Array[String], named: T::Hash[String, String]).returns(T.untyped)}
       def invoke(ordered, named); end
 
       sig {overridable.returns(TaskArgs)}

data/lib/spud/task_runners/task_runners.rb

@@ -1,9 +1,11 @@
-# typed: strict
+# typed: true
 require 'sorbet-runtime'
 require 'spud/task_runners/task'
 require 'spud/task_runners/spud_task_runner/task'
+require 'spud/task_runners/rake_task_runner/task'
 require 'spud/task_runners/make/task'
 require 'spud/task_runners/package.json/task'
+require 'spud/task_runners/docker-compose/task'
 
 module Spud
   module TaskRunners
@@ -12,14 +14,15 @@ module Spud
     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)]
-      )
+      runners = [
+        SpudTaskRunner::Task,
+        RakeTaskRunner::Task,
+        Make::Task,
+        PackageJSON::Task,
+        DockerCompose::Task,
+      ]
+
+      T.let(runners, T::Array[T.class_of(Task)])
     end
   end
 end

data/lib/spud/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - Andrew Booth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.6100
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +115,10 @@ files:
 - lib/spud/shell/result.rb
 - lib/spud/task_arg.rb
 - lib/spud/task_args.rb
+- lib/spud/task_runners/docker-compose/task.rb
 - lib/spud/task_runners/make/task.rb
 - lib/spud/task_runners/package.json/task.rb
+- lib/spud/task_runners/rake_task_runner/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