bundleup 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2042941c3836df1dff0b80b1b85122edb2c9dc6f
-  data.tar.gz: 4bed7910cd47f5613cd5feaff7cfe133e949ca9e
+  metadata.gz: 2cdcf23602e29ab6ba90b1595932e66128998669
+  data.tar.gz: 18f6f50cc591ee28556dd02b6d49e17ac59bf1f3
 SHA512:
-  metadata.gz: 4edde92228db4dd91b754baa92e9b5719c168fea1536e6922b8c8437c9c75c8090cdecb11afdfda8e06737dffa5f67108a44b814c4e64390508e6d8d45541661
-  data.tar.gz: 21a13add9532fde6fa8c3c00796300fed0074dd1a597ab98a9fe92893eb9ffd107c2c8d304100541f3fcf1d9795e9a69eaa1edc07f8ed239ec83f46119118844
+  metadata.gz: 4aad6eeb2689aa6e4497773eb121a49a4fa0e76b60b74f7b0093b934d6bc078026076c3fbfb351a3364896a101ec108a43bc479e3cf9a8be6ea7bf8642588274
+  data.tar.gz: e1858b619e1df3213996abd4da0ad6d27b8ecf8b0ced37bf487baf21412c43ef2d6418d791d7569b0b5ff02e1bdb5e7c2615c86d3d9c94f0536cdf2ade089d5b

data/.rubocop.yml

@@ -14,6 +14,9 @@ Metrics/ClassLength:
   Exclude:
     - "test/**/*"
 
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

data/CHANGELOG.md

@@ -8,6 +8,14 @@ bundleup is in a pre-1.0 state. This means that its APIs and behavior are subjec
 
 * Your contribution here!
 
+## [0.5.0][] (2016-04-01)
+
+* You can now pass command-line arguments to bundleup, which will in turn be
+  handed to `bundle update`. For example: `bundleup --group=development`.
+* Improve the console output when a Bundler command fails.
+* Fixed a bug where if a Bundler command failed to run, it would be executed a
+  second time.
+
 ## [0.4.0][] (2016-02-19)
 
 * **Change the upgrade process to modify the Gemfile.lock in place, with the
@@ -36,7 +44,8 @@ bundleup is in a pre-1.0 state. This means that its APIs and behavior are subjec
 * Initial release
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/mattbrictson/bundleup/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/mattbrictson/bundleup/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/mattbrictson/bundleup/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/mattbrictson/bundleup/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/mattbrictson/bundleup/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/mattbrictson/bundleup/compare/v0.1.0...v0.2.0

data/README.md

@@ -34,6 +34,12 @@ bundleup
 
 That’s it!
 
+Protip: Any extra command-line arguments will be passed along to `bundle update`. For example:
+
+```
+# Only upgrade development gems
+bundleup --group=development
+```
 
 ## How it works
 

data/lib/bundleup/bundle_commands.rb

@@ -5,25 +5,25 @@ module Bundleup
     include Console
 
     def outdated
-      run("bundle outdated", true)
+      run(%w(bundle outdated), true)
     end
 
     def show
-      run("bundle show")
+      run(%w(bundle show))
     end
 
-    def update
-      run("bundle update")
+    def update(args=[])
+      run(%w(bundle update) + args)
     end
 
     private
 
     def run(cmd, fail_silently=false)
-      progress("Running `#{cmd}`") do
-        out, err, status = Open3.capture3(cmd)
+      cmd_line = cmd.join(" ")
+      progress("Running `#{cmd_line}`") do
+        out, err, status = Open3.capture3(*cmd)
         next(out) if status.success? || fail_silently
-
-        raise ["Failed to execute: #{cmd}", out, err].compact.join("\n")
+        raise ["Failed to execute: #{cmd_line}", out, err].compact.join("\n")
       end
     end
   end

data/lib/bundleup/cli.rb

@@ -19,7 +19,7 @@ module Bundleup
 
     def review_upgrades
       if upgrades.any?
-        puts "\nIt looks like the following gem(s) will be updated:\n\n"
+        puts "\nThe following gem(s) will be updated:\n\n"
         print_upgrades_table
       else
         ok("Nothing to update.")
@@ -37,13 +37,14 @@ module Bundleup
     end
 
     def restore_lockfile
+      return unless defined?(@upgrade)
       return unless upgrade.lockfile_changed?
       upgrade.undo
       puts "Your original Gemfile.lock has been restored."
     end
 
     def upgrade
-      @upgrade ||= Upgrade.new
+      @upgrade ||= Upgrade.new(ARGV)
     end
 
     def upgrades
@@ -66,7 +67,7 @@ module Bundleup
     def print_pins_table
       rows = tableize(pins) do |g|
         pin_operator, pin_version = g.pin.split(" ", 2)
-        reason = [":", "pinned at", pin_operator, pin_version]
+        reason = [":", "pinned at", pin_operator.rjust(2), pin_version]
         [g.name, g.new_version, "→", g.newest_version, *reason]
       end
       puts rows.join("\n")

data/lib/bundleup/console.rb

@@ -24,19 +24,21 @@ module Bundleup
 
     def confirm(question)
       print question.sub(/\??\z/, " [Yn]? ")
-      gets =~ /^($|y)/i
+      $stdin.gets =~ /^($|y)/i
     end
 
+    # Runs a block in the background and displays a spinner until it completes.
     def progress(message, &block)
+      spinner = %w(/ - \\ |).cycle
       print "\e[90m#{message}... \e[0m"
-      thread = Thread.new(&block)
-      thread.join(0.5)
-      %w(/ - \\ |).cycle do |char|
-        break if thread.join(0.1)
-        print "\r\e[90m#{message}... #{char} \e[0m"
+      result = observing_thread(block, 0.5, 0.1) do
+        print "\r\e[90m#{message}... #{spinner.next} \e[0m"
       end
       puts "\r\e[90m#{message}... OK\e[0m"
-      thread.value
+      result
+    rescue StandardError
+      puts "\r\e[90m#{message}...\e[0m \e[31mFAILED\e[0m"
+      raise
     end
 
     # Given a two-dimensional Array of strings representing a table of data,
@@ -67,5 +69,28 @@ module Bundleup
         rows.map { |values| values[i].to_s.length }.max
       end
     end
+
+    # Starts the `callable` in a background thread and waits for it to complete.
+    # If the callable fails with an exception, it will be raised here. Otherwise
+    # the main thread is paused for an `initial_wait` time in seconds, and
+    # subsequently for `periodic_wait` repeatedly until the thread completes.
+    # After each wait, `yield` is called to allow a block to execute.
+    def observing_thread(callable, initial_wait, periodic_wait)
+      thread = Thread.new(&callable)
+      wait_for_exit(thread, initial_wait)
+      loop do
+        break if wait_for_exit(thread, periodic_wait)
+        yield
+      end
+      thread.value
+    end
+
+    def wait_for_exit(thread, seconds)
+      thread.join(seconds)
+    rescue StandardError
+      # Sanity check. If we get an exception, the thread should be dead.
+      raise if thread.alive?
+      thread
+    end
   end
 end

data/lib/bundleup/upgrade.rb

@@ -1,6 +1,7 @@
 module Bundleup
   class Upgrade
-    def initialize(commands=BundleCommands.new)
+    def initialize(update_args=[], commands=BundleCommands.new)
+      @update_args = update_args
       @commands = commands
       @gem_statuses = {}
       @original_lockfile_contents = IO.read(lockfile)
@@ -25,11 +26,11 @@ module Bundleup
 
     private
 
-    attr_reader :commands, :original_lockfile_contents
+    attr_reader :update_args, :commands, :original_lockfile_contents
 
     def run
       find_versions(:old)
-      commands.update
+      commands.update(update_args)
       find_versions(:new)
       find_pinned_versions
     end

data/lib/bundleup/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Bundleup
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundleup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A friendlier command-line interface for Bundler’s `update` and `outdated`