rfix 1.1.0.pre.149 → 1.2.2.pre.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee4030d1ce4edff85010c48d311687c118f875406c6191069296e59287bf92c
-  data.tar.gz: d052536e2c5789b690f7c063d2b098c2be418de7b925c9778c0ce060b97ec87b
+  metadata.gz: 704cebdb37c95b97087becc1cca6fab240003915dec8ae8423ba4b41d8451834
+  data.tar.gz: d888590c884dd572f111799bcfb383d44e512dbd423d7a6a114c14e2ebbc8860
 SHA512:
-  metadata.gz: dae811bfdd02a5d81ac9b47cf0cbb7954a568d9de950242f3d5c946d52831f0898466bc93784b7c0e978d5d9fe57d3a5474ee75508eab99d43908c6ebcd328f4
-  data.tar.gz: 5c9458afa7c3b84e8be22963f7aa62aef4b4a22f406590050f970eaa1b72605e1cd5c3dcd550d564fc490e36cc792087fbf29bdf19000561bc654d91da762ff7
+  metadata.gz: 7725847efd4a1143f4e646c6bb99ef0e7b8cf30ac66fda0aabc09a588864d271b436c0f02b90a4632269d46a76f60a5d6bcdb5ae9fc0eca12c67a596e834b73b
+  data.tar.gz: 0162cf4c212c02167a505afad65de84363b1be6cc803ab0c2b7a05ebc6751c7423839df3ee70fb0d8b0ed7be87ef92a506c03082176e7077bbf0f23bd8111347

data/.github/workflows/main.yml

@@ -0,0 +1,38 @@
+---
+name: pre-release
+on: [push]
+env:
+  RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+  GITHUB_API_TOKEN: ${{secrets.API_KEY}}
+jobs:
+  setup:
+    container: ruby:2.7
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: apt-get update -y
+      - run: apt-get install -y bash git libffi-dev build-essential wget cmake
+
+      - run: gem install bundler
+      - run: bundle config build.rugged --use-system-libraries
+      - run: bundle config build.ffi --use-system-libraries
+      - run: gem install rake rspec colorize
+      - run: rake libgit2:install
+
+      - 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,10 +1,11 @@
 PATH
   remote: .
   specs:
-    rfix (1.1.0)
+    rfix (1.2.2)
       cri (~> 2.15.10)
       listen (~> 3.0)
       rainbow (~> 3.0)
+      require_all (~> 3.0.0)
       rouge (~> 3.20)
       rubocop (>= 0.80)
       rugged (~> 1.0.0)
@@ -118,6 +119,7 @@ GEM
       ffi (~> 1.0)
     rchardet (1.8.0)
     regexp_parser (1.7.1)
+    require_all (3.0.0)
     rexml (3.2.4)
     rouge (3.21.0)
     rspec (3.9.0)

data/lib/rfix.rb

@@ -4,6 +4,7 @@
 # https://gist.github.com/skanev/9d4bec97d5a6825eaaf6
 
 require "cli/ui"
+require "require_all"
 require "rfix/version"
 require "rfix/log"
 require "rfix/cmd"

data/lib/rfix/branch.rb

@@ -1,5 +1,6 @@
 require "rfix/repository"
 require "rfix/error"
+autoload_rel "branches/*.rb"
 
 module Rfix
   module Branch

data/lib/rfix/branches/head.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Head < Branch::Base
     def resolve(with:)

data/lib/rfix/branches/main.rb

@@ -1,4 +1,5 @@
 require "rugged"
+require_relative "base"
 
 module Rfix
   class Branch::Main < Branch::Base

data/lib/rfix/branches/name.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Name < Branch::Base
     attr_reader :name
@@ -10,7 +12,7 @@ module Rfix
       unless branch = with.branches[name]
         raise Branch::UnknownBranchError.new("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}}}")

data/lib/rfix/branches/reference.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Reference < Branch::Base
     attr_reader :reference

data/lib/rfix/branches/upstream.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Upstream < Branch::Base
     def resolve(with:)

data/lib/rfix/rake/paths.rb

@@ -8,11 +8,11 @@ end
 module Bundle
   INSTALL = "bundle:install".freeze
   ADD = "bundle:git:add".freeze
-  CONFIG = File.join(__dir__, "../../../.rubocop.yml")
   TAG = "rally-point".freeze
   REBUILD = "bundle:rebuild".freeze
   BUILD = "bundle:build".freeze
-  ROOT = File.expand_path(File.join(__dir__, "../../.."))
+  ROOT = Dir.getwd
+  CONFIG = File.join(ROOT, ".rubocop.yml")
   DIR = File.join(ROOT, "spec/fixtures")
   TMP = File.join(ROOT, "tmp")
 

data/lib/rfix/repository.rb

@@ -47,10 +47,13 @@ class Rfix::Repository
   end
 
   def include?(path, line)
+    say_debug "Checking #{path}:#{line}"
+
     if file = @files.get(path)
       return file.include?(line)
     end
 
