bummr 0.3.1 → 0.6.0

data/spec/lib/prompt_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Bummr::Prompt do
+  let(:parent_class) do
+    Class.new do
+      def yes?(message)
+        "called parent with #{message}"
+      end
+    end
+  end
+  let(:object_class) { Class.new(parent_class) }
+  let(:object) { object_class.new }
+
+  before do
+    object.extend(Bummr::Prompt)
+  end
+
+  describe "#yes?" do
+    context "when HEADLESS is false" do
+      it "calls super" do
+        stub_const("HEADLESS", false)
+
+        expect(
+          object.yes?("foo")
+        ).to eq "called parent with foo"
+      end
+    end
+
+    context "when HEADLESS is nil" do
+      it "calls super" do
+        stub_const("HEADLESS", nil)
+
+        expect(
+          object.yes?("foo")
+        ).to eq "called parent with foo"
+      end
+    end
+
+    context "when HEADLESS is true" do
+      it "returns true and skips asking for user input" do
+        stub_const("HEADLESS", true)
+
+        expect(
+          object.yes?("foo")
+        ).to eq true
+      end
+    end
+  end
+end

data/spec/lib/remover_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Bummr::Remover do
+  let(:remover) { Bummr::Remover.instance }
+  let(:git) { Bummr::Git.instance }
+  let(:sha) { "testsha" }
+
+  before do
+    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
+      allow(git).to receive(:message).and_return("commit message")
+
+      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

@@ -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)
 
@@ -78,15 +83,18 @@ 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)
+        allow(git).to receive(:add)
+        allow(git).to receive(:commit)
 
         updater.update_gem(gem, 0)
 
-        expect(updater).to have_received(:system).with(
-          "git commit -am #{commit_message}"
-        )
+        expect(git).to have_received(:add).with("Gemfile")
+        expect(git).to have_received(:add).with("Gemfile.lock")
+        expect(git).to have_received(:add).with("vendor/cache")
+        expect(git).to have_received(:commit).with(commit_message)
       end
     end
 
@@ -95,28 +103,20 @@ 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 commit -am '#{commit_message}'"
-        )
+        expect(git).to have_received(:add).with("Gemfile")
+        expect(git).to have_received(:add).with("Gemfile.lock")
+        expect(git).to have_received(:add).with("vendor/cache")
+        expect(git).to have_received(:commit).with(commit_message)
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,3 +4,4 @@ SimpleCov.start
 require 'pry'
 require 'bummr'
 require 'rainbow/ext/string'
+require 'jet_black/rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Lee Pender
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jet_black
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
@@ -208,29 +223,34 @@ files:
 - Rakefile
 - bin/bummr
 - bummr.gemspec
-- circle.yml
 - lib/bummr.rb
 - 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/rebaser.rb
+- lib/bummr/prompt.rb
+- lib/bummr/remover.rb
+- lib/bummr/scm.rb
 - lib/bummr/updater.rb
 - lib/bummr/version.rb
+- spec/black_box/bummr_update_spec.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/rebaser_spec.rb
+- spec/lib/prompt_spec.rb
+- spec/lib/remover_spec.rb
 - spec/lib/updater_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lpender/bummr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,17 +265,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Helper script to intelligently update your Gemfile
 test_files:
+- spec/black_box/bummr_update_spec.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/rebaser_spec.rb
+- spec/lib/prompt_spec.rb
+- spec/lib/remover_spec.rb
 - spec/lib/updater_spec.rb
 - spec/spec_helper.rb

data/circle.yml

@@ -1,3 +0,0 @@
-test:
-  post:
-    - bundle exec codeclimate-test-reporter

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