bummr 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e45c2c7ad39b56f06d1f4d1d9b92e81b9cfe99
-  data.tar.gz: 3926625ea98f21b174811801d4651fe57529714e
+  metadata.gz: 25ae2fed8478c1b44bd75fdb39aa01d2c7baa196
+  data.tar.gz: f01bf40b1efb8b489d7724f8411dd6f48d8655dd
 SHA512:
-  metadata.gz: 25f941aa5afaf12e341ca4418a456431e6fa7d1bbc1ad993d96fb848dc67a49bdbf26cff85c4e584037f5024cb4423f0cc5cfc9ccdf80cf61b7195e8f6fc7368
-  data.tar.gz: 55f6cb69285537ec993bbfd573c33ae1b550656f4a8b14b7e5906c7b967cfb09a47ad3d384e188e684c524061189538e465a1c404ebb731c5815a36ee88e682f
+  metadata.gz: ff5beb79273d4ccedd442f83e620e4f81df35f544ae4fb452d3c381dda7930e222d35468f9ad990d5afa2eb7c3889cc01c6f37062a14c1237d315aab906bbe67
+  data.tar.gz: 72925d9a0abff30b1c7fb1ead19ddeae96177029e0c61622d7303619fcda4da281ecfcc72f0588b6d690e0c4de5566198f83fdd2f4bd46c3b4646d4c35af6c88

data/README.md

@@ -1,46 +1,47 @@
 # Bummr
 
-Updating Gems one by one is a Bummr: especially when one gem causes your build
+Updating Gems one by one is a bumm(e)r: especially when one gem causes your build
 to fail.
 
-The *Bummr* gem allows you to automatically update all gems which pass your
+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/).
+
+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] (https://help.github.com/articles/using-pull-requests/) with `master` as your
+default branch.
+
+Please note that this gem is *alpha* stage and may have bugs.
+
 ## Installation
 
 ```bash
 $ gem install bummr
 ```
 
-Add a file called `.bummr-build.sh` to the root of your git directory.
-
-Here is a suggested `.bummr-build.sh` which will `bundle exec rake` 4 times:
-
-`.bummr-build.sh`
+By default, bummr will use `bundle exec rake` to run your build.
 
-```bash
-#!/bin/sh
-MAX_TRIES=4
-COUNT=0
-EXIT=0
-
-while [ $COUNT -lt $MAX_TRIES ] && [ $EXIT -eq 0 ]; do
-  git log --pretty=format:'%s' -n 1
-  echo "\nRunning test suite... $COUNT of $MAX_TRIES"
-  bundle exec rake
-  let EXIT=$?
-  let COUNT=COUNT+1
-done
-
-exit $EXIT
-```
+To customize your build command, `export BUMMR_TEST="./bummr-build.sh"`
 
-Commit this file and merge it to master before running `bummr update`!
+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.
 
 ## Usage:
 
-- Create a new, clean branch off of master.
-- Run `bummr update`
+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.
+- 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
+  to update and close the file.
+- At this point, you can leave `bummr` to work for some time.
+- If your build fails, `bummr` will attempt to automatically remove breaking
+  commits, until the build passes, logging any failures to `/log/bummr.log`.
+- Once your build passes, open a pull-request and merge it to your `master` branch.
 
 ##### `bummr update`
 
@@ -48,7 +49,7 @@ Commit this file and merge it to master before running `bummr update`!
 - Updates them each individually, using `bundle update --source #{gemname}`
 - Commits each gem update separately, with a commit message like:
 
-`gemname, {0.0.1 -> 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`
@@ -63,10 +64,13 @@ Commit this file and merge it to master before running `bummr update`!
 - `git bisect`s against master.
 - Finds the bad commit and attempts to remove it.
 - Logs the bad commit in `log/bummr.log`.
-- Runs `bummr test`
+- Runs `bummr test`.
 
 ## Notes
 
+- Bummr assumes you have good test coverage and follow a [pull-request workflow]
+  (https://help.github.com/articles/using-pull-requests/) with `master` 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.
@@ -74,13 +78,11 @@ Commit this file and merge it to master before running `bummr update`!
   which case you will have to remove it manually, continue the rebase, and
   run `bummr test` again.
 
-## Contributing
+## Developing
+
+`rake build` to build locally
 
-1. Fork it ( https://github.com/lpender/bummr/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+`gem install --local ~/dev/mine/bummr/pkg/bummr-0.0.X.gem` in the app you wish to use it with.
 
 ## Wanted
 

data/bummr.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lpender@gmail.com"]
   spec.summary       = %q{Helper script to intelligently update your Gemfile}
   spec.description   = %q{See Readme}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/lpender/bummr"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,11 +18,11 @@ 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 'colorize'
+  spec.add_dependency 'thor', "~> 0.19"
+  spec.add_dependency 'colorize', "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rspec', "~> 0"
+  spec.add_development_dependency 'pry', "~> 0"
 end

data/lib/bummr/cli.rb

@@ -3,6 +3,8 @@ require 'thor'
 require 'open3'
 require 'colorize'
 
+TEST_COMMAND = ENV["BUMMR_TEST"] || "bundle exec rake"
+
 module Bummr
   class CLI < Thor
     desc "check", "Run automated checks to see if bummr can be run"
@@ -16,14 +18,24 @@ module Bummr
         errors.push message
       end
 
-      unless File.file?(".bummr-build.sh") && File.executable?(".bummr-build.sh")
-        message = "You must have a file '.bummr-build.sh' which runs your build"
+      unless File.directory? "log"
+        message = "There is no log directory or you are not in the root"
         say message.red
         errors.push message
       end
 
-      unless File.directory? "log"
-        message = "There is no log directory or you are not in the root"
+      status = `git status`
+
+      if status.index 'are currently'
+        message = ""
+
+        if status.index 'rebasing'
+          message += "You are already rebasing. "
+        elsif status.index 'bisecting'
+          message += "You are already bisecting. "
+        end
+
+        message += "Make sure `git status` is clean"
         say message.red
         errors.push message
       end
@@ -48,11 +60,11 @@ module Bummr
       say "To run Bummr, you must:"
       say "- Be in the root path of a clean git branch off of master"
       say "- Have no commits or local changes"
-      say "- Have a file, '.bummr-build.sh' on master that runs your build"
       say "- Have a 'log' directory, where we can place logs"
       say "- Have your build configured to fail fast (recommended)"
       say "- Have locked any Gem version that you don't wish to update in your Gemfile"
       say "- It is recommended that you lock your versions of `ruby` and `rails in your Gemfile`"
+      say "Your test command is: '#{TEST_COMMAND}'"
 
       if yes? "Are you ready to use Bummr? (y/n)"
         check
@@ -65,18 +77,31 @@ module Bummr
           say outdated_gems_to_update.map { |g| "* #{g}" }.join("\n")
 
           outdated_gems_to_update.each_with_index do |gem, index|
-            message = "#{gem[:name]}, {#{gem[:current_version]} -> #{gem[:spec_version]}}"
-            say "Updating #{message}, #{index+1} of #{outdated_gems_to_update.count}"
+            say "Updating #{gem[:name]}: #{index+1} of #{outdated_gems_to_update.count}"
 
             system("bundle update --source #{gem[:name]}")
-            system("git commit -am '#{message}'")
+            updated_version = `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
+            message = "Update #{gem[:name]} from #{gem[:current_version]} to #{updated_version}"
+
+            if gem[:spec_version] != updated_version
+              log("#{gem[:name]} not updated from #{gem[:current_version]} to latest: #{gem[:spec_version]}")
+            end
+
+            unless gem[:current_version] == updated_version
+              say message.green
+              system("git commit -am '#{message}'")
+            else
+              log("#{gem[:name]} not updated")
+            end
           end
 
           say "Choose which gems to update"
           system("git rebase -i master")
-        end
 
-        test
+          log "Running Update + #{Time.now}"
+
+          test
+        end
       else
         say "Thank you!".green
       end
@@ -85,10 +110,10 @@ module Bummr
     desc "test", "Test for a successful build and bisect if necesssary"
     def test
       check(false)
+      `bundle`
       say "Testing the build!".green
 
-      if system("./.bummr-build.sh") == false
-        `bundle`
+      if system(TEST_COMMAND) == false
         bisect
       else
         say "Passed the build!".green
@@ -101,11 +126,10 @@ module Bummr
     def bisect
       check(false)
       say "Bad commits found! Bisecting...".red
-      log "Bad commits found: #{Time.now}"
 
       system("git bisect start head master")
 
-      Open3.popen2e("git bisect run ./.bummr-build.sh") do |std_in, std_out_err|
+      Open3.popen2e("git bisect run #{TEST_COMMAND}") do |std_in, std_out_err|
         while line = std_out_err.gets
           puts line
 
@@ -124,6 +148,7 @@ module Bummr
     private
 
     def log(message)
+      say message
       system("touch log/bummr.log && echo '#{message}' >> log/bummr.log")
     end
 

data/lib/bummr/version.rb

@@ -1,3 +1,3 @@
 module Bummr
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Lee Pender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,28 +70,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: See Readme
@@ -105,7 +105,6 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/bummr
@@ -113,7 +112,7 @@ files:
 - lib/bummr.rb
 - lib/bummr/cli.rb
 - lib/bummr/version.rb
-homepage: ''
+homepage: https://github.com/lpender/bummr
 licenses:
 - MIT
 metadata: {}
@@ -133,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Helper script to intelligently update your Gemfile

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Ryan Sonnek
-
-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.