git_curate 1.2.0.beta3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3fc938706457be386083c9441a7c50bebfe7b2cab57171f776b73d3e2aec5e3
-  data.tar.gz: e7bdcb5b6d3569f50e0666ff00b096b7dc3d5be346abf1a3f069504196e34cde
+  metadata.gz: b33e072a71943724778d39da1a00e03c8f35c35880ae4c17eb15195a22847529
+  data.tar.gz: 45cb3068e500a04742c5514aa1b06e8aae2b0dfeff3796a6e4669555e23aa611
 SHA512:
-  metadata.gz: f1ddd5f0da864679502d13b0e9ab6053abbe9bcbdc5555795da041ce0ffcc8b66af40d9811f0dffe21bdc7d00baa0f042aa5e27b2b3ba4af25c3474197b5ec5a
-  data.tar.gz: a57fcb5ea45588673fdfdbee07fc6de2cd384d64323bed105ee4af363109aaad3b4807ec846bc070ec48ce221b5249f6ddcdf3b2812cc95758c2ada9282fe309
+  metadata.gz: 85bab3c9cc97daf93ddf278713b8a7aad010c406cdcc940af7e100aebd7aa99d5c5b69a613ea736f990076718e628d7be7b92b18706ca35c63482980d9e11248
+  data.tar.gz: 4da0223e68e991c394ea88df0a8c0238100234ddc92d3a95c8823e52be428997835fc820ee23286ae9b3363dd9b49fedd541e2955668d1c66afd1800bb95bc8e

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/CHANGELOG.md

@@ -1,9 +1,23 @@
 # Changelog
 
-### v1.2.0.beta, v1.2.0.beta2, v1.2.0.beta3
+### v1.3.0
 
-* Fix for issue #16: "undefined method upstream" error on MacOS 15.7
-* Add rugged library
+* Add --merged and --no-merged options
+* Dependency version upgrades
+
+### v1.2.1
+
+* 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:
@@ -66,6 +75,9 @@ If you just want to view the information about your local branches without stepp
 them interactively, enter `git curate --list` or `git curate -l`. Your current branch _will_
 be included in this list in this case.
 
+You can also pass `--merged` to see only those branches merged into current `HEAD`; or `--no-merged`
+to see only those branches _not_ merged into current `HEAD`.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on [GitHub](https://github.com/matt-harvey/git_curate).
@@ -80,11 +92,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.beta3
+1.3.0

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.5.0.1"
+  spec.add_runtime_dependency "tabulo", "2.8.1"
   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

@@ -60,14 +60,16 @@ module GitCurate
     end
 
     # Returns the local branches
-    def self.local
+    def self.local(merged_opt)
       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|
+      command = "git branch" + (merged_opt ? " #{merged_opt}" : "")
+
+      Util.command_to_a(command).map do |line|
         raw_branch_name = line.strip
         proper_branch_name = raw_branch_name.gsub(CURRENT_BRANCH_REGEX, "")
         rugged_branch = rugged_branches[proper_branch_name]

data/lib/git_curate/cli_parser.rb

@@ -38,6 +38,20 @@ module GitCurate
           self.parsed_options[:list] = true
         end
 
+        opts.on(
+          "--merged",
+          "Only list branches whose tips are reachable from HEAD",
+        ) do
+          self.parsed_options[:merged_opt] = "--merged"
+        end
+
+        opts.on(
+          "--no-merged",
+          "Only list branches whose tips are not reachable from HEAD",
+        ) do
+          self.parsed_options[:merged_opt] = "--no-merged"
+        end
+
         opts.on("-h", "Print this help message") do
           puts opts
           return false

data/lib/git_curate/runner.rb

@@ -26,7 +26,7 @@ module GitCurate
         return EXIT_FAILURE
       end
 
-      branches = Branch.local
+      branches = Branch.local(@opts[:merged_opt])
       branches.reject!(&:current?) if interactive?
 
       table = Tabulo::Table.new(branches, border: :reduced_ascii, column_padding: 0, align_header: :left) do |t|
@@ -47,7 +47,7 @@ module GitCurate
       branches_to_delete = []
 
       if !interactive?
-        puts table
+        puts table if branches.any?
         return EXIT_SUCCESS
       end
 

data/lib/git_curate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta3
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthew Harvey
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2022-07-29 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.5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0.1
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.8.1
 - !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
@@ -189,7 +189,7 @@ licenses:
 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.9
-  - 2.6.7
-  - 2.7.3
-  - 3.0.1