engineyard-serverside 2.2.0.rc2 → 2.2.0

data/lib/engineyard-serverside/configuration.rb

@@ -7,7 +7,7 @@ require 'engineyard-serverside/paths'
 module EY
   module Serverside
     class Deploy::Configuration
-      include Paths::LegacyHelpers
+      include Paths::LegacyHelpers # deploy hooks depend on these to be here as well. Don't remove without plenty of deprecation warnings.
 
       # Defines a fetch method for the specified key.
       # If no default and no block is specified, it means the key is required

data/lib/engineyard-serverside/deploy_hook.rb

@@ -3,21 +3,23 @@ require 'engineyard-serverside/shell/helpers'
 module EY
   module Serverside
     class DeployHook
+      attr_reader :config, :shell, :hook_name
+
       def initialize(config, shell, hook_name)
         @config, @shell, @hook_name = config, shell, hook_name
       end
 
       def hook_path
-        @config.paths.deploy_hook(@hook_name)
+        config.paths.deploy_hook(hook_name)
       end
 
       def callback_context
-        @context ||= CallbackContext.new(@config, @shell, hook_path)
+        @context ||= CallbackContext.new(config, shell, hook_path)
       end
 
       def call
         if hook_path.exist?
-          Dir.chdir(@config.paths.active_release.to_s) do
+          Dir.chdir(config.paths.active_release.to_s) do
             if desc = syntax_error(hook_path)
               hook_name = hook_path.basename
               abort "*** [Error] Invalid Ruby syntax in hook: #{hook_name} ***\n*** #{desc.chomp} ***"
@@ -29,14 +31,24 @@ module EY
       end
 
       def eval_hook(code)
+        display_deprecation_warnings(code)
         callback_context.instance_eval(code)
       rescue Exception => exception
         display_hook_error(exception, code, hook_path)
         raise exception
       end
 
+      def display_deprecation_warnings(code)
+        if code =~ /@configuration/
+          shell.warning("Use of `@configuration` in deploy hooks is deprecated.\nPlease use `config`, which provides access to the same object.\n\tin #{hook_path}")
+        end
+        if code =~ /@node/
+          shell.warning("Use of `@node` in deploy hooks is deprecated.\nPlease use `config.node`, which provides access to the same object.\n\tin #{hook_path}")
+        end
+      end
+
       def display_hook_error(exception, code, hook_path)
-        @shell.fatal <<-ERROR
+        shell.fatal <<-ERROR
 Exception raised in deploy hook #{hook_path}.
 
 #{exception.class}: #{exception.to_s}
@@ -53,13 +65,13 @@ Please fix this error before retrying.
       class CallbackContext
         include EY::Serverside::Shell::Helpers
 
-        attr_reader :shell
+        attr_reader :shell, :hook_path
 
         def initialize(config, shell, hook_path)
           @configuration = config
           @configuration.set_framework_envs
           @shell = shell
-          @node = node
+          @node = config.node
           @hook_path = hook_path
         end
 
@@ -73,6 +85,7 @@ Please fix this error before retrying.
 
         def method_missing(meth, *args, &blk)
           if @configuration.respond_to?(meth)
+            shell.warning "Use of `#{meth}` (via method_missing) is deprecated in favor of `config.#{meth}` for improved error messages and compatibility.\n\tin #{hook_path}"
             @configuration.send(meth, *args, &blk)
           else
             super

data/lib/engineyard-serverside/rails_assets/strategy.rb

@@ -34,7 +34,7 @@ module EY
           end
 
           def reusable?
-            previous_assets_path.directory? && previous_assets_path.entries.any?
+            previous_assets_path && previous_assets_path.entries.any?
           end
 
           def reuse
@@ -47,8 +47,11 @@ module EY
           # This results in the directory structure:
           #   deploy_root/current/public/last_assets/assets -> deploy_root/releases/<prev>/public/assets
           def prepare
-            last = paths.public.join('last_assets')
-            run "mkdir -p #{last} && ln -nfs #{previous_assets_path} #{last.join('assets')}"
+            if previous_assets_path
+              last = paths.public.join('last_assets')
+              run "mkdir -p #{last} && ln -nfs #{previous_assets_path} #{last.join('assets')}"
+            end
+
             yield
           end
 
@@ -58,8 +61,17 @@ module EY
             runner.run cmd
           end
 
+          # Just to be safe, we don't check the real path until runtime
+          # to make sure the relevant directories are there.
           def previous_assets_path
