git_curate 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f019dd79a60464f73b25ee00bcd5f0a5bb07f696fb873ce288d05b3aeacdcb4
-  data.tar.gz: b29735e0e19a7f3c1110d19bca33811dce1875f9b097d12fb64010a312d680dc
+  metadata.gz: a6996bc4363bed00c0ed66d7ac49427a681f633e199e3b8f7b0e504bed64af52
+  data.tar.gz: 5a1766c37e6460a3b6081ba876443359b8fe01c44a898e234a4a96527ac13306
 SHA512:
-  metadata.gz: 335169413223db9f953f974533e3255dc51b5a42abd970dcbbcc37d743bb0302053204f51cfed51ee1859c4f8bdd7f1e975937f3c4d9abef35ad72bf01fd92e8
-  data.tar.gz: b9a30efa63839e7bd84354dce75b8604b9af34ad6ab04c2b57363ce14dea9e42093080ff8cacf8701a6babd30ac5f2e76a225c14ce5303acd45dfba54ea74376
+  metadata.gz: ed0bee6ea221fb9d3a50b8432151409604d0fee5ee63c7c423daf19fade386bc43a1c5d2645a178bdf9bc873d4318ec82d9f2468506f9b0643a59b9f48308f59
+  data.tar.gz: 909f9f0e1bc401c5e110a830b910192fd7fc959fc457ab8b1d19e5d7db0b1b0e6b1aa7a2d558f4d253b70a0ceb6dd8633d2152f7eaaf670c10355bee3255f321

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### v0.7.1
+
+* Fix errors on -h, -v and --version options due to incorrect exit code handling
+* Fix error when branch name is the same as the name of a filepath
+* Get test coverage to 100%
+
 ### v0.7.0
 
 * Show "no" option as capital "N", to hint that it's the default

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/exe/git-curate

@@ -1,19 +1,5 @@
 #!/usr/bin/env ruby
 
 require "git_curate"
-require "optparse"
 
-def main
-  parser = GitCurate::CLIParser.new
-  continue = parser.parse(ARGV)
-  return unless continue
-
-  runner = GitCurate::Runner.new(parser.parsed_options)
-  runner.run
-rescue OptionParser::InvalidOption
-  puts "Unrecognized option"
-  puts 'For help, enter `git curate -h`'
-  exit(1)
-end
-
-main
+exit(GitCurate::App.main)

data/lib/git_curate.rb

@@ -1,3 +1,4 @@
+require "git_curate/app"
 require "git_curate/branch"
 require "git_curate/cli_parser"
 require "git_curate/copyright"

data/lib/git_curate/app.rb

@@ -0,0 +1,22 @@
+require "optparse"
+
+module GitCurate
+
+  module App
+
+    def self.main
+      parser = GitCurate::CLIParser.new
+      continue = parser.parse(ARGV) # will throw on error
+      return 0 unless continue
+
+      runner = GitCurate::Runner.new(parser.parsed_options)
+      runner.run(ARGV)
+    rescue OptionParser::InvalidOption
+      puts "Unrecognized option"
+      puts "For help, enter `git curate -h`"
+      1
+    end
+
+  end
+
+end

data/lib/git_curate/branch.rb

@@ -34,15 +34,15 @@ module GitCurate
     end
 
     def last_author
-      Util.command_output("git log -n1 --format=format:%an #{proper_name}")
+      Util.command_output("git log -n1 --format=format:%an #{proper_name} --")
     end
 
     def last_commit_date
-      Util.command_output("git log -n1 --date=short --format=format:%cd #{proper_name}")
+      Util.command_output("git log -n1 --date=short --format=format:%cd #{proper_name} --")
     end
 
     def last_subject
-      Util.command_output("git log -n1 --format=format:%s #{proper_name}")
+      Util.command_output("git log -n1 --format=format:%s #{proper_name} --")
     end
 
     # Returns the local branches
@@ -77,6 +77,10 @@ module GitCurate
       end.compact.to_h
     end
 
+    def self.delete_multi(*branches)
+      Util.command_output("git branch -D #{branches.map(&:proper_name).join(" ")} --")
+    end
+
     private
 
     def self.command_to_branches(command)

data/lib/git_curate/runner.rb

@@ -5,16 +5,19 @@ require "tty-screen"
 
 module GitCurate
 
+  EXIT_SUCCESS = 0
+  EXIT_FAILURE = 1
+
   class Runner
 
     def initialize(opts)
       @opts = opts
     end
 
-    def run
-      if ARGV.length != 0
-        puts "This script does not accept any arguments."
-        exit
+    def run(args)
+      if args.length != 0
+        $stderr.puts "This script does not accept any arguments."
+        return EXIT_FAILURE
       end
 
       branches = Branch.local
@@ -36,30 +39,30 @@ module GitCurate
       prompt = " Delete? [y/N/done/abort/help] "
       longest_response = "abort"
       prompt_and_response_width = (interactive? ? (prompt.length + longest_response.length + 1) : 0)
-      table.pack(max_table_width: TTY::Screen.width - prompt_and_response_width)
+      max_table_width = TTY::Screen.width - prompt_and_response_width
+      table.pack(max_table_width: max_table_width)
 
       branches_to_delete = []
 
       if !interactive?
-        puts table
-        puts table.horizontal_rule
-        return
+        puts "#{table}#{$/}#{table.horizontal_rule}"
+        return EXIT_SUCCESS
       end
 
       table.each_with_index do |row, index|
         case HighLine.ask("#{row}#{prompt}").downcase
         when "y"
-          branches_to_delete << row.source.proper_name
+          branches_to_delete << row.source
         when "n", ""
           ;  # do nothing
         when "done"
           puts table.horizontal_rule
           finalize(branches_to_delete)
-          exit
+          return EXIT_SUCCESS
         when "abort"
           puts table.horizontal_rule
           puts "#{$/}Aborting. No branches deleted."
-          exit
+          return EXIT_SUCCESS
         else
           puts table.horizontal_rule
           print_help
@@ -70,6 +73,7 @@ module GitCurate
       puts table.horizontal_rule
 
       finalize(branches_to_delete)
+      return EXIT_SUCCESS
     end
 
     private
@@ -81,7 +85,7 @@ module GitCurate
     def finalize(branches_to_delete)
       if branches_to_delete.size != 0
         puts
-        system("git branch -D #{branches_to_delete.join(" ")}")
+        puts Branch.delete_multi(*branches_to_delete)
         puts "#{$/}Done"
       else
         puts "#{$/}No branches deleted."

data/lib/git_curate/util.rb

@@ -11,10 +11,17 @@ module GitCurate
     end
 
     # Runs the passed string as a system command and returns its output.
+    # If the command doesn't exit with 0 (success), then an error will be thrown, with the error
+    # output as its message.
     def self.command_output(command)
-      Open3.capture2(command).first
-    end
+      stdout_str, stderr_str, status = Open3.capture3(command)
+
+      if status.exitstatus != 0
+        raise RuntimeError.new(stderr_str)
+      end
 
+      stdout_str
+    end
   end
 
 end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matthew Harvey
@@ -159,6 +159,7 @@ files:
 - exe/git-curate
 - git_curate.gemspec
 - lib/git_curate.rb
+- lib/git_curate/app.rb
 - lib/git_curate/branch.rb
 - lib/git_curate/cli_parser.rb
 - lib/git_curate/copyright.rb