engineyard-serverside 1.7.0.pre2 → 2.0.0.pre1

data/lib/engineyard-serverside/deploy.rb

@@ -150,9 +150,15 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       end
 
       def disable_maintenance_page
-        @maintenance_up = false
-        roles :app_master, :app, :solo do
-          run "rm -f #{c.maintenance_page_enabled_path}"
+        if c.enable_maintenance_page?
+          @maintenance_up = false
+          roles :app_master, :app, :solo do
+            run "rm -f #{c.maintenance_page_enabled_path}"
+          end
+        else
+          if File.exists?(c.maintenance_page_enabled_path)
+            shell.notice "[Attention] Maintenance page is still up. You must remove it manually."
+          end
         end
       end
 

data/lib/engineyard-serverside/server.rb

@@ -102,6 +102,16 @@ module EY
         @known_hosts_file ||= Tempfile.new('ey-ss-known-hosts')
       end
 
+      # Make a known hosts tempfile to absorb host fingerprints so we don't show
+      #
+      #     Warning: Permanently added 'xxx' (RSA) to the list of known hosts.
+      #
+      # for every ssh command.
+      # (even with StrictHostKeyChecking=no, the warning output is annoying)
+      def self.known_hosts_file
+        @known_hosts_file ||= Tempfile.new('ey-ss-known-hosts')
+      end
+
       def ssh_command
         "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o UserKnownHostsFile=#{self.class.known_hosts_file.path} -o PasswordAuthentication=no "
       end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.7.0.pre2'
+    VERSION = '2.0.0.pre1'
   end
 end

data/spec/deploy_hook_spec.rb

@@ -166,10 +166,10 @@ describe "deploy hooks" do
 
     context "environment variables" do
       it "sets the framework env variables" do
-        run_hook('framework_env' => 'production') { ENV['RAILS_ENV'] }.should == 'production'
-        run_hook('framework_env' => 'production') { ENV['RACK_ENV']  }.should == 'production'
-        run_hook('framework_env' => 'production') { ENV['MERB_ENV']  }.should == 'production'
-        run_hook('framework_env' => 'production') { ENV['NODE_ENV']  }.should == 'production'
+        deploy_hook('framework_env' => 'production').eval_hook("ENV['RAILS_ENV']").should == 'production'
+        deploy_hook('framework_env' => 'production').eval_hook("ENV['RACK_ENV'] ").should == 'production'
+        deploy_hook('framework_env' => 'production').eval_hook("ENV['MERB_ENV'] ").should == 'production'
+        deploy_hook('framework_env' => 'production').eval_hook("ENV['NODE_ENV'] ").should == 'production'
       end
     end
 

data/spec/ey_yml_customized_deploy_spec.rb

@@ -42,6 +42,17 @@ describe "Deploying an app with ey.yml" do
       @deploy_dir.join('current','maintenance_enabled').should_not exist
     end
 
+    it "does not remove an existing maintenance page" do
+      @deploy_dir.join('current','maintenance_disabled').delete
+      @deployer.enable_maintenance_page
+      @deploy_dir.join('shared','system','maintenance.html').should exist
+      redeploy_test_application
+      read_output.should =~ /Maintenance page is still up. You must remove it manually./
+      @deploy_dir.join('shared','system','maintenance.html').should exist
+      @deploy_dir.join('current','maintenance_disabled').should_not exist
+      @deploy_dir.join('current','maintenance_enabled').should exist
+    end
+
     it "makes custom variables available to hooks" do
       @deploy_dir.join('current', 'custom_hook').read.should include("custom_from_ey_yml")
     end

data/spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'rake'

data/spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile.lock

@@ -0,0 +1,10 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake

data/spec/fixtures/repos/ey_yml/config/ey.yml

@@ -9,4 +9,5 @@ environments:
     custom: custom_from_ey_yml
     bundle_without: only test
     maintenance_on_migrate: false
+    maintenance_on_restart: false
     ignore_database_adapter_warning: true

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 3325805217
+  hash: 635318697
   prerelease: 6
   segments: 
-  - 1
-  - 7
+  - 2
+  - 0
   - 0
   - pre
-  - 2
-  version: 1.7.0.pre2
+  - 1
+  version: 2.0.0.pre1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 Z
+date: 2012-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -381,6 +381,8 @@ files:
 - spec/fixtures/repos/assets_enabled/Rakefile
 - spec/fixtures/repos/assets_enabled/README
 - spec/fixtures/repos/assets_enabled_in_ey_yml/config/ey.yml
+- spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile
+- spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_enabled_in_ey_yml/README
 - spec/fixtures/repos/assets_in_hook/config/application.rb
@@ -469,7 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -515,6 +517,8 @@ test_files:
 - spec/fixtures/repos/assets_enabled/Rakefile
 - spec/fixtures/repos/assets_enabled/README
 - spec/fixtures/repos/assets_enabled_in_ey_yml/config/ey.yml
+- spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile
+- spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_enabled_in_ey_yml/README
 - spec/fixtures/repos/assets_in_hook/config/application.rb