lino 3.2.0.pre.4 → 3.2.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc1f2750fea40c6d28634e9f9c44af15f3dc83d51e1db8b2060e4ab81ed1fce
-  data.tar.gz: 9d4f496acabeb9b074f900b2712b4288cab1ce53d90d679fe434f1b5549dbcad
+  metadata.gz: b1dd66849dd6c056a887e3db11f3b7e4ce81fe79977803e756295b432782990d
+  data.tar.gz: dd084ea5d3d3e2399e17e3bf560fd5452094623218c0b3124e4ed2749e9abfc7
 SHA512:
-  metadata.gz: 37efc811f61574e3fced1b1b39d378fa7b4ffd6c4ee80a398c53babb7bb8648703755f63d187e7a42b345e742914a42c3eb0178ae02e5462841bd633dfaed6ff
-  data.tar.gz: 92edcd9500895bc1881d07870785cd5cbdceb0ac12bbc57ab33ea3d67ce91d69c50249498f7ac1ec16efc6c2f75c58a84aaa8dbd026600f3070fd4d51588c7cf
+  metadata.gz: efbe7f4fea738bceb5ae5e148de4591e0a635a0c67923e30eb69f9503723d2bb70eb28911fd1addde172218d217de1cb27a9d3237293759b323a341c964ba3af
+  data.tar.gz: 38833fa7c9b6c9c91e1056099fa4f3d0fe35117c624cb20bc7e265ad234a27613fa5f8f13176a148b0690bf60368d4919a0263d455e1faebdb1922801548995c

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    lino (3.2.0.pre.4)
+    lino (3.2.0.pre.6)
+      childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -18,49 +19,80 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    childprocess (5.0.0)
+    coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    excon (0.104.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    drb (2.2.1)
+    excon (0.110.0)
+    faraday (2.9.2)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.17.0)
+    formatador (1.1.0)
     gem-release (2.2.2)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
+    guard (2.18.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
-    octokit (6.1.1)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    nenv (0.3.0)
+    net-http (0.4.1)
+      uri
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (8.1.0)
+      base64
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rake_circle_ci (0.11.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
@@ -69,18 +101,18 @@ GEM
     rake_factory (0.32.0.pre.2)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_git (0.1.0.pre.7)
+    rake_git (0.1.0.pre.10)
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
       rake_factory (= 0.32.0.pre.2)
-    rake_git_crypt (0.1.0.pre.26)
+    rake_git_crypt (0.1.0.pre.29)
       colored2 (~> 3.1)
       rake_factory (= 0.32.0.pre.2)
-      ruby_git_crypt (= 0.1.0.pre.2)
+      ruby_git_crypt (= 0.1.0.pre.4)
       ruby_gpg2 (~> 0.6)
-    rake_github (0.11.0)
+    rake_github (0.13.0)
       colored2 (~> 3.1)
-      octokit (>= 4.16, < 7.0)
+      octokit (>= 4.16, < 9.0)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
     rake_gpg (0.18.0)
@@ -90,48 +122,45 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.2)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    ruby_git_crypt (0.1.0.pre.2)
+    ruby_git_crypt (0.1.0.pre.4)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby_gpg2 (0.10.0)
@@ -139,6 +168,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -146,9 +176,12 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
+    strscan (3.1.0)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   ruby
@@ -156,6 +189,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   gem-release
+  guard
+  guard-rspec
   lino!
   rake
   rake_circle_ci

data/Rakefile

@@ -146,7 +146,7 @@ end
 RakeGithub.define_repository_tasks(
   namespace: :github,
   repository: 'infrablocks/lino'
-) do |t, args|
+) do |t|
   github_config =
     YAML.load_file('config/secrets/github/config.yaml')
 
@@ -157,8 +157,6 @@ RakeGithub.define_repository_tasks(
       public_key: File.read('config/secrets/ci/ssh.public')
     }
   ]
-  t.branch_name = args.branch_name
-  t.commit_message = args.commit_message
 end
 
 namespace :pipeline do

data/lib/lino/builders/command_line.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'hamster'
+
+require_relative 'mixins/appliables'
+require_relative 'mixins/arguments'
+require_relative 'mixins/environment_variables'
+require_relative 'mixins/executor'
+require_relative 'mixins/option_config'
+require_relative 'mixins/options'
+require_relative 'mixins/state_boundary'
+require_relative 'mixins/subcommands'
+require_relative 'mixins/validation'
+require_relative 'mixins/working_directory'
+require_relative '../model'
+
+module Lino
+  module Builders
+    class CommandLine
+      include Mixins::StateBoundary
+      include Mixins::Arguments
+      include Mixins::EnvironmentVariables
+      include Mixins::OptionConfig
+      include Mixins::Options
+      include Mixins::Subcommands
+      include Mixins::Executor
+      include Mixins::WorkingDirectory
+      include Mixins::Appliables
+      include Mixins::Validation
+
+      def initialize(state)
+        @command = state[:command]
+        super
+      end
+
+      def build
+        Model::CommandLine.new(
+          @command,
+          state.merge(
+            options: build_options,
+            subcommands: build_subcommands
+          )
+        )
+      end
+
+      protected
+
+      def state
+        super.merge(command: @command)
+      end
+
+      private
+
+      def with(replacements)
+        Builders::CommandLine.new(state.merge(replacements))
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/appliables.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative 'validation'
+
+module Lino
+  module Builders
+    module Mixins
+      module Appliables
+        include Validation
+
+        def with_appliable(appliable)
+          return self if nil?(appliable)
+
+          appliable.apply(self)
+        end
+
+        def with_appliables(appliables)
+          return self if nil_or_empty?(appliables)
+
+          appliables.inject(self) do |s, appliable|
+            s.with_appliable(appliable)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/arguments.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'validation'
+require_relative '../../model'
+
+module Lino
+  module Builders
+    module Mixins
+      module Arguments
+        include Validation
+
+        def initialize(state)
+          @arguments = Hamster::Vector.new(state[:arguments] || [])
+          super
+        end
+
+        def with_argument(argument)
+          return self if nil?(argument)
+          return self if empty?(argument.to_s)
+
+          with(arguments: @arguments.add(Model::Argument.new(argument)))
+        end
+
+        def with_arguments(arguments)
+          return self if nil_or_empty?(arguments)
+
+          arguments.inject(self) { |s, argument| s.with_argument(argument) }
+        end
+
+        private
+
+        def state
+          super.merge(arguments: @arguments)
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/defaulting.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Lino
+  module Builders
+    module Mixins
+      module Defaulting
+        private
+
+        def or_nil(enumerable, key)
+          enumerable.include?(key) ? enumerable[key] : nil
+        end
+
+        def or_nth(enumerable, key, index)
+          enumerable.include?(key) ? enumerable[key] : enumerable[index]
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/environment_variables.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'validation'
+require_relative '../../model'
+
+module Lino
+  module Builders
+    module Mixins
+      module EnvironmentVariables
+        include Validation
+
+        def initialize(state)
+          @environment_variables =
+            Hamster::Vector.new(state[:environment_variables] || [])
+          super
+        end
+
+        def with_environment_variable(environment_variable, value)
+          with(
+            environment_variables:
+              @environment_variables.add(
+                Model::EnvironmentVariable.new(environment_variable, value)
+              )
+          )
+        end
+
+        def with_environment_variables(environment_variables)
+          return self if nil_or_empty?(environment_variables)
+
+          environment_variables.entries.inject(self) do |s, var|
+            s.with_environment_variable(
+              var.include?(:name) ? var[:name] : var[0],
+              var.include?(:value) ? var[:value] : var[1]
+            )
+          end
+        end
+
+        private
+
+        def state
+          super.merge(environment_variables: @environment_variables)
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/executor.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Lino
+  module Builders
+    module Mixins
+      module Executor
+        def initialize(state)
+          @executor = state[:executor] || Executors::Childprocess.new
+          super
+        end
+
+        def with_executor(executor)
+          with(executor:)
+        end
+
+        private
+
+        def state
+          super.merge(executor: @executor)
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/option_config.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Lino
+  module Builders
+    module Mixins
+      module OptionConfig
+        def initialize(state)
+          @option_separator = state[:option_separator] || ' '
+          @option_quoting = state[:option_quoting]
+          @option_placement = state[:option_placement] || :after_command
+          super
+        end
+
+        def with_option_separator(option_separator)
+          with(option_separator:)
+        end
+
+        def with_option_quoting(character)
+          with(option_quoting: character)
+        end
+
+        def with_option_placement(option_placement)
+          with(option_placement:)
+        end
+
+        def with_options_after_command
+          with_option_placement(:after_command)
+        end
+
+        def with_options_after_subcommands
+          with_option_placement(:after_subcommands)
+        end
+
+        def with_options_after_arguments
+          with_option_placement(:after_arguments)
+        end
+
+        private
+
+        def state
+          super.merge(
+            option_separator: @option_separator,
+            option_quoting: @option_quoting,
+            option_placement: @option_placement
+          )
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/options.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require_relative '../../model'
+require_relative 'validation'
+require_relative 'defaulting'
+
+module Lino
+  module Builders
+    module Mixins
+      module Options
+        include Validation
+        include Defaulting
+
+        def initialize(state)
+          @options = Hamster::Vector.new(state[:options] || [])
+          super
+        end
+
+        def with_option(
+          option,
+          value,
+          separator: nil,
+          quoting: nil,
+          placement: nil
+        )
+          return self if nil?(value)
+
+          with(options: @options.add(
+            {
+              type: :option,
+              components: [option, value],
+              separator:,
+              quoting:,
+              placement:
+            }
+          ))
+        end
+
+        def with_options(options)
+          return self if nil_or_empty?(options)
+
+          options.entries.inject(self) do |s, entry|
+            s.with_option(
+              or_nth(entry, :option, 0),
+              or_nth(entry, :value, 1),
+              separator: or_nil(entry, :separator),
+              quoting: or_nil(entry, :quoting),
+              placement: or_nil(entry, :placement)
+            )
+          end
+        end
+
+        def with_repeated_option(
+          option,
+          values,
+          separator: nil,
+          quoting: nil,
+          placement: nil
+        )
+          values.inject(self) do |s, value|
+            s.with_option(
+              option,
+              value,
+              separator:,
+              quoting:,
+              placement:
+            )
+          end
+        end
+
+        def with_flag(flag)
+          return self if nil?(flag)
+
+          with(options: @options.add(
+            {
+              type: :flag,
+              components: [flag]
+            }
+          ))
+        end
+
+        def with_flags(flags)
+          return self if nil_or_empty?(flags)
+
+          flags.inject(self) { |s, flag| s.with_flag(flag) }
+        end
+
+        private
+
+        def state
+          super.merge(options: @options)
+        end
+
+        def build_options
+          @options.map do |data|
+            data[:type] == :option ? build_option(data) : build_flag(data)
+          end
+        end
+
+        def build_option(option_data)
+          Model::Option.new(
+            *option_data[:components],
+            separator: option_data[:separator] || @option_separator,
+            quoting: option_data[:quoting] || @option_quoting,
+            placement: option_data[:placement] || @option_placement
+          )
+        end
+
+        def build_flag(flag_data)
+          Model::Flag.new(
+            *flag_data[:components],
+            placement: flag_data[:placement] || @option_placement
+          )
+        end
+      end
+    end
+  end
+end

data/lib/lino/builders/mixins/state_boundary.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'validation'
+require_relative '../../model'
+
+module Lino
+  module Builders
+    module Mixins
+      module StateBoundary
+        def initialize(_state)
+          super()
+        end
+
+        private
+
+        def state
+          {}
+        end
+      end
+    end
+  end
+end