+    say_debug "\tSkip file (return false)"
     return false
   end
 

data/lib/rfix/tracked.rb

@@ -5,6 +5,7 @@ class Rfix::Tracked < Rfix::File
 
   def include?(line)
     set = diff.each_line.to_a.map{ |l| l.new_lineno }.reject { |l| l == -1 }.to_set
+    say_debug "Does {{yellow:#{set}}} contain {{red:#{line}}}"
     set.include?(line)
   end
 
@@ -52,14 +53,10 @@ class Rfix::Tracked < Rfix::File
   end
 
   def diff
-    upstream.diff(head, {
+    upstream.diff_workdir({
       include_untracked_content: true,
-      # ignore_whitespace_change: true,
       recurse_untracked_dirs: true,
-      disable_pathspec_match: false,
-      # ignore_whitespace_eol: false,
       include_untracked: true,
-      # ignore_whitespace: true,
       ignore_submodules: true,
       include_ignored: false,
       context_lines: 0,
@@ -67,7 +64,6 @@ class Rfix::Tracked < Rfix::File
     }).tap do |diff|
       diff.find_similar!(
         renames_from_rewrites: true,
-        # ignore_whitespace: true,
         renames: true,
         copies: true
       )

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |spec|
 
   if ENV["TRAVIS"]
     spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
+  elsif ENV["GITHUB_RUN_ID"]
+    spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
   else
     # rubocop:disable Gemspec/DuplicatedAssignment
     spec.version = Rfix::VERSION
@@ -55,6 +57,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rouge", "~> 3.20"
   spec.add_runtime_dependency "rubocop", ">= 0.80"
   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"

data/tasks/execute.rake

@@ -0,0 +1,38 @@
+require "rake/clean"
+require "tmpdir"
+require "pathname"
+
+repo_path = Pathname.new(Dir.mktmpdir)
+
+CLEAN.include(repo_path)
+
+namespace :execute do
+  task local: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix local"
+    end
+  end
+
+  task branch: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix branch master"
+    end
+  end
+
+  task origin: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix origin"
+    end
+  end
+
+  task lint: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix lint"
+    end
+  end
+
+  file repo_path => :rebuild do
+    sh "git clone spec/fixtures/complex.bundle #{repo_path} --branch master"
+    sh "git  --work-tree=#{repo_path} branch --set-upstream-to origin/master"
+  end
+end

data/tasks/libgit2.rake

@@ -0,0 +1,33 @@
+require "rake/clean"
+require "tmpdir"
+require "pathname"
+
+root_path = Pathname.new(Dir.mktmpdir)
+# root_path = Pathname.new(__dir__).join("../tmp")
+libgit2_gz_path = root_path.join("v1.0.1.tar.gz")
+libgit2_path = root_path.join("libgit2-1.0.1")
+
+CLEAN.include(root_path)
+
+namespace :libgit2 do
+  task build: libgit2_path do
+    chdir(libgit2_path) do
+      sh "cmake ."
+      sh "make"
+    end
+  end
+
+  task install: :build do
+    chdir(libgit2_path) do
+      sh "make install"
+    end
+  end
+
+  file libgit2_gz_path do
+    sh "wget -O #{libgit2_gz_path} https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz"
+  end
+
+  file libgit2_path => libgit2_gz_path do
+    sh "tar xzf #{libgit2_gz_path} -C #{root_path}"
+  end
+end

data/tasks/simple.rake

@@ -42,6 +42,10 @@ namespace :bundle do
 
         sh "git init"
         sh "git add .gitignore"
+
+        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.1.0.pre.149
+  version: 1.2.2.pre.172
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -94,6 +94,20 @@ 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
@@ -191,6 +205,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -270,13 +285,13 @@ files:
 - lib/rfix/tracked_file.rb
 - lib/rfix/untracked.rb
 - lib/rfix/version.rb
-- path.rb
 - resources/ps.png
 - rfix.gemspec
-- rugged.rb
 - tasks/bump.rake
 - tasks/bundle.rake
 - tasks/complex.rake
+- tasks/execute.rake
+- tasks/libgit2.rake
 - tasks/simple.rake
 - tasks/travis.rake
 - tasks/vendor.rake

data/path.rb

@@ -1,7 +0,0 @@
-require "jsonpath"
-require "json"
-
-json = JSON.parse(File.read("spec/fixtures/rubocop.json"))
-result = JsonPath.new("files[:][?(@.offenses[:].corrected==\"true\")].path").on(json)
-
-puts result

data/rugged.rb

@@ -1,206 +0,0 @@
-require "rugged"
-require "fileutils"
-require "rainbow"
-require "tmpdir"
-require "rfix"
-require 'shellwords'
-require "set"
-
-extend Rfix::Log
-
-# root_path = Dir.mktmpdir
-# at_exit { FileUtils.remove_dir(root_path) }
-
-
-# Dir.chdir(root_path) do
-#   File.write(".gitignore", "# empty")
-#   system "git init"
-#   system "git add .gitignore"
-#   system "git commit -a -m 'Test'"
-# end
-
-
-# class Git
-#
-#   class Blob < Struct.new(:repo, :tree)
-#     def commit(msg)
-#       author = {:email=>"tanoku@gmail.com", :time=>Time.now, :name=>"Vicent Mart\303\255"}
-#
-#       Rugged::Commit.create(repo,
-#       	:author => author,
-#       	:message => msg,
-#       	:committer => author,
-#       	:parents => parents,
-#       	:tree => tree,
-#       	:update_ref => "HEAD")
-#     end
-#
-#     def parents
-#       repo.empty? ? [] : [ repo.head.target ].compact
-#     end
-#   end
-#
-#   attr_reader :repo
-#
-#   def initialize(root_path)
-#     @repo = Rugged::Repository.new(root_path)
-#     # @repo.index.read_tree(@repo.head.target.tree)
-#     # @repo.index.reload
-#     # @repo.index.write_tree(@repo)
-#   end
-#
-#   def blob(params)
-#     abort "Must be a hash" unless params.is_a?(Hash)
-#     debug("New blob")
-#     index = repo.index
-#     index.reload
-#
-#     params.each do |path, content|
-#       oid = repo.write(content, :blob)
-#       index.read_tree(repo.head.target.tree)
-#       index.add(path: path, oid: oid, mode: 0100644)
-#     end
-#
-#     Blob.new(repo, index.write_tree(repo))
-#   end
-#
-#   def has_branch?(name)
-#     repo.branches.each_name().include?(name)
-#   end
-#
-#   def branch(name)
-#     debug("Checkout branch #{name}")
-#     if branch = repo.branches[name]
-#       return repo.checkout(branch)
-#     end
-#
-#     repo.create_branch(name)
-#   end
-#
-#   def tag(name)
-#     debug("Add tag #{name}")
-#     repo.tags.create(name, "HEAD")
-#   end
-#
-#   def checkout(ref)
-#     debug "Checkout ref #{ref}"
-#     repo.checkout(ref)
-#   end
-#
-#   def status
-#     debug "-- Get status"
-#     repo.status do |file, status|
-#       say "#{file} => #{status}"
-#     end
-#
-#     repo.index.entries.each do |entry|
-#       say "Staged: #{entry}"
-#     end
-#     debug "-- End of status"
-#   end
-#
-#   def say(msg)
-#     puts Rainbow("[LOG]").blue + " #{msg}"
-#   end
-#
-#   def debug(msg)
-#     puts Rainbow("[DEBUG]").red + " #{msg}"
-#   end
-#
-#   def new_file(file, content)
-#     debug "New file #{file}"
-#     Dir.chdir(repo.workdir) do
-#       File.write(file, content)
-#     end
-#
-#     file
-#   end
-#
-#   def add(file)
-#     debug "Add file #{file}"
-#     index = Rugged::Index.new(file)
-#     index.write_tree(repo)
-#     Blob.new(repo, index.write_tree(repo))
-#   end
-# end
-
-# repo = Git.new(root_path)
-# repo.status
-# puts "------"
-# repo.branch("master")
-# repo.tag("v2")
-# repo.branch("mastsdkfjfsd")
-# repo.blob("example.rb" => "This is content").commit("This is my message")
-# repo.status
-# repo.checkout("v2")
-# repo.blob("valid.rb" => "This is content")
-# .commit("This is my message")
-# repo.blob("this.rb" => "This is content").commit("This is my message")
-# file = repo.new_file("valid.rb", "this is content")
-# repo.status
-# blob = repo.add(file)
-# repo.status
-# puts "----"
-# blob.commit("Okay!")
-# repo.status
-
-class AFile
-  include Rfix::Log
-  attr_reader :repo, :path
-
-  def initialize(path, repo)
-    @repo = repo
-    @path = Shellwords.escape(path)
-    refresh!
-  end
-
-  def include?(line)
-    return true unless @changes
-    @changes.include?(line)
-  end
-
-  def refresh!
-    @changes = changed_lines
-  rescue Rugged::TreeError
-    @changed = nil
-  end
-
-  private
-
-  def upstream
-    @repo.rev_parse("@{u}:#{@path}")
-  end
-
-  def head
-    @repo.rev_parse("HEAD:#{@path}")
-  end
-
-  def diff
-    upstream.diff(head)
-  end
-
-  def changed_lines
-    diff.each_hunk
-      .to_a
-      .map(&:lines)
-      .flatten
-      .map(&:new_lineno)
-      .to_set
-  end
-end
-
-repo = Rugged::Repository.new(".")
-
-repo.diff("83800375874a5ebd55b48283cef9245c32103aef", "HEAD").each_delta do |delta|
-  pp delta.new_file.fetch(:path)
-end
-# files = `git ls-tree -r master --name-only`.lines.map(&:chomp)
-#
-# result = files.each_with_object({}) do |path, acc|
-#   acc[path] = AFile.new(path, repo)
-# end
-#
-# pp reslt
-
-# binding.pry
-# repo.branches