bummr 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ba0fef0427b0831920d37208c1a80827757d36
-  data.tar.gz: 564bf9e76cfa61e7247f5261d3d5e0004eb6820d
+  metadata.gz: de386c3a0c041b1dc02b6fc5d75f2b6f3b473624
+  data.tar.gz: 1dc533f03683112f7604c8fb80ad236ebd55ce4e
 SHA512:
-  metadata.gz: 3e1d9167c57e85513d41d1a988d93827855422612c790f16b24c2d04f3ba711c9f070e8666face7d0a875e28a506855efa4f0ec846fb18bcf024a964f53cf135
-  data.tar.gz: 1223ef7d6a3c2fe2fd99909d1ab7e1d6d8a40ec267c633fb9071510d56316c0051d020f7514c84e2938e27c4f7149e3579835f969c87f73d30d30dfeeb430338
+  metadata.gz: a837b59236235d1733ad24a770f63cf2b2b6c48739a1c538fc0ee2de807bf10c37824ebef30a5dc718b8e3d0cc9c57a75d7de273873824a36e395fdebbe6ecc1
+  data.tar.gz: 437a0facee5cf00915827b57604f3202a82104beccc07b867459b677856e0d10cc1edbeb6c0dfaa036723b343bb35844c1471969b474aee1eb5d3140724eacc8

data/README.md

@@ -49,11 +49,12 @@ instructions in the Installation section of this README.
 - After installing, create a new, clean branch off of your `master` branch.
 - Run `bummr update`. This may take some time.
 - `Bummr` will give you the opportunity to interactively rebase your branch
-  before running the tests. Delete any commits for gems which you don't want
-  to update and close the file.
+  before running the tests. Careful.
 - At this point, you can leave `bummr` to work for some time.
-- If your build fails, `bummr` will attempt to automatically remove breaking
-  commits, until the build passes, logging any failures to `/log/bummr.log`.
+- If your build fails, `bummr` will notify you of failures, logging the failures to
+  `log/bummr.log`. At this point it is recommended that you lock that gem version in 
+  your Gemfile and start the process over from the top. Alternatively, you may wish 
+  to implement code changes which fix the problem.
 - Once your build passes, open a pull-request and merge it to your `master` branch.
 
 ##### `bummr update`

data/lib/bummr/cli.rb

@@ -4,15 +4,23 @@ BASE_BRANCH = ENV["BASE_BRANCH"] || "master"
 module Bummr
   class CLI < Thor
     include Bummr::Log
+    include Bummr::Scm
 
     desc "check", "Run automated checks to see if bummr can be run"
     def check(fullcheck=true)
       Bummr::Check.instance.check(fullcheck)
     end
 
-    desc "update", "Update outdated gems, run tests, bisect if tests fail"
+    desc "update",
+      "Update outdated gems, run tests, bisect if tests fail\n\n" +
+      "--all: Update indirect dependencies\n" +
+      "--group: Specify a group from the Gemfile to update\n" +
+      "\n"
+
+
     method_option :all, type: :boolean, default: false
     method_option :group, type: :string
+
     def update
       system("bundle install")
       ask_questions
@@ -30,7 +38,7 @@ module Bummr
         else
           Bummr::Updater.new(outdated_gems).update_gems
 
-          system("git rebase -i #{BASE_BRANCH}")
+          git.rebase_interactive(BASE_BRANCH)
           test
         end
       else
@@ -75,13 +83,26 @@ module Bummr
     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 "- Be in the root path of a clean git branch off of " + "#{BASE_BRANCH}".color(:yellow)
       puts "- Have no commits or local changes"
       puts "- Have a 'log' directory, where we can place logs"
       puts "- Have your build configured to fail fast (recommended)"
       puts "- Have locked any Gem version that you don't wish to update in your Gemfile"
       puts "- It is recommended that you lock your versions of `ruby` and `rails` in your `Gemfile`"
-      puts "Your test command is: '#{TEST_COMMAND}'"
+      puts "\n"
+      puts "Your test command is: " + "'#{TEST_COMMAND}'".color(:yellow)
+      puts "\n"
+      print_received_options
+    end
+
+    def print_received_options
+      puts "Bummr will run with the following options:"
+
+      options.each do |key, value|
+        puts "--#{key.color(:yellow)}: #{value}"
+      end
+
+      puts "\nRun `#{"bummr help update".color(:yellow)}` for more information.\n\n"
     end
   end
 end

data/lib/bummr/git.rb

@@ -0,0 +1,31 @@
+module Bummr
+  class Git
+    include Singleton
+    include Log
+
+    def initialize
+      @git_commit = ENV.fetch("BUMMR_GIT_COMMIT") { "git commit" }
+    end
+
+    def add(files)
+      system("git add #{files}")
+    end
+
+    def commit(message)
+      log "Commit: #{message}".color(:green)
+      system("#{git_commit} -m '#{message}'")
+    end
+
+    def rebase_interactive(sha)
+      system("git rebase -i #{BASE_BRANCH}")
+    end
+
+    def message(sha)
+      `git log --pretty=format:'%s' -n 1 #{sha}`
+    end
+
+    private
+
+    attr_reader :git_commit
+  end
+end

data/lib/bummr/remover.rb

@@ -2,14 +2,15 @@ module Bummr
   class Remover < Thor
     include Singleton
     include Log
+    include Scm
 
     desc "remove_commit", "Remove a commit from the history"
     def remove_commit(sha)
-      log "Bad commit: #{commit_message_for(sha)}, #{sha}".color(:red)
+      log "Bad commit: #{git.message(sha)}, #{sha}".color(:red)
       log "Resetting..."
       system("git bisect reset")
 
-      message = "\nThe commit:\n\n `#{sha} #{commit_message_for(sha)}`\n\n" +
+      message = "\nThe commit:\n\n `#{sha} #{git.message(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" +
@@ -22,11 +23,5 @@ module Bummr
 
       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/scm.rb

@@ -0,0 +1,9 @@
+module Bummr
+  module Scm
+    private
+
+    def git
+      Bummr::Git.instance
+    end
+  end
+end

data/lib/bummr/updater.rb

@@ -1,6 +1,7 @@
 module Bummr
   class Updater
     include Log
+    include Scm
 
     def initialize(outdated_gems)
       @outdated_gems = outdated_gems
@@ -35,9 +36,8 @@ module Bummr
         log("#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}")
       end
 
-      log "Commit: #{message}".color(:green)
-      system("git add Gemfile Gemfile.lock")
-      system("git commit -m '#{message}'")
+      git.add("Gemfile Gemfile.lock vendor/cache")
+      git.commit(message)
     end
 
     def updated_version_for(gem)

data/lib/bummr/version.rb

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

data/lib/bummr.rb

@@ -1,5 +1,6 @@
 # grouped by dependency order than alpha
 require 'bummr/log'
+require "bummr/scm"
 require 'rainbow/ext/string'
 require 'open3'
 require 'singleton'
@@ -7,6 +8,7 @@ require 'thor'
 
 require "bummr/bisecter"
 require "bummr/check"
+require "bummr/git"
 require "bummr/outdated"
 require "bummr/remover"
 require "bummr/updater"

data/spec/lib/cli_spec.rb

@@ -6,6 +6,7 @@ describe Bummr::CLI do
   let(:options) { {} }
   let(:config) { { pretend: true } }
   let(:cli) { described_class.new(args, options, config) }
