bundler 1.12.0.rc.2 → 1.12.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288351bf045cbfa98272b96f724ed79211ce00b5
-  data.tar.gz: a261d17f2a6d093ed18fe154c3a564900fe8b4c4
+  metadata.gz: 6c6e3bb6749fe497b955858e6fd5adc9c1ccbe23
+  data.tar.gz: cc7858b1fd4b74f7e71c97c62ded46317d02690b
 SHA512:
-  metadata.gz: 0c88c4beeb3d543c7e3c9e95f4d3bd3ce4cd4961d17f2c329d934663322d488474c8e43c7cb06f0e733e22fb7e2cef376f6f2a50d89c260ec364ac3a790e2569
-  data.tar.gz: c8dfcfe5e8ed02350d90f9cffd0bca89be5e7b277eaf927c2795e87960411f8ddac27bd5c429257894bbbebbe1b06936043502ff44a5018b7aef5a6b42cab431
+  metadata.gz: f3cfde8e2f4d42e3a83ce2a1a573e4a7e19fd0abdd98f9de9fffa89d6516e6cf28fceddaca0b685d0f4c921ed489901c421773ee4d3079a954e66943a6bde899
+  data.tar.gz: 36c8f8d9c9953ac8738c251d4f234dc230a53b29ca65142a3597fe6455ea60181db264295b7c656b3926789c80e32aafe7216da57923194037b69a9d3f827df5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.12.0.rc.3 (2016-04-19)
+
+Bugfixes:
+
+  - don't allow new attributes to dirty a lockfile when running `bundle exec`, `-rbundler/setup`, or `bundle check` (@segiddins)
+
 ## 1.12.0.rc.2 (2016-04-15)
 
 Features:

data/lib/bundler/cli/check.rb

@@ -32,7 +32,7 @@ module Bundler
         Bundler.ui.error "This bundle has been frozen, but there is no #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} present"
         exit 1
       else
-        Bundler.load.lock(:preserve_bundled_with => true) unless options[:"dry-run"]
+        Bundler.load.lock(:preserve_unknown_sections => true) unless options[:"dry-run"]
         Bundler.ui.info "The Gemfile's dependencies are satisfied"
       end
     end

data/lib/bundler/definition.rb

@@ -241,7 +241,7 @@ module Bundler
       dependencies.map(&:groups).flatten.uniq
     end
 
-    def lock(file, preserve_bundled_with = false)
+    def lock(file, preserve_unknown_sections = false)
       contents = to_lock
 
       # Convert to \r\n if the existing lock has them
@@ -258,8 +258,8 @@ module Bundler
         end
       end
 
-      preserve_bundled_with ||= !updating_major && (Bundler.settings[:frozen] || !@unlocking)
-      return if lockfiles_equal?(@lockfile_contents, contents, preserve_bundled_with)
+      preserve_unknown_sections ||= !updating_major && (Bundler.settings[:frozen] || !@unlocking)
+      return if lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
 
       if Bundler.settings[:frozen]
         Bundler.ui.error "Cannot write a changed lockfile while frozen."
@@ -672,13 +672,17 @@ module Bundler
       groups - Bundler.settings.without - @optional_groups + Bundler.settings.with
     end
 
-    def lockfiles_equal?(current, proposed, preserve_bundled_with)
-      if preserve_bundled_with
-        pattern = /\n\n#{LockfileParser::BUNDLED}\n\s+#{Gem::Version::VERSION_PATTERN}\n/
-        current.sub(pattern, "\n") == proposed.sub(pattern, "\n")
-      else
-        current == proposed
+    def lockfiles_equal?(current, proposed, preserve_unknown_sections)
+      if preserve_unknown_sections
+        sections_to_ignore = LockfileParser.sections_to_ignore(@locked_bundler_version)
+        sections_to_ignore += LockfileParser.unknown_sections_in_lockfile(current)
+        sections_to_ignore += LockfileParser::ENVIRONMENT_VERSION_SECTIONS
+        pattern = /#{Regexp.union(sections_to_ignore)}\n(\s{2,}.*\n)+/
+        whitespace_cleanup = /\n{2,}/
+        current = current.gsub(pattern, "\n").gsub(whitespace_cleanup, "\n\n").strip
+        proposed = proposed.gsub(pattern, "\n").gsub(whitespace_cleanup, "\n\n").strip
       end
+      current == proposed
     end
   end
 end

data/lib/bundler/environment.rb

@@ -32,7 +32,7 @@ module Bundler
     end
 
     def lock(opts = {})
-      @definition.lock(Bundler.default_lockfile, opts[:preserve_bundled_with])
+      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
     end
 
     def update(*gems)

data/lib/bundler/lockfile_parser.rb

@@ -26,6 +26,35 @@ module Bundler
     OPTIONS      = /^  ([a-z]+): (.*)$/i
     SOURCE       = [GIT, GEM, PATH].freeze
 
+    SECTIONS_BY_VERSION_INTRODUCED = {
+      Gem::Version.create("1.0") => [DEPENDENCIES, PLATFORMS, GIT, GEM, PATH].freeze,
+      Gem::Version.create("1.10") => [BUNDLED].freeze,
+      Gem::Version.create("1.12") => [RUBY].freeze,
+    }.freeze
+
+    KNOWN_SECTIONS = SECTIONS_BY_VERSION_INTRODUCED.values.flatten.freeze
+
+    ENVIRONMENT_VERSION_SECTIONS = [BUNDLED, RUBY].freeze
+
+    def self.sections_in_lockfile(lockfile_contents)
+      lockfile_contents.scan(/^\w[\w ]*$/).uniq
+    end
+
+    def self.unknown_sections_in_lockfile(lockfile_contents)
+      sections_in_lockfile(lockfile_contents) - KNOWN_SECTIONS
+    end
+
+    def self.sections_to_ignore(base_version = nil)
+      base_version &&= base_version.release
+      base_version ||= Gem::Version.create("1.0")
+      attributes = []
+      SECTIONS_BY_VERSION_INTRODUCED.each do |version, introduced|
+        next if version <= base_version
+        attributes += introduced
+      end
+      attributes
+    end
+
     def initialize(lockfile)
       @platforms    = []
       @sources      = []

data/lib/bundler/runtime.rb

@@ -52,7 +52,7 @@ module Bundler
 
       setup_manpath
 
-      lock(:preserve_bundled_with => true)
+      lock(:preserve_unknown_sections => true)
 
       self
     end

data/lib/bundler/version.rb

@@ -7,5 +7,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.12.0.rc.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.0.rc.3" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.0.rc.2
+  version: 1.12.0.rc.3
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek