engineyard-serverside 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5333baa3bba55bce4078339f6240c0832b76f12d
-  data.tar.gz: eacf3427fae13fbd56c85054c1502da40d962d67
+  metadata.gz: 6486230a970d69456691197b715e213cde4bd543
+  data.tar.gz: e5908d2a85c14dd9de76ae090d9bebcd940637b5
 SHA512:
-  metadata.gz: 5bbd1b7d1dadb1ced6c38acd6e4a7a8977e3887abcd598ca7d67253b2efaad8d5fd5d8c9ac0d28a323e75e5933ef0398497d765489d217051abf595e5bcee59e
-  data.tar.gz: 890b5c71290167f2acdda70a3375773a02547b9d093c84f238be10605fab534d5eddafe3240514359214f30b501e12fe26a407580ae67da78e9bf59f8051e560
+  metadata.gz: 054c93f12c3b85e974a62eb547f6dddb8a81ac6a1be69594836c5f7094c4dfd628de53fb1b9bd64a8279e0390823c988c0a4d557ccaed9bdc033b72ee1ac778c
+  data.tar.gz: 5f46a8426973e59ad8e9ec1873af3edfc5f615b801a030963a41b8ebc8761c3ba53df0113e98e7ea9911593bf8c1ed6e370e39f2b435b97f2dc5dbea13322db5

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

@@ -8,8 +8,10 @@ module EY
 
         def install
           if composer_available?
+            shell.status "Checking for composer updates..."
+            composer_selfupdate
             shell.status "Installing composer packages (composer.#{lock_or_json} detected)"
-            run "composer install --no-interaction --working-dir #{paths.active_release}"
+            composer_install
           else
             shell.warning "composer.#{lock_or_json} detected but composer not available."
           end
@@ -27,6 +29,14 @@ module EY
           paths.composer_json.exist?
         end
 
+        def composer_install
+            run "composer install --no-interaction --working-dir #{paths.active_release}"
+        end
+
+        def composer_selfupdate
+            run "composer self-update"
+        end
+
         def composer_available?
           begin
             run "command -v composer > /dev/null"

data/lib/engineyard-serverside/deploy.rb

@@ -280,10 +280,10 @@ Deploy again if your services configuration appears incomplete or out of date.
           run <<-WRAP
 cat > #{paths.shared_config}/database.sqlite3.yml<<'YML'
 #{config.framework_env}:
-adapter: sqlite3
-database: #{paths.shared}/databases/#{config.framework_env}.sqlite3
-pool: 5
-timeout: 5000
+  adapter: sqlite3
+  database: #{paths.shared}/databases/#{config.framework_env}.sqlite3
+  pool: 5
+  timeout: 5000
 YML
           WRAP
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.1.1'
+    VERSION = '2.1.2'
   end
 end

data/spec/php_deploy_spec.rb

@@ -13,6 +13,16 @@ describe "Deploying an application that uses PHP and Composer" do
         install_cmd = @deployer.commands.grep(/composer install/).first
         install_cmd.should_not be_nil
       end
+
+      it "runs 'composer self-update' before 'composer install'" do
+        update_cmd = nil
+        @deployer.commands.each do |cmd|
+          update_cmd ||= /composer self-update/.match(cmd)
+          if /composer install/.match(cmd)
+            update_cmd.should_not be nil
+          end
+        end
+      end
     end
 
     context "WITHOUT a composer.lock but with composer.json" do
@@ -25,6 +35,16 @@ describe "Deploying an application that uses PHP and Composer" do
         install_cmd.should_not be_nil
       end
 
+      it "runs 'composer self-update' before 'composer install'" do
+        update_cmd = nil
+        @deployer.commands.each do |cmd|
+          update_cmd ||= /composer self-update/.match(cmd)
+          if /composer install/.match(cmd)
+            update_cmd.should_not be nil
+          end
+        end
+      end
+
     end
 
   end if $COMPOSER_INSTALLED

data/spec/sqlite3_deploy_spec.rb

@@ -29,4 +29,10 @@ describe "Deploying an application with sqlite3 as the only DB adapter in the Ge
     @shared_path.join('databases', "#{@framework_env}.sqlite3").should exist
   end
 
+  it 'should contain valid yaml config' do
+    config = YAML.load_file(@release_path.join('config', 'database.yml'))
+    config[@framework_env]['adapter'].should == 'sqlite3'
+    config[@framework_env]['database'].should == @shared_path.join('databases', "#{@framework_env}.sqlite3").expand_path.to_s
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec