rfix 1.2.6 → 1.3.0.pre.199

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4963fcdeb152d9e132794d42982797eadf9848ecfcfed8e94f51885003b0ddbb
-  data.tar.gz: 8cb32d9c8e17a881eec724678f0e69bc138ca360f24ea6318c733429e09e45f3
+  metadata.gz: 4329b03ddb1e83fbb9a00904e2f12ddd747bef384cea815b3fff933adffdc1c0
+  data.tar.gz: c9dbf63cbaaadefe458c560cf88535d2aef4d57e2dd7c0ff6554dcf560da51be
 SHA512:
-  metadata.gz: 064c76697d6e5cad1b1e35c52f4ee9b7f52df2697fdf8680f18289130aa8b6f634ed3cf2bcba41cc8d0a27fd95e61e79d2c3a5638620baf61440935471ed784f
-  data.tar.gz: 4936c5ca44319492caf7a8556ff5913ca527541b5d7a3453d04db77785bfcb535929153a7a7e11881283dc7e1910c7f4164d4293eae9c4b405de12fc032ccc88
+  metadata.gz: cc086f736a7bf0341b9bd2c05dc936b2f5a08a3443f235e914a52b05b4ea27ce385802fcba6275c9baae9d0f078493dc280d08a084acee177c4c26c4f5f0de9f
+  data.tar.gz: 9f157905bad41d869dbb3759533b1b7774b06dee8e3033e8f96259a83b8d376ddc23a9013f7014f56b1266ae035f94c9318a65d63099829aba18dde5162891c9

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rfix (1.2.6)
+    rfix (1.3.0)
       cri (~> 2.15.10)
       listen (~> 3.0)
       rainbow (~> 3.0)
       require_all (~> 3.0.0)
       rouge (~> 3.20)
-      rubocop (~> 0.80)
+      rubocop (>= 0.80, < 0.90)
       rugged (~> 1.0.0)
 
 GEM
@@ -121,7 +121,7 @@ GEM
     regexp_parser (1.7.1)
     require_all (3.0.0)
     rexml (3.2.4)
-    rouge (3.21.0)
+    rouge (3.24.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/Makefile

@@ -1,4 +1,12 @@
-install:
-	brew install cmake pkg-config libgit2 safe-rm
-	gem install colorize rake
-	rake build
+bundle:
+	cd tmp && bundle install
+install: bundle
+	bundle exec rake install:local
+	# brew install cmake pkg-config libgit2 safe-rm
+	# gem install colorize rake
+	# rake build
+
+test: install
+	cd tmp && rfix info || true
+	# cd tmp && bundle exec rfix --help || true
+	# cd tmp && bundle exec ./exe/rfix  --debug --help || true

data/exe/rfix

@@ -1,4 +1,23 @@
-#!/usr/bin/env ruby
+# #!/usr/bin/env ruby
+
+require "bundler"
+
+require_relative "../lib/rfix/loader/spec.rb"
+require_relative "../lib/rfix/loader/bundler.rb"
+require_relative "../lib/rfix/loader/env.rb"
+
+if spec = Bundler.find_locked("rubocop")
+  Gem::Specification.deactivate(spec.name)
+  unless spec.__materialize__&.activation
+    abort "Could not load rubocop spec file"
+  end
+end
+
+if spec = Gem.loaded_specs.fetch("rubocop")
+  unless Env.requirement === spec.version
+    abort "RuboCop version #{Env.pretty_req} required by rfix but #{spec.version} was found in Gemfile"
+  end
+end
 
 require "cri"
 require "rfix"

data/lib/rfix/loader/bundler.rb

@@ -0,0 +1,37 @@
+begin
+  require "bundler"
+
+  module Bundler
+    class Null
+      def __materialize__
+
+      end
+
+      def version
+        raise "#version not impl."
+      end
+
+      def activation
+        raise "#activation not impl."
+      end
+    end
+
+    def self.locked_specs
+      locked_gems&.specs || []
+    rescue Bundler::GemfileNotFound
+      []
+    end
+
+    def self.find_locked(name)
+      locked_specs.select do |spec|
+        spec.name.casecmp(name).zero?
+      end.first
+    end
+
+    def self.activate_locked(name)
+      find_locked(name).__materialize__.tap(&:activation)
+    end
+  end
+rescue LoadError
+  require_relative "null_bundler"
+end

data/lib/rfix/loader/env.rb

@@ -0,0 +1,33 @@
+# require "pry"
+class Env
+  KEY = "__RFIX_LOOP".freeze
+
+  def self.spec
+    Gem.loaded_specs.fetch("rfix")
+  end
+
+  def self.requirement
+    spec.dependencies.select do |gem|
+      gem.name == "rubocop"
+    end.first&.requirement || Env.log!("RuboCop requirement not found")
+  end
+
+  def self.pretty_req
+    requirement.as_list.join(" to ")
+  end
+
+  def self.bundle_path
+    Gem.bin_path("bundler", "bundle")
+  end
+
+  def self.log(msg)
+    # return unless ARGV.include?("--debug")
+
+    $stderr.puts ["==>", msg].join(" ")
+  end
+
+  def self.log!(msg)
+    $stderr.puts ["==>", msg].join(" ")
+    exit(1)
+  end
+end

data/lib/rfix/loader/spec.rb

@@ -0,0 +1,41 @@
+class Gem::Specification
+  def self.deactivate(name)
+    Gem.loaded_specs[name]&.deactivate
+  end
+
+  def deactivate
+    loaded_paths.each do |path|
+      $:.delete(path)
+    end
+
+    Gem.loaded_specs.delete(name)
+  end
+
+  def activation
+    self.class.deactivate(name)
+    activate
+  rescue Gem::ConflictError => error
+    abort error.to_s
+  end
+
+  private
+
+  def loaded_paths(spec = self, prev = [])
+    return root_loaded_path unless loaded_into_path?
+    return root_loaded_path if prev == root_loaded_path
+
+    root_loaded_path + dependent_specs.map do |spec|
+      loaded_paths(spec, root_loaded_path)
+    end.flatten
+  end
+
+  def loaded_into_path?
+    @lip ||= root_loaded_path.any? do |path|
+      $:.include?(path)
+    end
+  end
+
+  def root_loaded_path
+    @root ||= Dir.glob(lib_dirs_glob)
+  end
+end

data/lib/rfix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

data/rfix.gemspec

@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", "~> 3.0"
   spec.add_runtime_dependency "require_all", "~> 3.0.0"
   spec.add_runtime_dependency "rouge", "~> 3.20"
-  spec.add_runtime_dependency "rubocop", "~> 0.80"
+  spec.add_runtime_dependency "rubocop", ">= 0.80", "< 0.90"
   spec.add_runtime_dependency "rugged", "~> 1.0.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0.pre.199
 platform: ruby
 authors:
 - Linus Oleander
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -84,16 +84,22 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.80'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.90'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.80'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.90'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +281,9 @@ files:
 - lib/rfix/file_cache.rb
 - lib/rfix/formatter.rb
 - lib/rfix/git_helper.rb
+- lib/rfix/loader/bundler.rb
+- lib/rfix/loader/env.rb
+- lib/rfix/loader/spec.rb
 - lib/rfix/log.rb
 - lib/rfix/no_file.rb
 - lib/rfix/rake/paths.rb
@@ -325,7 +334,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/oleander/rfix-rb
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -337,13 +346,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - git, v2.0+
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: RuboCop CLI that only lints and auto-fixes code you committed by utilizing
   `git-log` and `git-diff`