milkshake 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/milkshake/app/actions.rb

@@ -8,31 +8,17 @@ module Milkshake
         override_app_path! path
         assert_new_app_path!
         
-        system(%{rails "#{self.options.app}" > /dev/null})
+        system(%{rails _#{Milkshake::RAILS_VERSION}_ "#{self.options.app}" > /dev/null})
         good_say('Rails app successfully created!')
         
-        goto_rails do
-          if File.file?('config/locales/en.yml')
-            File.unlink('config/locales/en.yml')
-          end
-          if File.file?('public/index.html')
-            File.unlink('public/index.html')
-          end
-          if File.file?('public/images/rails.png')
-            File.unlink('public/images/rails.png')
-          end
-          if File.file?('public/javascripts/controls.js')
-            File.unlink('public/javascripts/controls.js')
-          end
-          if File.file?('public/javascripts/dragdrop.js')
-            File.unlink('public/javascripts/dragdrop.js')
-          end
-          if File.file?('public/javascripts/effects.js')
-            File.unlink('public/javascripts/effects.js')
-          end
-          if File.file?('public/javascripts/prototype.js')
-            File.unlink('public/javascripts/prototype.js')
-          end
+        goto_rails do |rails_root|
+          safe_rm(rails_root + 'config/locales/en.yml')
+          safe_rm(rails_root + 'public/index.html')
+          safe_rm(rails_root + 'public/images/rails.png')
+          safe_rm(rails_root + 'public/javascripts/controls.js')
+          safe_rm(rails_root + 'public/javascripts/dragdrop.js')
+          safe_rm(rails_root + 'public/javascripts/effects.js')
+          safe_rm(rails_root + 'public/javascripts/prototype.js')
           
           Milkshake::Template.evaluate('routes.rb'
           ).write_to('config/routes.rb')
@@ -60,26 +46,16 @@ module Milkshake
       def install_gem!(name)
         assert_valid_gem_name! name
         
-        goto_rails do
+        goto_rails do |rails_root|
           
           Milkshake::Template.evaluate('jeweler.rake',
-            :name        => name,
-            :author      => ask_unless_given(
-              'Author',      self.options.author,      self.class.default_author),
-            :email       => ask_unless_given(
-              'Email',       self.options.email,       self.class.default_email),
-            :summary     => ask_unless_given(
-              'Summary',     self.options.summary,     'FIX_ME_SUMMARY'),
-            :description => ask_unless_given(
-              'Description', self.options.description, 'FIX_ME_DESCRIPTION'),
-            :website     => ask_unless_given(
-              'Website',     self.options.website,     'FIX_ME_WEBSITE')
+            gem_options(name)
           ).write_to('lib/tasks/jeweler.rake')
           
           FileUtils.mkdir_p('rails/initializers')
           FileUtils.touch('rails/init.rb')
-          FileUtils.rm_rf('app/controllers/application_controller.rb') rescue nil
-          FileUtils.rm_rf('app/helpers/application_helper.rb')         rescue nil
+          safe_rm(rails_root + 'app/controllers/application_controller.rb')
+          safe_rm(rails_root + 'app/helpers/application_helper.rb')
           
           if self.options.git or shell.yes?('Initialize git? [yN]:')
             system(%{ git init > /dev/null })
@@ -97,18 +73,18 @@ module Milkshake
       
       def install_host!
         goto_rails do |rails_root|
-          (rails_root + 'README').unlink             rescue nil
-          (rails_root + 'Rakefile').unlink           rescue nil
-          (rails_root + 'app').rmtree                rescue nil
-          (rails_root + 'config/locales').rmtree     rescue nil
-          (rails_root + 'db/seeds.rb').unlink        rescue nil
-          (rails_root + 'doc').rmtree                rescue nil
-          (rails_root + 'lib').rmtree                rescue nil
-          (rails_root + 'public/images').rmtree      rescue nil
-          (rails_root + 'public/javascripts').rmtree rescue nil
-          (rails_root + 'public/stylesheets').rmtree rescue nil
-          (rails_root + 'test').rmtree               rescue nil
-          (rails_root + 'vendor').rmtree             rescue nil
+          safe_rm(rails_root + 'README')
+          safe_rm(rails_root + 'Rakefile')
+          safe_rm(rails_root + 'app')
+          safe_rm(rails_root + 'config/locales')
+          safe_rm(rails_root + 'db/seeds.rb')
+          safe_rm(rails_root + 'doc')
+          safe_rm(rails_root + 'lib')
+          safe_rm(rails_root + 'public/images')
+          safe_rm(rails_root + 'public/javascripts')
+          safe_rm(rails_root + 'public/stylesheets')
+          safe_rm(rails_root + 'test')
+          safe_rm(rails_root + 'vendor')
         end
         
         good_say('Rails app successfully stripped!')
@@ -185,32 +161,32 @@ module Milkshake
         
         goto_rails do |rails_path|
           
-          (rails_path   + 'db').rmtree
+          safe_rm(rails_path + 'db')
           make_symlink!(
             rails_path  + 'db',
             shared_path + 'private')
           
-          (rails_path   + 'log').rmtree
+          safe_rm(rails_path + 'log')
           make_symlink!(
             rails_path  + 'log',
             shared_path + 'log')
           
-          (rails_path   + 'public/system').rmtree if File.exist?('public/system')
+          safe_rm(rails_path + 'public/system')
           make_symlink!(
             rails_path  + 'public/system',
             shared_path + 'public')
           
-          (rails_path   + 'config/settings').rmtree if File.exist?('config/settings')
+          safe_rm(rails_path + 'config/settings')
           make_symlink!(
             rails_path  + 'config/settings',
             shared_path + 'settings')
           
-          (rails_path   + 'config/milkshake.yml').unlink if File.exist?('config/milkshake.yml')
+          safe_rm(rails_path + 'config/milkshake.yml')
           make_symlink!(
             rails_path  + 'config/milkshake.yml',
             shared_path + 'settings/milkshake.yml')
           
-          (rails_path   + 'config/database.yml').unlink if File.exist?('config/database.yml')
+          safe_rm(rails_path + 'config/database.yml')
           make_symlink!(
             rails_path  + 'config/database.yml',
             shared_path + 'settings/database.yml')
@@ -218,6 +194,30 @@ module Milkshake
         end
       end
       
+    private
+      
+      def gem_options(name)
+        {
+        :name =>
+          name,
+        
+        :author =>
+          ask_unless_given('Author',      self.options.author,      self.class.default_author),
+        
+        :email =>
+          ask_unless_given('Email',       self.options.email,       self.class.default_email),
+        
+        :summary =>
+          ask_unless_given('Summary',     self.options.summary,     'FIX_ME_SUMMARY'),
+        
+        :description =>
+          ask_unless_given('Description', self.options.description, 'FIX_ME_DESCRIPTION'),
+        
+        :website =>
+          ask_unless_given('Website',     self.options.website,     'FIX_ME_WEBSITE')
+        }
+      end
+      
     end
   end
 end

data/lib/milkshake/app/helpers.rb

@@ -108,6 +108,15 @@ module Milkshake
         make_symlink! old_path, new_path
       end
       
+      def safe_rm(path)
+        path = Pathname.new(path) unless Pathname === path
+        if path.file? or path.symlink?
+          path.unlink
+        elsif path.directory?
+          path.rmtree
+        end
+      end
+      
     end
   end
 end

data/lib/milkshake/cache.rb

@@ -7,7 +7,7 @@ module Milkshake
     def initialize(path)
       @path = path
       begin
-        File.open(@path, 'r') { |f| @entries = Marshal.load(f.read) }
+        File.open(@path, 'r') { |file| @entries = Marshal.load(file.read) }
         raise 'wrong type' unless Hash === @entries
       rescue
         @entries = {}
@@ -16,10 +16,11 @@ module Milkshake
     end
     
     def key(name)
-      if @entries.key?(name.to_s)
-        @entries[name.to_s]
+      name = name.to_s
+      if @entries.key?(name)
+        @entries[name]
       elsif block_given?
-        @entries[name.to_s] = yield
+        @entries[name] = yield
       else
         nil
       end
@@ -43,7 +44,7 @@ module Milkshake
     end
     
     def persist!
-      File.open(@path, 'w+') { |f| f.write Marshal.dump(@entries) }
+      File.open(@path, 'w+') { |file| file.write Marshal.dump(@entries) }
     end
     
   end

data/lib/milkshake/dependency_resolver.rb

@@ -14,12 +14,12 @@ module Milkshake
     end
     
     def initialize(gems)
-      specs = gems.collect do |k,r|
-        find_gemspec(k, r)
+      specs = gems.collect do |name,options|
+        find_gemspec(name,options)
       end.compact
       
       @names = specs.collect { |spec| spec.name }
-      @specs = specs.inject({}) { |h, spec| h[spec.name] = spec ; h }
+      @specs = specs.inject({}) { |memo, spec| memo[spec.name] = spec ; memo }
       @gems  = gems
     end
     
@@ -56,8 +56,8 @@ module Milkshake
         raise "Failed to resolve dependency: #{name} #{options.inspect}"
       end
       
-      specs.sort! do |a,b|
-        b.version <=> a.version
+      specs.sort! do |left,right|
+        right.version <=> left.version
       end
       
       gemspec = specs.first

data/lib/milkshake/environment.rb

@@ -36,16 +36,16 @@ module Milkshake
         resolver ||= DependencyResolver.load_for(@options['gems'])
         specs = resolver.specs
         @gemspecs = specs
-        specs.inject({}) { |s, (name, spec)| s[name] = spec.version.to_s ; s  }
+        specs.inject({}) { |memo, (name, spec)| memo[name] = spec.version.to_s ; memo  }
       end
       
-      @gemspecs ||= @gemspec_versions.inject({}) do |s, (name, version)|
+      @gemspecs ||= @gemspec_versions.inject({}) do |memo, (name, version)|
         specs = index.search(Gem::Dependency.new(name, version))
-        specs.sort! do |a,b|
-          b.version <=> a.version
+        specs.sort! do |left,right|
+          right.version <=> left.version
         end
-        s[name] = specs.first
-        s
+        memo[name] = specs.first
+        memo
       end
       
       @order = @cache.key('environment.gems.order') do
@@ -67,8 +67,8 @@ module Milkshake
     end
     
     def gem_dependencies
-      @order.inject([]) do |g, name|
-        g << Rails::GemDependency.new(name, @gems[name])
+      @order.inject([]) do |deps, name|
+        deps << Rails::GemDependency.new(name, @gems[name])
       end
     end
     

data/lib/milkshake/extender.rb

@@ -14,13 +14,13 @@ module Milkshake
     # for passenger
     def extend_rails!
       Object.const_set('Rails', Module.new)
-      r = Object.const_get('Rails')
-      def r.singleton_method_added(m)
-        if (m.to_s == 'boot!') and !@injected_milkshake
+      rails_mod = Object.const_get('Rails')
+      def rails_mod.singleton_method_added(meth)
+        if (meth.to_s == 'boot!') and !@injected_milkshake
           @injected_milkshake = true
-          k = (class << self ; self ; end)
-          k.send :alias_method, "milkshakeless_#{m}", m
-          k.send :define_method, m do
+          klass = (class << self ; self ; end)
+          klass.send :alias_method, "milkshakeless_#{meth}", meth
+          klass.send :define_method, meth do
             milkshakeless_boot!
             Milkshake.load!
             Milkshake.extender.extend_railties!

data/lib/milkshake/linker.rb

@@ -15,7 +15,7 @@ module Milkshake
     def link!
       link_only_once do
         if validator.relink?
-          @current_snapshot = Snapshots.dump
+          # @current_snapshot = Snapshots.dump
           
           run_migrations!
           

data/lib/milkshake/loader.rb

@@ -24,8 +24,9 @@ module Milkshake
         self.environment.gemspecs.each do |gemspec|
           paths.concat Dir.glob(File.join(gemspec.full_gem_path, *relative_path))
         end
-        paths.concat Dir.glob(File.join(Rails.root, 'rails/init.rb'))
-        paths.concat Dir.glob(File.join(Rails.root, *relative_path))
+        rails_root = Rails.root
+        paths.concat Dir.glob(File.join(rails_root, 'rails/init.rb'))
+        paths.concat Dir.glob(File.join(rails_root, *relative_path))
         paths
       end
     end

data/lib/milkshake/rails_extentions/configuration.rb

@@ -4,9 +4,9 @@ module Milkshake
     module Configuration
       
       def self.included(base)
-        %w( default_gems default_i18n default_load_paths ).each do |m|
-          base.send :alias_method, "#{m}_without_milkshake", m
-          base.send :alias_method, m, "#{m}_with_milkshake"
+        %w( default_gems default_i18n default_load_paths ).each do |meth|
+          base.send :alias_method, "#{meth}_without_milkshake", meth
+          base.send :alias_method, meth, "#{meth}_with_milkshake"
         end
       end
       
@@ -27,6 +27,13 @@ module Milkshake
       
       # inject fallback application controller
       def default_load_paths_with_milkshake
+        Milkshake.environment.gemspecs.each do |gemspec|
+          app_path = File.join(gemspec.full_gem_path, 'app', 'controllers', 'application_controller.rb')
+          if File.file?(app_path)
+            return default_load_paths_without_milkshake
+          end
+        end
+        
         path = File.expand_path(File.join(File.dirname(__FILE__), *%w( .. rails_fallbacks )))
         default_load_paths_without_milkshake.push(path)
       end

data/lib/milkshake/rails_extentions/initializer.rb

@@ -4,9 +4,9 @@ module Milkshake
     module Initializer
       
       def self.included(base)
-        %w( require_frameworks check_for_unbuilt_gems load_application_initializers process ).each do |m|
-          base.send :alias_method, "#{m}_without_milkshake", m
-          base.send :alias_method, m, "#{m}_with_milkshake"
+        %w( require_frameworks check_for_unbuilt_gems load_application_initializers process ).each do |meth|
+          base.send :alias_method, "#{meth}_without_milkshake", meth
+          base.send :alias_method, meth, "#{meth}_with_milkshake"
         end
       end
       
@@ -30,7 +30,7 @@ module Milkshake
       
       def process_with_milkshake
         process_without_milkshake
-      rescue Exception => e
+      rescue Exception => exception
         begin
           Milkshake.cache.restore!
           Milkshake.environment.reload!
@@ -38,9 +38,10 @@ module Milkshake
             Snapshots.load(Milkshake.linker.current_snapshot)
           end
         rescue Exception
+          nil
         end
         
-        raise e
+        raise exception
       end
       
     end

data/lib/milkshake/template.rb

@@ -30,7 +30,7 @@ module Milkshake
     
     def evaluate(context={})
       result = @template.dup
-      result.gsub!(/\{\{([a-zA-Z0-9_.-]+)\}\}/) do |m|
+      result.gsub!(/\{\{([a-zA-Z0-9_.-]+)\}\}/) do |match|
         (context[$1] || context[$1.to_sym]).to_s
       end
       result.extend SourceFile
@@ -40,7 +40,7 @@ module Milkshake
     module SourceFile
       def write_to(path)
         FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, 'w+') { |f| f.write self }
+        File.open(path, 'w+') { |file| file.write self }
         self
       end
     end

data/lib/milkshake.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 
 module Milkshake
   
+  RAILS_VERSION = "2.3.4"
+  
   autoload :DependencyResolver, 'milkshake/dependency_resolver'
   autoload :Environment,        'milkshake/environment'
   autoload :Validator,          'milkshake/validator'

data/milkshake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkshake}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Menke"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2010-01-21}
   s.default_executable = %q{milkshake}
   s.description = %q{Compose rails applications using several smaller rails applications}
   s.email = %q{simon@mrhenry.be}
@@ -27,58 +27,32 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/milkshake",
      "lib/milkshake.rb",
-     "lib/milkshake.rb",
-     "lib/milkshake/app.rb",
      "lib/milkshake/app.rb",
      "lib/milkshake/app/actions.rb",
-     "lib/milkshake/app/actions.rb",
-     "lib/milkshake/app/defaults.rb",
      "lib/milkshake/app/defaults.rb",
      "lib/milkshake/app/helpers.rb",
-     "lib/milkshake/app/helpers.rb",
-     "lib/milkshake/automagic.rb",
      "lib/milkshake/automagic.rb",
      "lib/milkshake/cache.rb",
-     "lib/milkshake/cache.rb",
      "lib/milkshake/dependency_resolver.rb",
-     "lib/milkshake/dependency_resolver.rb",
-     "lib/milkshake/environment.rb",
      "lib/milkshake/environment.rb",
      "lib/milkshake/extender.rb",
-     "lib/milkshake/extender.rb",
      "lib/milkshake/linker.rb",
-     "lib/milkshake/linker.rb",
-     "lib/milkshake/loader.rb",
      "lib/milkshake/loader.rb",
      "lib/milkshake/rails_extentions/boot.rb",
-     "lib/milkshake/rails_extentions/boot.rb",
      "lib/milkshake/rails_extentions/configuration.rb",
-     "lib/milkshake/rails_extentions/configuration.rb",
-     "lib/milkshake/rails_extentions/initializer.rb",
      "lib/milkshake/rails_extentions/initializer.rb",
      "lib/milkshake/rails_extentions/migrations.rb",
-     "lib/milkshake/rails_extentions/migrations.rb",
-     "lib/milkshake/rails_fallbacks/application_controller.rb",
      "lib/milkshake/rails_fallbacks/application_controller.rb",
      "lib/milkshake/rubygems_extentions/specification.rb",
-     "lib/milkshake/rubygems_extentions/specification.rb",
-     "lib/milkshake/template.rb",
      "lib/milkshake/template.rb",
      "lib/milkshake/validator.rb",
-     "lib/milkshake/validator.rb",
      "milkshake.gemspec",
      "templates/gitignore",
-     "templates/gitignore",
-     "templates/gitignore_for_data",
      "templates/gitignore_for_data",
      "templates/jeweler.rake",
-     "templates/jeweler.rake",
      "templates/milkshake.yml",
-     "templates/milkshake.yml",
-     "templates/preinitializer.rb",
      "templates/preinitializer.rb",
      "templates/routes.rb",
-     "templates/routes.rb",
      "test/milkshake_test.rb",
      "test/test_helper.rb"
   ]

metadata

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