bummr 0.3.1 → 0.6.0

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
@@ -19,7 +20,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")
@@ -30,12 +36,17 @@ module Bummr
         log("#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}")
       end
 
-      log "Commit: #{message}".color(:green)
-      system("git commit -am '#{message}'")
+      git.add("Gemfile")
+      git.add("Gemfile.lock")
+      git.add("vendor/cache")
+      git.commit(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.6.0"
 end

data/lib/bummr.rb

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

data/spec/black_box/bummr_update_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+require "jet_black"
+
+describe "bummr update command" do
+  let(:session) { JetBlack::Session.new(options: { clean_bundler_env: true }) }
+  let(:bummr_gem_path) { File.expand_path("../../", __dir__) }
+
+  it "updates outdated gems" do
+    session.create_file "Gemfile", <<~RUBY
+      source "https://rubygems.org"
+      gem "rake", "~> 10.0"
+      gem "bummr", path: "#{bummr_gem_path}"
+    RUBY
+
+    session.create_file "Rakefile", <<~RUBY
+      task :default do
+        puts "Hello from the Rakefile"
+      end
+    RUBY
+
+    expect(session.run("bundle install --retry 3")).
+      to be_a_success.and have_stdout(/bummr .* from source/)
+
+    # Now allow newer versions of Rake to be installed
+    session.run("sed -i.bak 's/, \"~> 10.0\"//' Gemfile")
+
+    session.run("mkdir -p log")
+
+    expect(session.run("git init .")).
+      to be_a_success.and have_stdout("Initialized empty Git repository")
+
+    session.run("git config user.name 'Bummr Test'")
+    session.run("git config user.email 'test@example.com'")
+
+    expect(session.run("git add . && git commit -m 'Initial commit'")).
+      to be_a_success.and have_stdout("Initial commit")
+
+    session.run("git checkout -b bummr-branch")
+
+    update_result = session.run(
+      "bundle exec bummr update",
+      stdin: "y\ny\ny\n",
+      env: { EDITOR: nil, BUMMR_HEADLESS: "true" },
+    )
+
+    rake_gem_updated = /Update rake from 10\.\d\.\d to 1[1-9]\.\d\.\d/
+
+    expect(update_result).
+      to be_a_success.and have_stdout(rake_gem_updated)
+
+    expect(update_result).to have_stdout("Passed the build!")
+
+    expect(session.run("git log")).
+      to be_a_success.and have_stdout(rake_gem_updated)
+
+    expect(session.run("bundle show")).
+      to be_a_success.and have_stdout(/rake\s\(1[1-9]/)
+  end
+end

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

@@ -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" },
@@ -29,14 +30,14 @@ describe Bummr::CLI do
         updater = double
         allow(updater).to receive(:update_gems)
 
-        expect(cli).to receive(:ask_questions)
+        expect(cli).to receive(:display_info)
         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)
+        expect(git).to receive(:rebase_interactive).with(BASE_BRANCH)
       end
 
       context "and there are no outdated gems" do
@@ -44,11 +45,11 @@ describe Bummr::CLI do
           allow_any_instance_of(Bummr::Outdated).to receive(:outdated_gems)
             .and_return []
 
-          expect(cli).to receive(:ask_questions)
+          expect(cli).to receive(:display_info)
           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
@@ -93,6 +94,38 @@ describe Bummr::CLI do
           cli.update
         end
       end
+
+      describe "gem option" do
+        it "requests only outdated specific gem from supplied be listed" do
+          options[:gem] = 'tzdata'
+
+          expect_any_instance_of(Bummr::Outdated)
+            .to receive(:outdated_gems).with(hash_including({ gem: 'tzdata' }))
+            .and_return outdated_gems
+
+          mock_bummr_standard_flow
+
+          cli.update
+        end
+      end
+    end
+
+    context "when in headless mode" do
+      context "and there are no outdated gems" do
+        it "informs that there are no outdated gems" do
+          stub_const("HEADLESS", true)
+          allow_any_instance_of(Bummr::Outdated).to receive(:outdated_gems)
+            .and_return []
+
+          expect(cli).to receive(:display_info)
+          expect(cli).to receive(:check)
+          expect(cli).to receive(:log)
+          expect(cli).to receive(:system).with("bundle install")
+          expect(cli).to receive(:puts).with("No outdated gems to update".color(:green))
+
+          cli.update
+        end
+      end
     end
   end
 
@@ -102,6 +135,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 +145,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 +158,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 +168,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/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/outdated_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Bummr::Outdated do
   # https://github.com/wireframe/gitx/blob/8e3cdc8b5d0c2082ed3daaf2fc054654b2e7a6c8/spec/gitx/executor_spec.rb#L9
-  let(:stdoutput) {
+  let(:stdoutput_legacy) {
     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"
@@ -12,6 +12,11 @@ describe Bummr::Outdated do
     StringIO.new(output)
   }
 
+  let(:stdoutput) {
+    output = stdoutput_legacy.string.gsub(/^([\s*]+)/, "")
+    StringIO.new(output)
+  }
+
   let(:gemfile) {
     gemfile = String.new
     gemfile += "gem 'devise'\n"
@@ -22,33 +27,35 @@ describe Bummr::Outdated do
   }
 
   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
+    { bundler2: :stdoutput, bundler1: :stdoutput_legacy }.each_pair do |version, output|
+    it "Correctly identifies outdated gems with bundler #{version}" do
+      allow(Open3).to receive(:popen2).and_yield(nil, public_send(output))
+        allow_any_instance_of(described_class).to receive(:gemfile).and_return gemfile
 
-      instance = Bummr::Outdated.instance
-      result = instance.outdated_gems
+        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[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[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')
+        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')
 
-      expect(result[3][:name]).to eq('spring')
-      expect(result[3][:newest]).to eq('4.2.6')
-      expect(result[3][:installed]).to eq('4.2.5.1')
+        expect(result[3][:name]).to eq('spring')
+        expect(result[3][:newest]).to eq('4.2.6')
+        expect(result[3][:installed]).to eq('4.2.5.1')
+      end
     end
 
     describe "all gems option" do
       it "lists all outdated dependencies by omitting the strict option" do
-        allow(Open3).to receive(:popen2).with("bundle outdated").and_yield(nil, stdoutput)
+        allow(Open3).to receive(:popen2).with("bundle outdated --parseable").and_yield(nil, stdoutput)
 
         allow(Bummr::Outdated.instance).to receive(:gemfile).and_return gemfile
 
@@ -59,7 +66,7 @@ describe Bummr::Outdated do
       end
 
       it "defaults to false" do
-        expect(Open3).to receive(:popen2).with("bundle outdated --strict").and_yield(nil, stdoutput)
+        expect(Open3).to receive(:popen2).with("bundle outdated --parseable --strict").and_yield(nil, stdoutput)
 
         allow(Bummr::Outdated.instance).to receive(:gemfile).and_return gemfile
 
@@ -73,13 +80,13 @@ describe Bummr::Outdated do
     describe "group option" do
       let(:stdoutput_from_development_group) {
         output = String.new
-        output += "  * spring (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0)"
+        output += "spring (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0)"
         StringIO.new(output)
       }
 
       it "lists outdated gems only from supplied group" do
         allow(Open3).to receive(:popen2)
-          .with("bundle outdated --strict --group development")
+          .with("bundle outdated --parseable --strict --group development")
           .and_yield(nil, stdoutput_from_development_group)
 
         allow(Bummr::Outdated.instance).to receive(:gemfile).and_return gemfile
@@ -92,7 +99,7 @@ describe Bummr::Outdated do
 
       it "defaults to all groups" do
         allow(Open3).to receive(:popen2)
-          .with("bundle outdated --strict")
+          .with("bundle outdated --parseable --strict")
           .and_yield(nil, stdoutput)
 
         allow(Bummr::Outdated.instance).to receive(:gemfile).and_return gemfile
@@ -103,11 +110,32 @@ describe Bummr::Outdated do
         expect(gem_names).to include 'devise', 'rake', 'rails', 'spring'
       end
     end
+
+    describe "gem option" do
+      let(:stdoutput_from_spring_gem) {
+        output = String.new
+        output += "spring (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0)"
+        StringIO.new(output)
+      }
+
+      it "lists outdated gems only from supplied gem" do
+        allow(Open3).to receive(:popen2)
+          .with("bundle outdated --parseable --strict spring")
+          .and_yield(nil, stdoutput_from_spring_gem)
+
+        allow(Bummr::Outdated.instance).to receive(:gemfile).and_return gemfile
+
+        results = Bummr::Outdated.instance.outdated_gems(gem: :spring)
+        gem_names = results.map { |result| result[:name] }
+
+        expect(gem_names).to match_array ['spring']
+      end
+    end
   end
 
   describe "#parse_gem_from" do
     it 'line' do
-      line = '  * devise (newest 4.1.1, installed 3.5.2) in group "default"'
+      line = 'devise (newest 4.1.1, installed 3.5.2) in group "default"'
 
       gem = Bummr::Outdated.instance.parse_gem_from(line)
 
@@ -117,7 +145,7 @@ describe Bummr::Outdated do
     end
 
     it 'line in group' do
-      line = '  * rake (newest 11.1.2, installed 10.4.2)'
+      line = 'rake (newest 11.1.2, installed 10.4.2)'
 
       gem = Bummr::Outdated.instance.parse_gem_from(line)
 
@@ -127,7 +155,7 @@ describe Bummr::Outdated do
     end
 
     it 'line with requested' do
-      line = '  * rails (newest 4.2.6, installed 4.2.5.1, requested ~> 4.2.0) in group "default"'
+      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)