-            paths.previous_release(paths.active_release).join('public','assets')
+            return @previous_assets_path if defined? @previous_assets_path
+            if prev = paths.previous_release(paths.active_release)
+              @previous_assets_path = prev.join('public','assets')
+              @previous_assets_path = nil unless @previous_assets_path.directory?
+            else
+              @previous_assets_path = nil
+            end
+            @previous_assets_path
           end
         end
 

data/lib/engineyard-serverside/shell.rb

@@ -2,7 +2,6 @@ require 'logger'
 require 'pathname'
 require 'open3'
 require 'engineyard-serverside/shell/formatter'
-require 'engineyard-serverside/shell/command_result'
 require 'engineyard-serverside/shell/yieldio'
 
 module EY

data/lib/engineyard-serverside/version.rb

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

data/spec/deploy_hook_spec.rb

@@ -119,6 +119,13 @@ describe "deploy hooks" do
         deploy_hook.eval_hook('respond_to?(:failed_release_dir)').should be_true
         deploy_hook.eval_hook('respond_to?(:release_path)      ').should be_true
       end
+
+      it "shows a deprecation warning that asks you to use config to access these variables" do
+        deploy_hook.eval_hook('shared_path.nil?').should be_false
+        out = read_output
+        out.should include("Use of `shared_path` (via method_missing) is deprecated in favor of `config.shared_path` for improved error messages and compatibility.")
+        out.should =~ %r|in /data/app_name/releases/\d+/deploy/fake_test_hook.rb|
+      end
     end
 
     context "access to command line options that should be handed through to the config" do
@@ -139,7 +146,7 @@ describe "deploy hooks" do
       end
     end
 
-    context "the @node ivar" do
+    context "node" do
       before(:each) do
         EY::Serverside.dna_json = MultiJson.dump({
           'instance_role' => 'solo',
@@ -152,35 +159,51 @@ describe "deploy hooks" do
         })
       end
 
-      it "is available" do
+      it "is deprecated through the @node ivar" do
         deploy_hook.eval_hook('@node.nil?').should be_false
+        out = read_output
+        out.should =~ %r|Use of `@node` in deploy hooks is deprecated.|
+        out.should =~ %r|Please use `config.node`, which provides access to the same object.|
+        out.should =~ %r|/data/app_name/releases/\d+/deploy/fake_test_hook.rb|
+      end
+
+      it "is available" do
+        deploy_hook.eval_hook('config.node.nil?').should be_false
       end
 
       it "has indifferent access" do
-        deploy_hook.eval_hook('@node[:instance_role] ').should == 'solo'
-        deploy_hook.eval_hook('@node["instance_role"]').should == 'solo'
+        deploy_hook.eval_hook('config.node[:instance_role] ').should == 'solo'
+        deploy_hook.eval_hook('config.node["instance_role"]').should == 'solo'
       end
 
       it "has deep indifferent access" do
-        deploy_hook.eval_hook('@node["applications"]["myapp"]["type"]').should == 'rails'
-        deploy_hook.eval_hook('@node[:applications]["myapp"][:type]  ').should == 'rails'
-        deploy_hook.eval_hook('@node[:applications][:myapp][:type]   ').should == 'rails'
+        deploy_hook.eval_hook('config.node["applications"]["myapp"]["type"]').should == 'rails'
+        deploy_hook.eval_hook('config.node[:applications]["myapp"][:type]  ').should == 'rails'
+        deploy_hook.eval_hook('config.node[:applications][:myapp][:type]   ').should == 'rails'
       end
     end
 
-    context "the @configuration ivar" do
+    context "config" do
       it "is available" do
+        deploy_hook.eval_hook('config.nil?').should be_false
+      end
+
+      it "is deprecated through the @configuration ivar" do
         deploy_hook.eval_hook('@configuration.nil?').should be_false
+        out = read_output
+        out.should =~ %r|Use of `@configuration` in deploy hooks is deprecated.|
+        out.should =~ %r|Please use `config`, which provides access to the same object.|
+        out.should =~ %r|/data/app_name/releases/\d+/deploy/fake_test_hook.rb|
       end
 
       it "has the configuration in it" do
-        deploy_hook('bert' => 'ernie').eval_hook('@configuration.bert').should == 'ernie'
+        deploy_hook('bert' => 'ernie').eval_hook('config.bert').should == 'ernie'
       end
 
       it "can be accessed with method calls, with [:symbols], or ['strings']" do
