git_curate 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50c509c86ea95a040e7585fe963ddf1dcc393a5119ca88b13f0b80979e8cd228
-  data.tar.gz: c5d43923dbd54b153d087680f25e8af9b9428f63fce7c72a6371d9b30a9ae080
+  metadata.gz: b33e072a71943724778d39da1a00e03c8f35c35880ae4c17eb15195a22847529
+  data.tar.gz: 45cb3068e500a04742c5514aa1b06e8aae2b0dfeff3796a6e4669555e23aa611
 SHA512:
-  metadata.gz: c73b1abed7812ef99ca538d6d68946feda57320f0b4ee37885bd083b00ea8e675d6aa0c0a696dff6ffa881fa8fc9d7758c6e4ce73cb0ad4aeea5c9c5435e5b9d
-  data.tar.gz: 36c31763289bb4a50de7bb585d32308ffab6593a0116fce702578deddd8f8ea6e3268ae4dbd71d7a97727edf977a4d584e9f042a80ff5b57ec678c0c8b32f3e1
+  metadata.gz: 85bab3c9cc97daf93ddf278713b8a7aad010c406cdcc940af7e100aebd7aa99d5c5b69a613ea736f990076718e628d7be7b92b18706ca35c63482980d9e11248
+  data.tar.gz: 4da0223e68e991c394ea88df0a8c0238100234ddc92d3a95c8823e52be428997835fc820ee23286ae9b3363dd9b49fedd541e2955668d1c66afd1800bb95bc8e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### v1.3.0
+
+* Add --merged and --no-merged options
+* Dependency version upgrades
+
 ### v1.2.1
 
 * Dependency version upgrades

data/README.md

@@ -75,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).

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/git_curate.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "highline", "2.0.3"
-  spec.add_runtime_dependency "rugged", "1.4.3"
-  spec.add_runtime_dependency "tabulo", "2.8.0"
+  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"

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.1"
+  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.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-01 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.4.3
+        version: 1.5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.5.0.1
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement