git_curate 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1c8358c5021c6985ce3e6d701d607a2df341cc4ed2ba20dac43c13912a1fe44
-  data.tar.gz: c30b0e19d28f7ae48e5fb59372da44158940b8b79008c9d2a07f3b3e8d7d6534
+  metadata.gz: '0399b237571cee939ec07f97f719f29225491cf5a2899e6bc539b1c5b4ad863b'
+  data.tar.gz: 22c062f9e94c984de985fda7cd44cba9e6978999b2920599e72574e69358a490
 SHA512:
-  metadata.gz: 2a872d7d0555cab6a4d4df1d33c96cda3cce1952c09cda057816065e81a7af65c033196365ed0207a255c5cf9c0b190cd500376ca8620b9738084b683064e88c
-  data.tar.gz: 8e842c8f27654e625bcc9b895064a49764c6d67fd0c0b340c8ba900bcd6ad0850b66c836158e08fab0f04d03a3cd98b6dba6c38e84472ab7aa6c97c1db80b72c
+  metadata.gz: 3092b79d185c7b090f4409ba22b1e234b8a46666d692d3e935bad2e1e3cb4edadcba0cee625a2e07d9010562c95271e4783b1a37dcd75d456e5d7d0b39248d4b
+  data.tar.gz: 6b19d4d6c85e6418a91f0ef8256fdb9d7d4fe7077d07452aadb93cccc9ab0b3fbb832edffc5ebafbd531c233aefa52b50e4ce52f793adb108b039a7d54e46e78

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### v0.4.2
+
+* Cap output to terminal width automatically.
+* Documentation improvements.
+
 ### v0.4.0
 
 * Add "Status vs upstream" column.

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    git_curate (0.4.0)
-      highline (= 2.0.0)
-      tabulo (= 1.2.0)
+    git_curate (0.4.2)
+      highline (= 2.0.1)
+      tabulo (= 1.2.1)
+      tty-screen (= 0.6.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    highline (2.0.0)
+    highline (2.0.1)
     rake (11.3.0)
     rake-version (1.0.1)
       rake (> 11.1)
-    tabulo (1.2.0)
+    tabulo (1.2.1)
+    tty-screen (0.6.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -22,6 +22,10 @@ a time, outputting the following information about each:
 
 You can then select whether to delete or keep each branch as you go.
 
+**NOTE** `git curate` does _not_ run `git fetch` prior to generating its output. If you want to
+be sure that the "Status vs upstream" column reflects the latest state of the upstream branches
+as per their remote repository, you should run `git fetch` first.
+
 ## Installation
 
 You'll need Ruby v2.1.10 or higher. Run
@@ -50,14 +54,15 @@ a gem. When `git_curate` is installed, an executable is created called `git-cura
 In general, for any executable of the form _git-xyz_ in your `PATH`, `git` will automatically
 recognize _xyz_ as a subcommand, and will run that executable whenever that subcommand is invoked.)
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies.
-
 ## Contributing
 
 Bug reports and pull requests are welcome on [GitHub](https://github.com/matt-harvey/git_curate).
 
+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`.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/git_curate.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "highline", "2.0.0"
-  spec.add_runtime_dependency "tabulo", "1.2.0"
+  spec.add_runtime_dependency "highline", "2.0.1"
+  spec.add_runtime_dependency "tabulo", "1.2.1"
+  spec.add_runtime_dependency "tty-screen", "0.6.5"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 11.0"

data/lib/git_curate/runner.rb

@@ -1,3 +1,8 @@
+require "highline/import"
+require "set"
+require "tabulo"
+require "tty-screen"
+
 module GitCurate
 
   # Regexes for unpacking the output of `git branch -vv`
@@ -13,8 +18,8 @@ module GitCurate
       end
 
       branches = command_to_a("git branch").reject { |b| current_branch?(b) }
-      merged_branches = command_to_a("git branch --merged").reject { |b| current_branch?(b) }.to_set
-      upstreams = upstream_branches
+      merged_branches = command_to_a("git branch --merged").to_set
+      upstream_branches = get_upstream_branches
 
       table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
         horizontal_rule_character: "-", column_padding: 0) do |t|
@@ -38,16 +43,19 @@ module GitCurate
         end
 
         t.add_column("Status vs\nupstream", align_header: :left) do |branch|
-          upstreams.fetch(branch, "No upstream")
+          upstream_branches.fetch(branch, "No upstream")
         end
       end
 
-      table.shrinkwrap!(max_table_width: 150)
+      prompt = " Delete? [y/n/done/abort/help] "
+      longest_response = "abort"
+      prompt_and_response_width = prompt.length + longest_response.length + 1
+      table.shrinkwrap!(max_table_width: TTY::Screen.width - prompt_and_response_width)
 
       branches_to_delete = []
 
       table.each_with_index do |row, index|
-        case HighLine.ask("#{row} Delete? [y/n/done/abort/help] ")
+        case HighLine.ask("#{row}#{prompt}")
         when "y"
           branches_to_delete << row.to_h[:branch]
         when "n"
@@ -78,10 +86,10 @@ module GitCurate
       branch =~ /^\s*\*/
     end
 
-    # Returns a Hash containing, as keys, all local branches that have upstream branches (excluding
-    # the current branch) and, as values, a brief description of each branch's status relative
-    # to its upstream branch (up to date, or ahead/behind)
-    def upstream_branches
+    # Returns a Hash containing, as keys, all local branches that have upstream branches,
+    # and, as values, a brief description of each branch's status relative to its upstream
+    # branch (up to date, or ahead/behind)
+    def get_upstream_branches
       command_to_a("git branch -vv").map do |line|
         branch_name = line.split(BRANCH_NAME_REGEX)[0]
         remote_info = line[REMOTE_INFO_REGEX, 1]

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/git_curate.rb

@@ -1,5 +1,2 @@
 require "git_curate/runner"
 require "git_curate/version"
-require "highline/import"
-require "set"
-require "tabulo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement