rfix 1.0.15 → 1.1.0.pre.147

data/lib/rfix/tracked.rb

@@ -0,0 +1,76 @@
+require "rfix/no_file"
+
+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.include?(line - 1)
+  end
+
+  private
+
+  # def set
+  #   return NoFile.new(path) if @set.empty?
+  #   return @set
+  # end
+
+  # def refresh!
+  #   @changes = diff.each_line.to_a.map{ |l| l.new_lineno }.to_set
+  #
+  #   if @changes.empty?
+  #     @changes = NoFile.new(path)
+  #   end
+  # rescue Rugged::TreeError
+  #   @changed = NoFile.new(path)
+  # end
+
+  # def changes
+  #   @changes or raise(Rfix::Error, "No changes found: #{self}")
+  # end
+
+  # def needs_update?
+  #   current_changed_at = changed_at
+  #   if @changed_at != current_changed_at
+  #     @changed_at = current_changed_at
+  #     return true
+  #   end
+  #
+  #   return false
+  # end
+
+  # def changed_at
+  #   File.new(absolute_path).ctime
+  # end
+
+  def upstream
+    @upstream ||= ref.resolve(with: repo)
+  end
+
+  def head
+    @head ||= repo.rev_parse("HEAD")
+  end
+
+  def diff
+    upstream.diff(head, {
+      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,
+      paths: [path]
+    }).tap do |diff|
+      diff.find_similar!(
+        renames_from_rewrites: true,
+        # ignore_whitespace: true,
+        renames: true,
+        copies: true
+      )
+    end
+  end
+end

data/lib/rfix/tracked_file.rb

@@ -4,7 +4,7 @@ require "rfix/git_file"
 
 class Rfix::TrackedFile < Rfix::GitFile
   def refresh!
-    @ranges = git("--no-pager", "diff", *params, "#{ref}...HEAD", path)
+    @ranges = git("--no-pager", "diff", *params, "#{ref}..HEAD", path)
               .grep(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/) do
       Regexp.last_match(1).to_i...(Regexp.last_match(1).to_i + (Regexp.last_match(2) || 1).to_i)
     end

data/lib/rfix/untracked.rb

@@ -0,0 +1,13 @@
+class Rfix::Untracked < Rfix::File
+  def include?(_)
+    return true
+  end
+
+  def refresh!
+    # NOP
+  end
+
+  def inspect
+    "<Untracked({{info:#{path}}})>"
+  end
+end

data/lib/rfix/version.rb

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

data/path.rb

@@ -0,0 +1,7 @@
+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/rfix.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.authors       = ["Linus Oleander"]
   spec.email         = ["linus@oleander.nu"]
-
-  # rubocop:disable Layout/LineLength
   spec.summary       = "RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`"
   # rubocop:enable Layout/LineLength
 
@@ -51,11 +49,17 @@ Gem::Specification.new do |spec|
 
   spec.requirements << "git, v2.0+"
 
+  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 "rouge", "~> 3.20"
   spec.add_runtime_dependency "rubocop", ">= 0.80"
+  spec.add_runtime_dependency "rugged", "~> 1.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"
 end

data/rugged.rb

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

data/tasks/bump.rake

@@ -0,0 +1,11 @@
+namespace :gem do
+  task :inc do
+    sh "gem", "bump", "-c", "-m", "'Bump version to %{version}'"
+  end
+
+  task :amend do
+    sh "git commit --amend --no-edit"
+  end
+
+  task bump: [:inc, Bundle::INSTALL, Bundle::ADD, :amend]
+end

data/tasks/bundle.rake

@@ -0,0 +1,17 @@
+namespace :bundle do
+  task :install do
+    gemfiles.each do |gemfile|
+      next if gemfile.end_with?(".lock")
+
+      sh "bundle install", "--gemfile", gemfile, "--jobs 3"
+    end
+  end
+
+  namespace :git do
+    task :add do
+      gemfiles.each do |gemfile|
+        sh "git add", gemfile
+      end
+    end
+  end
+end

data/tasks/complex.rake

@@ -0,0 +1,54 @@
+require "tmpdir"
+
+namespace :bundle do
+  namespace :complex do
+    directory Bundle::TMP
+
+    desc "Build complex bundle"
+    task build: [Bundle::Complex::FILE, Bundle::Complex::TEST] do
+      say "Complex bundle has been stored @ #{Bundle::Complex::FILE}"
+    end
+
+    desc "Rebuild complex bundle"
+    task rebuild: [:flush, Bundle::Complex::BUILD]
+
+    desc "Remove complex bundle"
+    task :flush do
+      rm_f Bundle::Complex::FILE
+      rm_rf Bundle::Complex::REPO
+    end
+
+    desc "Test repo by cloning to local directory"
+    task test: Bundle::Complex::FILE do
+      Dir.mktmpdir do |repo|
+        sh "git clone", Bundle::Complex::FILE, repo, "--branch master"
+        cd repo do
+          sh "git rev-list --count HEAD"
+          sh "git ls-files"
+          sh "git status"
+        end
+      end
+
+      say "Finished testing complex bundle"
+    end
+
+    file Bundle::Complex::FILE => Bundle::Complex::REPO do
+      cd Bundle::Complex::REPO do
+        sh "git bundle create", Bundle::Complex::FILE, "--branches --tags"
+      end
+    end
+
+    file Bundle::Complex::REPO do
+      sh "git clone", Bundle::Complex::GITHUB, Bundle::Complex::REPO, "--branch", "master"
+
+      cd Bundle::Complex::REPO do
+        sh "git", "reset --hard 27fec8"
+
+        sh "git config user.email 'not-my@real-email.com'"
+        sh "git config user.name 'John Doe'"
+
+        sh "git tag", Bundle::Complex::TAG
+      end
+    end
+  end
+end

data/tasks/simple.rake

@@ -0,0 +1,58 @@
+namespace :bundle do
+  namespace :simple do
+    directory Bundle::Simple::REPO
+
+    desc "Build complex bundle"
+    task build: [Bundle::Simple::FILE, Bundle::Simple::TEST] do
+      say "Simple bundle has been stored @ #{Bundle::Simple::FILE}"
+    end
+
+    desc "Rebuild complex bundle"
+    task rebuild: [:flush, Bundle::Simple::BUILD]
+
+    desc "Remove complex bundle"
+    task :flush do
+      rm_f Bundle::Simple::FILE
+      rm_rf Bundle::Simple::REPO
+    end
+
+    desc "Test repo by cloning to local directory"
+    task test: Bundle::Simple::FILE do
+      Dir.mktmpdir do |repo|
+        sh "git clone", Bundle::Simple::FILE, repo, "--branch master"
+        cd repo do
+          sh "git rev-list --count HEAD"
+          sh "git ls-files"
+          sh "git status"
+        end
+      end
+
+      say "Finished testing simple bundle"
+    end
+
+    file Bundle::Simple::FILE => Bundle::Simple::REPO do
+      cd Bundle::Simple::REPO do
+        sh "git bundle create", Bundle::Simple::FILE, "--branches --tags"
+      end
+    end
+
+    file Bundle::Simple::REPO do
+      cd Bundle::Simple::REPO do
+        touch ".gitignore"
+
+        sh "git init"
+        sh "git add .gitignore"
+        sh "git commit -m 'A Commit Message'"
+
+        sh "git config push.default current"
+        sh "git config branch.autosetupmerge always"
+        sh "git config branch.autosetuprebase always"
+
+        sh "git config user.email 'not-my@real-email.com'"
+        sh "git config user.name 'John Doe'"
+
+        sh "git tag", Bundle::Simple::TAG
+      end
+    end
+  end
+end