engineyard-serverside 2.3.1 → 2.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTY0OGQwYWRkMDM2MDczMjM3YzQ0YTdlNjgzZjMwOTJhMWFmMTBmYQ==
+    ODg5ZGYzMGM2MzIyMmI2ZGYyNTQ3NzY1M2MwOWU3YzMxYjZlNGFjNw==
   data.tar.gz: !binary |-
-    OTdiNzFhZDEyNjk2MmU0NWQ5MzNjYjc4MjAxNTI2NDk4ZDQ3YmZjYg==
+    N2FkMGZiNzM2MTEwOTRkOTRlZmYxOTJiZmZiM2VlYjNlNWU0ODE2YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzBiYzI1NDYxYjAzNjJjZDc2OTg0YzZiZGFmOWExNWJiNjNhNzcxNzFiY2Q4
-    MDY5NGJlMTE0MTY2YWM2MjdiNjZiNjVjM2FhM2RhZDY0NGI2Y2M1Nzc3NTNi
-    YzM3NzBkNzI3NDk4M2E5ODc2MGU3YzRhZTk4N2VlM2IxYjcxNGQ=
+    MTgyNWI4OGZiMjhlYWM3N2JiY2U0ODRmNTQzZjI4NTRiNDA0NTg3NDM0NmI2
+    ODlkMThmZDk5NGU4MjM1OTA3NzUwNzZhNjA0NGY4ZTc1OTkwNzY4ZjYwOTcx
+    ZjRjMWM2MTE0ZGVjNWYwMjlhOWM4NmI0MGU5MGRmMDkwMTMxZDQ=
   data.tar.gz: !binary |-
-    MjI0MzQwNGQwZGQ3MWVlOGM1ZWEwYzI2YjQ5NjBjYjIxNmI4MDI1MDI1NzVl
-    NGE5MzU3ZTU4YWEzMTA1NDJiZGZkNmU4MDBiZjJiM2YzODBmYzY5Njg5NDA0
-    YzlmNzkzMzhhNzA0ZGM3NDNkYmMxMjc2NmFlYzI2NzFhN2ViNjQ=
+    NTQ4MDJiMmI3ZDg0MWJkMDZjOThiNGRlNWYzMWNkMzU4NjZiMGNjY2RmYTAw
+    MDEwYTcyNTQ0ODYzZTA5OGMzMjc1MmJiOWFkZTBhMDc0NWYyOWE2MDQwN2Qx
+    ZDA5OGNjMDQwNThjOTYzYzMyZjhiZDZlMWUwNmQ2Njk0YTQ0YWE=

data/lib/engineyard-serverside/cli.rb

@@ -33,6 +33,9 @@ module EY
       method_option :git,            :type     => :string,
                                      :desc     => "Remote git repo to deploy"
 
+      method_option :clean,          :type     => :boolean,
+                                     :desc     => "Run deploy without relying on existing files"
+
 
       account_app_env_options
       config_option
@@ -108,6 +111,9 @@ module EY
         # we have to deploy the same SHA there as here
         integrate_options[:branch] = current_app_dir.join('REVISION').read.strip
 
+        # always rebundle gems on integrate to make sure the instance comes up correctly.
+        integrate_options[:clean] = true
+
         init_and_propagate(integrate_options, 'integrate') do |servers, config, shell|
 
           # We have to rsync the entire app dir, so we need all the permissions to be correct!

data/lib/engineyard-serverside/configuration.rb

@@ -101,6 +101,7 @@ module EY
 
       def_option :restart_groups,         1
 
+      def_boolean_option :clean,                           false
       def_boolean_option :verbose,                         false
       def_boolean_option :precompile_unchanged_assets,     false
       def_boolean_option :ignore_database_adapter_warning, false

data/lib/engineyard-serverside/dependency_manager.rb

@@ -40,7 +40,7 @@ module EY
           case enabled
           when 'false', false then nil
           when 'true',  true  then klass.new(servers, config, shell, runner)
-          when 'detect'       then klass.detect(servers, config, shell, runner)
+          when 'detect', nil  then klass.detect(servers, config, shell, runner)
           else
             raise "Unknown value #{enabled.inspect} for option #{name.inspect}. Expected [true, false, detect]"
           end

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

