ruby_leiningen 0.24.0.pre.6 → 0.24.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e94778c404922e29dc5189f2229d213c7460cb62aae1a05ed181d1ea76a9e30
-  data.tar.gz: ac25972328c16933a33e242b5cf048e5e4b38d1c3b7ff7fff4c46255ed542ed1
+  metadata.gz: e549b8cc69dc3899d4607f03743a5043311fa16d4798e3d9e23c720781e44aac
+  data.tar.gz: a60245fa5c45664a228bd40765b295892b95fdad82ff5ec8149da4733e4ba54a
 SHA512:
-  metadata.gz: 865d737bf00495d78f6261d2be560d414a40a0cd12990fc8fc9c403e19b64c630c75ecbc18c9e93f118183db09dd1c00854ed2b05f104e904a76a1be219e352a
-  data.tar.gz: 465d316adbafcac2396c5d642bc5908556e50b65e09271c8b24dc450bddd3268757aeddd31277819261c0424714265aa86fda797dfbd7e70ddff604f5722ce33
+  metadata.gz: 9412cb38b4a4a3d0593d0dcd4cd6656f78995a5a61eeeb01d8c9eb933a44435b6bab25287a566cdb50446943e7744f14f164869bec94800783479f6c3e2f75c8
+  data.tar.gz: 79454751e0af70e7ef2c0b738bf6e0b046b864d4b6844e5256f339525371e992a173ff920adc38d2bf60a24faff0d739b148d32ea08a665c45541f18bf21bc68

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby_leiningen.gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_leiningen (0.24.0.pre.6)
+    ruby_leiningen (0.24.0.pre.7)
       activesupport (>= 6.0.2, < 8)
       lino (~> 3.0)
 
@@ -15,9 +15,11 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
     concurrent-ruby (1.1.9)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     excon (0.92.0)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
@@ -56,7 +58,11 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -78,6 +84,8 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -91,15 +99,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    rubocop (1.27.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -115,7 +146,11 @@ DEPENDENCIES
   rake_gpg
   rake_ssh
   rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   ruby_leiningen!
+  simplecov
 
 BUNDLED WITH
-   2.3.9
+   2.3.11

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,17 +7,26 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
+  namespace :directory do
+    desc 'Ensure CI secrets directory exists.'
+    task :ensure do
+      FileUtils.mkdir_p('config/secrets/ci')
+    end
+  end
+
   namespace :passphrase do
-    task :generate do
-      File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
-        f.write(SecureRandom.base64(36))
-      end
+    desc 'Generate encryption passphrase used by CI.'
+    task generate: ['directory:ensure'] do
+      File.write('config/secrets/ci/encryption.passphrase',
+                 SecureRandom.base64(36))
     end
   end
 end
@@ -23,85 +34,111 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'ruby_leiningen CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'ruby_leiningen CI Key'
+    )
   end
 end
 
+namespace :secrets do
+  desc 'Regenerate all generatable secrets.'
+  task regenerate: %w[
+    encryption:passphrase:generate
+    keys:deploy:generate
+    keys:gpg:generate
+  ]
+end
+
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/ruby_leiningen'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/ruby_leiningen'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/ruby_leiningen',
+  namespace: :github,
+  repository: 'infrablocks/ruby_leiningen'
 ) do |t, args|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      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
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 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} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "ruby_leiningen"
+require 'bundler/setup'
+require 'ruby_leiningen'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "ruby_leiningen"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/ruby_leiningen/commands/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 module RubyLeiningen
@@ -14,40 +16,33 @@ module RubyLeiningen
       end
 
       def stdout
-        STDOUT
+        $stdout
       end
 
       def stderr
-        STDERR
+        $stderr
       end
 
       def execute(opts = {})
-        builder = instantiate_builder
-
         do_before(opts)
-        configure_command(builder, opts)
-            .build
-            .execute(
-                stdin: stdin,
-                stdout: stdout,
-                stderr: stderr)
+        configure_command(instantiate_builder, opts)
+          .build
+          .execute(stdin: stdin, stdout: stdout, stderr: stderr)
         do_after(opts)
       end
 
       def instantiate_builder
         Lino::CommandLineBuilder
-            .for_command(binary)
+          .for_command(binary)
       end
 
-      def do_before(opts)
-      end
+      def do_before(opts); end
 
-      def configure_command(builder, opts)
+      def configure_command(builder, _opts)
         builder
       end
 
-      def do_after(opts)
-      end
+      def do_after(opts); end
     end
   end
-end
+end

data/lib/ruby_leiningen/commands/check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_leiningen/commands/clean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_leiningen/commands/deps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_leiningen/commands/helpers.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module RubyLeiningen
+  module Commands
+    module Helpers
+    end
+  end
+end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RubyLeiningen
   module Commands
     module Mixins
       module Environment
-        def initialize(opts={})
+        def initialize(opts = {})
           super(opts)
           @environment = opts[:environment]
         end
@@ -17,7 +19,7 @@ module RubyLeiningen
           environment = opts[:environment] || @environment
           if environment
             builder = environment.to_a
-                .inject(builder) do |b, environment_variable|
+                                 .inject(builder) do |b, environment_variable|
               b.with_environment_variable(*environment_variable)
             end
           end
@@ -26,4 +28,4 @@ module RubyLeiningen
       end
     end
   end
-end
+end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RubyLeiningen
   module Commands
     module Mixins
       module Profile
-        def initialize(opts={})
+        def initialize(opts = {})
           super(opts)
           @profile = opts[:profile]
         end
@@ -17,12 +19,12 @@ module RubyLeiningen
           profile = opts[:profile] || @profile
           if profile
             builder = builder
-                .with_subcommand('with-profile')
-                .with_subcommand(profile)
+                      .with_subcommand('with-profile')
+                      .with_subcommand(profile)
           end
           builder
         end
       end
     end
   end
-end
+end

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

@@ -1,51 +1,93 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("bikeshed") do |config, opts|
-  show_help = opts[:show_help]
-  verbose = opts[:verbose]
-  maximum_line_length = opts[:maximum_line_length]
-  long_lines = opts[:long_lines]
-  trailing_whitespace = opts[:trailing_whitespace]
-  trailing_blank_lines = opts[:trailing_blank_lines]
-  var_redefs = opts[:var_redefs]
-  docstrings = opts[:docstrings]
-  name_collisions = opts[:name_collisions]
-  exclude_profiles = opts[:exclude_profiles]
-
-  config.on_subcommand_builder do |command|
-    unless show_help.nil?
-      command = command.with_flag(show_help ? '--help-me' : '--no-help-me')
-    end
-    unless verbose.nil?
-      command = command.with_flag(verbose ? '--verbose' : '--no-verbose')
-    end
-    if maximum_line_length
-      command = command.with_option('--max-line-length', maximum_line_length)
-    end
-    unless long_lines.nil?
-      command = command.with_option('--long-lines', long_lines)
-    end
-    unless trailing_whitespace.nil?
-      command = command
-          .with_option('--trailing-whitespace', trailing_whitespace)
-    end
-    unless trailing_blank_lines.nil?
-      command = command
-          .with_option('--trailing-blank-lines', trailing_blank_lines)
-    end
-    unless var_redefs.nil?
-      command = command.with_option('--var-redefs', var_redefs)
-    end
-    unless docstrings.nil?
-      command = command.with_option('--docstrings', docstrings)
-    end
-    unless name_collisions.nil?
-      command = command.with_option('--name-collisions', name_collisions)
-    end
-    unless exclude_profiles.nil?
-      command = command
-          .with_option('--exclude-profiles', exclude_profiles.join(","))
+module RubyLeiningen
+  module Commands
+    module Helpers
+      module Bikeshed
+        class << self
+          def with_show_help(command, show_help)
+            return command if show_help.nil?
+
+            command.with_flag(show_help ? '--help-me' : '--no-help-me')
+          end
+
+          def with_verbose(command, verbose)
+            return command if verbose.nil?
+
+            command.with_flag(verbose ? '--verbose' : '--no-verbose')
+          end
+
+          def with_maximum_line_length(command, maximum_line_length)
+            return command unless maximum_line_length
+
+            command.with_option('--max-line-length', maximum_line_length)
+          end
+
+          def with_long_lines(command, long_lines)
+            return command if long_lines.nil?
+
+            command.with_option('--long-lines', long_lines)
+          end
+
+          def with_trailing_whitespace(command, trailing_whitespace)
+            return command if trailing_whitespace.nil?
+
+            command.with_option('--trailing-whitespace', trailing_whitespace)
+          end
+
+          def with_trailing_blank_lines(command, trailing_blank_lines)
+            return command if trailing_blank_lines.nil?
+
+            command.with_option('--trailing-blank-lines', trailing_blank_lines)
+          end
+
+          def with_var_redefs(command, var_redefs)
+            return command if var_redefs.nil?
+
+            command.with_option('--var-redefs', var_redefs)
+          end
+
+          def with_docstrings(command, docstrings)
+            return command if docstrings.nil?
+
+            command.with_option('--docstrings', docstrings)
+          end
+
+          def with_name_collisions(command, name_collisions)
+            return command if name_collisions.nil?
+
+            command.with_option('--name-collisions', name_collisions)
+          end
+
+          def with_exclude_profiles(command, exclude_profiles)
+            return command if exclude_profiles.nil?
+
+            command.with_option(
+              '--exclude-profiles', exclude_profiles.join(',')
+            )
+          end
+        end
+      end
     end
-    command
+  end
+end
+
+RubyLeiningen::Commands.define_custom_command('bikeshed') do |config, opts|
+  helper = RubyLeiningen::Commands::Helpers::Bikeshed
+
+  config.on_subcommand_builder do |sub|
+    sub = helper.with_show_help(sub, opts[:show_help])
+    sub = helper.with_verbose(sub, opts[:verbose])
+    sub = helper.with_maximum_line_length(sub, opts[:maximum_line_length])
+    sub = helper.with_long_lines(sub, opts[:long_lines])
+    sub = helper.with_trailing_whitespace(sub, opts[:trailing_whitespace])
+    sub = helper.with_trailing_blank_lines(sub, opts[:trailing_blank_lines])
+    sub = helper.with_var_redefs(sub, opts[:var_redefs])
+    sub = helper.with_docstrings(sub, opts[:docstrings])
+    sub = helper.with_name_collisions(sub, opts[:name_collisions])
+    sub = helper.with_exclude_profiles(sub, opts[:exclude_profiles])
+    sub
   end
 end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("cljfmt") do |config, opts|
+RubyLeiningen::Commands.define_custom_command('cljfmt') do |config, opts|
   mode = opts[:mode] || :check
   paths = opts[:paths] || []
 

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("cljstyle") do |config, opts|
+RubyLeiningen::Commands.define_custom_command('cljstyle') do |config, opts|
   mode = opts[:mode] || :check
   paths = opts[:paths] || []
 

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("eastwood") do |config, opts|
+RubyLeiningen::Commands.define_custom_command('eastwood') do |config, opts|
   config.on_command_builder do |command|
     command = command.with_argument("\"#{opts[:config]}\"") if opts[:config]
     command

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("eftest") do |config, opts|
+RubyLeiningen::Commands.define_custom_command('eftest') do |config, opts|
   only = opts[:only] ? [":only #{opts[:only]}"] : []
   specific = (opts[:test_selectors] || [])
-     .map { |m| m.is_a?(Symbol) ? ":#{m}" : "#{m}" }
-  all = [":all"]
+             .map { |m| m.is_a?(Symbol) ? ":#{m}" : m.to_s }
+  all = [':all']
 
   test_selectors =
     if only.any?

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

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require_relative '../../commands'
 
-RubyLeiningen::Commands.define_custom_command("kibit") do |config, opts|
+RubyLeiningen::Commands.define_custom_command('kibit') do |config, opts|
   paths = opts[:paths] || []
 
   config.on_subcommand_builder do |command|
-    command = command.with_flag("--replace") if opts[:replace]
-    command = command.with_flag("--interactive") if opts[:interactive]
-    command = command
-        .with_option("--reporter", opts[:reporter]) if opts[:reporter]
+    command = command.with_flag('--replace') if opts[:replace]
+    command = command.with_flag('--interactive') if opts[:interactive]
+    if opts[:reporter]
+      command = command
+                .with_option('--reporter', opts[:reporter])
+    end
     command
   end
   config.on_command_builder do |subcommand|

data/lib/ruby_leiningen/commands/release.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_leiningen/commands/run.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -10,28 +12,43 @@ module RubyLeiningen
       include Mixins::Profile
       include Mixins::Environment
 
+      # rubocop:disable Style/RedundantAssignment
       def configure_command(builder, opts)
         builder = super(builder, opts)
-
-        main_function = opts[:main_function]
-        arguments = opts[:arguments] || []
-        quote_arguments = opts[:quote_arguments]
-
         builder = builder.with_subcommand('run') do |sub|
-          sub = sub.with_option('-m', main_function) if main_function
-          sub = sub.with_flag('--quote-args') if quote_arguments
+          sub = with_main_function(sub, opts[:main_function])
+          sub = with_quote_arguments(sub, opts[:quote_arguments])
           sub
         end
+        builder = with_arguments(builder, opts[:arguments])
+        builder
+      end
+      # rubocop:enable Style/RedundantAssignment
+
+      private
 
+      def with_arguments(builder, arguments)
+        arguments ||= []
         if arguments.any?
-          builder = builder.with_argument("--")
+          builder = builder.with_argument('--')
           builder = arguments.inject(builder) do |b, argument|
             b.with_argument(argument)
           end
         end
