summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2016-10-02 21:27:50 -0700
committerAndre Arko <andre@arko.net>2016-10-02 21:27:50 -0700
commita8d140b35c98adf85689bcd7fa5c4ffd5d3064c7 (patch)
tree3e3319f4d10e1c9a52dd41966f9f2b5092ed8752
parent10108fb1cb4760b477094c9df39860ef48b60ea1 (diff)
downloadbundler-a8d140b35c98adf85689bcd7fa5c4ffd5d3064c7.tar.gz
Rename to force_ruby_platformseg-settings-only-ruby-platform
-rw-r--r--lib/bundler.rb2
-rw-r--r--lib/bundler/lazy_specification.rb2
-rw-r--r--lib/bundler/rubygems_integration.rb2
-rw-r--r--lib/bundler/settings.rb2
-rw-r--r--spec/runtime/platform_spec.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index d0ea501aef..b721c138b7 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -259,7 +259,7 @@ EOF
end
def local_platform
- return Gem::Platform::RUBY if settings[:only_ruby_platform]
+ return Gem::Platform::RUBY if settings[:force_ruby_platform]
Gem::Platform.local
end
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index ccba575b07..7508347c32 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -69,7 +69,7 @@ module Bundler
end
def __materialize__
- search_object = Bundler.settings[:specific_platform] || Bundler.settings[:only_ruby_platform] ? self : Dependency.new(name, version)
+ search_object = Bundler.settings[:specific_platform] || Bundler.settings[:force_ruby_platform] ? self : Dependency.new(name, version)
@specification = if source.is_a?(Source::Gemspec) && source.gemspec.name == name
source.gemspec.tap {|s| s.source = source }
else
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 877c6a7b70..9ad07d5a25 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -80,7 +80,7 @@ module Bundler
end
def platforms
- return [Gem::Platform::RUBY] if Bundler.settings[:only_ruby_platform]
+ return [Gem::Platform::RUBY] if Bundler.settings[:force_ruby_platform]
Gem.platforms
end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index ebf6dc40fc..1bbfcdefc3 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -17,7 +17,7 @@ module Bundler
major_deprecations
no_install
no_prune
- only_ruby_platform
+ force_ruby_platform
only_update_to_newer_versions
plugins
silence_root_warning
diff --git a/spec/runtime/platform_spec.rb b/spec/runtime/platform_spec.rb
index ab409774b7..4fd09cf4b7 100644
--- a/spec/runtime/platform_spec.rb
+++ b/spec/runtime/platform_spec.rb
@@ -98,7 +98,7 @@ describe "Bundler.setup with multi platform stuff" do
gem "platform_specific"
G
- bundle! "config only_ruby_platform true"
+ bundle! "config force_ruby_platform true"
bundle! "install"