@@ -114,12 +114,17 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 
         def clean_bundle_on_system_version_change
           # diff exits with 0 for same and 1/2 for different/file not found.
-          check_ruby   = "#{config.ruby_version_command} | diff - #{paths.ruby_version} >/dev/null 2>&1"
-          check_system = "#{config.system_version_command} | diff - #{paths.system_version} >/dev/null 2>&1"
           clean_bundle = "rm -Rf #{paths.bundled_gems}"
 
-          shell.substatus "Checking for system version changes"
-          run "#{check_ruby} && #{check_system} || #{clean_bundle}"
+          if config.clean?
+            shell.substatus "Clean bundle forced (--clean)"
+            run clean_bundle
+          else
+            check_ruby   = "#{config.ruby_version_command} | diff - #{paths.ruby_version} >/dev/null 2>&1"
+            check_system = "#{config.system_version_command} | diff - #{paths.system_version} >/dev/null 2>&1"
+            shell.substatus "Checking for system version changes"
+            run "#{check_ruby} && #{check_system} || #{clean_bundle}"
+          end
         end
 
         def bundler_version

data/lib/engineyard-serverside/deploy.rb

@@ -26,6 +26,7 @@ module EY
 
         shell.status "Starting full deploy"
         copy_repository_cache
+        callback(:before_deploy)
         check_repository
 
         with_failed_release_cleanup do
@@ -49,6 +50,7 @@ module EY
 
         cleanup_old_releases
         gc_repository_cache
+        callback(:after_deploy)
         shell.status "Finished deploy at #{Time.now.asctime}"
       rescue Exception => e
         shell.status "Finished failing to deploy at #{Time.now.asctime}"

data/lib/engineyard-serverside/source/git.rb

@@ -2,7 +2,7 @@ require 'engineyard-serverside/source'
 
 # Deploy source for git repository sourced deploy.
 class EY::Serverside::Source::Git < EY::Serverside::Source
-  require_opts :uri, :ref, :repository_cache
+  require_opts :ref, :repository_cache
 
   def create_revision_file_command(revision_file_path)
     %Q{#{git} show --pretty=format:"%H" | head -1 > "#{revision_file_path}"}

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.3.1'
+    VERSION = '2.3.2'
   end
 end

data/spec/archive_deploy_spec.rb

@@ -17,6 +17,7 @@ describe "Deploying a simple application" do
       args.archive = FIXTURES_DIR.join('retwisj.war')
       args.verbose = true
       args.instances = [{ :hostname => "localhost", :roles => ["solo"], :name => "single" }]
+      args.serverside_version = Gem::Version.create(EY::Serverside::VERSION.dup).release
       args.config = {
         "deploy_to" => deploy_dir,
         "release_path"     => release_path.to_s,

data/spec/bundler_deploy_spec.rb

@@ -21,6 +21,8 @@ describe "Deploying an application that uses Bundler" do
     end
 
     it "removes bundled_gems directory if the ruby or system version changed" do
+      should_run_clear_bundle_cmd = @deployer.commands.grep(/diff/).first
+      should_run_clear_bundle_cmd.should_not be_nil
       clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
       clear_bundle_cmd.should_not be_nil
     end
@@ -44,6 +46,20 @@ describe "Deploying an application that uses Bundler" do
     end
   end
 
+  context "with clean option" do
+    before(:all) do
+      deploy_test_application('ey_yml', 'clean' => true)
+    end
+
+    it "removes bundled_gems directory if the ruby or system version changed" do
+      should_run_clear_bundle_cmd = @deployer.commands.grep(/diff/).first
+      should_run_clear_bundle_cmd.should be_nil
+      clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+      clear_bundle_cmd.should_not be_nil
+    end
+
+  end
+
   context "with bundler disabled in ey.yml" do
     before(:all) do
       deploy_test_application('bundler_disabled')

data/spec/deploy_hook_spec.rb

@@ -7,6 +7,7 @@ describe "deploy hooks" do
     end
 
     it "runs all the hooks" do
+      deploy_dir.join('current', 'before_deploy.ran' ).should exist
       deploy_dir.join('current', 'before_bundle.ran' ).should exist
       deploy_dir.join('current', 'after_bundle.ran'  ).should exist
       deploy_dir.join('current', 'before_migrate.ran').should exist
@@ -17,6 +18,7 @@ describe "deploy hooks" do
       deploy_dir.join('current', 'after_symlink.ran' ).should exist
       deploy_dir.join('current', 'before_restart.ran').should exist
       deploy_dir.join('current', 'after_restart.ran' ).should exist
+      deploy_dir.join('current', 'after_deploy.ran'  ).should exist
     end
   end
 

data/spec/fixtures/repos/hooks/deploy/after_deploy.rb

@@ -0,0 +1 @@
+run 'touch after_deploy.ran'

data/spec/fixtures/repos/hooks/deploy/before_deploy.rb

@@ -0,0 +1 @@
+run 'touch before_deploy.ran'

data/spec/spec_helper.rb

@@ -251,13 +251,14 @@ exec "$@"
 
     # Create the command to send to CLI.start, even though most of the options are ignored
     @adapter = EY::Serverside::Adapter.new do |args|
-      args.app              = options['app']
-      args.environment_name = options['environment_name']
-      args.account_name     = options['account_name']
-      args.migrate          = options['migrate']
-      args.ref              = options['branch']
-      args.git              = options['git']
-      args.config           = {
+      args.app                = options['app']
+      args.environment_name   = options['environment_name']
+      args.account_name       = options['account_name']
+      args.migrate            = options['migrate']
+      args.ref                = options['branch']
+      args.git                = options['git']
+      args.serverside_version = Gem::Version.create(EY::Serverside::VERSION.dup).release
+      args.config             = {
         "services_check_command" => "which echo",
         "services_setup_command" => "echo 'services setup command'",
         "source_class"           => options["source_class"],
@@ -265,10 +266,11 @@ exec "$@"
         "release_path"           => options["release_path"],
         "group"                  => options["group"]
       }.merge(options['config'] || {})
-      args.framework_env    = options['framework_env']
-      args.stack            = options['stack']
-      args.verbose          = options['verbose']
-      args.instances        = test_servers.map {|s| {:hostname => s.hostname, :roles => s.roles.to_a, :name => s.name} }
+      args.framework_env      = options['framework_env']
+      args.stack              = options['stack']
+      args.verbose            = options['verbose']
+      args.clean              = options['clean']
+      args.instances          = test_servers.map {|s| {:hostname => s.hostname, :roles => s.roles.to_a, :name => s.name} }
     end
 
     @argv = @adapter.deploy.commands.last.to_argv[2..-1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -331,11 +331,13 @@ files:
 - spec/fixtures/repos/hook_fails/README
 - spec/fixtures/repos/hooks/deploy/after_bundle.rb
 - spec/fixtures/repos/hooks/deploy/after_compile_assets.rb
+- spec/fixtures/repos/hooks/deploy/after_deploy.rb
 - spec/fixtures/repos/hooks/deploy/after_migrate.rb
 - spec/fixtures/repos/hooks/deploy/after_restart.rb
 - spec/fixtures/repos/hooks/deploy/after_symlink.rb
 - spec/fixtures/repos/hooks/deploy/before_bundle.rb
 - spec/fixtures/repos/hooks/deploy/before_compile_assets.rb
+- spec/fixtures/repos/hooks/deploy/before_deploy.rb
 - spec/fixtures/repos/hooks/deploy/before_migrate.rb
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb
@@ -525,11 +527,13 @@ test_files:
 - spec/fixtures/repos/hook_fails/README
 - spec/fixtures/repos/hooks/deploy/after_bundle.rb
 - spec/fixtures/repos/hooks/deploy/after_compile_assets.rb
+- spec/fixtures/repos/hooks/deploy/after_deploy.rb
 - spec/fixtures/repos/hooks/deploy/after_migrate.rb
 - spec/fixtures/repos/hooks/deploy/after_restart.rb
 - spec/fixtures/repos/hooks/deploy/after_symlink.rb
 - spec/fixtures/repos/hooks/deploy/before_bundle.rb
 - spec/fixtures/repos/hooks/deploy/before_compile_assets.rb
+- spec/fixtures/repos/hooks/deploy/before_deploy.rb
 - spec/fixtures/repos/hooks/deploy/before_migrate.rb
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb