git_curate 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3210c7e8b48389447db001fa0b444b930a764a2c8c390a61827a2d6f01436d3b
-  data.tar.gz: 3b31eb0d7f14f5cc6cad363de5feb41aa9b38c2f3cea985b7ea309bfc0201f2d
+  metadata.gz: 104be2a4415dd003c7c407d28ffcabb1eda79e0f8276e7be30aa5387592fe0ef
+  data.tar.gz: 2636466a92daeda271e41ebd4b10003f10703f792f1b41c0f5757089ed7aa932
 SHA512:
-  metadata.gz: 9c9d9b44f67a34b792045029656cf8c2e5f916d2325c45e6a2cf23989fd4d2c40431107b61405ad05dab21a0b8c80bf8e6ce3051689ca61a0429f0ca0c822ec3
-  data.tar.gz: 4178cf08ef5e4785cb42ec4d9437f1b0079e0adaa5ad8c56f87c25ba00ab6f678a0d1dde64ba57630b43f4376b149aeab7eeb332de28ef7c9cc4419f16137160
+  metadata.gz: 4cf19b5538b1a996c29e260e7d576e9f12dade39bc506c008946aaec2ef4f2042fe2b4f85b7c66fe1c87c9db5d1c69815ded3e38496226bfc5f6354ef62ae07b
+  data.tar.gz: 0521c60590d20e6fd36aecc5b8759a38c7d30077043e1b64d33cab6d8d200fb179af6091a52c24be8a63352af82128bbef0d7a317ff5b96ad9e74a1f579280aa

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+### v0.6.4
+
+* Fix breakage on Ruby <= 2.3 due to unsupported Regex #match? method.
+
 ### v0.6.3
 
-* Fix formatting oof output on Windows.
+* Fix formatting of output on Windows.
 
 ### v0.6.2
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_curate (0.6.3)
+    git_curate (0.6.4)
       highline (= 2.0.2)
       tabulo (= 1.5.1)
       tty-screen (= 0.7.0)
@@ -9,10 +9,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    diff-lcs (1.3)
     highline (2.0.2)
     rake (12.3.2)
     rake-version (1.0.1)
       rake (> 11.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     tabulo (1.5.1)
       tty-screen (= 0.7.0)
       unicode-display_width (= 1.6.0)
@@ -27,6 +41,7 @@ DEPENDENCIES
   git_curate!
   rake (~> 12.3)
   rake-version (~> 1.0)
+  rspec (~> 3.0)
 
 BUNDLED WITH
    2.0.1

data/README.md

@@ -68,7 +68,7 @@ Bug reports and pull requests are welcome on [GitHub](https://github.com/matt-ha
 To start working on `git_curate`, `git clone` and `cd` into your fork of the repo, then run `bin/setup` to
 install dependencies.
 
-For a list of Rake tasks that are available in the development environment, run `rake -T`.
+To run the test suite, run `rake spec`. For a list of other Rake tasks, run `rake -T`.
 
 ## License
 

data/Rakefile

@@ -1,6 +1,12 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 require "rake-version"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
 RakeVersion::Tasks.new do |v|
   v.copy "lib/git_curate/version.rb"
+  v.copy "README.md", all: true
 end

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/exe/git-curate

@@ -5,7 +5,9 @@ require "optparse"
 
 def main
   parser = GitCurate::CLIParser.new
-  parser.parse(ARGV)
+  continue = parser.parse(ARGV)
+  return unless continue
+
   runner = GitCurate::Runner.new(parser.parsed_options)
   runner.run
 rescue OptionParser::InvalidOption

data/git_curate.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rake-version", "~> 1.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/git_curate/branch.rb

@@ -1,3 +1,5 @@
+require "open3"
+
 module GitCurate
 
   class Branch
@@ -14,7 +16,7 @@ module GitCurate
     end
 
     def current?
-      @current ||= /^\*\s+/.match?(@raw_name)
+      @current ||= (/^\*\s+/ =~ @raw_name)
     end
 
     def displayable_name(pad:)
@@ -26,15 +28,15 @@ module GitCurate
     end
 
     def last_author
-      `git log -n1 --format=format:%an #{proper_name}`
+      Open3.capture2("git log -n1 --format=format:%an #{proper_name}").first
     end
 
     def last_commit_date
-      `git log -n1 --date=short --format=format:%cd #{proper_name}`
+      Open3.capture2("git log -n1 --date=short --format=format:%cd #{proper_name}").first
     end
 
     def last_subject
-      `git log -n1 --format=format:%s #{proper_name}`
+      Open3.capture2("git log -n1 --format=format:%s #{proper_name}").first
     end
 
   end

data/lib/git_curate/cli_parser.rb

@@ -10,6 +10,8 @@ module GitCurate
       @parsed_options = {}
     end
 
+    # Sets @parsed_options according to the options received, and return truthy
+    # if and only if the program should continue after the options are passed.
     def parse(options)
       opt_parser = OptionParser.new do |opts|
         opts.banner = <<-EOF
@@ -36,16 +38,17 @@ module GitCurate
 
         opts.on("-h", "Print this help message") do
           puts opts
-          exit
+          return false
         end
 
         opts.on("-v", "--version", "Print the currently installed version of this program") do
           puts "git curate v#{GitCurate::VERSION} #{GitCurate::COPYRIGHT}"
-          exit
+          return false
         end
       end
 
       opt_parser.parse!(options)
+      return true
     end
   end
 end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Step through local git branches from the command line, keeping or deleting
   each.
 email: