rfix 1.2.6.pre.198 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f49efc581ec20334b8f0e9594959a71185c6a51ae0ca13ab92d5ea3d3db86f6
-  data.tar.gz: 73aef727ae29434806a4c573b77fff684e406f2c3f3c0615963c213c3d6d5931
+  metadata.gz: 4963fcdeb152d9e132794d42982797eadf9848ecfcfed8e94f51885003b0ddbb
+  data.tar.gz: 8cb32d9c8e17a881eec724678f0e69bc138ca360f24ea6318c733429e09e45f3
 SHA512:
-  metadata.gz: 06f7708c0d34baf97708409375fc712c8a5cfdce94b44c8acc8a69135ebd2bb9ebe22dd0b7b9587371ddd9eaf718cbfabcf734ac2eb6adbb862cbb6cbe110f01
-  data.tar.gz: 6e3e19062b9e6eeadff64c8215229c95e3ab553065922bf920f0ce622edc2cb83feb4d9a156ee9204070b0f74ff0aed76308c026f3dd53b2507b229d9ebddfc7
+  metadata.gz: 064c76697d6e5cad1b1e35c52f4ee9b7f52df2697fdf8680f18289130aa8b6f634ed3cf2bcba41cc8d0a27fd95e61e79d2c3a5638620baf61440935471ed784f
+  data.tar.gz: 4936c5ca44319492caf7a8556ff5913ca527541b5d7a3453d04db77785bfcb535929153a7a7e11881283dc7e1910c7f4164d4293eae9c4b405de12fc032ccc88

data/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
       rainbow (~> 3.0)
       require_all (~> 3.0.0)
       rouge (~> 3.20)
-      rubocop (>= 0.80, < 0.90)
+      rubocop (~> 0.80)
       rugged (~> 1.0.0)
 
 GEM

data/Makefile

@@ -1,12 +1,4 @@
-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
+install:
+	brew install cmake pkg-config libgit2 safe-rm
+	gem install colorize rake
+	rake build

data/exe/rfix

@@ -1,23 +1,4 @@
-# #!/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
+#!/usr/bin/env ruby
 
 require "cri"
 require "rfix"

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", "< 0.90"
+  spec.add_runtime_dependency "rubocop", "~> 0.80"
   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.pre.198
+  version: 1.2.6
 platform: ruby
 authors:
 - Linus Oleander
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -84,22 +84,16 @@ 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
@@ -281,9 +275,6 @@ 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
@@ -334,7 +325,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/oleander/rfix-rb
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -346,13 +337,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: 1.3.1
+      version: '0'
 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`

data/lib/rfix/loader/bundler.rb

@@ -1,37 +0,0 @@
-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

@@ -1,33 +0,0 @@
-# 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

@@ -1,41 +0,0 @@
-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