engineyard-serverside 2.2.0.rc1 → 2.2.0.rc2

data/bin/engineyard-serverside

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 $LOAD_PATH.push(File.expand_path("../lib", File.dirname(__FILE__)))
+
 require 'engineyard-serverside'
 
 EY::Serverside::CLI.start

data/lib/engineyard-serverside.rb

@@ -7,6 +7,11 @@ else
   $string_encodings = false
 end
 
+if defined?(Encoding) && Encoding.respond_to?(:default_internal=) # String.instance_methods.include?(:force_encoding)
+  Encoding.default_internal = Encoding::UTF_8
+  Encoding.default_external = Encoding::UTF_8
+end
+
 $LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/systemu/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))

data/lib/engineyard-serverside/configuration.rb

@@ -285,16 +285,6 @@ module EY
         [nil, 'nginx_mongrel', 'glassfish'].include? stack
       end
 
-      # Enable if stack requires it or if overridden in the ey.yml config.
-      def enable_maintenance_page?
-        maintenance_on_restart? || (migrate? && maintenance_on_migrate?)
-      end
-
-      # We disable the maintenance page if we would have enabled.
-      def disable_maintenance_page?
-        enable_maintenance_page?
-      end
-
       def configured_services
         services = YAML.load_file(paths.shared_services_yml.to_s)
         services.respond_to?(:keys) && !services.empty? ? services.keys : nil

data/lib/engineyard-serverside/maintenance.rb

@@ -19,8 +19,7 @@ module EY
           enable
           shell.status "Maintenance page enabled"
         else
-          shell.fatal "Cannot enable maintenance page. Application #{config.app_name} has never been deployed."
-          false
+          raise "Cannot enable maintenance page. Application #{config.app_name} has never been deployed."
         end
       end
 
@@ -29,13 +28,12 @@ module EY
           disable
           shell.status "Maintenance page disabled"
         else
-          shell.fatal "Cannot disable maintenance page. Application #{config.app_name} has never been deployed."
-          false
+          raise "Cannot disable maintenance page. Application #{config.app_name} has never been deployed."
         end
       end
 
       def conditionally_enable
-        if config.enable_maintenance_page?
+        if using_maintenance_page?
           enable
         else
           explain_not_enabling
@@ -43,10 +41,10 @@ module EY
       end
 
       def conditionally_disable
-        if config.disable_maintenance_page?
+        if using_maintenance_page?
           disable
         elsif exist?
-          shell.info "[Attention] Maintenance page is still up.\nYou must remove it manually using `ey web enable`."
+          shell.notice "[Attention] Maintenance page is still up.\nYou must remove it manually using `ey web enable`."
         end
       end
 
@@ -54,6 +52,10 @@ module EY
 
       attr_reader :config, :shell
 
+      def using_maintenance_page?
+        config.maintenance_on_restart? || (config.migrate? && config.maintenance_on_migrate?)
+      end
+
       def enable
         shell.status "Enabling maintenance page."
         @up = true
@@ -89,23 +91,19 @@ module EY
 
       def explain_not_enabling
         if config.migrate?
-          if !config.maintenance_on_migrate? && !config.maintenance_on_restart?
-            shell.status "Skipping maintenance page. (maintenance_on_migrate is false in ey.yml)"
-            shell.notice "[Caution] No maintenance migrations must be non-destructive!"
-            shell.notice "Requests may be served during a partially migrated state."
-          end
+          shell.status "Skipping maintenance page. (maintenance_on_migrate is false in ey.yml)"
+          shell.notice "[Caution] No maintenance migrations must be non-destructive!\nRequests may be served during a partially migrated state."
+        elsif config.required_downtime_stack?
+          shell.status "Skipping maintenance page. (maintenance_on_restart is false in ey.yml, overriding recommended default)"
         else
-          if config.required_downtime_stack? && !config.maintenance_on_restart?
-            shell.status "Skipping maintenance page. (maintenance_on_restart is false in ey.yml, overriding recommended default)"
-            unless exist?
-              shell.warning <<-WARN
-No maintenance page! Brief downtime may be possible during restart.
+          shell.status "Skipping maintenance page. (no-downtime restarts supported)"
+        end
+
+        if config.required_downtime_stack? && !exist?
+          shell.warning <<-WARN
+No maintenance page! Brief downtime is possible during restart.
 This application stack does not support no-downtime restarts.
-              WARN
-            end
-          elsif !config.required_downtime_stack?
-            shell.status "Skipping maintenance page. (no-downtime restarts supported)"
-          end
+          WARN
         end
       end
 

data/lib/engineyard-serverside/task.rb

@@ -6,15 +6,9 @@ module EY
     class Task
       attr_reader :servers, :config, :shell
 
-      # deprecated, please don't use
-      def c
-        EY::Serverside.deprecation_warning("The method 'c' is deprecated in favor of 'config' for better clarity.")
-        config
-      end
-
-      def initialize(servers, conf, shell)
+      def initialize(servers, config, shell)
         @servers = servers
-        @config = conf
+        @config = config
         @shell = shell
         @roles = :all
       end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.2.0.rc1'
+    VERSION = '2.2.0.rc2'
   end
 end

data/spec/configuration_spec.rb

@@ -19,8 +19,6 @@ describe EY::Serverside::Deploy::Configuration do
       @config.maintenance_on_migrate.should == true
       @config.maintenance_on_restart.should == true
       @config.required_downtime_stack?.should == true
-      @config.enable_maintenance_page?.should == true
-      @config.disable_maintenance_page?.should == true
       @config.framework_env.should == "production"
       @config.precompile_assets.should == "detect"
       @config.precompile_assets_inferred?.should == true

data/spec/fixtures/repos/assets_disabled_utf8/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'ey_config'
+gem 'rails'

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

@@ -0,0 +1,88 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    ey_config (0.0.5)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.6.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ey_config
+  rails
+  rake

data/spec/fixtures/repos/assets_disabled_utf8/README

@@ -0,0 +1,3 @@
+Assets disabled in application.rb, but the application.rb file has characters we don't expect.
+
+Previous versions of serverside would crash if the file encoding was loaded incorrectly.

data/spec/fixtures/repos/assets_disabled_utf8/Rakefile

@@ -0,0 +1,5 @@
+desc 'Precompile yar assetz'
+task 'assets:precompile' do
+  sh "touch #{File.expand_path('../public/assets/compiled_asset', __FILE__)}"
+  sh "touch precompiled"
+end

data/spec/fixtures/repos/assets_disabled_utf8/config/application.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+module Rails31
+  class Application < Rails::Application
+    config.assets.enabled = false
+    # ☃  漢字仮名交じり文
+  end
+end

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

@@ -0,0 +1,3 @@
+environments:
+  env:
+    ignore_database_adapter_warning: true

data/spec/rails31_deploy_spec.rb

@@ -94,12 +94,15 @@ describe "Deploying a Rails 3.1 application" do
   end
 
   context "with asset support disabled in config/application.rb" do
-    before(:all) do
+    it "does not precompile assets" do
       deploy_test_application('assets_disabled')
+      deploy_dir.join('current', 'precompiled').should_not exist
+      read_output.should include("Skipping asset precompilation. ('config/application.rb' disables assets.)")
     end
 
-    it "does not precompile assets" do
-      deploy_dir.join('current', 'precompiled').should_not exist
+    it "deploys successfully when application.rb has utf-8 encoding" do
+      deploy_test_application('assets_disabled_utf8')
+      deploy_dir.join('current', 'precompiled').should exist
       read_output.should include("Skipping asset precompilation. ('config/application.rb' disables assets.)")
     end
   end

data/spec/spec_helper.rb

@@ -33,20 +33,6 @@ module EY
       def short_log_message(_) "" end
     end
 
-
-    class Paths
-      # This needs to be patched for the tests to succeed, but
-      # the chances of 2 real deploys colliding in the same second
-      # is very very low.
-      def active_release
-        @active_release ||= if Time.now.utc.strftime("%L") =~ /L/ # old ruby
-                              path(:releases, Time.now.utc.strftime("%Y%m%d%H%M%S#{Time.now.tv_usec}"))
-                            else
-                              path(:releases, Time.now.utc.strftime("%Y%m%d%H%M%S%L"))
-                            end
-      end
-    end
-
   end
 end
 
@@ -228,6 +214,15 @@ exec "$@"
     @deploy_dir ||= tmpdir.join("serverside-deploy-#{Time.now.to_f}-#{$$}")
   end
 
+  # This needs to be patched for the tests to succeed, but
+  # the chances of 2 real deploys colliding in the same second
+  # is very very low.
+  #
+  # can't use %L n strftime because old ruby doesn't support it.
+  def release_path
+    deploy_dir.join('releases', Time.now.utc.strftime("%Y%m%d%H%M%S#{Time.now.tv_usec}"))
+  end
+
   # set up EY::Serverside::Server like we're on a solo
   def test_servers
     @test_servers ||= EY::Serverside::Servers.from_hashes([{:hostname => 'localhost', :roles => %w[solo], :user => ENV['USER']}], test_shell)
@@ -239,6 +234,7 @@ exec "$@"
     options = {
       "strategy"         => "IntegrationSpec",
       "deploy_to"        => deploy_dir.to_s,
+      "release_path"     => release_path.to_s,
       "group"            => GROUP,
       "stack"            => 'nginx_passenger',
       "migrate"          => "ruby -e 'puts ENV[\"PATH\"]' > #{deploy_dir}/path-when-migrating",
@@ -268,9 +264,10 @@ exec "$@"
       args.config           = {
         "services_check_command" => "which echo",
         "services_setup_command" => "echo 'services setup command'",
-        "strategy" => options["strategy"],
-        "deploy_to" => options["deploy_to"],
-        "group" => options["group"]
+        "strategy"               => options["strategy"],
+        "deploy_to"              => options["deploy_to"],
+        "release_path"           => options["release_path"],
+        "group"                  => options["group"]
       }.merge(options['config'] || {})
       args.framework_env    = options['framework_env']
       args.stack            = options['stack']
@@ -299,6 +296,9 @@ exec "$@"
     bundle_install_fails = extra_config.delete('bundle_install_fails')
 
     @action = @adapter.deploy do |args|
+      # we must refresh the release path every deploy since we're setting it manually
+      args.config = args.config.merge({'release_path' => release_path})
+
       extra_config.each do |key,val|
         case key
         when 'branch' then args.ref    = val

data/spec/sqlite3_deploy_spec.rb

@@ -9,7 +9,7 @@ describe "Deploying an application with sqlite3 as the only DB adapter in the Ge
     deploy_test_application('sqlite3')
     @shared_path   = @deployer.config.paths.shared
     @release_path  = @deployer.config.paths.active_release
-    @framework_env = @deployer.framework_env
+    @framework_env = @deployer.config.framework_env
   end
 
   it 'should symlink database.sqlite3.yml' do

data/spec/support/integration.rb

@@ -33,14 +33,11 @@ class FullTestDeploy < EY::Serverside::Deploy
   # deploy does not
   def bundle
     my_env = ENV.to_hash
-    result = super
+    super
+  ensure
     ENV.replace(my_env)
-    result
   end
 
-  def framework_env
-    config.framework_env
-  end
 end
 
 class EY::Serverside::Deploy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc1
+  version: 2.2.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -284,6 +284,13 @@ files:
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_disabled_in_ey_yml/README
+- spec/fixtures/repos/assets_disabled_utf8/app/assets/empty
+- spec/fixtures/repos/assets_disabled_utf8/config/application.rb
+- spec/fixtures/repos/assets_disabled_utf8/config/ey.yml
+- spec/fixtures/repos/assets_disabled_utf8/Gemfile
+- spec/fixtures/repos/assets_disabled_utf8/Gemfile.lock
+- spec/fixtures/repos/assets_disabled_utf8/Rakefile
+- spec/fixtures/repos/assets_disabled_utf8/README
 - spec/fixtures/repos/assets_enabled_all/app/assets/empty
 - spec/fixtures/repos/assets_enabled_all/config/application.rb
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml
@@ -452,6 +459,13 @@ test_files:
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Gemfile.lock
 - spec/fixtures/repos/assets_disabled_in_ey_yml/Rakefile
 - spec/fixtures/repos/assets_disabled_in_ey_yml/README
+- spec/fixtures/repos/assets_disabled_utf8/app/assets/empty
+- spec/fixtures/repos/assets_disabled_utf8/config/application.rb
+- spec/fixtures/repos/assets_disabled_utf8/config/ey.yml
+- spec/fixtures/repos/assets_disabled_utf8/Gemfile
+- spec/fixtures/repos/assets_disabled_utf8/Gemfile.lock
+- spec/fixtures/repos/assets_disabled_utf8/Rakefile
+- spec/fixtures/repos/assets_disabled_utf8/README
 - spec/fixtures/repos/assets_enabled_all/app/assets/empty
 - spec/fixtures/repos/assets_enabled_all/config/application.rb
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml