git_curate 1.2.0.beta2 → 1.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d25c82cca61f81731702b5ff45d30a44ed5778304c49a0a250171f268fd8ce9
-  data.tar.gz: b4ad3c50995bcee65fb57c6455b70b6960cf7ee5309265e70fd95f6a80c666ea
+  metadata.gz: f3fc938706457be386083c9441a7c50bebfe7b2cab57171f776b73d3e2aec5e3
+  data.tar.gz: e7bdcb5b6d3569f50e0666ff00b096b7dc3d5be346abf1a3f069504196e34cde
 SHA512:
-  metadata.gz: 317df38e0f8d54f750544346570961ac09c4d5f03c5b1593c3423d53e461cb8c64b2d1e669453c3bf2f9ade9cd8a1c1336ba2aea4edc3a29b401912b8c374259
-  data.tar.gz: 6b6f5d5fee3bd0c6b96114afd5fda13ecd6cfc99d1ba5ebeff7fe16de44e5fe74239e530589adcec0423034d25a9918413af45b36771a758236693fb6a77737f
+  metadata.gz: f1ddd5f0da864679502d13b0e9ab6053abbe9bcbdc5555795da041ce0ffcc8b66af40d9811f0dffe21bdc7d00baa0f042aa5e27b2b3ba4af25c3474197b5ec5a
+  data.tar.gz: a57fcb5ea45588673fdfdbee07fc6de2cd384d64323bed105ee4af363109aaad3b4807ec846bc070ec48ce221b5249f6ddcdf3b2812cc95758c2ada9282fe309

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 **/.*.swp
 coverage
+play.rb

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-### v1.2.0.beta, v1.2.0.beta2
+### v1.2.0.beta, v1.2.0.beta2, v1.2.0.beta3
 
 * Fix for issue #16: "undefined method upstream" error on MacOS 15.7
 * Add rugged library

data/VERSION

@@ -1 +1 @@
-1.2.0.beta2
+1.2.0.beta3

data/lib/git_curate.rb

@@ -1,5 +1,6 @@
 require "git_curate/app"
 require "git_curate/branch"
+require "git_curate/commit"
 require "git_curate/cli_parser"
 require "git_curate/copyright"
 require "git_curate/exceptions"

data/lib/git_curate/branch.rb

@@ -2,12 +2,8 @@ require "rugged"
 
 module GitCurate
 
-  UpstreamInfo = Struct.new(:upstream, :status)
-
   class Branch
 
-    @@repo = Rugged::Repository.new(".")
-
     # Regex for determining whether a "raw" branch name is the name of the current branch
     # on this or another worktree.
     CURRENT_BRANCH_REGEX = /^[+*]\s+/
@@ -48,29 +44,28 @@ module GitCurate
     end
 
     def last_commit_date
-      initialize_last_commit_data
-      @last_commit_date
+      last_commit.date
     end
 
     def hash
-      initialize_last_commit_data
-      @hash
+      last_commit.hash
     end
 
     def last_author
-      initialize_last_commit_data
-      @last_author
+      last_commit.author
     end
 
     def last_subject
-      initialize_last_commit_data
-      @last_subject
+      last_commit.subject
     end
 
     # Returns the local branches
     def self.local
-      rugged_branches = @@repo.branches
-      repo_head_target = @@repo.head.target
+      toplevel_dir = Util.command_output("git rev-parse --show-toplevel").strip
+      repo = Rugged::Repository.new(toplevel_dir)
+
+      rugged_branches = repo.branches
+      repo_head_target = repo.head.target
 
       Util.command_to_a("git branch").map do |line|
         raw_branch_name = line.strip
@@ -80,7 +75,7 @@ module GitCurate
         upstream_data =
           if upstream
             target_id = rugged_branch.target_id
-            ahead, behind = @@repo.ahead_behind(target_id, upstream.target_id)
+            ahead, behind = repo.ahead_behind(target_id, upstream.target_id)
             parts = []
             parts << "ahead #{ahead}" if ahead != 0
             parts << "behind #{behind}" if behind != 0
@@ -94,7 +89,7 @@ module GitCurate
           end
 
         target = rugged_branch.resolve.target
-        merged = (@@repo.merge_base(repo_head_target, target) == target.oid)
+        merged = (repo.merge_base(repo_head_target, target) == target.oid)
 
         new(
           raw_branch_name,
@@ -118,16 +113,13 @@ module GitCurate
       @upstream_info = upstream_info
     end
 
-    # Returns an array with [date, author, subject], each as a string.
-    def initialize_last_commit_data
-      return if @last_commit_data
-
-      # For Windows compatibility we need double quotes around the format string, as well as spaces
-      # between the placeholders.
-      command = %Q(git log -n1 --date=short --format=format:"%cd %n %h %n %an %n %s" #{proper_name} --)
-      @last_commit_data = Util.command_to_a(command)
-
-      @last_commit_date, @hash, @last_author, @last_subject = @last_commit_data
+    def last_commit
+      @last_commit ||= begin
+        # For Windows compatibility we need double quotes around the format string, as well as spaces
+        # between the placeholders.
+        command = %Q(git log -n1 --date=short --format=format:"%cd %n %h %n %an %n %s" #{proper_name} --)
+        Commit.new(*Util.command_to_a(command))
+      end
     end
 
   end

data/lib/git_curate/commit.rb

@@ -0,0 +1,5 @@
+module GitCurate
+
+  Commit = Struct.new(:date, :hash, :author, :subject)
+
+end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "1.2.0.beta2"
+  VERSION = "1.2.0.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta2
+  version: 1.2.0.beta3
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -177,12 +177,12 @@ files:
 - lib/git_curate/app.rb
 - lib/git_curate/branch.rb
 - lib/git_curate/cli_parser.rb
+- lib/git_curate/commit.rb
 - lib/git_curate/copyright.rb
 - lib/git_curate/exceptions.rb
 - lib/git_curate/runner.rb
 - lib/git_curate/util.rb
 - lib/git_curate/version.rb
-- play.rb
 homepage: https://github.com/matt-harvey/git_curate
 licenses:
 - MIT

data/play.rb

@@ -1,31 +0,0 @@
-require "rugged"
-
-repo = Rugged::Repository.new(".")
-
-current_branch_name = repo.head.name.sub(/^refs\/heads\//, '')
-
-repo.branches.each_name(:local) do |branch_name|
-  branch_reference = repo.references["refs/heads/#{branch_name}"]
-  branch = repo.branches[branch_name]
-  is_current = current_branch_name == branch_name
-  target_id = branch.target_id
-  top_commit = branch_reference.log.first
-  commit = repo.lookup(target_id)
-
-  target = branch.resolve.target
-  merged = repo.merge_base(repo.head.target, target) == target.oid
-
-  puts "Branch: #{is_current ? '* ' + branch_name : branch_name}"
-  puts "date: #{commit.time}"
-  puts "hash: #{target_id}"
-  puts "author: #{top_commit[:committer][:name]}"
-  puts "subject: #{commit.message.split($/, -1)[0]}"
-  if branch.upstream
-    puts "upstream: #{branch.upstream.name}"
-    ahead, behind = repo.ahead_behind(target_id, branch.upstream.target_id)
-    puts "ahead: #{ahead}"
-    puts "behind: #{behind}"
-  end
-  puts "merged: #{merged ? 'Merged' : 'Not merged'}"
-  puts "*****************"
-end