bundler-patch 1.1.0.pre2 → 1.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e15e29ba6d792404c4675f7f0a9feb02675cdea
-  data.tar.gz: ea0d23abcdc4859e441ed3a378bde6858187bf75
+  metadata.gz: 67617245f2ccb603b4e769123cfeca8c1651b7ed
+  data.tar.gz: '0318430c3f11b8a769bba339aeebb869e94fe3e2'
 SHA512:
-  metadata.gz: e9ff099ef9e01ef481be0b67ca8eb4e0e9d78a7d9cbfd7d907fa063122428e5050c53684d8a9b4856efad5c2271d74e8a6e75155007ecdd91c45d18576094409
-  data.tar.gz: a2399d339c85e883ed238eea4fb741daa97a7b7da0fdbac578d3e1761264543c7383e5d59cf1ae1aed0e1eba0cf84cbce1816f0c10687e5cba6d4136b0ebaf6c
+  metadata.gz: 47a5029a627739791d69d9e5ea8b4098ed7339b44501c438158d7402ff40e8a972e07578d5182b9fc30b16a3db9dd8d0f6c4cb11d0c3963492546189ab846d2f
+  data.tar.gz: a1f27bc6462f64e0d7ba846e507e0bf24212b3f5180ed78ada81af96a98613d479ed1b7b8a76e627631d850b343f98ab825af84f77a23b836c3777b0f0a74368

data/lib/bundler/patch.rb

@@ -13,5 +13,6 @@ require 'bundler/patch/advisory_consolidator'
 require 'bundler/patch/conservative_definition'
 require 'bundler/patch/conservative_resolver'
 require 'bundler/patch/gems_to_patch_reconciler'
+require 'bundler/patch/cli_options'
 require 'bundler/patch/cli'
 require 'bundler/patch/version'

data/lib/bundler/patch/cli.rb

@@ -63,9 +63,7 @@ module Bundler::Patch
     def patch(options={})
       Bundler.ui = Bundler::UI::Shell.new
 
-      normalize_options(options)
-
-      process_gemfile_option(options)
+      options = Bundler::Patch::CLI::Options.new.normalize_options(options)
 
       if options[:use_target_ruby] # TODO: && different_ruby_found
         tb = options[:target]
@@ -84,32 +82,8 @@ module Bundler::Patch
       end
     end
 
-    def normalize_options(options)
-      map = {:prefer_minimal => :minimal, :strict_updates => :strict, :minor_preferred => :minor}
-      {}.tap do |target|
-        options.each_pair do |k, v|
-          new_key = k.to_s.gsub('-', '_').to_sym
-          new_key = map[new_key] || new_key
-          target[new_key] = v
-        end
-      end
-    end
-
     private
 
-    def process_gemfile_option(options)
-      # copy/pasta from Bundler
-      custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
-      if custom_gemfile && !custom_gemfile.empty?
-        ENV['BUNDLE_GEMFILE'] = File.expand_path(custom_gemfile)
-        dir, gemfile = [File.dirname(custom_gemfile), File.basename(custom_gemfile)]
-        target_bundle = TargetBundle.new(dir: dir, gemfile: gemfile)
-        options[:target] = target_bundle
-      else
-        options[:target] = TargetBundle.new
-      end
-    end
-
     def list(options)
       gem_patches = AdvisoryConsolidator.new(options).vulnerable_gems
 

data/lib/bundler/patch/cli_options.rb

@@ -0,0 +1,33 @@
+module Bundler::Patch
+  class CLI
+    class Options
+      def normalize_options(options)
+        map = {:prefer_minimal => :minimal, :strict_updates => :strict, :minor_preferred => :minor}
+        {}.tap do |target|
+          options.each_pair do |k, v|
+            new_key = k.to_s.gsub('-', '_').to_sym
+            new_key = map[new_key] || new_key
+            target[new_key] = v
+          end
+          process_gemfile_option(target)
+        end
+      end
+
+      private
+
+      def process_gemfile_option(options)
+        # copy/pasta from Bundler
+        custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
+        if custom_gemfile && !custom_gemfile.empty?
+          custom_gemfile = File.join(custom_gemfile, TargetBundle.default_gemfile) if File.directory?(custom_gemfile)
+          ENV['BUNDLE_GEMFILE'] = File.expand_path(custom_gemfile)
+          dir, gemfile = [File.dirname(custom_gemfile), File.basename(custom_gemfile)]
+          target_bundle = TargetBundle.new(dir: dir, gemfile: gemfile)
+          options[:target] = target_bundle
+        else
+          options[:target] = TargetBundle.new
+        end
+      end
+    end
+  end
+end

data/lib/bundler/patch/target_bundle.rb

@@ -9,8 +9,12 @@ class TargetBundle
     Gem::Version.new(a) >= Gem::Version.new(b)
   end
 
-  # TODO: Make gems.rb default in Bundler 2.0.
-  def initialize(dir: Dir.pwd, gemfile: 'Gemfile')
+  def self.default_gemfile
+    # TODO: Make gems.rb default in Bundler 2.0.
+    'Gemfile'
+  end
+
+  def initialize(dir: Dir.pwd, gemfile: TargetBundle.default_gemfile)
     @dir = dir
     @gemfile = gemfile
   end
@@ -28,7 +32,7 @@ class TargetBundle
              end
 
     result ||= if File.exist?(ruby_version_filename)
-                 File.read('.ruby-version').chomp
+                 File.read(File.join(@dir, '.ruby-version')).chomp
                else
                  Bundler::Definition.build(gemfile_name, lockfile_name, nil).ruby_version
                end

data/lib/bundler/patch/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Patch
-    VERSION = '1.1.0.pre2'
+    VERSION = '1.1.0.pre3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-patch
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.1.0.pre3
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-advise
@@ -137,6 +137,7 @@ files:
 - lib/bundler/patch.rb
 - lib/bundler/patch/advisory_consolidator.rb
 - lib/bundler/patch/cli.rb
+- lib/bundler/patch/cli_options.rb
 - lib/bundler/patch/conservative_definition.rb
 - lib/bundler/patch/conservative_resolver.rb
 - lib/bundler/patch/gem_version_patch_promoter.rb