diff options
| author | serge <net1957@free.fr> | 2010-11-13 20:43:08 +0100 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2010-11-14 02:01:22 -0600 |
| commit | 279c51585c218d3fb89692acaebe356d28dbf3bf (patch) | |
| tree | 6de704f0ace4c20b84bc07e80b2fbb3446f830e2 | |
| parent | 4139386351098883ec4634b1f7f7995149e91e0b (diff) | |
| download | bundler-279c51585c218d3fb89692acaebe356d28dbf3bf.tar.gz | |
Add mingw_18 and mingw19 as platform for mingw with 1.8 or 1.9 RUBY version.
Closes #845
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 29 | ||||
| -rw-r--r-- | man/gemfile.5.ronn | 6 |
3 files changed, 29 insertions, 9 deletions
@@ -17,3 +17,6 @@ lib/bundler/man # output from ci_reporter spec/reports + +# Netbeans +nbproject diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index d074fd26..06cb78c7 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -9,15 +9,17 @@ module Bundler attr_reader :platforms PLATFORM_MAP = { - :ruby => Gem::Platform::RUBY, - :ruby_18 => Gem::Platform::RUBY, - :ruby_19 => Gem::Platform::RUBY, - :mri => Gem::Platform::RUBY, - :mri_18 => Gem::Platform::RUBY, - :mri_19 => Gem::Platform::RUBY, - :jruby => Gem::Platform::JAVA, - :mswin => Gem::Platform::MSWIN, - :mingw => Gem::Platform::MINGW + :ruby => Gem::Platform::RUBY, + :ruby_18 => Gem::Platform::RUBY, + :ruby_19 => Gem::Platform::RUBY, + :mri => Gem::Platform::RUBY, + :mri_18 => Gem::Platform::RUBY, + :mri_19 => Gem::Platform::RUBY, + :jruby => Gem::Platform::JAVA, + :mswin => Gem::Platform::MSWIN, + :mingw => Gem::Platform::MINGW, + :mingw_18 => Gem::Platform::MINGW, + :mingw_19 => Gem::Platform::MINGW }.freeze def initialize(name, version, options = {}, &blk) @@ -115,5 +117,14 @@ module Bundler def mingw? Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" end + + def mingw_18? + mingw? && RUBY_VERSION < "1.9" + end + + def mingw_19? + mingw? && RUBY_VERSION >= "1.9" + end + end end diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn index 7553fc78..b0d69153 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -124,6 +124,12 @@ There are a number of `Gemfile` platforms: JRuby * `mswin`: Windows + * `mingw`: + Windows 'mingw32' platform (aka RubyInstaller) + * `mingw_18`: + _mingw_ `AND` version 1.8 + * `mingw_19`: + _mingw_ `AND` version 1.9 As with groups, you can specify one or more platforms: |