ruby_leiningen 0.28.0.pre.5 → 0.28.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8116817aa5c0a3f4c6da8ea4eb513a07fdd53715d4c1357397febb0f5eb289f5
-  data.tar.gz: 2a113ab6e138820beef8b0384064fd10b3e9e30b810825e4f908c4d2a73cf1a7
+  metadata.gz: ea3d5bd33c790acd0f4d052b2566f502df4fcf693fde7e4d9a746db9372d1d81
+  data.tar.gz: 18be52b810f5a720f7f669f6db3faffee243892d8ea1f13502c3e3b5bdfd8650
 SHA512:
-  metadata.gz: 94f46e30aae9afab0c9d9e625d389f26870368aa9df533c8f476b3067e4f9e290f456c5be8aabfc18686bdf6a37ccce093ca586bcdbd956a75830ebf617bffea
-  data.tar.gz: 93e52a83d58d634a358db41bf17a500baf8d166d8d94cb76149a9697f4af8d5755f5dc1c1c91b1140426387d3e207b84accc8705b14a22fca959b845e9695f8f
+  metadata.gz: 6df4f5108e8481f37a488145d5ccb48907d326455b19d18fd4831969d33779c96b42e478ef7d845daec6760d24ca70b95955fe5a7e7c7d3715ff6cd3135d5258
+  data.tar.gz: ad7abc4e22665d63d76800001e44f90b1ea29709ab9876a3f57f373c88d64e916db48ef1597c1ec36d410b2128410dfac42bc9113262c74219454c1a50dd71a7

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    ruby_leiningen (0.28.0.pre.5)
+    ruby_leiningen (0.28.0.pre.7)
       activesupport (>= 6.0.2, < 8)
-      lino (= 3.2.0.pre.10)
+      lino (>= 4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -18,30 +18,29 @@ 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.2.0)
-    bigdecimal (3.1.4)
+    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.2.0)
-      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.111.0)
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    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)
@@ -60,66 +59,70 @@ GEM
       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.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    lino (3.2.0.pre.10)
