bummr 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb83d2ce7db59a0420fbfb78ca04026aafa4c945
-  data.tar.gz: 6f4a32d78dabf543fc17469e939419ab10e9f091
+  metadata.gz: a6413e280f39b5c4f19afd9bffd18b6b86c324a1
+  data.tar.gz: 292d5f9cbbd1a73c93e12012acb8008078024484
 SHA512:
-  metadata.gz: 309abf056757d64abdc38fe77a373c8575d9607e582620246a53fa0ad42f45b5103239ae3f589d64e7303ab0119bc27058eb6a162516b7c8c7d8bc28c8842e61
-  data.tar.gz: 50f5c6b7b537e4271cc7c3ca4672b41db8a48e190e8ae8f8492c3393052b483a5c450d52afb433a85a10851258b27e49e8f2979aeeb4a5f8a164f69e36b226fa
+  metadata.gz: 9192c684fd46c2b0ea404d9e837dccd708d4c5f804edcd3583046d3d58e0e173945ed58f990e650eca95bc92cef959df476e9e86d396d6289014f056b30dceef
+  data.tar.gz: 586e248bebae4861de260e63cc98f0fbd53d381ad267d0974913b4ff967a3cd4e5a60c4fb3cd5fad5c33c511ebaefb792cffc03dd9ff3c19eb275aa241a84823

data/README.md

@@ -1,5 +1,9 @@
 # Bummr
 
+[![CircleCI](https://circleci.com/gh/lpender/bummr.svg?style=svg)](https://circleci.com/gh/lpender/bummr)
+[![Code Climate](https://codeclimate.com/github/lpender/bummr/badges/gpa.svg)](https://codeclimate.com/github/lpender/bummr)
+[![Test Coverage](https://codeclimate.com/github/lpender/bummr/badges/coverage.svg)](https://codeclimate.com/github/lpender/bummr/coverage)
+
 Updating Gems one by one is a bumm(e)r: especially when one gem causes your build
 to fail.
 
@@ -94,13 +98,6 @@ I'd like to create feature tests, but because Bummr relies on command line
 manipulations which need to be doubled, I'm waiting on [this
 issue](https://github.com/bjoernalbers/aruba-doubles/issues/5)
 
-## Wanted
-
-Here are some things I'd love to add to Bummr:
-
-- Test coverage.
-- Configuration options (for test script path, name of master branch, etc)
-
 ## Thank you!
 
 Thanks to Ryan Sonnek for the [Bundler

data/bummr.gemspec

@@ -23,10 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-nc"
+  spec.add_development_dependency "spring"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-remote"
   spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/bummr/bisecter.rb

@@ -0,0 +1,29 @@
+module Bummr
+  class Bisecter
+    include Singleton
+
+    def bisect
+      puts "Bad commits found! Bisecting...".red
+
+      system("bundle")
+      system("git bisect start")
+      system("git bisect bad")
+      system("git bisect good master")
+
+      Open3.popen2e("git bisect run #{TEST_COMMAND}") do |_std_in, std_out_err|
+        while line = std_out_err.gets
+          puts line
+
+          sha_regex = Regexp::new("(.*) is the first bad commit\n").match(line)
+          unless sha_regex.nil?
+            sha = sha_regex[1]
+          end
+
+          if line == "bisect run success\n"
+            Bummr::Rebaser.instance.remove_commit(sha)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bummr/check.rb

@@ -0,0 +1,70 @@
+module Bummr
+  class Check
+    include Singleton
+
+    def check(fullcheck=true)
+      @errors = []
+
+      check_master
+      check_log
+      check_status
+
+      if fullcheck == true
+        check_diff
+      end
+
+      if @errors.any?
+        unless yes? "Bummr found errors! Do you want to continue anyway?".red
+          exit 0
+        end
+      else
+        puts "Ready to run bummr.".green
+      end
+    end
+
+    private
+
+    def check_master
+      if `git rev-parse --abbrev-ref HEAD` == "master\n"
+        message = "Bummr is not meant to be run on master"
+        puts message.red
+        puts "Please checkout a branch with 'git checkout -b update-gems'"
+        @errors.push message
+      end
+    end
+
+    def check_log
+      unless File.directory? "log"
+        message = "There is no log directory or you are not in the root"
+        puts message.red
+        @errors.push message
+      end
+    end
+
+    def check_status
+      status = `git status`
+
+      if status.index 'are currently'
+        message = ""
+
+        if status.index 'rebasing'
+          message += "You are already rebasing. "
+        elsif status.index 'bisecting'
+          message += "You are already bisecting. "
+        end
+
+        message += "Make sure `git status` is clean"
+        puts message.red
+        @errors.push message
+      end
+    end
+
+    def check_diff
+      unless `git diff master`.empty?
+        message = "Please make sure that `git diff master` returns empty"
+        puts message.red
+        @errors.push message
+      end
+    end
+  end
+end

data/lib/bummr/cli.rb

@@ -1,125 +1,49 @@
-require 'thor'
-require 'open3'
-require 'colorize'
-
 TEST_COMMAND = ENV["BUMMR_TEST"] || "bundle exec rake"
 
 module Bummr
   class CLI < Thor
+    include Bummr::Log
+
     desc "check", "Run automated checks to see if bummr can be run"
     def check(fullcheck=true)
-      errors = []
-
-      if `git rev-parse --abbrev-ref HEAD` == "master\n"
-        message = "Bummr is not meant to be run on master"
-        say message.red
-        say "Please checkout a branch with 'git checkout -b update-gems'"
-        errors.push message
-      end
-
-      unless File.directory? "log"
-        message = "There is no log directory or you are not in the root"
-        say message.red
-        errors.push message
-      end
-
-      status = `git status`
-
-      if status.index 'are currently'
-        message = ""
-
-        if status.index 'rebasing'
-          message += "You are already rebasing. "
-        elsif status.index 'bisecting'
-          message += "You are already bisecting. "
-        end
-
-        message += "Make sure `git status` is clean"
-        say message.red
-        errors.push message
-      end
-
-      if fullcheck == true
-        unless `git diff master`.empty?
-          message = "Please make sure that `git diff master` returns empty"
-          say message.red
-          errors.push message
-        end
-      end
-
-      if errors.any?
-        exit 0
-      else
-        puts "Ready to run bummr.".green
-
-      end
+      Bummr::Check.instance.check(fullcheck)
     end
 
     desc "update", "Update outdated gems, run tests, bisect if tests fail"
     def update
-      say "To run Bummr, you must:"
-      say "- Be in the root path of a clean git branch off of master"
-      say "- Have no commits or local changes"
-      say "- Have a 'log' directory, where we can place logs"
-      say "- Have your build configured to fail fast (recommended)"
-      say "- Have locked any Gem version that you don't wish to update in your Gemfile"
-      say "- It is recommended that you lock your versions of `ruby` and `rails in your Gemfile`"
-      say "Your test command is: '#{TEST_COMMAND}'"
+      ask_questions
 
       if yes? "Are you ready to use Bummr? (y/n)"
         check
         log("Bummr update initiated #{Time.now}")
-        `bundle`
+        system("bundle")
 
         outdated_gems = Bummr::Outdated.instance.outdated_gems
 
         if outdated_gems.empty?
-          say "No outdated gems to update".green
+          puts "No outdated gems to update".green
         else
-          say "Updating outdated gems".green
+          Bummr::Updater.new(outdated_gems).update_gems
 
-          outdated_gems.each_with_index do |gem, index|
-            say "Updating #{gem[:name]}: #{index+1} of #{outdated_gems.count}"
-
-            system("bundle update --source #{gem[:name]}")
-            updated_version = `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
-            message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
-
-            if gem[:newest] != updated_version
-              log("#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}")
-            end
-
-            unless gem[:installed] == updated_version
-              say message.green
-              system("git commit -am '#{message}'")
-            else
-              log("#{gem[:name]} not updated")
-            end
-          end
-
-          say "Choose which gems to update"
           system("git rebase -i master")
-
-          log "Running Update + #{Time.now}"
-
           test
         end
       else
-        say "Thank you!".green
+        puts "Thank you!".green
       end
     end
 
     desc "test", "Test for a successful build and bisect if necesssary"
     def test
       check(false)
-      `bundle`
-      say "Testing the build!".green
+      system "bundle"
+      puts "Testing the build!".green
 
       if system(TEST_COMMAND) == false
         bisect
       else
-        say "Passed the build!".green
-        say "See log/bummr.log for details".yellow
+        puts "Passed the build!".green
+        puts "See log/bummr.log for details".yellow
         system("cat log/bummr.log")
       end
     end
@@ -127,54 +51,21 @@ module Bummr
     desc "bisect", "Find the bad commit, remove it, test again"
     def bisect
       check(false)
-      say "Bad commits found! Bisecting...".red
-
-      system("git bisect start head master")
-
-      Open3.popen2e("git bisect run #{TEST_COMMAND}") do |std_in, std_out_err|
-        while line = std_out_err.gets
-          puts line
-
-          sha_regex = Regexp::new("(.*) is the first bad commit\n").match(line)
-          unless sha_regex.nil?
-            sha = sha_regex[1]
-          end
 
-          if line == "bisect run success\n"
-            remove_commit(sha)
-          end
-        end
-      end
+      Bummr::Bisecter.instance.bisect
     end
 
     private
 
-    def log(message)
-      say message
-      system("touch log/bummr.log && echo '#{message}' >> log/bummr.log")
-    end
-
-    def remove_commit(sha)
-      commit_message = `git log --pretty=format:'%s' -n 1 #{sha}`
-      message = "Could not apply: #{commit_message}, #{sha}"
-
-      say message.red
-      log message
-
-      say "Resetting..."
-      system("git bisect reset")
-
-      say "Removing commit..."
-      if system("git rebase -X ours --onto #{sha}^ #{sha}")
-        say "Successfully removed bad commit...".green
-        say "Re-testing build...".green
-        test
-      else
-        say message.red
-        say "Could not automatically remove this commit!".red
-        say "Please resolve conflicts, then 'git rebase --continue'."
-        say "Run 'bummr test' again once the rebase is complete"
-      end
+    def ask_questions
+      puts "To run Bummr, you must:"
+      puts "- Be in the root path of a clean git branch off of master"
+      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}'"
     end
   end
 end

data/lib/bummr/log.rb

@@ -0,0 +1,8 @@
+module Bummr
+  module Log
+    def log(message)
+      puts message
+      system("touch log/bummr.log && echo '#{message}' >> log/bummr.log")
+    end
+  end
+end

data/lib/bummr/outdated.rb

@@ -9,7 +9,7 @@ module Bummr
       @outdated_gems ||= begin
         results = []
 
-        Open3.popen2("bundle outdated --strict") do |std_in, std_out|
+        Open3.popen2("bundle outdated --strict") do |_std_in, std_out|
           while line = std_out.gets
             puts line
             gem = parse_gem_from(line)
@@ -25,13 +25,15 @@ module Bummr
     end
 
     def parse_gem_from(line)
-      regex = / \* (.*) \(newest (\d.*\d), installed (\d.*\d)[\),\s]/.match line
+      regex = / \* (.*) \(newest (\d[\d\.]*\d)[,\s] installed (\d[\d\.]*\d)[\),\s]/.match line
 
       unless regex.nil?
         { name: regex[1], newest: regex[2], installed: regex[3] }
       end
     end
 
+    private
+
     def gemfile_contains(gem_name)
       /gem ['"]#{gem_name}['"]/.match gemfile
     end

data/lib/bummr/rebaser.rb

@@ -0,0 +1,29 @@
+module Bummr
+  class Rebaser
+    include Singleton
+    include Log
+
+    def remove_commit(sha)
+      log "Bad commit: #{commit_message_for(sha)}, #{sha}".red
+      log "Resetting..."
+      system("git bisect reset")
+
+      log "Removing commit..."
+      if system("git rebase -X ours --onto #{sha}^ #{sha}")
+        log "Successfully removed bad commit...".green
+        log "Re-testing build...".green
+        system("bummr test")
+      else
+        log "Could not automatically remove this commit!".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/lib/bummr/updater.rb

@@ -0,0 +1,40 @@
+module Bummr
+  class Updater
+    def initialize(outdated_gems)
+      @outdated_gems = outdated_gems
+    end
+
+    def update_gems
+      puts "Updating outdated gems".green
+
+      @outdated_gems.each_with_index do |gem, index|
+        update_gem(gem, index)
+      end
+    end
+
+    def update_gem(gem, index)
+      puts "Updating #{gem[:name]}: #{index+1} of #{@outdated_gems.count}"
+      system("bundle update #{gem[:name]}")
+
+      updated_version = updated_version_for(gem)
+      message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
+
+      if gem[:installed] == updated_version
+        log("#{gem[:name]} not updated")
+        return
+      end
+
+      if gem[:newest] != updated_version
+        log("#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}")
+      end
+
+      log "Commit: #{message}".green
+      system("git commit -am '#{message}'")
+    end
+
+    def updated_version_for(gem)
+      `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
+    end
+  end
+end
+

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/bummr.rb

@@ -1,3 +1,15 @@
-require "bummr/version"
-require "bummr/cli"
+# grouped by dependency order than alpha
+require "bummr/log"
+require 'colorize'
+require 'open3'
+require 'singleton'
+require 'thor'
+
+require "bummr/bisecter"
+require "bummr/check"
 require "bummr/outdated"
+require "bummr/rebaser"
+require "bummr/updater"
+
+require "bummr/cli"
+require "bummr/version"

data/spec/check_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+describe Bummr::Check do
+  let(:check) { Bummr::Check.instance }
+
+  before(:each) do
+    allow(check)
+      .to receive(:check_master).and_return(nil)
+    allow(check)
+      .to receive(:check_log).and_return(nil)
+    allow(check)
+      .to receive(:check_status).and_return(nil)
+    allow(check)
+      .to receive(:check_diff).and_return(nil)
+    allow(check).to receive(:puts)
+    allow(check).to receive(:yes?).and_return(false)
+    allow(check).to receive(:exit).and_return(false)
+  end
+
+  describe "#check" do
+    context "all checks pass" do
+      context "not full check" do
+        it "returns 'Ready to run bummr.' and proceeds" do
+          check.check
+
+          expect(check).to have_received(:puts).with("Ready to run bummr.".green)
+        end
+      end
+
+      context "full check" do
+        it "returns 'Ready to run bummr.' and proceeds" do
+          check.check(true)
+
+          expect(check).to have_received(:puts).with("Ready to run bummr.".green)
+        end
+      end
+    end
+
+    context "check_master fails" do
+      it "reports the error and exits after confirm" do
+        allow(check)
+          .to receive(:check_master).and_call_original
+        allow(check).to receive(:`).with('git rev-parse --abbrev-ref HEAD')
+          .and_return "master\n"
+
+        check.check
+
+        expect(check).to have_received(:puts)
+          .with("Bummr is not meant to be run on master".red)
+        expect(check).to have_received(:yes?)
+        expect(check).to have_received(:exit).with(0)
+      end
+    end
+
+    context "check_log fails" do
+      it "reports the error and exits after confirm" do
+        allow(check)
+          .to receive(:check_log).and_call_original
+        allow(File).to receive(:directory?).with('log')
+          .and_return false
+
+        check.check
+
+        expect(check).to have_received(:puts)
+          .with("There is no log directory or you are not in the root".red)
+        expect(check).to have_received(:yes?)
+        expect(check).to have_received(:exit).with(0)
+      end
+    end
+
+    context "check_status fails" do
+      context "due to bisecting" do
+        before do
+          allow(check)
+            .to receive(:check_status).and_call_original
+          allow(check).to receive(:`).with('git status')
+            .and_return "are currently bisecting"
+        end
+
+        it "reports the error and exits after confirm" do
+          check.check
+
+          expect(check).to have_received(:puts)
+            .with("You are already bisecting. Make sure `git status` is clean".red)
+          expect(check).to have_received(:yes?)
+          expect(check).to have_received(:exit).with(0)
+        end
+      end
+
+      context "due to rebasing" do
+        before do
+          allow(check).to receive(:check_status).and_call_original
+          allow(check).to receive(:`).with('git status')
+            .and_return "are currently rebasing"
+        end
+
+        it "reports the error and exits after confirm" do
+          check.check
+
+          expect(check).to have_received(:puts)
+            .with("You are already rebasing. Make sure `git status` is clean".red)
+          expect(check).to have_received(:yes?)
+          expect(check).to have_received(:exit).with(0)
+        end
+      end
+    end
+
+    context "check_diff fails" do
+      before do
+        allow(check).to receive(:check_diff).and_call_original
+        allow(check).to receive(:`).with('git diff master')
+          .and_return "+ file"
+      end
+
+      it "reports the error and exits after confirm" do
+        check.check(true)
+
+        expect(check).to have_received(:puts)
+          .with("Please make sure that `git diff master` returns empty".red)
+        expect(check).to have_received(:yes?)
+        expect(check).to have_received(:exit).with(0)
+      end
+    end
+  end
+end

data/spec/lib/bisecter_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Bummr::Bisecter do
+  let(:std_out_err_bad_commit) {
+    output = String.new
+    output += "mybadcommit is the first bad commit\n"
+    output += "bisect run success\n"
+    StringIO.new(output)
+  }
+  let(:bisecter) { described_class.instance }
+  let(:rebaser) { Bummr::Rebaser.instance }
+
+  before do
+    allow(STDOUT).to receive(:puts)
+    allow(bisecter).to receive(:system).with("bundle")
+    allow(bisecter).to receive(:system)
+  end
+
+  describe "#bisect" 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)
+          .with("mybadcommit")
+
+        bisecter.bisect
+
+        expect(rebaser).to have_received(:remove_commit).with("mybadcommit")
+      end
+    end
+  end
+end

data/spec/lib/cli_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe Bummr::CLI do
+  # https://github.com/wireframe/gitx/blob/171da367072b0e82d5906d1e5b3f8ff38e5774e7/spec/thegarage/gitx/cli/release_command_spec.rb#L9
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) { { pretend: true } }
+  let(:cli) { described_class.new(args, options, config) }
+  let(:outdated_gems) {
+    [
+      { name: "myGem", installed: "0.3.2", newest: "0.3.5" },
+      { name: "otherGem", installed: "1.3.2.23", newest: "1.6.5" },
+      { name: "thirdGem", installed: "4.3.4", newest: "5.6.45" },
+    ]
+  }
+
+  describe "#update" do
+    context "when user rejects moving forward" do
+      it "does not attempt to move forward" do
+        expect(cli).to receive(:yes?).and_return(false)
+        expect(cli).not_to receive(:check)
+
+        cli.update
+      end
+    end
+
+    context "when user agrees to move forward" do
+      context "and there are no outdated gems" do
+        it "informs that there are no outdated gems" do
+          allow_any_instance_of(Bummr::Outdated).to receive(:outdated_gems)
+            .and_return []
+
+          expect(cli).to receive(:ask_questions)
+          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(:puts).with("No outdated gems to update".green)
+
+          cli.update
+        end
+      end
+
+      context "and there are outdated gems" do
+        it "calls 'update' on the updater" do
+          allow_any_instance_of(Bummr::Outdated).to receive(:outdated_gems)
+            .and_return outdated_gems
+          updater = double
+          allow(updater).to receive(:update_gems)
+
+          expect(cli).to receive(:ask_questions)
+          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(Bummr::Updater).to receive(:new).with(outdated_gems).and_return updater
+          expect(cli).to receive(:system).with("git rebase -i master")
+          expect(cli).to receive(:test)
+
+          cli.update
+        end
+      end
+    end
+  end
+
+  describe "#test" do
+    before do
+      allow(STDOUT).to receive(:puts)
+      allow(cli).to receive(:check)
+      allow(cli).to receive(:system)
+      allow(cli).to receive(:bisect)
+    end
+
+    context "build passes" do
+      it "reports that it passed the build, does not bisect" do
+        allow(cli).to receive(:system).with("bundle exec rake").and_return true
+
+        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 exec rake")
+        expect(cli).not_to have_received(:bisect)
+      end
+    end
+
+    context "build fails" do
+      it "bisects" do
+        allow(cli).to receive(:system).with("bundle exec rake").and_return false
+
+        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 exec rake")
+        expect(cli).to have_received(:bisect)
+      end
+    end
+  end
+
+  describe "#bisect" do
+    it "calls Bummr:Bisecter.instance.bisect" do
+      allow(cli).to receive(:check)
+      allow_any_instance_of(Bummr::Bisecter).to receive(:bisect)
+      bisecter = Bummr::Bisecter.instance
+
+      cli.bisect
+
+      expect(bisecter).to have_received(:bisect)
+    end
+  end
+end

data/spec/lib/log_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Bummr::Log do
+  let(:object) { Object.new }
+  let(:message) { "test message" }
+
+  before do
+    `mkdir -p log`
+    object.extend(Bummr::Log)
+  end
+
+  after do
+    `rm log/bummr.log`
+  end
+
+  describe "#log" do
+    it "puts the message" do
+      allow(STDOUT).to receive(:puts)
+
+      object.log message
+
+      expect(STDOUT).to have_received(:puts).with(message)
+    end
+
+    it "outputs the message to log/bummr.log" do
+      object.log message
+
+      result = `cat log/bummr.log`
+
+      expect(result).to eq message + "\n"
+    end
+  end
+end

data/spec/lib/outdated_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Bummr::Outdated do
+  # https://github.com/wireframe/gitx/blob/8e3cdc8b5d0c2082ed3daaf2fc054654b2e7a6c8/spec/gitx/executor_spec.rb#L9
+  let(:stdoutput) {
+    output = String.new
+    output += "  * devise (newest 4.1.1, installed 3.5.2) in group \"default\"\n"
+    output += "  * rake (newest 11.1.2, installed 10.4.2)\n"
+    output += "  * rails (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0) in group \"default\"\n"
+    StringIO.new(output)
+  }
+
+  let(:gemfile) {
+    gemfile = String.new
+    gemfile += "gem 'devise'\n"
+    gemfile += "gem 'rake'\n"
+    gemfile += "gem 'rails'\n"
+    gemfile
+  }
+
+  describe "#outdated_gems" do
+    it "Correctly identifies outdated gems" do
+      allow(Open3).to receive(:popen2).and_yield(nil, stdoutput)
+      allow_any_instance_of(described_class).to receive(:gemfile).and_return gemfile
+
+      instance = Bummr::Outdated.instance
+      result = instance.outdated_gems
+
+      expect(result[0][:name]).to eq('devise')
+      expect(result[0][:newest]).to eq('4.1.1')
+      expect(result[0][:installed]).to eq('3.5.2')
+
+      expect(result[1][:name]).to eq('rake')
+      expect(result[1][:newest]).to eq('11.1.2')
+      expect(result[1][:installed]).to eq('10.4.2')
+
+      expect(result[2][:name]).to eq('rails')
+      expect(result[2][:newest]).to eq('4.2.6')
+      expect(result[2][:installed]).to eq('4.2.5.1')
+    end
+  end
+
+  describe "#parse_gem_from" do
+    it 'line' do
+      line = '  * devise (newest 4.1.1, installed 3.5.2) in group "default"'
+
+      gem = Bummr::Outdated.instance.parse_gem_from(line)
+
+      expect(gem[:name]).to eq('devise')
+      expect(gem[:newest]).to eq('4.1.1')
+      expect(gem[:installed]).to eq('3.5.2')
+    end
+
+    it 'line in group' do
+      line = '  * rake (newest 11.1.2, installed 10.4.2)'
+
+      gem = Bummr::Outdated.instance.parse_gem_from(line)
+
+      expect(gem[:name]).to eq('rake')
+      expect(gem[:newest]).to eq('11.1.2')
+      expect(gem[:installed]).to eq('10.4.2')
+    end
+
+    it 'line with requested' do
+      line = '  * rails (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0) in group "default"'
+
+      gem = Bummr::Outdated.instance.parse_gem_from(line)
+
+      expect(gem[:name]).to eq('rails')
+      expect(gem[:newest]).to eq('4.2.6')
+      expect(gem[:installed]).to eq('4.2.5.1')
+    end
+  end
+end

data/spec/lib/rebaser_spec.rb

@@ -0,0 +1,64 @@
+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}".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...".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!".red
+        )
+      end
+    end
+  end
+end

data/spec/lib/updater_spec.rb

@@ -0,0 +1,133 @@
+require "spec_helper"
+
+describe Bummr::Updater do
+  let(:outdated_gems) {
+    [
+      { name: "myGem", installed: "0.3.2", newest: "0.3.5" },
+      { name: "otherGem", installed: "1.3.2.23", newest: "1.6.5" },
+      { name: "thirdGem", installed: "4.3.4", newest: "5.6.45" },
+    ]
+  }
+  let(:gem) { outdated_gems[0] }
+  let(:updater) { described_class.new(outdated_gems) }
+  let(:newest) { outdated_gems[0][:newest] }
+  let(:installed) { outdated_gems[0][:installed] }
+  let(:intermediate_version) { "0.3.4" }
+  let(:update_cmd) { "bundle update #{gem[:name]}" }
+
+  describe "#update_gems" do
+    it "calls update_gem on each gem" do
+      allow(updater).to receive(:update_gem)
+
+      updater.update_gems
+
+      outdated_gems.each_with_index do |gem, index|
+        expect(updater).to have_received(:update_gem).with(gem, index)
+      end
+    end
+  end
+
+  describe "#update_gem" do
+    it "attempts to update the gem" 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)
+
+      updater.update_gem(gem, 0)
+    end
+
+    context "not updated at all" do
+      it "logs that it's not updated to the latest" 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)
+
+        updater.update_gem(gem, 0)
+
+        expect(updater).to have_received(:log).with("#{gem[:name]} not updated")
+      end
+
+      it "doesn't commit anything" 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)
+
+        updater.update_gem(gem, 0)
+
+        expect(updater).to_not have_received(:system).with /git commit/
+      end
+    end
+
+    context "not updated to the newest version" do
+      before(:each) do
+        allow(updater).to receive(:updated_version_for).with(gem).and_return(
+          intermediate_version
+        )
+      end
+
+      it "logs that it's not updated to the latest" do
+        not_latest_message =
+          "#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}"
+        allow(updater).to receive(:system)
+        allow(updater).to receive(:log)
+
+        updater.update_gem(gem, 0)
+
+        expect(updater).to have_received(:log).with not_latest_message
+      end
+
+      it "commits" do
+        commit_message =
+          "'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}"
+        )
+      end
+    end
+
+    context "updated the gem to the latest" do
+      before(:each) 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]}".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)
+
+        updater.update_gem(gem, 0)
+
+        expect(updater).to have_received(:system).with(
+          "git commit -am '#{commit_message}'"
+        )
+      end
+    end
+  end
+
+  describe "#updated_version_for" do
+    it "returns the correct version from bundle list" do
+      allow(updater).to receive(:`).with(
+        "bundle list | grep \" #{gem[:name]} \""
+      ).and_return("  * #{gem[:name]} (3.5.2)\n")
+
+      expect(updater.updated_version_for(gem)).to eq "3.5.2"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,5 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'pry'
 require 'bummr'
+require 'colorize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Lee Pender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spring
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See Readme
 email:
 - lpender@gmail.com
@@ -166,10 +194,21 @@ files:
 - bin/bummr
 - bummr.gemspec
 - lib/bummr.rb
+- lib/bummr/bisecter.rb
+- lib/bummr/check.rb
 - lib/bummr/cli.rb
+- lib/bummr/log.rb
 - lib/bummr/outdated.rb
+- lib/bummr/rebaser.rb
+- lib/bummr/updater.rb
 - lib/bummr/version.rb
-- spec/outdated_spec.rb
+- spec/check_spec.rb
+- spec/lib/bisecter_spec.rb
+- spec/lib/cli_spec.rb
+- spec/lib/log_spec.rb
+- spec/lib/outdated_spec.rb
+- spec/lib/rebaser_spec.rb
+- spec/lib/updater_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lpender/bummr
 licenses:
@@ -196,5 +235,11 @@ signing_key:
 specification_version: 4
 summary: Helper script to intelligently update your Gemfile
 test_files:
-- spec/outdated_spec.rb
+- spec/check_spec.rb
+- spec/lib/bisecter_spec.rb
+- spec/lib/cli_spec.rb
+- spec/lib/log_spec.rb
+- spec/lib/outdated_spec.rb
+- spec/lib/rebaser_spec.rb
+- spec/lib/updater_spec.rb
 - spec/spec_helper.rb

data/spec/outdated_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe Bummr::Outdated do
-  describe "#parse_gem_from" do
-    it 'line' do
-      line = '  * devise (newest 4.1.1, installed 3.5.2) in group "default"'
-
-      gem = Bummr::Outdated.instance.parse_gem_from(line)
-
-      expect(gem[:name]).to eq('devise')
-      expect(gem[:newest]).to eq('4.1.1')
-      expect(gem[:installed]).to eq('3.5.2')
-    end
-
-    it 'line in group' do
-      line = '  * rake (newest 11.1.2, installed 10.4.2)'
-
-      gem = Bummr::Outdated.instance.parse_gem_from(line)
-
-      expect(gem[:name]).to eq('rake')
-      expect(gem[:newest]).to eq('11.1.2')
-      expect(gem[:installed]).to eq('10.4.2')
-    end
-  end
-end