diff options
| author | Andre Arko <andre@arko.net> | 2010-08-03 11:33:03 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2010-08-03 11:33:19 -0700 |
| commit | a9e8b091324f90aa768f3a39e56e701e6a42bd28 (patch) | |
| tree | 1dccd3cfc01c87e53301ad57eb5bc3f6b00fb082 | |
| parent | 251b9c78cdb1c1cd04de57965752373fd37856df (diff) | |
| download | bundler-a9e8b091324f90aa768f3a39e56e701e6a42bd28.tar.gz | |
Don't list platforms twice, actually require required files
| -rw-r--r-- | lib/bundler/dependency.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/dsl.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index bf29751478..358dfd5abc 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -1,5 +1,6 @@ require 'rubygems/dependency' require 'bundler/shared_helpers' +require 'bundler/rubygems_ext' module Bundler class Dependency < Gem::Dependency @@ -16,7 +17,7 @@ module Bundler :mri_19 => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, :mswin => Gem::Platform::MSWIN - } + }.freeze def initialize(name, version, options = {}, &blk) super(name, version) diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 4691b071b1..afd1868989 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -1,3 +1,5 @@ +require 'bundler/dependency' + module Bundler class Dsl def self.evaluate(gemfile) @@ -6,7 +8,7 @@ module Bundler builder.to_definition end - VALID_PLATFORMS = [:ruby, :ruby_18, :ruby_19, :mri, :mri_18, :mri_19, :jruby, :mswin] + VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze def initialize @rubygems_source = Source::Rubygems.new |