bummr 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f30f548b39e6f3124501b0408ee062380074d09
-  data.tar.gz: 6e7740872ead38b07b91426f65fe67a623e1de54
+  metadata.gz: d8473b4f3a06e36c229bf26a1e3616772f7d3990
+  data.tar.gz: ab6ce39aeecddd616183755cf4a434639b52a76d
 SHA512:
-  metadata.gz: 3aba5630386853fd5d46c021ace68cf0777828ac65c7f347a8a1df0baf4ff0107c895e913c83fa485b9023ead25c3dd778d6a96f7fdd3d9998453a36fbba3dbc
-  data.tar.gz: b7d5ae9de74c88d18673a45d105496100052f1c42b0e4dd4bddbb6b7bcd975ae41f68a09e8fd611bb9c47e216d4dc02df6afae76fa24db839405402eebcc4cd8
+  metadata.gz: c41d64f81b11a1c8a7874925cde87c0a745ea20a2a0102bc0472abeef74424704a67f6ebd37a38b63fc9f5ed743d881a4ba44f9b28ce413efbd5032673e13e23
+  data.tar.gz: de76a97147722a12995845c759ddb0f4f80272303e38c09ae4536b8d59b7d15e342b6d4ae20b608c5435435c4690101f7498198a16ed72fa1a418a4b2d59f0ba

data/LICENSE

@@ -0,0 +1,19 @@
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -31,13 +31,21 @@ If you prefer, you can [run the build more than once]
 (https://gist.github.com/lpender/f6b55e7f3649db3b6df5), 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'
+
 ## 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
 suite.
 
-- After installing, create a new, clean branch off of master.
+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.
 - Run `bummr update`. This may take some time.
 - `Bummr` will give you the opportunity to interactively rebase your branch
   before running the tests. Delete any commits for gems which you don't want
@@ -85,6 +93,10 @@ suite.
   which case you will have to remove it manually, continue the rebase, and
   run `bummr test` again.
 
+## License
+
+See LICENSE
+
 ## Developing
 
 `rake build` to build locally

data/bummr.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor'
-  spec.add_dependency 'rainbow'
+  spec.add_dependency "thor"
+  spec.add_dependency "rainbow"
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-nc"

data/lib/bummr.rb

@@ -1,5 +1,5 @@
 # grouped by dependency order than alpha
-require "bummr/log"
+require 'bummr/log'
 require 'rainbow/ext/string'
 require 'open3'
 require 'singleton'

data/lib/bummr/bisecter.rb

@@ -8,7 +8,7 @@ module Bummr
       system("bundle")
       system("git bisect start")
       system("git bisect bad")
-      system("git bisect good master")
+      system("git bisect good #{BASE_BRANCH}")
 
       Open3.popen2e("git bisect run #{TEST_COMMAND}") do |_std_in, std_out_err|
         while line = std_out_err.gets

data/lib/bummr/check.rb

@@ -1,11 +1,11 @@
 module Bummr
-  class Check
+  class Check < Thor
     include Singleton
 
     def check(fullcheck=true)
       @errors = []
 
-      check_master
+      check_base_branch
       check_log
       check_status
 
@@ -24,9 +24,9 @@ module Bummr
 
     private
 
-    def check_master
-      if `git rev-parse --abbrev-ref HEAD` == "master\n"
-        message = "Bummr is not meant to be run on master"
+    def check_base_branch
+      if `git rev-parse --abbrev-ref HEAD` == "#{BASE_BRANCH}\n"
+        message = "Bummr is not meant to be run on your base branch"
         puts message.color(:red)
         puts "Please checkout a branch with 'git checkout -b update-gems'"
         @errors.push message
@@ -60,8 +60,8 @@ module Bummr
     end
 
     def check_diff
-      unless `git diff master`.empty?
-        message = "Please make sure that `git diff master` returns empty"
+      unless `git diff #{BASE_BRANCH}`.empty?
+        message = "Please make sure that `git diff #{BASE_BRANCH}` returns empty"
         puts message.color(:red)
         @errors.push message
       end

data/lib/bummr/cli.rb

@@ -1,4 +1,5 @@
 TEST_COMMAND = ENV["BUMMR_TEST"] || "bundle exec rake"
+BASE_BRANCH = ENV["BASE_BRANCH"] || "master"
 
 module Bummr
   class CLI < Thor
@@ -25,7 +26,7 @@ module Bummr
         else
           Bummr::Updater.new(outdated_gems).update_gems
 
-          system("git rebase -i master")
+          system("git rebase -i #{BASE_BRANCH}")
           test
         end
       else
@@ -59,7 +60,7 @@ module Bummr
 
     def ask_questions
       puts "To run Bummr, you must:"
-      puts "- Be in the root path of a clean git branch off of master"
+      puts "- Be in the root path of a clean git branch off of #{BASE_BRANCH}"
       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)"

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/check_spec.rb

@@ -5,7 +5,7 @@ describe Bummr::Check do
 
   before(:each) do
     allow(check)
-      .to receive(:check_master).and_return(nil)
+      .to receive(:check_base_branch).and_return(nil)
     allow(check)
       .to receive(:check_log).and_return(nil)
     allow(check)
@@ -36,17 +36,17 @@ describe Bummr::Check do
       end
     end
 
-    context "check_master fails" do
+    context "check_base_branch fails" do
       it "reports the error and exits after confirm" do
         allow(check)
-          .to receive(:check_master).and_call_original
+          .to receive(:check_base_branch).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".color(:red))
+          .with("Bummr is not meant to be run on your base branch".color(:red))
         expect(check).to have_received(:yes?)
         expect(check).to have_received(:exit).with(0)
       end

data/spec/lib/cli_spec.rb

@@ -54,7 +54,7 @@ describe Bummr::CLI do
           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(:system).with("git rebase -i #{BASE_BRANCH}")
           expect(cli).to receive(:test)
 
           cli.update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Lee Pender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -203,6 +203,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/bummr
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Helper script to intelligently update your Gemfile