bummr 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ae2fed8478c1b44bd75fdb39aa01d2c7baa196
-  data.tar.gz: f01bf40b1efb8b489d7724f8411dd6f48d8655dd
+  metadata.gz: cd6d2b3e86b89fd5ebe4bdc256646fd98a7d4ef7
+  data.tar.gz: d2479e96779e929066df0596652d2c5786c863d4
 SHA512:
-  metadata.gz: ff5beb79273d4ccedd442f83e620e4f81df35f544ae4fb452d3c381dda7930e222d35468f9ad990d5afa2eb7c3889cc01c6f37062a14c1237d315aab906bbe67
-  data.tar.gz: 72925d9a0abff30b1c7fb1ead19ddeae96177029e0c61622d7303619fcda4da281ecfcc72f0588b6d690e0c4de5566198f83fdd2f4bd46c3b4646d4c35af6c88
+  metadata.gz: 3775a716d8e1331f713f05164646bbb7f443e5faa950b5b090d5ee93dc57f540747dcddd9df7b0bae5e6097cae099dfc6a53c23146bfcc718a2a7b54e043b488
+  data.tar.gz: 261a954cfe05dc78af6d90662cbe6e50dca3fa6b726f8e6c6d218832fdbdcdd72baa9f88639f2090db6f659048482c412c42901247760c344766f5c17f12d524

data/README.md

@@ -29,7 +29,7 @@ brittle tests and false positives.
 
 ## Usage:
 
-Using bummr can take anywhere from a few minutes to several hours, depending 
+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.
 
@@ -74,6 +74,9 @@ suite.
 - 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.
+- Bummr conservatively updates gems using `bundle update --source gemname`
+- Bummr automatically rebases out commits which fail the build using an "ours"
+  merge strategy.
 - Bummr may not be able to remove the bad commit due to a merge conflict, in
   which case you will have to remove it manually, continue the rebase, and
   run `bummr test` again.

data/lib/bummr/cli.rb

@@ -70,24 +70,23 @@ module Bummr
         check
         `bundle`
 
-        if outdated_gems_to_update.empty?
+        if outdated_gems.empty?
           say "No outdated gems to update".green
         else
-          say "Updating outdated gems:"
-          say outdated_gems_to_update.map { |g| "* #{g}" }.join("\n")
+          say "Updating outdated gems".green
 
-          outdated_gems_to_update.each_with_index do |gem, index|
-            say "Updating #{gem[:name]}: #{index+1} of #{outdated_gems_to_update.count}"
+          outdated_gems.each_with_index do |gem, index|
+            say "Updating #{gem[:name]}: #{index+1} of #{outdated_gems.count}"
 
             system("bundle update --source #{gem[:name]}")
             updated_version = `bundle list | grep " #{gem[:name]} "`.split('(')[1].split(')')[0]
-            message = "Update #{gem[:name]} from #{gem[:current_version]} to #{updated_version}"
+            message = "Update #{gem[:name]} from #{gem[:installed]} to #{updated_version}"
 
-            if gem[:spec_version] != updated_version
-              log("#{gem[:name]} not updated from #{gem[:current_version]} to latest: #{gem[:spec_version]}")
+            if gem[:newest] != updated_version
+              log("#{gem[:name]} not updated from #{gem[:installed]} to latest: #{gem[:newest]}")
             end
 
-            unless gem[:current_version] == updated_version
+            unless gem[:installed] == updated_version
               say message.green
               system("git commit -am '#{message}'")
             else
@@ -152,34 +151,6 @@ module Bummr
       system("touch log/bummr.log && echo '#{message}' >> log/bummr.log")
     end
 
-    # see bundler/lib/bundler/cli/outdated.rb
-    def outdated_gems_to_update
-      @gems_to_update ||= begin
-        say 'Scanning for outdated gems...'
-        gems_to_update = []
-
-        all_gem_specs.each do |current_spec|
-          active_spec = bundle_spec(current_spec)
-          next if active_spec.nil?
-
-          if spec_outdated?(current_spec, active_spec)
-            spec_version    = "#{active_spec.version}#{active_spec.git_version}"
-            current_version = "#{current_spec.version}#{current_spec.git_version}"
-
-            gem_to_update = { name: active_spec.name, spec_version: spec_version, current_version: current_version }
-
-            say "Adding #{gem_to_update[:name]} version: #{gem_to_update[:current_version]} to update list"
-
-            gems_to_update << gem_to_update
-          end
-        end
-
-        gems_to_update.sort_by do |gem|
-          gem[:name]
-        end
-      end
-    end
-
     def remove_commit(sha)
       commit_message = `git log --pretty=format:'%s' -n 1 #{sha}`
       message = "Could not apply: #{commit_message}, #{sha}"
@@ -203,35 +174,23 @@ module Bummr
       end
     end
 
-    def spec_outdated?(current_spec, active_spec)
-      gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
-      git_outdated = current_spec.git_version != active_spec.git_version
+    def outdated_gems
+      @outdated_gems ||= begin
+        results = []
 
-      gem_outdated || git_outdated
-    end
-
-    def bundle_spec(current_spec)
-      active_spec = bundle_definition.index[current_spec.name].sort_by { |b| b.version }
-      if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
-        active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
-      end
-      active_spec.last
-    end
+        Open3.popen2("bundle outdated --strict") do |std_in, std_out|
+          while line = std_out.gets
+            puts line
 
-    def all_gem_specs
-      current_specs = Bundler.ui.silence { Bundler.load.specs }
-      current_dependencies = {}
-      Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
-      gemfile_specs, dependency_specs = current_specs.partition { |spec| current_dependencies.has_key? spec.name }
-      [gemfile_specs, dependency_specs].flatten.sort_by(&:name)
-    end
+            regex = / \* (.*) \(newest (\d\.\d\.\d), installed (\d\.\d\.\d)/.match line
+            unless regex.nil?
+              gem = { name: regex[1], newest: regex[2], installed: regex[3] }
+              results.push gem
+            end
+          end
+        end
 
-    def bundle_definition
-      @definition ||= begin
-        Bundler.definition.validate_ruby!
-        definition = Bundler.definition(true)
-        definition.resolve_remotely!
-        definition
+        results
       end
     end
   end

data/lib/bummr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bummr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Lee Pender