-        deploy_hook('bert' => 'ernie').eval_hook('@configuration.bert   ').should == 'ernie'
-        deploy_hook('bert' => 'ernie').eval_hook('@configuration[:bert] ').should == 'ernie'
-        deploy_hook('bert' => 'ernie').eval_hook('@configuration["bert"]').should == 'ernie'
+        deploy_hook('bert' => 'ernie').eval_hook('config.bert   ').should == 'ernie'
+        deploy_hook('bert' => 'ernie').eval_hook('config[:bert] ').should == 'ernie'
+        deploy_hook('bert' => 'ernie').eval_hook('config["bert"]').should == 'ernie'
       end
 
       [:repository_cache,
@@ -192,7 +215,7 @@ describe "deploy hooks" do
         :revision,
         :environment].each do |attribute|
         it "has the #{attribute.inspect} attribute for compatibility with chef-deploy" do
-          deploy_hook.eval_hook("@configuration.has_key?(#{attribute.inspect})").should be_true
+          deploy_hook.eval_hook("config.has_key?(#{attribute.inspect})").should be_true
         end
       end
     end

data/spec/fixtures/repos/assets_enabled_in_ey_yml/Rakefile

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

data/spec/rails31_deploy_spec.rb

@@ -58,6 +58,21 @@ describe "Deploying a Rails 3.1 application" do
       deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
       read_output.should_not =~ %r#Reusing existing assets#
     end
+
+    %w[cleaning shared private].each do |strategy|
+      it "precompiles assets with asset_strategy '#{strategy}', then reuses them on the next deploy if nothing has changed" do
+        deploy_test_application('assets_enabled_in_ey_yml', 'config' => {'asset_strategy' => strategy})
+        deploy_dir.join('current', 'precompiled').should exist
+        deploy_dir.join('current', 'public', 'assets').should exist
+        deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+
+        redeploy_test_application
+        deploy_dir.join('current', 'precompiled').should_not exist # doesn't run the task
+        deploy_dir.join('current', 'public', 'assets').should exist # but the assets are there
+        deploy_dir.join('current', 'public', 'assets', 'compiled_asset').should exist
+        read_output.should =~ %r#Reusing existing assets\. \(configured asset_dependencies unchanged from \w{7}..\w{7}\)#
+      end
+    end
   end
 
   context "with asset compilation enabled in ey.yml, despite not otherwise being enabled" do
@@ -102,7 +117,7 @@ describe "Deploying a Rails 3.1 application" do
 
     it "deploys successfully when application.rb has utf-8 encoding" do
       deploy_test_application('assets_disabled_utf8')
-      deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'precompiled').should_not exist
       read_output.should include("Skipping asset precompilation. ('config/application.rb' disables assets.)")
     end
   end

metadata

@@ -1,151 +1,151 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: engineyard-serverside
-version: !ruby/object:Gem::Version
-  version: 2.2.0.rc2
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: 
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
-authors:
+authors: 
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 2
+        - 12
+        - 0
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: timecop
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: engineyard-cloud-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.11
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: engineyard-cloud-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 0
+        - 11
         version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: engineyard-serverside-adapter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.6
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: engineyard-serverside-adapter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: 
 email: cloud@engineyard.com
-executables:
+executables: 
 - engineyard-serverside
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/engineyard-serverside
 - lib/engineyard-serverside/about.rb
 - lib/engineyard-serverside/cli.rb
@@ -167,7 +167,6 @@ files:
 - lib/engineyard-serverside/rails_assets.rb
 - lib/engineyard-serverside/server.rb
 - lib/engineyard-serverside/servers.rb
-- lib/engineyard-serverside/shell/command_result.rb
 - lib/engineyard-serverside/shell/formatter.rb
 - lib/engineyard-serverside/shell/helpers.rb
 - lib/engineyard-serverside/shell/yieldio.rb
@@ -390,29 +389,40 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files:
+test_files: 
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/configuration_spec.rb

data/lib/engineyard-serverside/shell/command_result.rb

@@ -1,16 +0,0 @@
-module EY
-  module Serverside
-    class Shell
-      class CommandResult < Struct.new(:command, :success, :output, :server)
-        alias success? success
-
-        def inspect
-          <<-EOM
-$ #{success? ? "(success)" : "(failed)"} #{command}
-#{output}
-          EOM
-        end
-      end
-    end
-  end
-end