engineyard-serverside 1.5.9 → 1.5.10

data/lib/engineyard-serverside/deploy.rb

@@ -403,8 +403,8 @@ WRAP
           if File.directory?(c.bundled_gems_path)
             rebundle = false
 
-            rebundle = true if File.exist?(c.ruby_version_file)   && File.read(c.ruby_version_file)   != ruby_version
-            rebundle = true if File.exist?(c.system_version_file) && File.read(c.system_version_file) != system_version
+            rebundle = true if !File.exist?(c.ruby_version_file)   || File.read(c.ruby_version_file)   != ruby_version
+            rebundle = true if !File.exist?(c.system_version_file) || File.read(c.system_version_file) != system_version
 
             if rebundle
               info "~> Ruby version change detected, cleaning bundled gems"

data/lib/engineyard-serverside/deploy_hook.rb

@@ -25,8 +25,8 @@ module EY
       end
 
       def syntax_error(file)
-        valid = Kernel.system("ruby -c #{file} 2>/tmp/ey_invalid_deploy_hook | grep 'Syntax OK' --quiet")
-        File.new("/tmp/ey_invalid_deploy_hook").gets unless valid
+        output = `ruby -c #{file} 2>&1`
+        output unless output =~ /Syntax OK/
       end
 
       class CallbackContext

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -7,7 +7,7 @@ module EY
         rails_version = bundled_rails_version
         roles :app_master, :app, :solo do
           keep_existing_assets
-          cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile"
+          cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile || true"
           if rails_version
             info "~> Precompiling assets for rails v#{rails_version}"
           else
@@ -20,7 +20,13 @@ module EY
       def app_needs_assets?
         app_rb_path = File.join(c.release_path, 'config', 'application.rb')
         return unless File.readable?(app_rb_path) # Not a Rails app in the first place.
-        return unless File.directory?(File.join(c.release_path, 'app', 'assets'))
+
+        if File.directory?(File.join(c.release_path, 'app', 'assets'))
+          info "~> app/assets/ found. Attempting Rails asset pre-compilation."
+        else
+          return false
+        end
+
         if app_builds_own_assets?
           info "~> public/assets already exists, skipping pre-compilation."
           return

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.9'
+    VERSION = '1.5.10'
   end
 end

data/spec/deploy_hook_spec.rb

@@ -194,7 +194,7 @@ describe "the deploy-hook API" do
     it "returns a brief problem description for hook files containing valid Ruby syntax" do
       hook_path = File.expand_path('../fixtures/invalid_hook.rb', __FILE__)
       desc = "spec/fixtures/invalid_hook.rb:1: syntax error, unexpected '^'"
-      match = /\A.*#{Regexp.escape desc}\Z/
+      match = /#{Regexp.escape desc}/
       @hook.syntax_error(hook_path).should =~ match
     end
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 9
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,39 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 -04:00
+date: 2011-11-01 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
         version: 1.3.2
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
+  type: :development
+  prerelease: false
+  version_requirements: *id002
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -307,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1487870425695455343
       segments: 
       - 0
       version: "0"
@@ -316,14 +303,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1487870425695455343
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances