rake_leiningen 0.4.0 → 0.5.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 387376ea318a6e5c4fcd1134d92054aa8af61ffcdc76d6b50a7c4e2f2850a914
-  data.tar.gz: ffe1bbed16a80abad3052c42a564e5f4fc10520270e0f6cd1a50716459f112ee
+  metadata.gz: fec72dfd178142a7a51f577e110d1c7902c79145d46041bdf09b5a2a122083ac
+  data.tar.gz: 925392a7345b17ff4622be91b36dbdae33e20f91d6e7e3e162949460883c1b7c
 SHA512:
-  metadata.gz: 8114f9efd9ff2fa3371b46600bd9fa8ce47a6f390c3b0861f65e8ee53c592a7f58e319902bb6ff84f38f15ba9826ec4e4655b6cbe7e9012e4b9d2dd525eabcf7
-  data.tar.gz: c2d297035d769598cc38d010dce6bca9d6e46c39c056156937101331a9390d8c78039976092636d354282e027b7d7b64f246ca41449cf0c15eae5b0948e68b52
+  metadata.gz: 82ca69f481ec630d657e2d65a57bb053ea81c817c0a7923e0cfa598ce63f2dde32284f3d7c4b8454a8db93b1fd50f5865b48321c9cd1f0a3a0006078aaace27f
+  data.tar.gz: aa0d112d2f8d15113d9a85223fcdf2908051b095beabe8171916ba7edad9ab653cc761f141807b5bad01f7f8a06fb00fc1e37a5b39488288ae3e7dbad4ab9631

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    rake_leiningen (0.4.0)
+    rake_leiningen (0.5.0.pre.1)
       rake_dependencies (~> 1.10)
-      rake_factory (~> 0.17)
+      rake_factory (>= 0.17)
+      ruby_leiningen (~> 0.5)
       semantic (~> 1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     docile (1.3.2)
@@ -24,16 +26,20 @@ GEM
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
+    lino (1.1.0)
+      hamster (~> 3.0)
+      open4 (~> 1.3)
     minitar (0.9)
     minitest (5.14.0)
+    open4 (1.3.4)
     rake (13.0.1)
     rake_dependencies (1.10.0)
       hamster (~> 3.0)
       minitar (~> 0.9)
       rake_factory (>= 0.11)
       rubyzip (~> 2.0)
-    rake_factory (0.17.0)
-      activesupport (~> 5.2)
+    rake_factory (0.19.0)
+      activesupport (>= 5.2)
       rake (~> 13.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -48,7 +54,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubyzip (2.1.0)
+    ruby_leiningen (0.5.0)
+      activesupport (~> 6.0, >= 6.0.2)
+      lino (~> 1.1)
+    rubyzip (2.2.0)
     semantic (1.6.1)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -58,12 +67,13 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.2)
+  activesupport (>= 5.2)
   bundler (~> 2.1)
   fakefs (~> 1.0)
   gem-release (~> 2.0)

data/lib/rake_leiningen/mixins/directoried.rb

@@ -0,0 +1,13 @@
+module RakeLeiningen
+  module Mixins
+    module Directoried
+      def in_directory(directory, &block)
+        if directory
+          Dir.chdir(directory, &block)
+        else
+          block.call
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/task_sets/checks.rb

@@ -0,0 +1,41 @@
+require 'rake_factory'
+
+require_relative '../tasks/lint'
+require_relative '../tasks/optimise'
+require_relative '../tasks/idiomise'
+require_relative '../tasks/format'
+require_relative '../tasks/pedantise'
+require_relative '../tasks/check'
+
+module RakeLeiningen
+  module TaskSets
+    class Checks < RakeFactory::TaskSet
+      parameter :argument_names, default: []
+
+      parameter :profile
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      parameter :lint_task_name, :default => :lint
+      parameter :optimise_task_name, :default => :optimise
+      parameter :idiomise_task_name, :default => :idiomise
+      parameter :format_task_name, :default => :format
+      parameter :pedantise_task_name, :default => :pedantise
+      parameter :check_task_name, :default => :check
+
+      task Tasks::Lint,
+          name: ->(ts) { ts.lint_task_name }
+      task Tasks::Optimise,
+          name: ->(ts) { ts.optimise_task_name }
+      task Tasks::Idiomise,
+          name: ->(ts) { ts.idiomise_task_name }
+      task Tasks::Format,
+          name: ->(ts) { ts.format_task_name }
+      task Tasks::Pedantise,
+          name: ->(ts) { ts.pedantise_task_name }
+      task Tasks::Check,
+          name: ->(ts) { ts.check_task_name }
+    end
+  end
+end

data/lib/rake_leiningen/task_sets.rb

@@ -0,0 +1 @@
+require_relative 'task_sets/checks'

data/lib/rake_leiningen/tasks/check.rb

@@ -0,0 +1,31 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Check < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :check
+      default_description "Perform all checks against clojure files."
+      default_prerequisites ->(t) {
+        [
+            t.lint_task_name,
+            t.optimise_task_name,
+            t.idiomise_task_name,
+            t.format_task_name,
+            t.pedantise_task_name
+        ]
+      }
+
+      parameter :lint_task_name, default: :lint
+      parameter :optimise_task_name, default: :optimise
+      parameter :idiomise_task_name, default: :idiomise
+      parameter :format_task_name, default: :format
+      parameter :pedantise_task_name, default: :pedantise
+    end
+  end
+end

data/lib/rake_leiningen/tasks/format.rb

@@ -0,0 +1,38 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Format < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :format
+      default_description "Format all clojure files."
+      default_prerequisites ->(t) {
+        t.ensure_task_name ? [t.ensure_task_name] : []
+      }
+
+      parameter :mode
+      parameter :paths
+      parameter :profile
+
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      action do |t|
+        puts "Formatting all clojure files..."
+
+        in_directory(t.directory) do
+          RubyLeiningen.cljfmt(
+              mode: t.mode,
+              paths: t.paths,
+              profile: t.profile)
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/tasks/idiomise.rb

@@ -0,0 +1,42 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Idiomise < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :idiomise
+      default_description "Transform all clojure files to be more idiomatic."
+      default_prerequisites ->(t) {
+        t.ensure_task_name ? [t.ensure_task_name] : []
+      }
+
+      parameter :replace
+      parameter :interactive
+      parameter :reporter
+      parameter :paths
+      parameter :profile
+
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      action do |t|
+        puts "Making all clojure files more idiomatic..."
+
+        in_directory(t.directory) do
+          RubyLeiningen.kibit(
+              replace: t.replace,
+              interactive: t.interactive,
+              reporter: t.reporter,
+              paths: t.paths,
+              profile: t.profile)
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/tasks/lint.rb

@@ -0,0 +1,36 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Lint < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :lint
+      default_description "Lint all clojure files."
+      default_prerequisites ->(t) {
+        t.ensure_task_name ? [t.ensure_task_name] : []
+      }
+
+      parameter :config
+      parameter :profile
+
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      action do |t|
+        puts "Linting all clojure files..."
+
+        in_directory(t.directory) do
+          RubyLeiningen.eastwood(
+              config: t.config,
+              profile: t.profile)
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/tasks/optimise.rb

@@ -0,0 +1,34 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Optimise < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :optimise
+      default_description "Warn on reflection for all clojure files."
+      default_prerequisites ->(t) {
+        t.ensure_task_name ? [t.ensure_task_name] : []
+      }
+
+      parameter :profile
+
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      action do |t|
+        puts "Checking for uses of reflection in all clojure files..."
+
+        in_directory(t.directory) do
+          RubyLeiningen.check(
+              profile: t.profile)
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/tasks/pedantise.rb

@@ -0,0 +1,54 @@
+require 'rake_factory'
+require 'ruby_leiningen'
+require 'ruby_leiningen/plugins'
+
+require_relative '../mixins/directoried'
+
+module RakeLeiningen
+  module Tasks
+    class Pedantise < RakeFactory::Task
+      include Mixins::Directoried
+
+      default_name :pedantise
+      default_description "Hunt for 'bad' code in all clojure files."
+      default_prerequisites ->(t) {
+        t.ensure_task_name ? [t.ensure_task_name] : []
+      }
+
+      parameter :show_help
+      parameter :verbose
+      parameter :maximum_line_length
+      parameter :long_lines
+      parameter :trailing_whitespace
+      parameter :trailing_blank_lines
+      parameter :var_redefs
+      parameter :docstrings
+      parameter :name_collisions
+      parameter :exclude_profiles
+      parameter :profile
+
+      parameter :directory, default: '.'
+
+      parameter :ensure_task_name, default: 'leiningen:ensure'
+
+      action do |t|
+        puts "Looking for 'bad' code in all clojure files..."
+
+        in_directory(t.directory) do
+          RubyLeiningen.bikeshed(
+              show_help: t.show_help,
+              verbose: t.verbose,
+              maximum_line_length: t.maximum_line_length,
+              long_lines: t.long_lines,
+              trailing_whitespace: t.trailing_whitespace,
+              trailing_blank_lines: t.trailing_blank_lines,
+              var_redefs: t.var_redefs,
+              docstrings: t.docstrings,
+              name_collisions: t.name_collisions,
+              exclude_profiles: t.exclude_profiles,
+              profile: t.profile)
+        end
+      end
+    end
+  end
+end

data/lib/rake_leiningen/tasks.rb

@@ -0,0 +1,6 @@
+require_relative 'tasks/lint'
+require_relative 'tasks/optimise'
+require_relative 'tasks/idiomise'
+require_relative 'tasks/format'
+require_relative 'tasks/pedantise'
+require_relative 'tasks/check'

data/lib/rake_leiningen/version.rb

@@ -1,3 +1,3 @@
 module RakeLeiningen
-  VERSION = '0.4.0'
+  VERSION = '0.5.0.pre.1'
 end

data/lib/rake_leiningen.rb

@@ -1,12 +1,18 @@
 require 'rake_dependencies'
 require 'rake_leiningen/version'
+require 'rake_leiningen/tasks'
+require 'rake_leiningen/task_sets'
 
 module RakeLeiningen
+  def self.define_check_tasks(opts = {}, &block)
+    RakeLeiningen::TaskSets::Checks.define(opts, &block)
+  end
+
   def self.define_installation_tasks(opts = {})
     namespace = opts[:namespace] || :leiningen
     dependency = 'lein'
     version = opts[:version] || '2.9.1'
-    path = opts[:path] || File.join('vendor', 'leiningen')
+    path = opts[:path] || File.join(Dir.pwd, 'vendor', 'leiningen')
     type = :uncompressed
     uri_template = "https://raw.githubusercontent.com/technomancy/" +
         "leiningen/<%= @version %>/bin/lein"
@@ -30,6 +36,10 @@ module RakeLeiningen
       return true
     end
 
+    RubyLeiningen.configure do |c|
+      c.binary = File.join(path, 'bin', 'lein')
+    end
+
     RakeDependencies::TaskSets::All.define(
         namespace: namespace,
         dependency: dependency,

data/rake_leiningen.gemspec

@@ -25,14 +25,15 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'rake_dependencies', '~> 1.10'
-  spec.add_dependency 'rake_factory', '~> 0.17'
+  spec.add_dependency 'rake_factory', '>= 0.17'
+  spec.add_dependency 'ruby_leiningen', '~> 0.5'
   spec.add_dependency 'semantic', '~> 1.6.1'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'gem-release', '~> 2.0'
-  spec.add_development_dependency 'activesupport', '~> 5.2'
+  spec.add_development_dependency 'activesupport', '>= 5.2'
   spec.add_development_dependency 'fakefs', '~> 1.0'
   spec.add_development_dependency 'simplecov', '~> 0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_leiningen
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -28,16 +28,30 @@ dependencies:
   name: rake_factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: ruby_leiningen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +126,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -185,6 +199,16 @@ files:
 - config/secrets/rubygems/credentials
 - go
 - lib/rake_leiningen.rb
+- lib/rake_leiningen/mixins/directoried.rb
+- lib/rake_leiningen/task_sets.rb
+- lib/rake_leiningen/task_sets/checks.rb
+- lib/rake_leiningen/tasks.rb
+- lib/rake_leiningen/tasks/check.rb
+- lib/rake_leiningen/tasks/format.rb
+- lib/rake_leiningen/tasks/idiomise.rb
+- lib/rake_leiningen/tasks/lint.rb
+- lib/rake_leiningen/tasks/optimise.rb
+- lib/rake_leiningen/tasks/pedantise.rb
 - lib/rake_leiningen/version.rb
 - rake_leiningen.gemspec
 - scripts/ci/common/configure-git.sh
@@ -209,9 +233,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 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: