bummr 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 389815b5180dc129c7eabe7f2d2a4652c0266a7e
-  data.tar.gz: 55dea3cebd0100b8a484a8994ef4657765a27b84
+SHA256:
+  metadata.gz: 3defa139f960ba6926952a637df79639fa2ba63d42215ea3b6e91036fc2e229b
+  data.tar.gz: c97eef10397acf5441dd7d2ea3330afb9c6e8c98a4aaf1ea33508adb614368bb
 SHA512:
-  metadata.gz: 47ac269d5bffa3e9f45d83eabe2befb31f5ad932e18aa5cdd3cf817b3bca3153c15166e12f2f5489682d3c058bbce77579fe68e4e7a3126a0b21acf7885182de
-  data.tar.gz: f953d5673838a0c6f00f6785ec65745fbac5f550285796d061fdf2221c4a8baff9d40bfda5d8c877d3530a34fcc6cd0e44da6e5db0bae9d9929aa8f3bf698a8d
+  metadata.gz: 3ec5cb5fde39dabc1dc008fd28cbba5cc936a32785ce1605085b9db4e1aabcb04b866a2d8b0e8fa497c45c58507f4268841c3d1ffc91199e266a6a3389aaac72
+  data.tar.gz: 404c1a9e7aecf4140cbdd9fa5137b333731047a6eac06dd0ea018317db94f1926ab28a72dc5323127d49857d90ea52a42c7a449654edc8257ceb22aea7133015

data/.circleci/config.yml

@@ -0,0 +1,24 @@
+version: 2.1,
+orbs:
+  ruby: circleci/ruby@1.1.2
+jobs:
+  test:
+    docker:
+      - image: cimg/ruby:2.7-node
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: bundle install
+      - run:
+          name: Test
+          command: bundle exec rake
+      - run:
+          name:
+            Report coverage to codeclimate
+          command: bundle exec codeclimate-test-reporter
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.7.2

data/README.md

@@ -1,23 +1,31 @@
 # Bummr
 
-[![CircleCI](https://circleci.com/gh/lpender/bummr.svg?style=svg)](https://circleci.com/gh/lpender/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://codeclimate.com/github/lpender/bummr/badges/coverage.svg)](https://codeclimate.com/github/lpender/bummr/coverage)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/52d6651bf8cd5e729b11/test_coverage)](https://codeclimate.com/github/lpender/bummr/test_coverage)
 
 Updating Gems one by one is a bumm(e)r: especially when one gem causes your build
 to fail.
 
-Gems should be updated in [separate commits](http://ilikestuffblog.com/2012/07/01/you-should-update-one-gem-at-a-time-with-bundler-heres-how/).
+Gems should be updated in [separate commits](https://thoughtbot.com/blog/keep-your-gems-up-to-date).
 
 The bummr gem allows you to automatically update all gems which pass your
 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]
-with `master` as your default branch.
+Bummr assumes you have good test coverage and follow a [pull-request workflow].
 
-Please note that this gem is _alpha_ stage and may have bugs.
+By default, bummr will assume your base branch is named `master`. If you would
+like to designate a different base branch, you can set the `BASE_BRANCH`
+environment variable: `export BASE_BRANCH='main'`
+
+## Compatibility
 
-## Installation
+| Bundler Version | Bummr Version |
+| --------------- | ------------- |
+| <= 2.1          | <= 0.6.0      |
+| >= 2.2          | >= 1.0.0      |
+
+## Setup
 
 ```bash
 $ gem install bummr
@@ -33,13 +41,9 @@ To customize your build command, `export BUMMR_TEST="./bummr-build.sh"`
 If you prefer, you can [run the build more than once], to protect against
 brittle tests and false positives.
 
-By default, bummr will assume your base branch is named `master`. If you would
-like to designate a different base branch, you can set the `BASE_BRANCH`
-environment variable: `export BASE_BRANCH='develop'`
-
 [run the build more than once]: https://gist.github.com/lpender/f6b55e7f3649db3b6df5
 
-## Usage:
+## Usage
 
 Using bummr can take anywhere from a few minutes to several hours, depending
 on the number of outdated gems you have and the number of tests in your test
@@ -49,7 +53,7 @@ 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
 instructions in the Installation section of this README.
 
-- After installing, create a new, clean branch off of your `master` branch.
+- After installing, create a new, clean branch off of your main branch.
 - Run `bummr update`. This may take some time.
 - `Bummr` will give you the opportunity to interactively rebase your branch
   before running the tests. Careful.
@@ -58,19 +62,24 @@ instructions in the Installation section of this README.
   `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.
+- Once your build passes, open a pull-request and merge it to your main branch.
 
 ##### `bummr update`
 
+- Options:
+
+  - `--all` to include indirect dependencies (`bummr` defaults to direct dependencies only)
+  - `--group` to update only gems from a specific group (i.e. `test`, `development`)
+  - `--gem` to update only a specific gem (i.e. `tzinfo`)
+
 - Finds all your outdated gems
 - Updates them each individually, using `bundle update --source #{gemname}`. To use a less
   conservative update strategy, start `bummr update` with the `--all` option.
 - Commits each gem update separately, with a commit message like:
-- Options:
-  - `--all` to include indirect dependencies (`bummr` defaults to direct dependencies only)
-  - `--group` to update only gems from a specific group (i.e. `test`, `development`)
 
-`Update gemname from 0.0.1 to 0.0.2`
+```
+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 `bummr test`
@@ -83,7 +92,7 @@ instructions in the Installation section of this README.
 ##### `bummr bisect`
 
 - `git bisect`s against master.
-- Upon finding the bad commit, runs `git bisect reset` and notifies the developer on 
+- 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`.
 

data/lib/bummr/cli.rb

@@ -17,11 +17,13 @@ module Bummr
       "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" +
+      "--gem: Specify a specific gem to update\n" +
       "\n"
 
 
     method_option :all, type: :boolean, default: false
     method_option :group, type: :string
+    method_option :gem, type: :string
 
     def update
       system("bundle install")
@@ -32,7 +34,7 @@ module Bummr
         log("Bummr update initiated #{Time.now}")
 
         outdated_gems = Bummr::Outdated.instance.outdated_gems(
-          all_gems: options[:all], group: options[:group]
+          all_gems: options[:all], group: options[:group], gem: options[:gem]
         )
 
         if outdated_gems.empty?
@@ -52,7 +54,7 @@ module Bummr
     def test
       check(false)
 
-      if yes? "Do you want to test the build now?"
+      if yes? "Do you want to test the build now? (y/n)"
         system "bundle install"
         puts "Testing the build!".color(:green)
 

data/lib/bummr/outdated.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'singleton'
+require 'bundler'
 
 module Bummr
   class Outdated
@@ -9,8 +10,10 @@ module Bummr
       results = []
 
       bundle_options =  ""
+      bundle_options << " --parseable" if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2")
       bundle_options << " --strict" unless options[:all_gems]
       bundle_options << " --group #{options[:group]}" if options[:group]
+      bundle_options << " #{options[:gem]}" if options[:gem]
 
       Open3.popen2("bundle outdated" + bundle_options) do |_std_in, std_out|
         while line = std_out.gets
@@ -27,7 +30,7 @@ module Bummr
     end
 
     def parse_gem_from(line)
-      regex = / \* (.*) \(newest (\d[\d\.]*\d)[,\s] installed (\d[\d\.]*\d)[\),\s]/.match line
+      regex = /(?:\s+\* )?(.*) \(newest (\d[\d\.]*\d)[,\s] installed (\d[\d\.]*\d)[\),\s]/.match line
 
       unless regex.nil?
         { name: regex[1], newest: regex[2], installed: regex[3] }

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/lib/cli_spec.rb

@@ -94,6 +94,20 @@ 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

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)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Lee Pender
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -214,6 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
@@ -222,7 +223,6 @@ files:
 - Rakefile
 - bin/bummr
 - bummr.gemspec
-- circle.yml
 - lib/bummr.rb
 - lib/bummr/bisecter.rb
 - lib/bummr/check.rb
@@ -250,7 +250,7 @@ homepage: https://github.com/lpender/bummr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,9 +265,8 @@ 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:

data/circle.yml

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