milkshake 0.0.2 → 0.1.1

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_development_dependency "yard"
     gem.add_runtime_dependency 'thor'
     gem.add_runtime_dependency 'snapshots'
+    gem.add_runtime_dependency 'rack-gem-assets'
     gem.files += FileList['lib/**/*.rb'] + FileList['templates/**/*']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.1

data/lib/milkshake/dependency_resolver.rb

@@ -52,7 +52,9 @@ module Milkshake
       dep   = Gem::Dependency.new(name, requirement)
       specs = gemspec_index.search(dep)
       
-      return nil if specs.empty?
+      if specs.empty?
+        raise "Failed to resolve dependency: #{name} #{options.inspect}"
+      end
       
       specs.sort! do |a,b|
         b.version <=> a.version

data/lib/milkshake/environment.rb

@@ -15,6 +15,7 @@ module Milkshake
     def initialize(cache, options={})
       @cache   = cache
       @options = {'gems' => {}}.merge(options)
+      @options['gems']['rack-gem-assets'] = { 'lib' => 'rack/gem_assets' }
       
       Milkshake.extender.extend_rubygems!
       
@@ -41,7 +42,7 @@ module Milkshake
         resolver.names
       end
       
-      @gemspecs = @ordered_gemspecs = nil
+      @ordered_gemspecs = nil
     end
     
     def gemspecs_by_name

data/lib/milkshake/linker.rb

@@ -17,8 +17,6 @@ module Milkshake
         if validator.relink?
           @current_snapshot = Snapshots.dump
           
-          link_public_directories!
-          
           run_migrations!
           
           validator.persist!
@@ -33,19 +31,6 @@ module Milkshake
       ActiveRecord::Migrator.migrate("db/migrate/", nil)
     end
     
-    def link_public_directories!
-      public_vendor_path = File.join(Rails.public_path, 'vendor')
-      FileUtils.rm_rf(public_vendor_path)
-      FileUtils.mkdir_p(public_vendor_path)
-      
-      self.environment.gemspecs.each do |gemspec|
-        public_path = File.join(gemspec.full_gem_path, 'public')
-        if File.directory?(public_path)
-          FileUtils.ln_s(public_path, File.join(public_vendor_path, gemspec.name))
-        end
-      end
-    end
-    
     def link_only_once
       lock_path  = Milkshake.cache_file
       FileUtils.touch(lock_path)

data/lib/milkshake/rails_extentions/initializer.rb

@@ -31,18 +31,16 @@ module Milkshake
       def process_with_milkshake
         process_without_milkshake
       rescue Exception => e
-        Milkshake.cache.restore!
-        Milkshake.environment.reload!
-        if Milkshake.linker.current_snapshot
-          Snapshots.load(Milkshake.linker.current_snapshot)
+        begin
+          Milkshake.cache.restore!
+          Milkshake.environment.reload!
+          if Milkshake.linker.current_snapshot
+            Snapshots.load(Milkshake.linker.current_snapshot)
+          end
+        rescue Exception
         end
         
-        if @restore_relink
-          raise e
-        else
-          @restore_relink = true
-          retry
-        end
+        raise e
       end
       
     end

data/milkshake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkshake}
-  s.version = "0.0.2"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Menke"]
-  s.date = %q{2009-11-02}
+  s.date = %q{2009-11-09}
   s.default_executable = %q{milkshake}
   s.description = %q{Compose rails applications using several smaller rails applications}
   s.email = %q{simon@mrhenry.be}
@@ -101,17 +101,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<snapshots>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-gem-assets>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<snapshots>, [">= 0"])
+      s.add_dependency(%q<rack-gem-assets>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<snapshots>, [">= 0"])
+    s.add_dependency(%q<rack-gem-assets>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milkshake
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 +01:00
+date: 2009-11-09 00:00:00 +01:00
 default_executable: milkshake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-gem-assets
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Compose rails applications using several smaller rails applications
 email: simon@mrhenry.be
 engine_dependencies: {}