rfix 1.2.2.pre → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba53958e4103258b8e86578694c48233c47ffef40f9731086a3cd99b1da5b719
-  data.tar.gz: b8aacca8d0c536a3c4f4135f15951be49fcad5d89524e2d8f2f1b85459667b9f
+  metadata.gz: 979604266b50448ef2a189a633eda6a6057e179ef67962a850718c07f8e2c726
+  data.tar.gz: 60b0a5b249baf32b738bde9ae350af154b3bf7862af836b42b960d5c91347b0f
 SHA512:
-  metadata.gz: f2bca003e662486e4d96a1619c4f90d2a17e8ac2ec64b43b12b4841fcdbe3d66d18238a62c2d21fb8e210a1bb22e66c0e4ab2162155a6668e6814c44ff522adb
-  data.tar.gz: 9a53c0431ab2ea56084b2cc6de231869b00e0bf91acb6a73cd89fd623ad569c0f638f48927f7a39d55260f62ce990750d33334950a729246d774f97a3b12ce77
+  metadata.gz: 7efcea3b4f4419c05fca0467bfa1748d2cf1eb2c7771aeaa7f8bb83826016ece746635eb1303b6e881a1e108d4d06f9d6c0730db447314500ff1f30f5259b3b1
+  data.tar.gz: 3aba1e9526e140517131811ec818edcc437274cf36746b5253bffd86fcf301ffde93d40370264157a7099b30e7fd906f198b765dfb523725e6a752a8cbdb9c1d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rfix (1.2.2.pre)
+    rfix (1.2.5)
       cri (~> 2.15.10)
       listen (~> 3.0)
       rainbow (~> 3.0)

data/exe/rfix

@@ -27,4 +27,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

@@ -7,20 +7,6 @@ class Rfix::Branch::Base
     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
-  end
-
   def revparse(using:, ref:)
     using.rev_parse(ref)
   rescue Rugged::InvalidError

data/lib/rfix/branches/main.rb

@@ -10,17 +10,11 @@ module Rfix
         raise Error.new("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/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

data/lib/rfix/log.rb

@@ -31,9 +31,9 @@ module Rfix::Log
   end
 
   def say_debug(message)
-    # if debug? or test?
+    if debug? or test?
       prt("{{i}} #{strip(message)}", to: $stderr)
-    # end
+    end
   end
 
   def say_abort(message)

data/lib/rfix/repository.rb

@@ -113,7 +113,7 @@ class Rfix::Repository
       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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.2.2"
+  VERSION = "1.2.5"
 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.2.2.pre
+  version: 1.2.5
 platform: ruby
 authors:
 - Linus Oleander
@@ -337,9 +337,9 @@ 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