bummr 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc66045a4cf51578172ac7c875574465d60b019
-  data.tar.gz: 343b2794e4c16c57b938a26a41aa256df41216c3
+  metadata.gz: 73ba0fef0427b0831920d37208c1a80827757d36
+  data.tar.gz: 564bf9e76cfa61e7247f5261d3d5e0004eb6820d
 SHA512:
-  metadata.gz: 36acc698fe92f04a82c4158bf7600a9453dc2235cbb58c4a125fd05280eaf8abc60d811d9c8f4675ad29df9b14a55f6043ade5c79842daae6c58c3000487ab37
-  data.tar.gz: e68e9a0212deeb3211904b8549b4e7be67d2eb657bc389faaf964e17c9c7519d007aecac6d848a1196c8eae736430b6dc5d733b630088098241dd6a2a2ceb063
+  metadata.gz: 3e1d9167c57e85513d41d1a988d93827855422612c790f16b24c2d04f3ba711c9f070e8666face7d0a875e28a506855efa4f0ec846fb18bcf024a964f53cf135
+  data.tar.gz: 1223ef7d6a3c2fe2fd99909d1ab7e1d6d8a40ec267c633fb9071510d56316c0051d020f7514c84e2938e27c4f7149e3579835f969c87f73d30d30dfeeb430338

data/lib/bummr/bisecter.rb

@@ -20,7 +20,7 @@ module Bummr
           end
 
           if line == "bisect run success\n"
-            Bummr::Rebaser.instance.remove_commit(sha)
+            Bummr::Remover.instance.remove_commit(sha)
           end
         end
       end

data/lib/bummr/cli.rb

@@ -14,12 +14,12 @@ module Bummr
     method_option :all, type: :boolean, default: false
     method_option :group, type: :string
     def update
+      system("bundle install")
       ask_questions
 
       if yes? "Are you ready to use Bummr? (y/n)"
         check
         log("Bummr update initiated #{Time.now}")
-        system("bundle")
 
         outdated_gems = Bummr::Outdated.instance.outdated_gems(
           all_gems: options[:all], group: options[:group]
@@ -41,15 +41,17 @@ module Bummr
     desc "test", "Test for a successful build and bisect if necesssary"
     def test
       check(false)
-      system "bundle"
-      puts "Testing the build!".color(:green)
 
-      if system(TEST_COMMAND) == false
-        bisect
-      else
-        puts "Passed the build!".color(:green)
-        puts "See log/bummr.log for details".color(:yellow)
-        system("cat log/bummr.log")
+      if yes? "Do you want to test the build now?"
+        system "bundle install"
+        puts "Testing the build!".color(:green)
+
+        if system(TEST_COMMAND) == false
+          bisect
+        else
+          puts "Passed the build!".color(:green)
+          puts "See log/bummr.log for details".color(:yellow)
+        end
       end
     end
 
@@ -57,12 +59,21 @@ module Bummr
     def bisect
       check(false)
 
-      Bummr::Bisecter.instance.bisect
+      if yes? "Would you like to bisect in order to find which gem is causing " +
+              "your build to break? (y/n)"
+        Bummr::Bisecter.instance.bisect
+      end
+    end
+
+    desc "remove_commit", "Remove a commit from the history"
+    def remove_commit(sha)
+      Bummr::Remover.instance.remove_commit(sha)
     end
 
     private
 
     def ask_questions
+      puts "Bummr #{VERSION}"
       puts "To run Bummr, you must:"
       puts "- Be in the root path of a clean git branch off of #{BASE_BRANCH}"
       puts "- Have no commits or local changes"

data/lib/bummr/remover.rb

@@ -0,0 +1,32 @@
+module Bummr
+  class Remover < Thor
+    include Singleton
+    include Log
+
+    desc "remove_commit", "Remove a commit from the history"
+    def remove_commit(sha)
+      log "Bad commit: #{commit_message_for(sha)}, #{sha}".color(:red)
+      log "Resetting..."
+      system("git bisect reset")
+
+      message = "\nThe commit:\n\n `#{sha} #{commit_message_for(sha)}`\n\n" +
+        "Is breaking the build.\n\n" +
+        "Please do one of the following: \n\n" +
+        " 1. Update your code to work with the latest version of this gem.\n\n" +
+        " 2. Perform the following steps to lock the gem version:\n\n" +
+        "    - `git reset --hard master`\n" +
+        "    - Lock the version of this Gem in your Gemfile.\n" +
+        "    - Commit the changes.\n" +
+        "    - Run `bummr update` again.\n\n" +
+        "Lord Bummr\n\n"
+
+      puts message.color(:yellow)
+    end
+
+    private
+
+    def commit_message_for(sha)
+      `git log --pretty=format:'%s' -n 1 #{sha}`
+    end
+  end
+end

data/lib/bummr/updater.rb

@@ -19,7 +19,12 @@ module Bummr
       system("bundle update #{gem[:name]}")
 
       updated_version = updated_version_for(gem)
-      message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
+
+      if (updated_version)
+        message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
+      else
+        message = "Update dependencies for #{gem[:name]}"
+      end
 
       if gem[:installed] == updated_version
         log("#{gem[:name]} not updated")
@@ -31,11 +36,15 @@ module Bummr
       end
 
       log "Commit: #{message}".color(:green)
-      system("git commit -am '#{message}'")
+      system("git add Gemfile Gemfile.lock")
+      system("git commit -m '#{message}'")
     end
 
     def updated_version_for(gem)
-      `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
+      begin
+        `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
+      rescue Error
+      end
     end
   end
 end

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/bummr.rb

@@ -8,7 +8,7 @@ require 'thor'
 require "bummr/bisecter"
 require "bummr/check"
 require "bummr/outdated"
-require "bummr/rebaser"
+require "bummr/remover"
 require "bummr/updater"
 
 require "bummr/cli"

data/spec/lib/bisecter_spec.rb

@@ -8,7 +8,7 @@ describe Bummr::Bisecter do
     StringIO.new(output)
   }
   let(:bisecter) { described_class.instance }
-  let(:rebaser) { Bummr::Rebaser.instance }
+  let(:remover) { Bummr::Remover.instance }
 
   before do
     allow(STDOUT).to receive(:puts)
@@ -20,12 +20,12 @@ describe Bummr::Bisecter do
     context "bad commit" do
       it "rebases it out" do
         allow(Open3).to receive(:popen2e).and_yield(nil, std_out_err_bad_commit)
-        allow(rebaser).to receive(:remove_commit)
+        allow(remover).to receive(:remove_commit)
           .with("mybadcommit")
 
         bisecter.bisect
 
-        expect(rebaser).to have_received(:remove_commit).with("mybadcommit")
+        expect(remover).to have_received(:remove_commit).with("mybadcommit")
       end
     end
   end

data/spec/lib/cli_spec.rb

@@ -33,7 +33,7 @@ describe Bummr::CLI do
         expect(cli).to receive(:yes?).and_return(true)
         expect(cli).to receive(:check)
         expect(cli).to receive(:log)
-        expect(cli).to receive(:system).with("bundle")
+        expect(cli).to receive(:system).with("bundle install")
         expect(Bummr::Updater).to receive(:new).with(outdated_gems).and_return updater
         expect(cli).to receive(:system).with("git rebase -i #{BASE_BRANCH}")
         expect(cli).to receive(:test)
@@ -48,7 +48,7 @@ describe Bummr::CLI do
           expect(cli).to receive(:yes?).and_return(true)
           expect(cli).to receive(:check)
           expect(cli).to receive(:log)
-          expect(cli).to receive(:system).with("bundle")
+          expect(cli).to receive(:system).with("bundle install")
           expect(cli).to receive(:puts).with("No outdated gems to update".color(:green))
 
           cli.update
@@ -102,6 +102,7 @@ describe Bummr::CLI do
       allow(cli).to receive(:check)
       allow(cli).to receive(:system)
       allow(cli).to receive(:bisect)
+      allow(cli).to receive(:yes?).and_return true
     end
 
     context "build passes" do
@@ -111,7 +112,7 @@ describe Bummr::CLI do
         cli.test
 
         expect(cli).to have_received(:check).with(false)
-        expect(cli).to have_received(:system).with("bundle")
+        expect(cli).to have_received(:system).with("bundle install")
         expect(cli).to have_received(:system).with("bundle exec rake")
         expect(cli).not_to have_received(:bisect)
       end
@@ -124,7 +125,7 @@ describe Bummr::CLI do
         cli.test
 
         expect(cli).to have_received(:check).with(false)
-        expect(cli).to have_received(:system).with("bundle")
+        expect(cli).to have_received(:system).with("bundle install")
         expect(cli).to have_received(:system).with("bundle exec rake")
         expect(cli).to have_received(:bisect)
       end
@@ -134,6 +135,7 @@ describe Bummr::CLI do
   describe "#bisect" do
     it "calls Bummr:Bisecter.instance.bisect" do
       allow(cli).to receive(:check)
+      allow(cli).to receive(:yes?).and_return true
       allow_any_instance_of(Bummr::Bisecter).to receive(:bisect)
       bisecter = Bummr::Bisecter.instance
 

data/spec/lib/remover_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Bummr::Remover do
+  # let(:commit_message) { "test commit message" }
+  let(:remover) { Bummr::Remover.instance }
+  let(:sha) { "testsha" }
+  let(:remove_command) { "git rebase -p --onto #{sha}^ #{sha}" }
+
+  before do
+    allow(remover).to receive(:commit_message_for).and_return "commit message"
+    allow(remover).to receive(:log)
+    allow(remover).to receive(:system)
+    allow(remover).to receive(:yes?).and_return(true)
+  end
+
+  describe "#remove_commit" do
+    it "logs the bad commit" do
+      remover.remove_commit(sha)
+
+      expect(remover).to have_received(:log).with(
+        "Bad commit: commit message, #{sha}".color(:red)
+      )
+    end
+
+    it "resets the bisection" do
+      remover.remove_commit(sha)
+
+      expect(remover).to have_received(:system).with("git bisect reset")
+    end
+  end
+end

data/spec/lib/updater_spec.rb

@@ -78,15 +78,14 @@ describe Bummr::Updater do
 
       it "commits" do
         commit_message =
-          "'Update #{gem[:name]} from #{gem[:installed]} to #{intermediate_version}'"
+          "Update #{gem[:name]} from #{gem[:installed]} to #{intermediate_version}"
         allow(updater).to receive(:system)
         allow(updater).to receive(:log)
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to have_received(:system).with(
-          "git commit -am #{commit_message}"
-        )
+        expect(updater).to have_received(:system).with("git add Gemfile Gemfile.lock")
+        expect(updater).to have_received(:system).with("git commit -m '#{commit_message}'")
       end
     end
 
@@ -114,9 +113,8 @@ describe Bummr::Updater do
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to have_received(:system).with(
-          "git commit -am '#{commit_message}'"
-        )
+        expect(updater).to have_received(:system).with("git add Gemfile Gemfile.lock")
+        expect(updater).to have_received(:system).with("git commit -m '#{commit_message}'")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Lee Pender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -215,7 +215,7 @@ files:
 - lib/bummr/cli.rb
 - lib/bummr/log.rb
 - lib/bummr/outdated.rb
-- lib/bummr/rebaser.rb
+- lib/bummr/remover.rb
 - lib/bummr/updater.rb
 - lib/bummr/version.rb
 - spec/check_spec.rb
@@ -223,7 +223,7 @@ files:
 - spec/lib/cli_spec.rb
 - spec/lib/log_spec.rb
 - spec/lib/outdated_spec.rb
-- spec/lib/rebaser_spec.rb
+- spec/lib/remover_spec.rb
 - spec/lib/updater_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lpender/bummr
@@ -256,6 +256,6 @@ test_files:
 - spec/lib/cli_spec.rb
 - spec/lib/log_spec.rb
 - spec/lib/outdated_spec.rb
-- spec/lib/rebaser_spec.rb
+- spec/lib/remover_spec.rb
 - spec/lib/updater_spec.rb
 - spec/spec_helper.rb

data/lib/bummr/rebaser.rb

@@ -1,29 +0,0 @@
-module Bummr
-  class Rebaser
-    include Singleton
-    include Log
-
-    def remove_commit(sha)
-      log "Bad commit: #{commit_message_for(sha)}, #{sha}".color(:red)
-      log "Resetting..."
-      system("git bisect reset")
-
-      log "Removing commit..."
-      if system("git rebase -X ours --onto #{sha}^ #{sha}")
-        log "Successfully removed bad commit...".color(:green)
-        log "Re-testing build...".color(:green)
-        system("bummr test")
-      else
-        log "Could not automatically remove this commit!".color(:red)
-        log "Please resolve conflicts, then 'git rebase --continue'."
-        log "Run 'bummr test' again once the rebase is complete"
-      end
-    end
-
-    private
-
-    def commit_message_for(sha)
-      `git log --pretty=format:'%s' -n 1 #{sha}`
-    end
-  end
-end

data/spec/lib/rebaser_spec.rb

@@ -1,64 +0,0 @@
-require "spec_helper"
-
-describe Bummr::Rebaser do
-  # let(:commit_message) { "test commit message" }
-  let(:rebaser) { Bummr::Rebaser.instance }
-  let(:sha) { "testsha" }
-  let(:rebase_command) { "git rebase -X ours --onto #{sha}^ #{sha}" }
-
-  before do
-    allow(rebaser).to receive(:commit_message_for).and_return "commit message"
-    allow(rebaser).to receive(:log)
-    allow(rebaser).to receive(:system)
-  end
-
-  describe "#remove_commit" do
-    it "logs the bad commit" do
-      rebaser.remove_commit(sha)
-
-      expect(rebaser).to have_received(:log).with(
-        "Bad commit: commit message, #{sha}".color(:red)
-      )
-    end
-
-    it "resets the bisection" do
-      rebaser.remove_commit(sha)
-
-      expect(rebaser).to have_received(:system).with("git bisect reset")
-    end
-
-    context "successfully rebases the commit out" do
-      before(:each) do
-        allow(rebaser).to receive(:system).with(rebase_command).and_return true
-      end
-
-      it "logs the successful result" do
-        rebaser.remove_commit(sha)
-
-        expect(rebaser).to have_received(:log).with(
-          "Successfully removed bad commit...".color(:green)
-        )
-      end
-
-      it "tests the build again" do
-        rebaser.remove_commit(sha)
-
-        expect(rebaser).to have_received(:system).with "bummr test"
-      end
-    end
-
-    context "fails to rebase the commit out" do
-      before(:each) do
-        allow(rebaser).to receive(:system).with(rebase_command).and_return false
-      end
-
-      it "logs the  failure to rebase" do
-        rebaser.remove_commit(sha)
-
-        expect(rebaser).to have_received(:log).with(
-          "Could not automatically remove this commit!".color(:red)
-        )
-      end
-    end
-  end
-end