bundler-fixture 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2090727bfc13bfae0b6173146aa05fc7c237ddca
-  data.tar.gz: ff065db51f45f0157b19ff070ac966aa389040f3
+  metadata.gz: 325d6cee72122a5efbdd6cae02fc8b7835387588
+  data.tar.gz: 4bc227d2f1ded990d61beeb4a1eda6fdd49fa61d
 SHA512:
-  metadata.gz: 1d94a93f92acc1c3183114f4757f634bc527010f00c1275e93013f76f5894e569109ce5bce9810626cd2bf52b4b41c8e19c6c5017381393e08bd1d00abe69467
-  data.tar.gz: 317b5b02029abe98693b78b4c7af9971c18763d671fedd7cfa3d28ae871ea1fee89fa74386f08343653557ce58d132a04b93393395b23d929cc49a83cbc8caa7
+  metadata.gz: 0ecabe68e5d6026e8dbe7e2bdd97212f531274753dc76bafd7a4a7ec8c5611d1d0ba111d126b98eec300909ad17cf551a27b7d02322d2b01486f8121dd496988
+  data.tar.gz: d7ff261ac62c34791379a361935e091b07292ac03955c7ca41e54e4f821a442d3d03d92ed21c5cb2a5c13cf91650b236598862c3efdcf43b392c1cc058223f9f

data/.travis.yml

@@ -28,4 +28,8 @@ matrix:
     - rvm: 2.2.7
       env: BUNDLER_TEST_VERSION=1.14.6
     - rvm: 2.3.4
-      env: BUNDLER_TEST_VERSION=1.15.0.pre.4
+      env: BUNDLER_TEST_VERSION=1.15.0
+    - rvm: 2.1.10
+      env: BUNDLER_TEST_VERSION=1.15.0
+    - rvm: 2.2.7
+      env: BUNDLER_TEST_VERSION=1.15.0

data/lib/bundler/fixture/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Fixture
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

data/lib/bundler/fixture.rb

@@ -5,6 +5,10 @@ require 'tmpdir'
 class BundlerFixture
   attr_reader :dir
 
+  def self.bundler_version_or_higher(version)
+    Gem::Version.new(Bundler::VERSION) >= Gem::Version.new(version)
+  end
+
   def initialize(dir: File.join(Dir.tmpdir, 'fake_project_root'), gemfile: 'Gemfile')
     @dir = dir
     @gemfile = gemfile
@@ -14,6 +18,10 @@ class BundlerFixture
     @sources.add_rubygems_remote('https://rubygems.org')
   end
 
+  def bundler_version_or_higher(version)
+    self.class.bundler_version_or_higher(version)
+  end
+
   def clean_up
     FileUtils.rmtree @dir
   end
@@ -28,19 +36,21 @@ class BundlerFixture
                       source_specs: [],
                       ensure_sources: true,
                       update_gems: [],
-                      gemfile: nil)
+                      gemfile: nil,
+                      ruby_version: nil)
     @gemfile = gemfile if gemfile
-    defn = create_definition(gem_dependencies: gem_dependencies,
-                             source_specs: source_specs,
-                             ensure_sources: ensure_sources,
-                             update_gems: update_gems)
-    defn.lock(lockfile_filename)
+    dfn = create_definition(gem_dependencies: gem_dependencies,
+                            source_specs: source_specs,
+                            ensure_sources: ensure_sources,
+                            update_gems: update_gems,
+                            ruby_version: ruby_version)
+    dfn.lock(lockfile_filename)
   end
 
-  def create_definition(gem_dependencies:, source_specs:, ensure_sources:, update_gems:)
+  def create_definition(gem_dependencies:, source_specs:, ensure_sources:, update_gems:, ruby_version: nil)
     index = Bundler::Index.new
     Array(source_specs).flatten.each { |s| index << s }
-    if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.14.0')
+    if bundler_version_or_higher('1.14.0')
       index << Gem::Specification.new("ruby\0", Bundler::RubyVersion.system.to_gem_version_with_patchlevel)
       index << Gem::Specification.new("rubygems\0", Gem::VERSION)
     end
@@ -50,12 +60,55 @@ class BundlerFixture
     end if ensure_sources
 
     update_hash = update_gems === true ? true : {gems: Array(update_gems)}
-    defn = Bundler::Definition.new(lockfile_filename, Array(gem_dependencies), @sources, update_hash)
-    defn.instance_variable_set('@index', index)
+    ruby_version_obj = Bundler::RubyVersion.new(ruby_version, nil, nil, nil)
+    dfn = Bundler::Definition.new(lockfile_filename, Array(gem_dependencies), @sources, update_hash, ruby_version_obj)
+    dfn.instance_variable_set('@index', index)
     # reading an existing lockfile in will overwrite the hacked up sources with detected
     # ones from lockfile, so this needs to go here after the constructor is called.
     source.instance_variable_set('@specs', index)
-    defn
+    dfn
+  end
+
+  def create_gemfile(gem_dependencies:, ruby_version: nil)
+    lines = []
+    lines << "source 'https://rubygems.org'"
+    Array(gem_dependencies).each do |spec|
+      name, requirement = case spec
+                          when Array
+                            spec
+                          when Gem::Dependency, Bundler::Dependency
+                            [spec.name, spec.requirement]
+                          end
+      line = "gem '#{name}'"
+      if requirement
+        req_output = requirement_to_s(requirement)
+        line << ", #{req_output}" unless req_output.empty?
+      end
+      lines << line
+    end
+    lines << "ruby '#{ruby_version}'" if ruby_version
+    File.open(gemfile_filename, 'w') { |f| f.puts lines }
+  end
+
+  def requirement_to_s(req)
+    case req
+    when Gem::Requirement
+      req.as_list.delete_if do |r|
+        r == '>= 0'
+      end.map do |r|
+        "'#{r.gsub(/^= /, '')}'"
+      end.join(', ')
+    when String
+      "'#{req}'"
+    when Array
+      req.map { |r| "'#{r}'" }.join(', ')
+    else
+      req
+    end
+  end
+
+  def gemfile_filename
+    File.join(@dir, "#{@gemfile}")
   end
 
   def lockfile_filename

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-fixture
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler