git_curate 1.2.0.beta2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d25c82cca61f81731702b5ff45d30a44ed5778304c49a0a250171f268fd8ce9
-  data.tar.gz: b4ad3c50995bcee65fb57c6455b70b6960cf7ee5309265e70fd95f6a80c666ea
+  metadata.gz: 50c509c86ea95a040e7585fe963ddf1dcc393a5119ca88b13f0b80979e8cd228
+  data.tar.gz: c5d43923dbd54b153d087680f25e8af9b9428f63fce7c72a6371d9b30a9ae080
 SHA512:
-  metadata.gz: 317df38e0f8d54f750544346570961ac09c4d5f03c5b1593c3423d53e461cb8c64b2d1e669453c3bf2f9ade9cd8a1c1336ba2aea4edc3a29b401912b8c374259
-  data.tar.gz: 6b6f5d5fee3bd0c6b96114afd5fda13ecd6cfc99d1ba5ebeff7fe16de44e5fe74239e530589adcec0423034d25a9918413af45b36771a758236693fb6a77737f
+  metadata.gz: c73b1abed7812ef99ca538d6d68946feda57320f0b4ee37885bd083b00ea8e675d6aa0c0a696dff6ffa881fa8fc9d7758c6e4ce73cb0ad4aeea5c9c5435e5b9d
+  data.tar.gz: 36c31763289bb4a50de7bb585d32308ffab6593a0116fce702578deddd8f8ea6e3268ae4dbd71d7a97727edf977a4d584e9f042a80ff5b57ec678c0c8b32f3e1

data/.github/workflows/tests.yml

@@ -0,0 +1,56 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [
+          '2.4.10',
+          '2.5.9',
+          '2.6.10',
+          '2.7.6',
+          '3.0.4',
+          '3.1.2',
+        ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1 # Was: uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec
+    - name: Report to Coveralls
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.github_token }}
+        flag-name: test-${{ matrix.ruby }}-${{ matrix.gemfile }}
+        parallel: true
+
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Report completion to Coveralls
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: truec

data/.gitignore

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

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 # Changelog
 
-### v1.2.0.beta, v1.2.0.beta2
+### v1.2.1
 
-* Fix for issue #16: "undefined method upstream" error on MacOS 15.7
-* Add rugged library
+* Dependency version upgrades
+* GitHub actions replaces Travis for CI
+* Better installation instructions around 'rugged' dependency
+
+### v1.2.0
+
+* Fix issue #16: "undefined method 'upstream'" error on MacOS 15.7
+* Use [rugged](https://github.com/libgit2/rugged) library to get various branch information,
+  decreasing reliance of parsing `git` CLI output, and increasing robustness of the application
+  across platforms.
+* Dependency version upgrades
 
 ### v1.1.2
 

data/README.md

@@ -40,6 +40,15 @@ gem install git_curate
 
 to install the executable.
 
+Note `git_curate` uses the [rugged](https://github.com/libgit2/rugged) library, which comes with a
+native C extension, `libgit2`. Installation via `gem install git_curate` will trigger this extension
+to be compiled; this may take a few minutes, depending on your machine.
+
+If you receive an error like `ERROR: Failed to build gem native extension`, it’s probably because
+your system lacks certain prerequisites needed for building `libgit2`, for example `cmake`. To fix this,
+first follow the [installation instructions for rugged](https://github.com/libgit2/rugged#install); then
+run `gem install git_curate` again.
+
 ## Usage
 
 From within a git repo, run:
@@ -80,11 +89,11 @@ To run the test suite, run `bundle exec rake spec`. For a list of other Rake tas
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 [Gem Version]: https://rubygems.org/gems/git_curate
-[Build Status]: https://travis-ci.org/matt-harvey/git_curate
+[Build Status]: https://github.com/matt-harvey/git_curate/actions/workflows/tests.yml
 [Coverage Status]: https://coveralls.io/github/matt-harvey/git_curate
 [Awesome Ruby]: https://awesome-ruby.com/#-git-tools
 
 [GV img]: https://img.shields.io/gem/v/git_curate.svg
-[BS img]: https://img.shields.io/travis/matt-harvey/git_curate.svg
+[BS img]: https://github.com/matt-harvey/git_curate/actions/workflows/tests.yml/badge.svg
 [CS img]: https://img.shields.io/coveralls/matt-harvey/git_curate.svg
 [AR img]: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg

data/VERSION

@@ -1 +1 @@
-1.2.0.beta2
+1.2.1

data/git_curate.gemspec

@@ -29,14 +29,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "highline", "2.0.3"
-  spec.add_runtime_dependency "rugged", "1.1.0"
-  spec.add_runtime_dependency "tabulo", "2.6.2"
+  spec.add_runtime_dependency "rugged", "1.4.3"
+  spec.add_runtime_dependency "tabulo", "2.8.0"
   spec.add_runtime_dependency "tty-screen", "0.8.1"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rake-version", "~> 1.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-lcov"
 end

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.1"
 end

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"

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.1
 platform: ruby
 authors:
 - Matthew Harvey
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Step through local git branches from the command line, keeping or deleting
   each.
 email:
@@ -159,9 +159,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -177,19 +177,19 @@ 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
 metadata:
   source_code_uri: https://github.com/matt-harvey/git_curate
   changelog_uri: https://raw.githubusercontent.com/matt-harvey/git_curate/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -200,12 +200,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Simple git branch curation tool
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0

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