-
         builder
       end
+
+      def with_main_function(builder, main_function)
+        return builder unless main_function
+
+        builder.with_option('-m', main_function)
+      end
+
+      def with_quote_arguments(builder, quote_arguments)
+        return builder unless quote_arguments
+
+        builder.with_flag('--quote-args')
+      end
     end
   end
 end

data/lib/ruby_leiningen/commands/uberjar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_leiningen/commands/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -12,7 +14,7 @@ module RubyLeiningen
         @version_string
       end
 
-      def do_before(opts)
+      def do_before(_opts)
         @version_string = StringIO.new
       end
 
@@ -21,7 +23,7 @@ module RubyLeiningen
         builder.with_argument('version')
       end
 
-      def do_after(opts)
+      def do_after(_opts)
         @version_string.string.gsub(/\n/, '')
       end
     end

data/lib/ruby_leiningen/commands.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 
+require_relative 'commands/helpers'
 require_relative 'commands/check'
 require_relative 'commands/clean'
 require_relative 'commands/deps'
@@ -14,19 +17,28 @@ module RubyLeiningen
     class << self
       def define_custom_command(name, options = {}, &config_block)
         klass_name = name.classify
+        klass = define_command_class(name, options, &config_block)
+        const_set(klass_name, klass)
 
-        klass = Class.new(Base) do
+        return if options[:skip_singleton_method]
+
+        RubyLeiningen.define_singleton_method name do |opts = {}|
+          klass.new.execute(opts)
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def define_command_class(name, options, &config_block)
+        Class.new(Base) do
           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 })
-                .call(Config.new, opts)
-
+          define_method 'configure_command' do |builder, opts|
+            config = (config_block || ->(conf, _) { conf })
+                     .call(Config.new, opts)
             builder = super(builder, opts)
             builder = builder.with_subcommand(name) do |sub|
               config.subcommand_block.call(sub)
@@ -34,25 +46,16 @@ module RubyLeiningen
             config.command_block.call(builder)
           end
         end
-
-        const_set(klass_name, klass)
-
-        unless options[:skip_singleton_method]
-          RubyLeiningen.define_singleton_method name do |opts = {}|
-            klass.new.execute(opts)
-          end
-        end
       end
+      # rubocop:enable Metrics/MethodLength
     end
 
-    private
-
     class Config
       attr_accessor :command_block, :subcommand_block
 
       def initialize
-        self.command_block = lambda { |command| command }
-        self.subcommand_block = lambda { |sub| sub }
+        self.command_block = ->(command) { command }
+        self.subcommand_block = ->(sub) { sub }
       end
 
       def on_command_builder(&block)

data/lib/ruby_leiningen/plugins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'commands'
 
 require_relative 'commands/plugins/bikeshed'

data/lib/ruby_leiningen/version.rb

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

data/lib/ruby_leiningen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_leiningen/version'
 require 'ruby_leiningen/commands'
 

data/ruby_leiningen.gemspec

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ruby_leiningen/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  ruby_leiningen.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'ruby_leiningen'
+  spec.version = RubyLeiningen::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'A simple Ruby wrapper for invoking leiningen commands.'
+  spec.description = 'Wraps the leiningen CLI so that leiningen can be ' \
+                     'invoked from a Ruby script or Rakefile.'
+  spec.homepage = 'https://github.com/infrablocks/ruby_leiningen'
+  spec.license = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'activesupport', '>= 6.0.2', '< 8'
+  spec.add_dependency 'lino', '~> 3.0'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
+
+  spec.metadata['rubygems_mfa_required'] = 'false'
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ruby_leiningen
 version: !ruby/object:Gem::Version
-  version: 0.24.0.pre.6
+  version: 0.24.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
@@ -25,27 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +157,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,6 +234,7 @@ files:
 - lib/ruby_leiningen/commands/check.rb
 - lib/ruby_leiningen/commands/clean.rb
 - lib/ruby_leiningen/commands/deps.rb
+- lib/ruby_leiningen/commands/helpers.rb
 - lib/ruby_leiningen/commands/mixins/environment.rb
 - lib/ruby_leiningen/commands/mixins/profile.rb
 - lib/ruby_leiningen/commands/plugins/bikeshed.rb
@@ -192,10 +249,12 @@ files:
 - lib/ruby_leiningen/commands/version.rb
 - lib/ruby_leiningen/plugins.rb
 - lib/ruby_leiningen/version.rb
+- ruby_leiningen.gemspec
 homepage: https://github.com/infrablocks/ruby_leiningen
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: