rfix 1.2.2.pre.174 → 1.2.6.pre.198

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21eca1cf7b672049156a68d5b78b205fe3a51356fd005cea3ca7de90b35f8504
-  data.tar.gz: 01631f5a207dcd3018d55dd7df84d44e4b90985be602270ed242bcba2cc704ed
+  metadata.gz: 0f49efc581ec20334b8f0e9594959a71185c6a51ae0ca13ab92d5ea3d3db86f6
+  data.tar.gz: 73aef727ae29434806a4c573b77fff684e406f2c3f3c0615963c213c3d6d5931
 SHA512:
-  metadata.gz: 6dcd829c42c554bdf92c0474a397129b66edaa33974554996d0d5bc1b8fc7738510cbffff43c13359b2844e8730693b600f5038c59d54351c14d14dac1a1399a
-  data.tar.gz: 1f0ea8c9615cfa02cf7022af7514633a9331d42a35d58e759f9d5c8010f2e25d2b976b0dd984aa50045f6f1a7f933bf800b88ff577e1fbfb86cd8518f1e625ac
+  metadata.gz: 06f7708c0d34baf97708409375fc712c8a5cfdce94b44c8acc8a69135ebd2bb9ebe22dd0b7b9587371ddd9eaf718cbfabcf734ac2eb6adbb862cbb6cbe110f01
+  data.tar.gz: 6e3e19062b9e6eeadff64c8215229c95e3ab553065922bf920f0ce622edc2cb83feb4d9a156ee9204070b0f74ff0aed76308c026f3dd53b2507b229d9ebddfc7

data/.github/workflows/main.yml

@@ -5,7 +5,7 @@ env:
   RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
   GITHUB_API_TOKEN: ${{secrets.API_KEY}}
 jobs:
-  setup:
+  build:
     container: ruby:2.7
     runs-on: ubuntu-latest
     steps:
@@ -22,17 +22,3 @@ jobs:
 
       - run: bundle install --path vendor/bundle
       - run: rake execute:local execute:origin execute:lint execute:branch
-
-      - run: git config user.email "linus@oleander.io"
-      - run: git config user.name "Linus Oleander"
-
-      - name: Publish to RubyGems
-        run: |
-          mkdir -p $HOME/.gem
-          touch $HOME/.gem/credentials
-          chmod 0600 $HOME/.gem/credentials
-          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-          gem build *.gemspec
-          gem push *.gem
-        env:
-          GEM_HOST_API_KEY: "Bearer ${{secrets.RUBYGEMS_API_KEY}}"

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rfix (1.2.2pre)
+    rfix (1.2.6)
       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

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"
@@ -27,4 +46,6 @@ begin
   end
 rescue RuntimeError => e
   say_abort e.to_s
+rescue Rfix::Error => e
+  say_abort e.to_s
 end

data/lib/rfix/branches/base.rb

@@ -1,29 +1,15 @@
 class Rfix::Branch::Base
   def resolve(with:)
-    raise Rfix::NotYetImplementedError.new("#resolved")
+    raise Rfix::NotYetImplementedError, "#resolved"
   end
 
   def to_s
-    raise Rfix::NotYetImplementedError.new("#to_s")
-  end
-
-  def branch(using:)
-    names(using: using).last or raise Rfix::Error.new("No named branch found for {{error:#{self}}}")
-  end
-
-  def names(using:)
-    oid = resolve(with: using).oid
-    locals = using.branches.each_name(:local).to_a
-
-    using.branches.select do |branch|
-      next false unless locals.include?(branch.name)
-      branch.target_id == oid
-    end
+    raise Rfix::NotYetImplementedError, "#to_s"
   end
 
   def revparse(using:, ref:)
     using.rev_parse(ref)
   rescue Rugged::InvalidError
-    raise Rfix::Branch::UnknownBranchError.new("Could not find reference {{error:#{ref}}}")
+    raise Rfix::Branch::UnknownBranchError, "Could not find reference {{error:#{ref}}}"
   end
 end

data/lib/rfix/branches/main.rb

@@ -3,24 +3,18 @@ require_relative "base"
 
 module Rfix
   class Branch::Main < Branch::Base
-    KEY = "rfix.main.branch"
+    KEY = "rfix.main.branch".freeze
 
     def resolve(with:)
       unless name = with.config[KEY]
-        raise Error.new("Please run {{command:rfix setup}} first")
+        raise Error, "Please run {{command:rfix setup}} first"
       end
 
-      String.new(name).resolve(with: with)
+      Branch::Name.new(name).resolve(with: with)
     end
 
     def self.set(branch, at: Dir.pwd)
-      unless branch.is_a?(String)
-        raise Rfix::Error.new("Branch must be a string, got {{error:#{branch.class}}}")
-      end
-
-      check = Branch::Name.new(branch)
-      repo = Branch.repo(at: at)
-      Branch.repo(at: at).config[KEY] = check.branch(using: repo).name
+      Branch.repo(at: at).config[KEY] = branch
     end
 
     def self.get(at: Dir.pwd)

data/lib/rfix/branches/name.rb

@@ -10,12 +10,12 @@ module Rfix
 
     def resolve(with:)
       unless branch = with.branches[name]
-        raise Branch::UnknownBranchError.new("Could not find branch {{error:#{name}}}")
+        raise Branch::UnknownBranchError, "Could not find branch {{error:#{name}}}"
       end
 
       with.lookup(with.merge_base(branch.target_id, with.head.target_id))
     rescue Rugged::ReferenceError
-      raise Branch::UnknownBranchError.new("Could not find branch {{error:#{name}}}")
+      raise Branch::UnknownBranchError, "Could not find branch {{error:#{name}}}"
     end
 
     alias to_s name

data/lib/rfix/branches/reference.rb

@@ -13,7 +13,7 @@ module Rfix
     rescue Branch::UnknownBranchError
       revparse(using: with, ref: reference)
     rescue Rugged::InvalidError
-      raise Branch::UnknownBranchError.new("Branch with reference {{error:#{reference}}} not found")
+      raise Branch::UnknownBranchError, "Branch with reference {{error:#{reference}}} not found"
     end
 
     alias to_s reference

data/lib/rfix/commands/helper/args.rb

@@ -1,5 +1,5 @@
 option :r, :root, "{{*}} Project root path", default: Dir.pwd, argument: :required
-option :b, :"main-branch", "{{*}} Branch to use", default: "master", argument: :required
+option :b, :"main-branch", "{{*}} Branch to use", argument: :required
 option :l, :limit, "{{*}} Limit number of files", argument: :required, transform: method(:Integer)
 
 flag nil, :dry, "{{*}} Run in dry mode"
@@ -78,6 +78,10 @@ def setup(r_args = [], opts, _args, files: [], reference:)
     say_debug "Cleared Rubocop`s cache"
   end
 
+  if opts[:debug]
+    Rfix.test = true
+  end
+
   if block_given?
     yield(repo, [])
   end
@@ -112,7 +116,7 @@ def setup(r_args = [], opts, _args, files: [], reference:)
     paths = files
   elsif paths.empty? && repo.paths.empty?
     if opts[:format] == "json"
-      prt JSON.pretty_generate({"files": []})
+      prt JSON.pretty_generate({ "files": [] })
       exit 0
     else
       say_exit "Everything looks good, nothing to lint"

data/lib/rfix/commands/lint.rb

@@ -8,7 +8,6 @@ summary "Lints commits and untracked files not yet pushed to upstream"
 usage "rfix lint [opts] [path ..]"
 description "Lint (read-only) files"
 
-
 run do |opts, args, _cmd|
   opts[:dry] = true
   opts[:untracked] = true

data/lib/rfix/file.rb

@@ -18,15 +18,15 @@ class Rfix::File < Struct.new(:path, :repo, :ref)
   end
 
   def include?(_)
-    raise Rfix::Error.new("#include? not implemented")
+    raise Rfix::Error, "#include? not implemented"
   end
 
   def refresh!
-    raise Rfix::Error.new("#refresh! not implemented")
+    raise Rfix::Error, "#refresh! not implemented"
   end
 
   def inspect
-    raise Rfix::Error.new("#inspect not implemented")
+    raise Rfix::Error, "#inspect not implemented"
   end
 
   def git_path

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/log.rb

@@ -31,9 +31,9 @@ module Rfix::Log
   end
 
   def say_debug(message)
-    # if debug? or test?
+    if debug? || test?
       prt("{{i}} #{strip(message)}", to: $stderr)
-    # end
+    end
   end
 
   def say_abort(message)
@@ -43,6 +43,7 @@ module Rfix::Log
 
   def debug?
     return false unless defined?(RSpec)
+
     return RSpec.configuration.debug?
   end
 

data/lib/rfix/repository.rb

@@ -18,7 +18,7 @@ class Rfix::Repository
     end
 
     unless reference.is_a?(Rfix::Branch::Base)
-      raise Rfix::Error.new("Need Branch::Base, got {{error:#{reference.class}}}")
+      raise Rfix::Error, "Need Branch::Base, got {{error:#{reference.class}}}"
     end
 
     @files          = FileCache.new(root_path)
@@ -35,12 +35,10 @@ class Rfix::Repository
   end
 
   def load_tracked?
-    !! @reference
+    !!@reference
   end
 
-  def reference
-    @reference
-  end
+  attr_reader :reference
 
   def refresh!(path)
     @files.get(path).refresh!
@@ -108,12 +106,12 @@ class Rfix::Repository
     }
 
     unless @paths.empty?
-      say_debug("Use @paths #{@paths.join(", ")}")
+      say_debug("Use @paths #{@paths.join(', ')}")
       params[:disable_pathspec_match] = false
       params[:paths] = @paths
     end
 
-    say_debug("Run diff on #{reference}")
+    say_debug("Run diff on {{info:#{reference}}}")
     upstream.diff(head, **params).tap do |diff|
       diff.find_similar!(
         renames_from_rewrites: true,

data/lib/rfix/tracked.rb

@@ -4,7 +4,7 @@ class Rfix::Tracked < Rfix::File
   include Rfix::Log
 
   def include?(line)
-    set = diff.each_line.to_a.map{ |l| l.new_lineno }.reject { |l| l == -1 }.to_set
+    set = diff.each_line.to_a.map(&:new_lineno).reject { |l| l == -1 }.to_set
     say_debug "Does {{yellow:#{set}}} contain {{red:#{line}}}"
     set.include?(line)
   end
@@ -54,14 +54,14 @@ class Rfix::Tracked < Rfix::File
 
   def diff
     upstream.diff_workdir({
-      include_untracked_content: true,
+                            include_untracked_content: true,
       recurse_untracked_dirs: true,
       include_untracked: true,
       ignore_submodules: true,
       include_ignored: false,
       context_lines: 0,
       paths: [path]
-    }).tap do |diff|
+                          }).tap do |diff|
       diff.find_similar!(
         renames_from_rewrites: true,
         renames: true,

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
   else
     # rubocop:disable Gemspec/DuplicatedAssignment
-    spec.version = [Rfix::VERSION, "pre"].join
+    spec.version = Rfix::VERSION
     # rubocop:enable Gemspec/DuplicatedAssignment
   end
 
@@ -54,15 +54,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "cri", "~> 2.15.10"
   spec.add_runtime_dependency "listen", "~> 3.0"
   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_runtime_dependency "require_all", "~> 3.0.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "aruba", "~> 1.0"
   spec.add_development_dependency "colorize", "~> 0.8.1"
   spec.add_development_dependency "git", "~> 1.7.0"
-  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "pry", "~> 0.13.1"
+  spec.add_development_dependency "rake", "~> 12.3"
 end

data/tasks/execute.rake

@@ -9,7 +9,7 @@ CLEAN.include(repo_path)
 namespace :execute do
   task local: [repo_path, :install] do
     chdir(repo_path) do
-      sh "rfix local"
+      sh "rfix local --main-branch master"
     end
   end
 
@@ -21,13 +21,13 @@ namespace :execute do
 
   task origin: [repo_path, :install] do
     chdir(repo_path) do
-      sh "rfix origin"
+      sh "rfix origin --main-branch master"
     end
   end
 
   task lint: [repo_path, :install] do
     chdir(repo_path) do
-      sh "rfix lint"
+      sh "rfix lint --main-branch master"
     end
   end
 

data/tasks/simple.rake

@@ -45,7 +45,7 @@ namespace :bundle do
 
         sh "git config user.email 'you@example.com'"
         sh "git config user.name 'Your Name'"
-        
+
         sh "git commit -m 'A Commit Message'"
 
         sh "git config push.default current"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.2.2.pre.174
+  version: 1.2.6.pre.198
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.80'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.90'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +97,9 @@ dependencies:
     - - ">="
       - !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
@@ -94,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,33 +171,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '12.3'
 description: |
   RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`. Rfix CLI makes it possible to lint (`rfix lint`) and auto-fix (`rfix local|origin|branch`) code changes since a certain point in history. You can auto-fix code committed since creating the current branch (`rfix origin`) or since pushing to upstream (`rfix local`).
 
@@ -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