engineyard-serverside 2.1.3 → 2.1.4

data/lib/engineyard-serverside/dependency_manager/composer.rb

@@ -3,20 +3,32 @@ module EY
     module DependencyManager
       class Composer < Base
         def detected?
-           composer_lock? || composer_json?
+          composer_lock? || composer_json?
         end
 
-        def install
-          if composer_available?
-            shell.status "Checking for composer updates..."
-            composer_selfupdate
-            shell.status "Installing composer packages (composer.#{lock_or_json} detected)"
-            composer_install
-          else
-            shell.warning "composer.#{lock_or_json} detected but composer not available."
+        def check
+          unless composer_available?
+            raise EY::Serverside::RemoteFailure.new("composer.#{lock_or_json} detected but composer not available!")
+          end
+
+          if composer_json? && !composer_lock?
+            shell.warning <<-WARN
+composer.json found but composer.lock missing!
+This may result in different versions of packages
+being installed than what you tested with.
+
+To fix this problem, commit your composer.lock to the repository and redeploy.
+            WARN
           end
         end
 
+        def install
+          shell.status "Checking for composer updates..."
+          composer_selfupdate
+          shell.status "Installing composer packages (composer.#{lock_or_json} detected)"
+          composer_install
+        end
+
         def lock_or_json
           composer_lock? ? 'lock' : 'json'
         end

data/lib/engineyard-serverside/rails_assets.rb

@@ -71,7 +71,8 @@ module EY
       # silentely failed assets. Only reusing when assets are enabled
       # ensures that existing assets were successful.
       def reuse_assets?
-        previous_revision &&
+        asset_strategy.reusable? &&
+          previous_revision &&
           active_revision &&
           runner.strategy.same?(previous_revision, active_revision, asset_dependencies)
       end

data/lib/engineyard-serverside/rails_assets/strategy.rb

@@ -33,6 +33,10 @@ module EY
             @runner = runner
           end
 
+          def reusable?
+            previous_assets_path.directory? && previous_assets_path.entries.any?
+          end
+
           def reuse
             run "mkdir -p #{paths.public_assets} && rsync -aq #{previous_assets_path}/ #{paths.public_assets}"
           end
@@ -73,6 +77,10 @@ module EY
             @runner = runner
           end
 
+          def reusable?
+            shared_assets_path.directory? && shared_assets_path.entries.any?
+          end
+
           def reuse
             run "mkdir -p #{shared_assets_path} && ln -nfs #{shared_assets_path} #{paths.public}"
           end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.1.3'
+    VERSION = '2.1.4'
   end
 end

data/spec/php_deploy_spec.rb

@@ -30,6 +30,11 @@ describe "Deploying an application that uses PHP and Composer" do
         deploy_test_application('php_no_composer_lock')
       end
 
+      it "outputs a warning about deploying without a .lock" do
+        warning_out = read_output.should include("WARNING: composer.json found but composer.lock missing!")
+        warning_out.should_not be_nil
+      end
+
       it "runs 'composer install'" do
         install_cmd = @deployer.commands.grep(/composer install/).first
         install_cmd.should_not be_nil
@@ -52,24 +57,16 @@ describe "Deploying an application that uses PHP and Composer" do
   context "without composer available" do
 
     context "with a composer.lock" do
-      before(:all) do
-        deploy_test_application('php_composer_lock')
-      end
 
-      it "outputs a warning, but continues" do
-        warning_out = read_output.should include("WARNING: composer.lock")
-        warning_out.should_not be_nil
+      it "fails to deploy" do
+        expect {deploy_test_application('php_composer_lock')}.to raise_error EY::Serverside::RemoteFailure
       end
     end
 
     context "WITHOUT a composer.lock but with composer.json" do
-      before(:all) do
-        deploy_test_application('php_no_composer_lock')
-      end
 
-      it "outputs a warning, but continues" do
-        warning_out = read_output.should include("WARNING: composer.json")
-        warning_out.should_not be_nil
+      it "fails to deploy" do
+        expect {deploy_test_application('php_no_composer_lock')}.to raise_error EY::Serverside::RemoteFailure
       end
 
     end

data/spec/rails31_deploy_spec.rb

@@ -43,6 +43,21 @@ describe "Deploying a Rails 3.1 application" do
       deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
       read_output.should_not =~ %r#Reusing existing assets#
     end
+
+    it "precompile assets when redeploying the same ref, but assets were turned off the first time" do
+      deploy_test_application('assets_enabled_in_ey_yml', 'config' => {'precompile_assets' => 'false'})
+      deploy_dir.join('current', 'precompiled').should_not exist
+      deploy_dir.join('current', 'public', 'assets').should_not exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should_not exist
+      read_output.should_not include("Precompiling assets. (precompile_assets: true)")
+
+      # assets will show as unchanged, but it should compile them fresh anyway.
+      redeploy_test_application('config' => {'precompile_assets' => 'true'})
+      deploy_dir.join('current', 'precompiled').should exist # it does runs the task
+      deploy_dir.join('current', 'public', 'assets').should exist
+      deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+      read_output.should_not =~ %r#Reusing existing assets#
+    end
   end
 
   context "with asset compilation enabled in ey.yml, despite not otherwise being enabled" do

data/spec/shell_spec.rb

@@ -3,10 +3,11 @@ require 'tempfile'
 require 'timecop'
 
 describe EY::Serverside::Shell do
+  let(:output) { StringIO.new }
+
   if "".respond_to?(:force_encoding)
     it "status works for ut8" do
-      output = StringIO.new
-      shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => Time.local(2008, 9, 1, 12, 10, 25))
+      shell = EY::Serverside::Shell.new(:verbose => true, :stdout => output, :stderr => output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => Time.local(2008, 9, 1, 12, 10, 25))
       shell.status("\u2603".force_encoding("binary"))
     end
   end
@@ -16,8 +17,7 @@ describe EY::Serverside::Shell do
     time2 = Time.local(2008, 9, 1, 12, 3, 5)
     time3 = Time.local(2008, 9, 1, 12, 10, 25)
 
-    @output = StringIO.new
-    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => time1)
+    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => output, :stderr => output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => time1)
 
     Timecop.freeze(time1) do
       @shell.debug('debug')
@@ -36,8 +36,8 @@ describe EY::Serverside::Shell do
     tstp_2 = "+ 3m 05s "
     tstp_3 = "+10m 25s "
     notstp = "         "
-    @output.rewind
-    @output.read.should == <<-OUTPUT
+    output.rewind
+    output.read.should == <<-OUTPUT
 #{notstp} debug
 
 \e[1m\e[33m#{tstp_1} !> notice

metadata

@@ -1,159 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 3
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.2
-  prerelease: false
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 10
-        - 0
-        version: "10.0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 0
-        - 11
+      - !ruby/object:Gem::Version
         version: 1.0.11
-  prerelease: false
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.11
+- !ruby/object:Gem::Dependency
   name: engineyard-serverside-adapter
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.0.6
-  prerelease: false
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/about.rb
 - lib/engineyard-serverside/cli.rb
@@ -390,40 +388,32 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1955652891792976111
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb