engineyard-serverside 1.6.4 → 1.6.5

data/lib/engineyard-serverside/cli.rb

@@ -135,6 +135,9 @@ module EY
 
         config = EY::Serverside::Deploy::Configuration.new(integrate_options)
 
+        # We have to rsync the entire app dir, so we need all the permissions to be correct!
+        system "sudo sh -l -c 'find #{app_dir} -not -user #{config.user} -or -not -group #{config.group} -exec chown #{config.user}:#{config.group} {} +'"
+
         load_servers(config)
 
         invoke :propagate

data/lib/engineyard-serverside/configuration.rb

@@ -128,8 +128,16 @@ module EY
         release_path + '/ey_bundler_binstubs'
       end
 
+      def framework_env_names
+        %w[RAILS_ENV RACK_ENV NODE_ENV MERB_ENV]
+      end
+
       def framework_envs
-        "RAILS_ENV=#{environment} RACK_ENV=#{environment} NODE_ENV=#{environment} MERB_ENV=#{environment}"
+        framework_env_names.map { |e| "#{e}=#{environment}" }.join(' ')
+      end
+
+      def set_framework_envs
+        framework_env_names.each { |e| ENV[e] = environment }
       end
 
       def current_path

data/lib/engineyard-serverside/deploy.rb

@@ -211,7 +211,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 [[ -x #{path} ]] || cat > #{path} <<'SSH'
 #!/bin/sh
 unset SSH_AUTH_SOCK
-ssh -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PasswordAuthentication=no -o LogLevel=DEBUG -o IdentityFile=#{identity_file} -o IdentitiesOnly=yes $*
+ssh -o CheckHostIP=no -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o LogLevel=INFO -o IdentityFile=#{identity_file} -o IdentitiesOnly=yes $*
 SSH
 chmod 0700 #{path}
 WRAP

data/lib/engineyard-serverside/deploy_hook.rb

@@ -32,6 +32,7 @@ module EY
       class CallbackContext
         def initialize(config)
           @configuration = config
+          @configuration.set_framework_envs
           @node = node
         end
 

data/lib/engineyard-serverside/server.rb

@@ -87,8 +87,18 @@ module EY
         end
       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=/dev/null -o PasswordAuthentication=no"
+        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o UserKnownHostsFile=#{self.class.known_hosts_file.path} -o PasswordAuthentication=no "
       end
 
     end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.6.4'
+    VERSION = '1.6.5'
   end
 end

data/spec/deploy_hook_spec.rb

@@ -1,23 +1,18 @@
 require 'spec_helper'
 
 describe "the deploy-hook API" do
-  before(:each) do
-    @hook = EY::Serverside::DeployHook.new(options)
-    @callback_context = EY::Serverside::DeployHook::CallbackContext.new(@hook.config)
+  def deploy_hook(options={})
+    EY::Serverside::DeployHook.new(options)
   end
 
   def run_hook(options={}, &blk)
     raise ArgumentError unless block_given?
-    options.each do |k, v|
-      @callback_context.configuration[k] = v
-    end
-
     # The hooks on the filesystem are run by passing a string to
     # context.instance_eval, not a block. However, using a block
     # should allow us to get the same degree of test coverage and
     # still let us have things like syntax checking work on this spec
     # file.
-    @callback_context.instance_eval(&blk)
+    deploy_hook(options).callback_context.instance_eval(&blk)
   end
 
   context "#run" do
@@ -46,9 +41,9 @@ describe "the deploy-hook API" do
     end
 
     it "runs things with sudo" do
-      @callback_context.should_receive(:system).with("sudo sh -l -c 'do it as root'").and_return(true)
-
-      run_hook { sudo("do it as root") }
+      callback = deploy_hook.callback_context
+      callback.should_receive(:system).with("sudo sh -l -c 'do it as root'").and_return(true)
+      callback.instance_eval { sudo("do it as root") }
     end
   end
 
@@ -123,6 +118,15 @@ describe "the deploy-hook API" do
     end
   end
 
+  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'
+    end
+  end
+
   context "has methods to run code only on certain instances" do
     def scenarios
       [
@@ -141,10 +145,11 @@ describe "the deploy-hook API" do
 
     def where_code_runs_with(method, *args)
       scenarios.map do |s|
-        @callback_context.configuration[:current_roles] = s[:instance_role].split(',')
-        @callback_context.configuration[:current_name] = s[:name]
+        hook_result = run_hook('current_roles' => s[:instance_role].split(','), 'current_name' => s[:name]) do
+          send(method, *args) { 'ran!' }
+        end
 
-        if run_hook { send(method, *args) { 'ran!'} } == 'ran!'
+        if hook_result == 'ran!'
           result = s[:instance_role]
           result << "_#{s[:name]}" if s[:name]
           result
@@ -189,14 +194,14 @@ describe "the deploy-hook API" do
   context "#syntax_error" do
     it "returns nil for hook files containing valid Ruby syntax" do
       hook_path = File.expand_path('../fixtures/valid_hook.rb', __FILE__)
-      @hook.syntax_error(hook_path).should be_nil
+      deploy_hook.syntax_error(hook_path).should be_nil
     end
 
     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 = /#{Regexp.escape desc}/
-      @hook.syntax_error(hook_path).should =~ match
+      deploy_hook.syntax_error(hook_path).should =~ match
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -323,6 +323,8 @@ files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
+- spec/fixtures/gitrepo/bar
+- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler
@@ -365,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4080169497059985943
+      hash: -3529286902582306998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -374,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 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
@@ -385,6 +387,8 @@ test_files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
+- spec/fixtures/gitrepo/bar
+- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler