rfix 1.1.0.pre.149 → 1.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee4030d1ce4edff85010c48d311687c118f875406c6191069296e59287bf92c
-  data.tar.gz: d052536e2c5789b690f7c063d2b098c2be418de7b925c9778c0ce060b97ec87b
+  metadata.gz: 2fd96e76cafc6a288cb5df13b2480059aa408abefab74c4fa10932d67d5f955f
+  data.tar.gz: e4a96eb5322a6782fe3dc2983c59789f60226a61c6b79e7e88c3805137e1cf67
 SHA512:
-  metadata.gz: dae811bfdd02a5d81ac9b47cf0cbb7954a568d9de950242f3d5c946d52831f0898466bc93784b7c0e978d5d9fe57d3a5474ee75508eab99d43908c6ebcd328f4
-  data.tar.gz: 5c9458afa7c3b84e8be22963f7aa62aef4b4a22f406590050f970eaa1b72605e1cd5c3dcd550d564fc490e36cc792087fbf29bdf19000561bc654d91da762ff7
+  metadata.gz: 064f9537855fc01eeb0a584db2627518d6e49de21f6a057682ec18730afff08ea2abc8d1a61a5d47a812b442be711f6afca41c0cd88f381f7cd447ca8a7c03f4
+  data.tar.gz: 04d6c3383940faccfb95696b77fa97eaf5483b1c3c9dd579b022d2d4018e23857c081dc66aae6f3626f47fc13e22486c3e5acaaedfd8d80be68cc073383466e3

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    rfix (1.1.0)
+    rfix (1.1.1.pre)
       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/version.rb

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

data/rfix.gemspec

@@ -55,6 +55,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"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.149
+  version: 1.1.1.pre
 platform: ruby
 authors:
 - Linus Oleander
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2020-07-21 00:00:00.000000000 Z
@@ -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
@@ -270,10 +284,8 @@ 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
@@ -310,7 +322,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/oleander/rfix-rb
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -328,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 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/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