+  let(:git) { Bummr::Git.instance }
   let(:outdated_gems) {
     [
       { name: "myGem", installed: "0.3.2", newest: "0.3.5" },
@@ -35,8 +36,8 @@ describe Bummr::CLI do
         expect(cli).to receive(:log)
         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)
+        expect(git).to receive(:rebase_interactive).with(BASE_BRANCH)
       end
 
       context "and there are no outdated gems" do

data/spec/lib/git_spec.rb

@@ -0,0 +1,88 @@
+require "spec_helper"
+
+describe Bummr::Git do
+  describe "#add" do
+    it "stages specified files with git" do
+      git = stub_git
+      files = "Gemfile Gemfile.lock"
+
+      git.add(files)
+
+      expect(git).to have_received(:system).with(
+        "git add #{files}"
+      )
+    end
+  end
+
+  describe "#commit" do
+    it "logs the commit" do
+      git = stub_git
+      commit_message = "Update Foo from 0.0.1 to 0.0.2"
+
+      git.commit(commit_message)
+
+      expect(git).to have_received(:log).with(
+        /Commit: #{commit_message}/
+      )
+    end
+
+    it "commits with a message" do
+      git = stub_git
+      commit_message = "Update Foo from 0.0.1 to 0.0.2"
+
+      git.commit(commit_message)
+
+      expect(git).to have_received(:system).with(
+        "git commit -m '#{commit_message}'"
+      )
+    end
+
+    describe "when BUMMR_GIT_COMMIT is defined" do
+      it "commits using defined value" do
+        allow(ENV).to receive(:fetch).with("BUMMR_GIT_COMMIT").and_return("git commit --no-verify")
+        git = stub_git
+        commit_message = "Update Foo from 0.0.1 to 0.0.2"
+
+        git.commit(commit_message)
+
+        expect(git).to have_received(:system).with(
+          "git commit --no-verify -m '#{commit_message}'"
+        )
+      end
+    end
+  end
+
+  describe "#rebase_interactive" do
+    it "runs git interactive rebase to the given sha" do
+      git = stub_git
+      sha = "b39dcd8"
+
+      git.rebase_interactive(sha)
+
+      expect(git).to have_received(:system).with(
+        "git rebase -i #{BASE_BRANCH}"
+      )
+    end
+  end
+
+  describe "#message" do
+    it "displays the commit message for a given sha" do
+      git = stub_git
+      sha = "b39dcd8"
+
+      git.message(sha)
+
+      expect(git).to have_received(:`).with(
+        "git log --pretty=format:'%s' -n 1 #{sha}"
+      )
+    end
+  end
+
+  def stub_git
+    git = Bummr::Git.clone.instance
+    allow(git).to receive(:log)
+    allow(git).to receive(:system)
+    allow(git).to receive(:`)
+    git
+  end
+end

data/spec/lib/remover_spec.rb

@@ -1,13 +1,11 @@
 require "spec_helper"
 
 describe Bummr::Remover do
-  # let(:commit_message) { "test commit message" }
   let(:remover) { Bummr::Remover.instance }
+  let(:git) { Bummr::Git.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)
@@ -15,6 +13,8 @@ describe Bummr::Remover do
 
   describe "#remove_commit" do
     it "logs the bad commit" do
+      allow(git).to receive(:message).and_return("commit message")
+
       remover.remove_commit(sha)
 
       expect(remover).to have_received(:log).with(

data/spec/lib/updater_spec.rb

@@ -14,6 +14,7 @@ describe Bummr::Updater do
   let(:installed) { outdated_gems[0][:installed] }
   let(:intermediate_version) { "0.3.4" }
   let(:update_cmd) { "bundle update #{gem[:name]}" }
+  let(:git) { Bummr::Git.instance }
 
   describe "#update_gems" do
     it "calls update_gem on each gem" do
@@ -32,6 +33,7 @@ describe Bummr::Updater do
       allow(updater).to receive(:system).with(update_cmd)
       allow(updater).to receive(:updated_version_for).with(gem).and_return installed
       allow(updater).to receive(:log)
+      allow(git).to receive(:commit)
 
       updater.update_gem(gem, 0)
     end
@@ -41,6 +43,7 @@ describe Bummr::Updater do
         allow(updater).to receive(:system).with(update_cmd)
         allow(updater).to receive(:updated_version_for).with(gem).and_return installed
         allow(updater).to receive(:log)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
@@ -51,10 +54,11 @@ describe Bummr::Updater do
         allow(updater).to receive(:system).with(update_cmd)
         allow(updater).to receive(:updated_version_for).with(gem).and_return installed
         allow(updater).to receive(:log)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to_not have_received(:system).with /git commit/
+        expect(git).to_not have_received(:commit)
       end
     end
 
@@ -70,6 +74,7 @@ describe Bummr::Updater do
           "#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}"
         allow(updater).to receive(:system)
         allow(updater).to receive(:log)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
@@ -81,11 +86,13 @@ describe Bummr::Updater do
           "Update #{gem[:name]} from #{gem[:installed]} to #{intermediate_version}"
         allow(updater).to receive(:system)
         allow(updater).to receive(:log)
+        allow(git).to receive(:add)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to have_received(:system).with("git add Gemfile Gemfile.lock")
-        expect(updater).to have_received(:system).with("git commit -m '#{commit_message}'")
+        expect(git).to have_received(:add).with("Gemfile Gemfile.lock vendor/cache")
+        expect(git).to have_received(:commit).with(commit_message)
       end
     end
 
@@ -94,27 +101,18 @@ describe Bummr::Updater do
         allow(updater).to receive(:updated_version_for).and_return newest
       end
 
-      it "logs the commit" do
-        commit_message =
-          "Commit: Update #{gem[:name]} from #{gem[:installed]} to #{gem[:newest]}".color(:green)
-        allow(updater).to receive(:system)
-        allow(updater).to receive(:log)
-
-        updater.update_gem(gem, 0)
-
-        expect(updater).to have_received(:log).with commit_message
-      end
-
       it "commits" do
         commit_message =
           "Update #{gem[:name]} from #{gem[:installed]} to #{gem[:newest]}"
         allow(updater).to receive(:system)
         allow(updater).to receive(:log)
+        allow(git).to receive(:add)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to have_received(:system).with("git add Gemfile Gemfile.lock")
-        expect(updater).to have_received(:system).with("git commit -m '#{commit_message}'")
+        expect(git).to have_received(:add).with("Gemfile Gemfile.lock vendor/cache")
+        expect(git).to have_received(:commit).with(commit_message)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Lee Pender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -213,14 +213,17 @@ files:
 - lib/bummr/bisecter.rb
 - lib/bummr/check.rb
 - lib/bummr/cli.rb
+- lib/bummr/git.rb
 - lib/bummr/log.rb
 - lib/bummr/outdated.rb
 - lib/bummr/remover.rb
+- lib/bummr/scm.rb
 - lib/bummr/updater.rb
 - lib/bummr/version.rb
 - spec/check_spec.rb
 - spec/lib/bisecter_spec.rb
 - spec/lib/cli_spec.rb
+- spec/lib/git_spec.rb
 - spec/lib/log_spec.rb
 - spec/lib/outdated_spec.rb
 - spec/lib/remover_spec.rb
@@ -254,6 +257,7 @@ test_files:
 - spec/check_spec.rb
 - spec/lib/bisecter_spec.rb
 - spec/lib/cli_spec.rb
+- spec/lib/git_spec.rb
 - spec/lib/log_spec.rb
 - spec/lib/outdated_spec.rb
 - spec/lib/remover_spec.rb