+    lino (4.1.0)
       childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    minitest (5.20.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.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.4.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
-    racc (1.7.3)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rake_circle_ci (0.11.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.32.0.pre.2)
+    rake_factory (0.33.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_git (0.1.0.pre.10)
+    rake_git (0.2.0)
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
-      rake_factory (= 0.32.0.pre.2)
-    rake_git_crypt (0.1.0.pre.29)
+      rake_factory (~> 0.33)
+    rake_git_crypt (0.2.0)
       colored2 (~> 3.1)
-      rake_factory (= 0.32.0.pre.2)
-      ruby_git_crypt (= 0.1.0.pre.4)
-      ruby_gpg2 (~> 0.6)
+      rake_factory (~> 0.33)
+      ruby_git_crypt (~> 0.1)
+      ruby_gpg2 (~> 0.12)
     rake_github (0.13.0)
       colored2 (~> 3.1)
       octokit (>= 4.16, < 9.0)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_gpg (0.18.0)
-      rake_factory (~> 0.23)
-      ruby_gpg2 (~> 0.6)
+    rake_gpg (0.20.0)
+      rake_factory (~> 0.33)
+      ruby_gpg2 (~> 0.12)
     rake_ssh (0.10.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
@@ -128,51 +131,45 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    regexp_parser (2.8.3)
-    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.2)
+      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.59.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       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)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 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.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    ruby_git_crypt (0.1.0.pre.4)
+    ruby_git_crypt (0.1.0)
       immutable-struct (~> 2.4)
-      lino (~> 3.0)
-    ruby_gpg2 (0.10.0)
-      lino (~> 3.0)
+      lino (>= 4.1)
+    ruby_gpg2 (0.12.0)
+      lino (>= 4.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -184,10 +181,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
   arm64-darwin-21

data/lib/ruby_leiningen/commands/base.rb

@@ -23,12 +23,22 @@ module RubyLeiningen
         $stderr
       end
 
-      def execute(opts = {})
-        do_before(opts)
-        configure_command(instantiate_builder, opts)
-          .build
-          .execute(stdin:, stdout:, stderr:)
-        do_after(opts)
+      def execute(parameters = {})
+        parameters = resolve_parameters(parameters)
+
+        do_before(parameters)
+        result = build_and_execute_command(parameters)
+        do_after(parameters)
+
+        result
+      end
+
+      private
+
+      def build_and_execute_command(parameters)
+        command = configure_command(instantiate_builder, parameters).build
+
+        command.execute(stdin:, stdout:, stderr:)
       end
 
       def instantiate_builder
@@ -36,13 +46,27 @@ module RubyLeiningen
           .for_command(binary)
       end
 
-      def do_before(opts); end
+      def do_before(_); end
 
-      def configure_command(builder, _opts)
+      def configure_command(builder, _parameters)
         builder
       end
 
-      def do_after(opts); end
+      def do_after(_); end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def parameter_defaults(_parameters)
+        {}
+      end
+
+      def parameter_overrides(_parameters)
+        {}
+      end
     end
   end
 end

data/lib/ruby_leiningen/commands/check.rb

@@ -12,8 +12,8 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
         builder.with_subcommand('check')
       end
     end

data/lib/ruby_leiningen/commands/clean.rb

@@ -12,8 +12,8 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
         builder.with_subcommand('clean')
       end
     end

data/lib/ruby_leiningen/commands/deps.rb

@@ -12,8 +12,8 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
         builder.with_subcommand('deps')
       end
     end

data/lib/ruby_leiningen/commands/mixins/environment.rb

@@ -5,7 +5,7 @@ module RubyLeiningen
     module Mixins
       module Environment
         def initialize(opts = {})
-          super(opts)
+          super
           @environment = opts[:environment]
         end
 
@@ -14,8 +14,8 @@ module RubyLeiningen
           self
         end
 
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
+        def configure_command(initial_builder, opts)
+          builder = super
           environment = opts[:environment] || @environment
           if environment
             builder = environment.to_a

data/lib/ruby_leiningen/commands/mixins/profile.rb

@@ -5,7 +5,7 @@ module RubyLeiningen
     module Mixins
       module Profile
         def initialize(opts = {})
-          super(opts)
+          super
           @profile = opts[:profile]
         end
 
@@ -14,8 +14,8 @@ module RubyLeiningen
           self
         end
 
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
+        def configure_command(initial_builder, opts)
+          builder = super
           profile = opts[:profile] || @profile
           if profile
             builder = builder

data/lib/ruby_leiningen/commands/release.rb

@@ -12,8 +12,8 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
 
         level = opts[:level]
 

data/lib/ruby_leiningen/commands/run.rb

@@ -13,8 +13,8 @@ module RubyLeiningen
       include Mixins::Environment
 
       # rubocop:disable Style/RedundantAssignment
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
         builder = builder.with_subcommand('run') do |sub|
           sub = with_main_function(sub, opts[:main_function])
           sub = with_quote_arguments(sub, opts[:quote_arguments])

data/lib/ruby_leiningen/commands/uberjar.rb

@@ -12,8 +12,8 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
 
         main_namespace = opts[:main_namespace]
 

data/lib/ruby_leiningen/commands/version.rb

@@ -10,21 +10,18 @@ module RubyLeiningen
     class Version < Base
       include Mixins::Environment
 
-      def stdout
-        @version_string
+      def invocation_option_defaults(_invocation_options)
+        super.merge(capture: [:stdout])
       end
 
-      def do_before(_opts)
-        @version_string = StringIO.new
-      end
-
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(initial_builder, opts)
+        builder = super
         builder.with_argument('version')
       end
 
-      def do_after(_opts)
-        @version_string.string.gsub("\n", '')
+      def process_result(result, _parameters, _invocation_options)
+        output = result[:output]
+        output.gsub("\n", '')
       end
     end
   end

data/lib/ruby_leiningen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLeiningen
-  VERSION = '0.28.0.pre.5'
+  VERSION = '0.28.0.pre.7'
 end

data/ruby_leiningen.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'activesupport', '>= 6.0.2', '< 8'
-  spec.add_dependency 'lino', '3.2.0.pre.10'
+  spec.add_dependency 'lino', '>= 4.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'gem-release'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_leiningen
 version: !ruby/object:Gem::Version
-  version: 0.28.0.pre.5
+  version: 0.28.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,16 +34,16 @@ dependencies:
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0.pre.10
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0.pre.10
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement