engineyard-serverside 1.2.1 → 1.2.2

data/lib/engineyard-serverside/configuration.rb

@@ -73,9 +73,12 @@ module EY
     end
 
     def user
-      ENV['USER']
+      configuration['user'] || ENV['USER']
+    end
+
+    def group
+      configuration['group'] || user
     end
-    alias :group :user
 
     def role
       node['instance_role']
@@ -106,6 +109,10 @@ module EY
       Dir.glob("#{release_dir}/*").sort
     end
 
+    def binstubs_path
+      release_path + '/ey_bundler_binstubs'
+    end
+
     def framework_envs
       "RAILS_ENV=#{environment} RACK_ENV=#{environment} MERB_ENV=#{environment}"
     end

data/lib/engineyard-serverside/deploy.rb

@@ -62,8 +62,10 @@ module EY
 
       @maintenance_up = true
       roles :app_master, :app, :solo do
-        visible_maint_page = File.join(c.shared_path, "system", "maintenance.html")
-        run "cp '#{maintenance_file}' '#{visible_maint_page}'"
+        maint_page_dir = File.join(c.shared_path, "system")
+        visible_maint_page = File.join(maint_page_dir, "maintenance.html")
+        run Escape.shell_command(['mkdir', '-p', maint_page_dir])
+        run Escape.shell_command(['cp', maintenance_file, visible_maint_page])
       end
     end
 
@@ -126,7 +128,7 @@ module EY
                               get_bundler_installer(lockfile)
                             else
                               warn_about_missing_lockfile
-                              BundleInstaller.new(default_09_bundler, "--without=development --without=test")
+                              bundler_09_installer(default_09_bundler)
                             end
 
         sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_installer.version}"
@@ -167,7 +169,7 @@ module EY
       return unless c.migrate?
       @migrations_reached = true
       roles :app_master, :solo do
-        cmd = "cd #{c.release_path} && #{c.framework_envs} #{c.migration_command}"
+        cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} #{c.migration_command}"
         info "~> Migrating: #{cmd}"
         run(cmd)
       end
@@ -292,22 +294,26 @@ module EY
       parser = LockfileParser.new(File.read(lockfile))
       case parser.lockfile_version
       when :bundler09
-        BundleInstaller.new(
-          parser.bundler_version || default_09_bundler,
-          "--without=development --without=test")
+        bundler_09_installer(parser.bundler_version || default_09_bundler)
       when :bundler10
-        BundleInstaller.new(
-          parser.bundler_version || default_10_bundler,
-          "--deployment --path #{c.shared_path}/bundled_gems --without development test"
-          )
+        bundler_10_installer(parser.bundler_version || default_10_bundler)
       else
         raise "Unknown lockfile version #{parser.lockfile_version}"
       end
     end
     public :get_bundler_installer
 
-    def default_09_bundler() "0.9.26"     end
-    def default_10_bundler() "1.0.0.rc.6" end
+    def bundler_09_installer(version)
+      BundleInstaller.new(version, '--without=development --without=test')
+    end
+
+    def bundler_10_installer(version)
+      BundleInstaller.new(version,
+        "--deployment --path #{c.shared_path}/bundled_gems --binstubs #{c.binstubs_path} --without development test")
+    end
+
+    def default_09_bundler() "0.9.26" end
+    def default_10_bundler() "1.0.0"  end
 
   end   # DeployBase
 

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -35,7 +35,7 @@ module EY
         end
 
         unless dep_section.length > 0
-          raise "Couldn't parse #{lockfile}; exiting"
+          raise "Couldn't parse #{@contents}; exiting"
           exit(1)
         end
 

data/lib/engineyard-serverside/task.rb

@@ -56,7 +56,7 @@ module EY
       # MRI's truthiness check is an internal C thing that does not call
       # any methods... so Dataflow cannot proxy it & we must "x == true"
       # Rubinius, wherefore art thou!?
-      results.all?{|x| x == true } || raise(EY::RemoteFailure)
+      results.all?{|x| x == true } || raise(EY::RemoteFailure.new(cmd))
     end
   end
 end

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/real_deploy_spec.rb

@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+module EY::Strategies::IntegrationSpec
+  module Helpers
+
+    def update_repository_cache
+      cached_copy = File.join(c.shared_path, 'cached-copy')
+
+      FileUtils.mkdir_p(cached_copy)
+      Dir.chdir(cached_copy) do
+        `echo "this is my file; there are many like it, but this one is mine" > file`
+        File.open('Gemfile', 'w') do |f|
+          f.write <<-EOF
+source :gemcutter
+
+gem "bundler", "~> 1.0.0.rc.6"
+gem "rake"
+EOF
+        end
+
+        File.open("Gemfile.lock", "w") do |f|
+          f.write <<-EOF
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.8.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0.rc.6)
+  rake
+EOF
+        end
+      end
+    end
+
+    def create_revision_file_command
+      "echo 'revision, yo' > #{c.release_path}/REVISION"
+    end
+
+    def short_log_message(revision)
+      "FONDLED THE CODE"
+    end
+
+  end
+end
+
+describe "deploying an application" do
+  class FullTestDeploy < EY::Deploy
+    attr_reader :infos, :debugs, :commands
+
+    def initialize(*)
+      super
+      @infos = []
+      @debugs = []
+      @commands = []
+    end
+
+    # stfu
+    def info(msg)
+      @infos << msg
+    end
+
+    # no really, stfu
+    def debug(msg)
+      @debugs << msg
+    end
+
+    # passwordless sudo is neither guaranteed nor desired
+    def sudo(cmd)
+      run(cmd)
+    end
+
+    def run(cmd)
+      # $stderr.puts(cmd)
+      @commands << cmd
+      super
+    end
+
+    # we're probably running this spec under bundler, but a real
+    # deploy does not
+    def bundle
+      my_env = ENV.to_hash
+
+      ENV.delete("BUNDLE_GEMFILE")
+      ENV.delete("BUNDLE_BIN_PATH")
+
+      result = super
+
+      ENV.replace(my_env)
+      result
+    end
+
+    def get_bundler_installer(lockfile)
+      installer = super
+      installer.options << ' --quiet'   # stfu already!
+      installer
+    end
+
+  end
+
+  before(:all) do
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+
+    # set up EY::Server like we're on a solo
+    EY::Server.all = [{:hostname => 'dontcare', :role => 'solo'}]
+
+    # run a deploy
+    config = EY::Deploy::Configuration.new({
+        "strategy" => "IntegrationSpec",
+        "deploy_to" => @deploy_dir,
+        "group" => `id -gn`.strip,
+        "stack" => 'nginx_passenger',
+        "migrate" => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating"
+      })
+
+    $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @deployer = FullTestDeploy.new(config)
+    @deployer.deploy
+  end
+
+  it "creates a REVISION file" do
+    File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
+  end
+
+  it "restarts the app servers" do
+    File.exist?(File.join(@deploy_dir, 'current', 'tmp', 'restart.txt')).should be_true
+  end
+
+  it "runs 'bundle install' with --deployment" do
+    bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+    bundle_install_cmd.should_not be_nil
+    bundle_install_cmd.should include('--deployment')
+  end
+
+  it "creates binstubs somewhere out of the way" do
+    File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
+  end
+
+  it "has the binstubs in the path when migrating" do
+    File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -41,7 +41,6 @@ files:
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
-- lib/engineyard-serverside/version_flymake.rb
 - lib/engineyard-serverside.rb
 - lib/vendor/dataflow/dataflow/actor.rb
 - lib/vendor/dataflow/dataflow/equality.rb
@@ -242,6 +241,7 @@ files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/real_deploy_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler
 - spec/support/lockfiles/0.9-with-bundler
@@ -291,6 +291,7 @@ test_files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/real_deploy_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler
 - spec/support/lockfiles/0.9-with-bundler

data/lib/engineyard-serverside/version_flymake.rb

@@ -1,3 +0,0 @@
-module EY
-  VERSION = '1.2.1'
-end