ruby_leiningen 0.15.0 → 0.20.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772882430aa9cf79a5b4bd21fc35a5dd9a1ae1edb7960586204901884d7d7ab7
-  data.tar.gz: a57376a9020ba0fcbbca12a6461467133c892ccef9dc8197cd1e0d0e36057baf
+  metadata.gz: 00b70c38cd754da90a447b5afadda27a36b48cc5e2c03704b991b95d2a0387ca
+  data.tar.gz: 9cc8447859796905d74544d295223b8acc2e5233f76148603baf8898e596ad2f
 SHA512:
-  metadata.gz: 141397915cab453b41e5eb9cb8d9f423bd20d4a41381bc4ff6eb7c90140fe9dc607e8c37e6a11e28a15d2c13478a2c41f8ae8a0551aa2744f5d480b0f3ec793f
-  data.tar.gz: 9ac9894b84fe5c6538c02092676938cb35dcc40113fb5be2bc7687cc2c0ed7b91025f95ab5f366313d29ba6c1e3cc77aa46e6cb2256328331a935412759a3bc6
+  metadata.gz: 195a3a0572dbdb3a70970be7aad487a6a874e79774e0af7920d5796e7670703992ed018eecb691687fbf24f5f81fad2d58a0a8d965f4bbd6cb9c8fbb7bf1cfeb
+  data.tar.gz: c7957756a1adeb7f41c397a31fc7b59b28fffa32f8f4b1a5699fa976f789029f7ca3e555009b0e634e3524ad6e4c4acfdf9f6224289241727a866a114f4f87a7

data/Gemfile.lock

@@ -1,42 +1,43 @@
 PATH
   remote: .
   specs:
-    ruby_leiningen (0.15.0)
+    ruby_leiningen (0.20.0.pre.1)
       activesupport (~> 6.0, >= 6.0.2)
-      lino (~> 1.1)
+      lino (>= 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    excon (0.73.0)
-    faraday (1.0.1)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    excon (0.78.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    gem-release (2.1.1)
+      ruby2_keywords
+    gem-release (2.2.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    lino (1.3.0)
+    lino (1.5.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multipart-post (2.1.1)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rake (13.0.1)
     rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
@@ -55,30 +56,32 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    ruby2_keywords (0.0.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     sshkey (2.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.0)
@@ -91,4 +94,4 @@ DEPENDENCIES
   ruby_leiningen!
 
 BUNDLED WITH
-   2.1.4
+   2.2.2

data/Rakefile

@@ -72,8 +72,5 @@ task :release do
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type}"
 end

data/lib/ruby_leiningen/commands.rb

@@ -19,6 +19,9 @@ module RubyLeiningen
           unless options[:include_profile_support] == false
             include Mixins::Profile
           end
+          unless options[:include_environment_support] == false
+            include Mixins::Environment
+          end
 
           define_method "configure_command" do |builder, opts|
             config = (config_block || lambda { |conf, _| conf })

data/lib/ruby_leiningen/commands/check.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Check < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_leiningen/commands/clean.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Clean < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_leiningen/commands/deps.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Deps < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

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

@@ -0,0 +1,29 @@
+module RubyLeiningen
+  module Commands
+    module Mixins
+      module Environment
+        def initialize(opts={})
+          super(opts)
+          @environment = opts[:environment]
+        end
+
+        def for_environment(environment)
+          @environment = environment
+          self
+        end
+
+        def configure_command(builder, opts)
+          builder = super(builder, opts)
+          environment = opts[:environment] || @environment
+          if environment
+            builder = environment.to_a
+                .inject(builder) do |b, environment_variable|
+              b.with_environment_variable(*environment_variable)
+            end
+          end
+          builder
+        end
+      end
+    end
+  end
+end

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

@@ -13,6 +13,7 @@ module RubyLeiningen
         end
 
         def configure_command(builder, opts)
+          builder = super(builder, opts)
           profile = opts[:profile] || @profile
           if profile
             builder = builder

data/lib/ruby_leiningen/commands/plugins/cljstyle.rb

@@ -0,0 +1,13 @@
+require_relative '../../commands'
+
+RubyLeiningen::Commands.define_custom_command("cljstyle") do |config, opts|
+  mode = opts[:mode] || :check
+  paths = opts[:paths] || []
+
+  config.on_command_builder do |command|
+    command = command.with_subcommand(mode.to_s)
+    paths.inject(command) do |c, path|
+      c.with_argument(path)
+    end
+  end
+end

data/lib/ruby_leiningen/commands/release.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Release < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_leiningen/commands/run.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Run < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_leiningen/commands/uberjar.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/profile'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Uberjar < Base
       include Mixins::Profile
+      include Mixins::Environment
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_leiningen/commands/version.rb

@@ -1,9 +1,13 @@
 require 'lino'
+
 require_relative 'base'
+require_relative 'mixins/environment'
 
 module RubyLeiningen
   module Commands
     class Version < Base
+      include Mixins::Environment
+
       def stdout
         @version_string
       end
@@ -13,6 +17,7 @@ module RubyLeiningen
       end
 
       def configure_command(builder, opts)
+        builder = super(builder, opts)
         builder.with_argument('version')
       end
 

data/lib/ruby_leiningen/version.rb

@@ -1,3 +1,3 @@
 module RubyLeiningen
-  VERSION = '0.15.0'
+  VERSION = '0.20.0.pre.1'
 end

data/ruby_leiningen.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'lino', '~> 1.1'
+  spec.add_dependency 'lino', '>= 1.5'
   spec.add_dependency 'activesupport', '~> 6.0', '>= 6.0.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

data/scripts/ci/steps/prerelease.sh

@@ -10,6 +10,11 @@ PROJECT_DIR="$( cd "$SCRIPT_DIR/../../.." && pwd )"
 cd "$PROJECT_DIR"
 
 ./go version:bump[pre]
+
+bundle install
+LAST_MESSAGE="$(git log -1 --pretty=%B)"
+git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"
+
 ./go release
 
 git status

data/scripts/ci/steps/release.sh

@@ -12,6 +12,11 @@ cd "$PROJECT_DIR"
 git pull
 
 ./go version:bump[minor]
+
+bundle install
+LAST_MESSAGE="$(git log -1 --pretty=%B)"
+git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"
+
 ./go release
 
 git status

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_leiningen
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.20.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -184,9 +184,11 @@ files:
 - lib/ruby_leiningen/commands/check.rb
 - lib/ruby_leiningen/commands/clean.rb
 - lib/ruby_leiningen/commands/deps.rb
+- lib/ruby_leiningen/commands/mixins/environment.rb
 - lib/ruby_leiningen/commands/mixins/profile.rb
 - lib/ruby_leiningen/commands/plugins/bikeshed.rb
 - lib/ruby_leiningen/commands/plugins/cljfmt.rb
+- lib/ruby_leiningen/commands/plugins/cljstyle.rb
 - lib/ruby_leiningen/commands/plugins/eastwood.rb
 - lib/ruby_leiningen/commands/plugins/eftest.rb
 - lib/ruby_leiningen/commands/plugins/kibit.rb
@@ -219,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: