bummr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a418b56df2ef27d3133a50eb3496fc185e08fd33980891d55f0fa17b4924640e
-  data.tar.gz: afa326b65168586bb0f9526c8f060d830b55f94ddaa5228c24cbbc0b65d43dc7
+  metadata.gz: c6eba01b649b2d2a467eebcc14c7c81040b8c6038c4a0f798fc740688fbb1fb6
+  data.tar.gz: 390435ebf0c5efb38bd355748afd84758912c72cc6a43e88f6cf7c0c2befec52
 SHA512:
-  metadata.gz: f86b59ec25374e52448f933a6923e582713f05a6f23f050b2af0854d3fab4a8489e04f4feaeb14a94707cc1650e3472f79caf67ba0af6fbb8a0c6694acdedcca
-  data.tar.gz: 56e01e31f8e7d03a7111f378d4283cf497e90dc4e29c0f0bac8bebf2cb423b5bf27d6e74fa16c804e6f50b3f174d0f0850821b8dd314fcbcea35fe70756a21fe
+  metadata.gz: 8315fefc4d58a5bef3ebabe084886c975a967e9bf38d4b9d48105d83ee01ce34065dfed54f725487343b8752128a1c1c2c452c982ff497e1c9befb46c59f64b7
+  data.tar.gz: dabf3ccfd52d3e927335fe591188d7512092dca5de2bec188c20b28c77d52a9b709241ac8dd8f2b4e9e5fbb33b82586eea41de311c61f8c3381df3571ab58f42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bummr (0.6.0)
+    bummr (1.1.0)
       rainbow
       thor
 

data/README.md

@@ -1,6 +1,5 @@
 # Bummr
 
-[![CircleCI](https://circleci.com/gh/lpender/bummr.svg?style=shield)](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://api.codeclimate.com/v1/badges/52d6651bf8cd5e729b11/test_coverage)](https://codeclimate.com/github/lpender/bummr/test_coverage)
 
@@ -14,7 +13,7 @@ build in separate commits, and logs the name and sha of each gem that fails.
 
 Bummr assumes you have good test coverage and follow a [pull-request workflow].
 
-By default, bummr will assume your base branch is named `master`. If you would
+By default, bummr will assume your base branch is named `main`. If you would
 like to designate a different base branch, you can set the `BASE_BRANCH`
 environment variable: `export BASE_BRANCH='main'`
 
@@ -50,7 +49,7 @@ on the number of outdated gems you have and the number of tests in your test
 suite.
 
 For the purpose of these instructions, we are assuming that your base branch is
-`master`. If you would like to specify a different base branch, see the
+`main`. If you would like to specify a different base branch, see the
 instructions in the Installation section of this README.
 
 - After installing, create a new, clean branch off of your main branch.
@@ -81,7 +80,7 @@ instructions in the Installation section of this README.
 Update gemname from 0.0.1 to 0.0.2
 ```
 
-- Runs `git rebase -i master` to allow you the chance to review and make changes.
+- Runs `git rebase -i main` to allow you the chance to review and make changes.
 - Runs `bummr test`
 
 ##### `bummr test`
@@ -91,7 +90,7 @@ Update gemname from 0.0.1 to 0.0.2
 
 ##### `bummr bisect`
 
-- `git bisect`s against master.
+- `git bisect`s against main.
 - Upon finding the bad commit, runs `git bisect reset` and notifies the developer on
   how best to proceed.
 - Logs the bad commit in `log/bummr.log`.
@@ -99,7 +98,7 @@ Update gemname from 0.0.1 to 0.0.2
 ## Notes
 
 - Bummr assumes you have good test coverage and follow a [pull-request workflow]
-  with `master` as your default branch.
+  with `main` as your default branch.
 - Once the build passes, you can push your branch and create a pull-request!
 - You may wish to `tail -f log/bummr.log` in a separate terminal window so you
   can see which commits are being removed.
@@ -114,11 +113,13 @@ Set version in `lib/bummr/version.rb`
 
 `rake build` to build locally
 
-`gem install --local ~/dev/mine/bummr/pkg/bummr-X.X.X.gem` in the app you
-wish to use it with.
+`gem install --local ./pkg/bummr-X.X.X.gem` with the ruby version of the app
+you'd like to use it with.
 
 `rake` will run the suite of unit tests.
 
+`gem push ./pkg/bummr-x.x.x.gem` to publish new versions.
+
 The suite relies on Oliver Peate's [jet
 black](https://github.com/odlp/jet_black) testing library for command line feature
 tests.

data/lib/bummr/cli.rb

@@ -1,5 +1,5 @@
 TEST_COMMAND = ENV["BUMMR_TEST"] || "bundle exec rake"
-BASE_BRANCH = ENV["BASE_BRANCH"] || "master"
+BASE_BRANCH = ENV["BASE_BRANCH"] || "main"
 HEADLESS = ENV["BUMMR_HEADLESS"] || false
 
 module Bummr

data/lib/bummr/remover.rb

@@ -15,7 +15,7 @@ module Bummr
         "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" +
+        "    - `git reset --hard main`\n" +
         "    - Lock the version of this Gem in your Gemfile.\n" +
         "    - Commit the changes.\n" +
         "    - Run `bummr update` again.\n\n"

data/lib/bummr/updater.rb

@@ -16,15 +16,15 @@ module Bummr
     end
 
     def update_gem(gem, index)
-      puts "Updating #{gem[:name]}: #{index+1} of #{@outdated_gems.count}"
+      puts "Updating #{gem[:name]}: #{index + 1} of #{@outdated_gems.count}"
       system("bundle update #{gem[:name]}")
 
       updated_version = updated_version_for(gem)
 
-      if (updated_version)
-        message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
+      message = if updated_version
+        "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
       else
-        message = "Update dependencies for #{gem[:name]}"
+        "Update dependencies for #{gem[:name]}"
       end
 
       if gem[:installed] == updated_version
@@ -43,7 +43,8 @@ module Bummr
     end
 
     def updated_version_for(gem)
-      `bundle list | grep " #{gem[:name]} "`&.split('(')[1].split(')')[0]
+      string = `bundle list --paths | grep "#{gem[:name]}"`
+      string.match(/#{gem[:name]}-(.*)$/)[1]
     end
   end
 end

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/check_spec.rb

@@ -41,7 +41,7 @@ describe Bummr::Check do
         allow(check)
           .to receive(:check_base_branch).and_call_original
         allow(check).to receive(:`).with('git rev-parse --abbrev-ref HEAD')
-          .and_return "master\n"
+          .and_return "main\n"
 
         check.check
 
@@ -108,7 +108,7 @@ describe Bummr::Check do
     context "check_diff fails" do
       before do
         allow(check).to receive(:check_diff).and_call_original
-        allow(check).to receive(:`).with('git diff master')
+        allow(check).to receive(:`).with('git diff main')
           .and_return "+ file"
       end
 
@@ -116,7 +116,7 @@ describe Bummr::Check do
         check.check(true)
 
         expect(check).to have_received(:puts)
-          .with("Please make sure that `git diff master` returns empty".color(:red))
+          .with("Please make sure that `git diff main` returns empty".color(:red))
         expect(check).to have_received(:yes?)
         expect(check).to have_received(:exit).with(0)
       end

data/spec/lib/updater_spec.rb

@@ -124,8 +124,8 @@ describe Bummr::Updater do
   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")
+        "bundle list --paths | grep \"#{gem[:name]}\""
+      ).and_return("asdf/asdf/asdf/#{gem[:name]}-3.5.2")
 
       expect(updater.updated_version_for(gem)).to eq "3.5.2"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Lee Pender
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor