bundler-auto-update 0.0.2 → 0.0.3

data/Gemfile

@@ -3,6 +3,3 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in bundler-auto-update.gemspec
 gemspec
 
-group :development do
-  gem 'rake'
-end

data/README.md

@@ -0,0 +1,63 @@
+# bundler-auto-update
+
+`bundler-auto-update` is a ruby gem that updates the gems listed in your Gemfile to the latest version that does not break your system.
+
+`bundler-auto-updates` iterates over the gems listed in your Gemfile. It updates them to their latest patch, then minor, then major version. It runs your test suite and it commit changes if successfull or revert changes otherwise.
+
+
+## Install
+
+    gem install bundler-auto-update
+
+## Usage
+
+    bundle-auto-update
+
+The default test suite command is `rake`.  You can specify a custom one with the `-c` option
+
+    bundle-auto-update -c rake test:all
+
+## Sample output
+
+<pre>
+$> bundle-auto-update -c rake spec features
+
+  Updating devise
+    - Updating to patch version 1.1.9
+    - Test suite ran successfully.
+    - Committing changes
+
+    - Updating to minor version 1.4.7
+    - Test suite failed to run.
+    - Reverting changes
+
+  Updating rspec
+    - Updating to patch version 2.5.1
+    # [...]
+</pre>
+
+<pre>
+$> git log
+  02cfb8c Auto update parallel to version 0.5.9 (16 hours ago) <Hudson>
+  ff39287 Auto update cucumber to version 1.1.0 (16 hours ago) <Hudson>
+  3502a14 Auto update cucumber to version 0.10.7 (16 hours ago) <Hudson>
+  2ff938c Auto update cucumber to version 0.9.4 (17 hours ago) <Hudson>
+  800ad84 Auto update hpricot to version 0.8.4 (17 hours ago) <Hudson>
+  5c92bf0 Auto update whenever to version 0.6.8 (17 hours ago) <Hudson>
+  d83172d Auto update addressable to version 2.2.6 (17 hours ago) <Hudson>
+  7dc3b72 Auto update fastercsv to version 1.5.4 (18 hours ago) <Hudson>
+  08ae945 Auto update compass to version 0.11.5 (19 hours ago) <Philippe Creux>
+  fe17166 Auto update hoptoad_notifier to version 2.4.11 (20 hours ago) <Philippe Creux>
+  5875d1a Auto update hoptoad_notifier to version 2.3.12 (21 hours ago) <Philippe Creux>
+  4388e07 Auto update activeadmin to version 0.3.2 (21 hours ago) <Philippe Creux>
+  4cd1d0e Auto update haml to version 3.1.3 (22 hours ago) <Philippe Creux>
+</pre>
+
+## License
+
+MIT
+
+## Copyright
+
+Copyright (c) 2011 VersaPay, Philippe Creux.
+

data/features/bundler_auto_update.feature

@@ -20,14 +20,20 @@ Feature: Auto update Gemfile
     When I run `bundle-auto-update`
     Then the output should contain:
       """
-      Updating dmg.
+      Updating dmg
         - Updating to patch version 0.0.4
       """
     Then the output should contain:
       """
-      rake
-        - Test suite failed to run. Reverting changes.
-      git checkout Gemfile Gemfile.lock
+        - Running test suite
+          > rake
+      """
+
+    Then the output should contain:
+      """
+        - Test suite failed to run.
+        - Reverting changes
+          > git checkout Gemfile Gemfile.lock
       """
 
   Scenario: Auto Update with custom command
@@ -38,15 +44,17 @@ Feature: Auto update Gemfile
     When I run `bundle-auto-update -c echo Hello`
     Then the output should contain:
       """
-      Updating dmg.
+      Updating dmg
         - Updating to patch version 0.0.4
       """
     Then the output should contain:
       """
-      echo Hello
+        - Running test suite
+          > echo Hello
       Hello
-        - Test suite ran successfully. Committing changes.
-      git commit Gemfile Gemfile.lock -m 'Auto update dmg to version 0.0.4'
+        - Test suite ran successfully.
+        - Committing changes
+          > git commit Gemfile Gemfile.lock -m 'Auto update dmg to version 0.0.4'
       """
     When I run `git log`
     Then the output should contain "Auto update dmg to version 0.0.4"

data/lib/bundler_auto_update.rb

@@ -47,34 +47,49 @@ module Bundler
 
       def auto_update
         if updatable?
-          Logger.log "Updating #{gem.name}."
+          Logger.log "Updating #{gem.name}"
           update(:patch) and update(:minor) and update(:major)
         else
           Logger.log "#{gem.name} is not auto-updatable, passing it."
         end
       end
 
+      # @return [Boolean] true on success or when already at latest version
       def update(version_type)
         new_version = gem.last_version(version_type)
 
         if new_version == gem.version
           Logger.log_indent "Current gem already at latest #{version_type} version. Passing this update."
-          return
+
+          return true
         end
 
         Logger.log_indent "Updating to #{version_type} version #{new_version}"
 
         gem.version = new_version
 
-        if gemfile.update_gem(gem) && run_test_suite
-          Logger.log_indent "Test suite ran successfully. Committing changes."
-          commit_new_version
+        (update_gemfile and run_test_suite and commit_new_version) or revert_to_previous_version
+      end
 
+      private
+
+      def update_gemfile
+        if gemfile.update_gem(gem) 
+          Logger.log_indent "Gemfile updated successfully."
           true
         else
-          Logger.log_indent "Test suite failed to run. Reverting changes."
-          revert_to_previous_version
+          Logger.log_indent "Failed to update Gemfile."
+          false
+        end
+      end
 
+      def run_test_suite
+        Logger.log_indent "Running test suite"
+        if CommandRunner.system test_command
+          Logger.log_indent "Test suite ran successfully."
+          true
+        else
+          Logger.log_indent "Test suite failed to run."
           false
         end
       end
@@ -84,21 +99,15 @@ module Bundler
       end
 
       def commit_new_version
-        run_cmd "git commit Gemfile Gemfile.lock -m 'Auto update #{gem.name} to version #{gem.version}'"
+        Logger.log_indent "Committing changes"
+        CommandRunner.system "git commit Gemfile Gemfile.lock -m 'Auto update #{gem.name} to version #{gem.version}'"
       end
 
       def revert_to_previous_version
-        run_cmd "git checkout Gemfile Gemfile.lock"
+        Logger.log_indent "Reverting changes"
+        CommandRunner.system "git checkout Gemfile Gemfile.lock"
         gemfile.reload!
       end
-
-      def run_test_suite
-        run_cmd test_command
-      end
-
-      def run_cmd(cmd)
-        CommandRunner.system(cmd)
-      end
     end # class Updater
 
     class Gemfile
@@ -172,6 +181,10 @@ module Bundler
       def self.log_indent(msg)
         log(msg, "  - ")
       end
+
+      def self.log_cmd(msg)
+        log(msg, "    > ")
+      end
     end
 
     class Dependency
@@ -207,13 +220,12 @@ module Bundler
 
     class CommandRunner
       def self.system(cmd)
-        Logger.log cmd
+        Logger.log_cmd cmd
+
         Kernel.system cmd
       end
 
       def self.run(cmd)
-        Logger.log cmd
-
         `#{cmd}`
       end
     end

data/lib/bundler_auto_update/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module AutoUpdate
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/spec_helper.rb

@@ -6,9 +6,23 @@ include Bundler::AutoUpdate
 class Bundler::AutoUpdate::CommandRunner
   def self.system(cmd)
     puts "Stub! #{cmd}"
+
+    true
   end
 
   def self.run(cmd)
     puts "Stub! #{cmd}"
   end
 end
+
+class Gemfile
+  def read
+    puts "Stub! read"
+  end
+
+  def write
+    puts "Stub! write"
+
+    true
+  end
+end

data/spec/unit/gem_updater_spec.rb

@@ -36,7 +36,7 @@ describe GemUpdater do
     context "when no new version" do
       it "should return" do
         gem.should_receive(:last_version).with(:patch) { gem.version }
-        gem_updater.gemfile.should_not_receive :update_gem
+        gem_updater.should_not_receive :update_gemfile
         gem_updater.should_not_receive :run_test_suite
 
         gem_updater.update(:patch)
@@ -47,9 +47,10 @@ describe GemUpdater do
       context "when tests pass" do
         it "should commit new version" do
           gem.should_receive(:last_version).with(:patch) { gem.version.next }
-          gem_updater.gemfile.should_receive :update_gem
+          gem_updater.should_receive(:update_gemfile).and_return true
           gem_updater.should_receive(:run_test_suite).and_return true
-          gem_updater.should_receive(:commit_new_version)
+          gem_updater.should_receive(:commit_new_version).and_return true
+          gem_updater.should_not_receive(:revert_to_previous_version)
 
           gem_updater.update(:patch)
         end
@@ -58,9 +59,22 @@ describe GemUpdater do
       context "when tests do not pass" do
         it "should revert to previous version" do
           gem.should_receive(:last_version).with(:patch) { gem.version.next }
-          gem_updater.gemfile.should_receive :update_gem
+          gem_updater.should_receive(:update_gemfile).and_return true
           gem_updater.should_receive(:run_test_suite).and_return false
           gem_updater.should_not_receive(:commit_new_version)
+          gem_updater.should_receive(:revert_to_previous_version)
+
+          gem_updater.update(:patch)
+        end
+      end
+
+      context "when it fails to upgrade gem" do
+        it "should revert to previous version" do
+          gem.should_receive(:last_version).with(:patch) { gem.version.next }
+          gem_updater.should_receive(:update_gemfile).and_return false
+          gem_updater.should_not_receive(:run_test_suite)
+          gem_updater.should_not_receive(:commit_new_version)
+          gem_updater.should_receive(:revert_to_previous_version)
 
           gem_updater.update(:patch)
         end

data/spec/unit/gemfile_spec.rb

@@ -58,6 +58,7 @@ EOF
   describe "#update_gem" do
     it "should update the gem version in the Gemfile" do
       gemfile.update_gem(Dependency.new('rails', '3.1.0'))
+
       gemfile.content.should include(%{gem 'rails',  "3.1.0"})
     end
 
@@ -68,9 +69,17 @@ EOF
     end
 
     it "should run 'bundle install' against the gem" do
-      CommandRunner.should_receive(:system).with("bundle install")
+      CommandRunner.should_receive(:system).with("bundle install") { true }
+      CommandRunner.should_not_receive(:system).with("bundle update rails")
 
       gemfile.update_gem(Dependency.new('rails', '3.1.0'))
     end
+
+    it "should run 'bundle update' against the gem when bundle install fails because a gem version is locked" do
+      CommandRunner.should_receive(:system).with("bundle install").and_return false
+      CommandRunner.should_receive(:system).with("bundle update rails").and_return true
+
+      gemfile.update_gem(Dependency.new('rails', '3.1.0')).should == true
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler-auto-update
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Philippe Creux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: bundle-auto-update
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README.md
 - Rakefile
 - bin/bundle-auto-update
 - bundler-auto-update.gemspec