bundleup 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 245fefcb714dea09da4249386faf7d427c4042f1
-  data.tar.gz: fb6a1589a8253f9db5bcb85d036b795581f572ad
+  metadata.gz: 2042941c3836df1dff0b80b1b85122edb2c9dc6f
+  data.tar.gz: 4bed7910cd47f5613cd5feaff7cfe133e949ca9e
 SHA512:
-  metadata.gz: b2a63df2aee21d9a55cf8173c1becf3e897cf23ed4d0547849676c1c2ec36c4dec450d03bc055054f5579baeb60503726ca6099265c8836fdbe90e087e404481
-  data.tar.gz: 952d65e4e3a7a5fb023022fe017933e9d7295da1697e5d7102cc1bf400c1657161426fd9325042c906c1e491164b404d6ce9f5ce69fa3073265a4ab563666fe0
+  metadata.gz: 4edde92228db4dd91b754baa92e9b5719c168fea1536e6922b8c8437c9c75c8090cdecb11afdfda8e06737dffa5f67108a44b814c4e64390508e6d8d45541661
+  data.tar.gz: 21a13add9532fde6fa8c3c00796300fed0074dd1a597ab98a9fe92893eb9ffd107c2c8d304100541f3fcf1d9795e9a69eaa1edc07f8ed239ec83f46119118844

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.8
-  - 2.2.4
+  - 2.1
+  - 2.2
+  - 2.3.0
 before_install: gem install bundler -v 1.11.2

data/CHANGELOG.md

@@ -8,6 +8,15 @@ bundleup is in a pre-1.0 state. This means that its APIs and behavior are subjec
 
 * Your contribution here!
 
+## [0.4.0][] (2016-02-19)
+
+* **Change the upgrade process to modify the Gemfile.lock in place, with the
+  option to "undo" (i.e. restore from backup) if the changes are not desired.**
+  This makes bundleup much faster since it doesn't have to run `bundle update`
+  twice.
+* Fixed a bug where color was mistakenly based on the newest version of a gem,
+  even if a restriction prevented upgrading to that version.
+
 ## [0.3.0][] (2016-01-08)
 
 * Always show SHA changes in red. If a dependency is tracking a
@@ -27,6 +36,7 @@ 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.3.0...HEAD
+[Unreleased]: https://github.com/mattbrictson/bundleup/compare/v0.4.0...HEAD
+[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

@@ -8,7 +8,7 @@
 
 You might like bundleup because it:
 
-* shows you exactly what gems will be updated *before* making any changes to your Gemfile.lock
+* shows you exactly what gems will be updated lets you decide whether to proceed
 * uses color to call your attention to important gem updates (based on [Semver][])
 * lets you know when a version "pin" in your Gemfile is preventing an update
 * relies on standard Bundler output and does not patch code or use Bundler internals
@@ -39,9 +39,9 @@ That’s it!
 
 bundleup starts by making a backup copy of your Gemfile.lock. Next it runs `bundle show`, then `bundle update` and `bundle show` again to find what gems versions are being used before and after Bundler does its updating magic. (Since gems are actually being installed into your Ruby environment during these steps, the process may take a few moments to complete, especially if gems with native extensions need to be compiled.)
 
-Finally, bundleup runs `bundle outdated` to see the gems that were *not* updated due to Gemfile restrictions. It then restores your original Gemfile.lock from the backup, leaving your project as it started.
+Finally, bundleup runs `bundle outdated` to see the gems that were *not* updated due to Gemfile restrictions.
 
-After displaying its findings, bundleup gives you the option of running `bundle update` once more against your project. This time your Gemfile.lock *will* be changed. You can skip this step if you want.
+After displaying its findings, bundleup gives you the option of keeping the changes. If you answer "no", bundleup will restore your original Gemfile.lock from its backup, leaving your project untouched.
 
 
 ## Roadmap

data/bundleup.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop", ">= 0.37.2"
 end

data/lib/bundleup.rb

@@ -2,5 +2,5 @@ require "bundleup/version"
 require "bundleup/console"
 require "bundleup/bundle_commands"
 require "bundleup/gem_status"
-require "bundleup/gemfile"
+require "bundleup/upgrade"
 require "bundleup/cli"

data/lib/bundleup/bundle_commands.rb

@@ -23,7 +23,7 @@ module Bundleup
         out, err, status = Open3.capture3(cmd)
         next(out) if status.success? || fail_silently
 
-        fail ["Failed to execute: #{cmd}", out, err].compact.join("\n")
+        raise ["Failed to execute: #{cmd}", out, err].compact.join("\n")
       end
     end
   end

data/lib/bundleup/cli.rb

@@ -4,11 +4,15 @@ module Bundleup
 
     def run
       puts \
-        "Please wait a moment while I try upgrading a copy of your Gemfile..."
+        "Please wait a moment while I upgrade your Gemfile.lock..."
 
+      committed = false
       review_upgrades
       review_pins
-      offer_bundle_update if upgrades.any?
+      committed = upgrades.any? && confirm_commit
+      puts "Done!" if committed
+    ensure
+      restore_lockfile unless committed
     end
 
     private
@@ -28,20 +32,26 @@ module Bundleup
       print_pins_table
     end
 
-    def offer_bundle_update
-      exec "bundle update" if confirm("\nShall I run `bundle update` for you?")
+    def confirm_commit
+      confirm("\nDo you want to apply these changes?")
     end
 
-    def gemfile
-      @gemfile ||= Gemfile.new
+    def restore_lockfile
+      return unless upgrade.lockfile_changed?
+      upgrade.undo
+      puts "Your original Gemfile.lock has been restored."
+    end
+
+    def upgrade
+      @upgrade ||= Upgrade.new
     end
 
     def upgrades
-      gemfile.upgrades
+      upgrade.upgrades
     end
 
     def pins
-      gemfile.pins
+      upgrade.pins
     end
 
     def print_upgrades_table

data/lib/bundleup/console.rb

@@ -4,7 +4,7 @@ module Bundleup
       :red    => 31,
       :green  => 32,
       :yellow => 33,
-      :blue => 34,
+      :blue   => 34,
       :gray   => 90
     }.freeze
 
@@ -63,7 +63,7 @@ module Bundleup
     private
 
     def max_length_of_each_column(rows)
-      rows.first.count.times.map do |i|
+      Array.new(rows.first.count) do |i|
         rows.map { |values| values[i].to_s.length }.max
       end
     end

data/lib/bundleup/gem_status.rb

@@ -33,15 +33,13 @@ module Bundleup
     end
 
     def major_upgrade?
-      new = newest_version || new_version
-      return false if new.nil? || old_version.nil?
-      major(new) != major(old_version)
+      return false if new_version.nil? || old_version.nil?
+      major(new_version) != major(old_version)
     end
 
     def minor_upgrade?
-      new = newest_version || new_version
-      return false if new.nil? || old_version.nil?
-      !major_upgrade? && minor(new) != minor(old_version)
+      return false if new_version.nil? || old_version.nil?
+      !major_upgrade? && minor(new_version) != minor(old_version)
     end
 
     private

data/lib/bundleup/{gemfile.rb → upgrade.rb}

@@ -1,12 +1,10 @@
-require "fileutils"
-require "tmpdir"
-
 module Bundleup
-  class Gemfile
+  class Upgrade
     def initialize(commands=BundleCommands.new)
       @commands = commands
       @gem_statuses = {}
-      load
+      @original_lockfile_contents = IO.read(lockfile)
+      run
     end
 
     def upgrades
@@ -17,25 +15,27 @@ module Bundleup
       @gem_statuses.values.select(&:pinned?).sort_by(&:name)
     end
 
+    def lockfile_changed?
+      IO.read(lockfile) != original_lockfile_contents
+    end
+
+    def undo
+      IO.write(lockfile, original_lockfile_contents)
+    end
+
     private
 
-    attr_reader :commands
+    attr_reader :commands, :original_lockfile_contents
 
-    def load
-      with_copy_of_lockfile do
-        find_versions(:old)
-        commands.update
-        find_versions(:new)
-        find_pinned_versions
-      end
+    def run
+      find_versions(:old)
+      commands.update
+      find_versions(:new)
+      find_pinned_versions
     end
 
-    def with_copy_of_lockfile
-      backup = ".Gemfile.lock.#{rand(1_000_000_000).to_s(36)}"
-      FileUtils.cp("Gemfile.lock", backup)
-      yield
-    ensure
-      FileUtils.mv(backup, "Gemfile.lock")
+    def lockfile
+      "Gemfile.lock"
     end
 
     def find_pinned_versions

data/lib/bundleup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundleup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.2
 description: 
 email:
 - bundleup@mattbrictson.com
@@ -135,7 +135,7 @@ files:
 - lib/bundleup/cli.rb
 - lib/bundleup/console.rb
 - lib/bundleup/gem_status.rb
-- lib/bundleup/gemfile.rb
+- lib/bundleup/upgrade.rb
 - lib/bundleup/version.rb
 - sample.png
 homepage: https://github.com/mattbrictson/bundleup