bundler-patch 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73070d64f11cc9e5a6b723cc54d196ba46bd157
-  data.tar.gz: 288593a0ed9fe0d9cef8251414fa8773c127cc6f
+  metadata.gz: 22e0f2d411e2e52b0a3d2ba2344d2f1c9bb9ceca
+  data.tar.gz: 37235b8053d27fa07a6fc48c74934ca8c8d8cf3f
 SHA512:
-  metadata.gz: 15e6134b2f6851ae6ecbb9293f61c3a547a3f7be3a32d56ec096c463593dc6713def084b1693ce82bd62540cb2aa5c6d5c00d870f97913162bcb1c6e46312582
-  data.tar.gz: 7378f5539c13b5af2b9c0190aeca169b1dcf3a120262a7be7b5a6d9a9743123534080a87b60dc091eb04014ae571b3d4b6aa508977bb5503958e5c7be6e37a9f
+  metadata.gz: 5e21f129bd9b325e8d5f576f935795c7b6a590cfb0c5c0881e7dcc8742f660964efb2915b4afd9ac999980695dd322486bf2785f2f9e6139b5e24f4d929bc1be
+  data.tar.gz: 380d5b23d3d55da4cff3e7cfc862696bb074867f22e5ccef024d36c469c4f858b0fe532d86b027bf472347cbf8fd741e29d909a6b441a217c7acd27801d9de51

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.4
-before_install: gem install bundler -v 1.10.6
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+before_install:
+  - gem install bundler -v 1.11.2

data/README.md

@@ -10,6 +10,8 @@ versions first.
 
 Works with Bundler 1.10.x and higher. Last confirmed with 1.12.0.rc.4.
 
+[![Build Status](https://travis-ci.org/livingsocial/bundler-patch.svg?branch=master)](https://travis-ci.org/livingsocial/bundler-patch)
+
 ## Installation
 
     $ gem install bundler-patch

data/Rakefile

@@ -1,7 +1,22 @@
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+task :default => 'test:unit'
+task :test => 'test:unit'
 
-task :default => :spec
+namespace :test do
+  desc 'Run all RSpec code examples'
+  RSpec::Core::RakeTask.new(:all)
+
+  desc 'Run RSpec unit code examples'
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = 'spec/bundler/unit/**{,/*/**}/*_spec.rb'
+  end
+
+  desc 'Run RSpec integration code examples'
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = 'spec/bundler/integration/**{,/*/**}/*_spec.rb'
+  end
+end
 
 require 'bundler/gem_tasks'
+

data/bundler-patch.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bundler-advise', '~> 1.0', '>= 1.0.3'
-  spec.add_dependency 'slop', '~> 4.0'
+  spec.add_dependency 'slop', '~> 3.0'
   spec.add_dependency 'bundler', '~> 1.10'
 
   spec.add_development_dependency 'bundler-fixture', '~> 1.3'

data/lib/bundler/patch/cli.rb

@@ -4,30 +4,30 @@ require 'slop'
 module Bundler::Patch
   class CLI
     def self.execute
-      opts = Slop.parse do |o|
-        o.banner = "Bundler Patch Version #{Bundler::Patch::VERSION}\nUsage: bundle patch [options] [gems_to_update]"
-        o.separator ''
-        o.separator 'bundler-patch attempts to update gems conservatively.'
-        o.separator ''
-        o.bool '-m', '--minor_preferred', 'Prefer update to the latest minor.release version.' # TODO: change to --minor_preferred
-        o.bool '-p', '--prefer_minimal', 'Prefer minimal version updates over most recent release (or minor if -m used).'
-        o.bool '-s', '--strict_updates', 'Restrict any gem to be upgraded past most recent release (or minor if -m used).'
-        o.bool '-l', '--list', 'List vulnerable gems and new version target. No updates will be performed.'
-        o.bool '-v', '--vulnerable_gems_only', 'Only update vulnerable gems.'
-        o.string '-a', '--advisory_db_path', 'Optional custom advisory db path. `gems` dir will be appended to this path.'
-        o.on('-h', 'Show this help') { show_help(o) }
-        o.on('--help', 'Show README.md') { show_readme }
+      opts = Slop.parse! do
+        banner "Bundler Patch Version #{Bundler::Patch::VERSION}\nUsage: bundle patch [options] [gems_to_update]\n\nbundler-patch attempts to update gems conservatively.\n"
+        on '-m', '--minor_preferred', 'Prefer update to the latest minor.release version.'
+        on '-p', '--prefer_minimal', 'Prefer minimal version updates over most recent release (or minor if -m used).'
+        on '-s', '--strict_updates', 'Restrict any gem to be upgraded past most recent release (or minor if -m used).'
+        on '-l', '--list', 'List vulnerable gems and new version target. No updates will be performed.'
+        on '-v', '--vulnerable_gems_only', 'Only update vulnerable gems.'
+        on '-a=', '--advisory_db_path=', 'Optional custom advisory db path. `gems` dir will be appended to this path.'
+        on '-h', 'Show this help'
+        on '--help', 'Show README.md'
       end
 
-      show_readme if opts.arguments.include?('help')
       options = opts.to_hash
-      options[:gems_to_update] = opts.arguments
+      options[:gems_to_update] = ARGV
+      STDERR.puts options.inspect if ENV['DEBUG']
+
+      show_help(opts) if options[:h]
+      show_readme if ARGV.include?('help') || options[:help]
 
       CLI.new.patch(options)
     end
 
     def self.show_help(opts)
-      puts opts.to_s(prefix: '  ')
+      puts opts
       exit
     end
 

data/lib/bundler/patch/conservative_resolver.rb

@@ -17,6 +17,8 @@ module Bundler::Patch
 
       dep = dependency.dep unless dependency.is_a? Gem::Dependency
 
+      STDERR.puts "super search_for: #{debug_format_result(dep, res).inspect}" if ENV['DEBUG_RESOLVER']
+
       @conservative_search_for ||= {}
       res = @conservative_search_for[dep] ||= begin
         gem_name = dep.name
@@ -28,7 +30,7 @@ module Bundler::Patch
         (@strict ?
           filter_specs(res, locked_spec) :
           sort_specs(res, locked_spec)).tap do |res|
-          STDERR.puts debug_format_result(dep, res).inspect if ENV['DEBUG_PATCH_RESOLVER']
+          STDERR.puts "after search_for: #{debug_format_result(dep, res).inspect}" if ENV['DEBUG_PATCH_RESOLVER']
         end
       end
 

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement