milkshake 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/milkshake/environment.rb

@@ -24,18 +24,29 @@ module Milkshake
     
     def reload!
       resolver  = nil
+      index = Gem::SourceIndex.from_installed_gems
+      
       @gems = @cache.key('environment.gems') do
         resolver ||= DependencyResolver.load_for(@options['gems'])
         resolver.gems
       end
       
-      @gemspecs = @cache.key('environment.gemspecs') do
+      @gemspecs = nil
+      @gemspec_versions = @cache.key('environment.gemspec-versions') do
         resolver ||= DependencyResolver.load_for(@options['gems'])
         specs = resolver.specs
-        specs.each { |(name, spec)| spec.store_persistent_load_information! }
-        specs
+        @gemspecs = specs
+        specs.inject({}) { |s, (name, spec)| s[name] = spec.version.to_s ; s  }
+      end
+      
+      @gemspecs ||= @gemspec_versions.inject({}) do |s, (name, version)|
+        specs.index.search(Gem::Dependency.new(name, version))
+        specs.sort! do |a,b|
+          b.version <=> a.version
+        end
+        s[name] = specs.first
+        s
       end
-      @gemspecs.each { |(name, spec)| spec.use_persistent_load_information! }
       
       @order = @cache.key('environment.gems.order') do
         resolver ||= DependencyResolver.load_for(@options['gems'])

data/milkshake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkshake}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Menke"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-11-12}
   s.default_executable = %q{milkshake}
   s.description = %q{Compose rails applications using several smaller rails applications}
   s.email = %q{simon@mrhenry.be}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milkshake
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +01:00
+date: 2009-11-12 00:00:00 +01:00
 default_executable: milkshake
 dependencies: 
 - !ruby/object:Gem::Dependency