ey-deploy 0.3.2 → 0.3.3

data/lib/ey-deploy/deploy.rb

@@ -156,10 +156,7 @@ module EY
     def self.run(opts={})
       conf = EY::Deploy::Configuration.new(opts)
       EY::Server.config = conf
-
-      dep = new(conf)
-      dep.require_custom_tasks
-      dep.send(opts["default_task"])
+      new(conf).send(opts["default_task"])
     end
   end
 end

data/lib/ey-deploy/server.rb

@@ -68,7 +68,7 @@ module EY
     def push_code
       return if local?
       run "mkdir -p #{config.repository_cache}"
-      system(%|rsync -aq -e "#{ssh_command}" #{config.repository_cache}/ #{config.user}@#{hostname}:#{config.repository_cache}|)
+      system(%|rsync --delete -aq -e "#{ssh_command}" #{config.repository_cache}/ #{config.user}@#{hostname}:#{config.repository_cache}|)
     end
 
     def run(command)

data/lib/ey-deploy/task.rb

@@ -10,10 +10,19 @@ module EY
     end
 
     def require_custom_tasks
-      deploy_file = ["config/eydeploy.rb", "eydeploy.rb"].detect do |file|
-        File.exists?(File.join(c.repository_cache, file))
+      deploy_file = ["config/eydeploy.rb", "eydeploy.rb"].map do |short_file|
+        File.join(c.repository_cache, short_file)
+      end.detect do |file|
+        File.exist?(file)
+      end
+
+      if deploy_file
+        puts "~> Loading deployment task overrides from #{deploy_file}"
+        instance_eval(File.read(deploy_file))
+        true
+      else
+        false
       end
-      require File.join(c.repository_cache, deploy_file) if deploy_file
     end
 
     def roles(*task_roles)

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/custom_deploy_spec.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "the EY::Deploy API" do
+  it "calls tasks in the right order" do
+    class TestDeploy < EY::Deploy
+      # cheat a bit; we don't actually want to do these things
+      def update_repository_cache() end
+      def require_custom_tasks() end
+      def callback(*_) end
+      def puts(*_) 'stfu' end
+
+      attr_reader :call_order
+      def initialize(*a)
+        super
+        @call_order = []
+      end
+
+      def push_code()             @call_order << 'push_code'             end
+      def copy_repository_cache() @call_order << 'copy_repository_cache' end
+      def create_revision_file()  @call_order << 'create_revision_file'  end
+      def bundle()                @call_order << 'bundle'                end
+      def symlink_configs()       @call_order << 'symlink_configs'       end
+      def migrate()               @call_order << 'migrate'               end
+      def symlink()               @call_order << 'symlink'               end
+      def restart()               @call_order << 'restart'               end
+      def cleanup()               @call_order << 'cleanup'               end
+    end
+
+    td = TestDeploy.new(EY::Deploy::Configuration.new)
+    td.deploy
+    td.call_order.should == %w[push_code copy_repository_cache create_revision_file bundle symlink_configs migrate symlink restart cleanup]
+  end
+
+  describe "task overrides" do
+    class TestQuietDeploy < EY::Deploy
+      def puts(*_) 'quiet' end
+    end
+
+    before(:each) do
+      @tempdir = `mktemp -d -t custom_deploy_spec`.strip
+      @config = EY::Deploy::Configuration.new('repository_cache' => @tempdir)
+      @deploy = TestQuietDeploy.new(@config)
+    end
+
+    def write_eydeploy(relative_path, contents = "def got_new_methods() 'from the file on disk' end")
+      FileUtils.mkdir_p(File.join(
+          @tempdir,
+          File.dirname(relative_path)))
+
+      File.open(File.join(@tempdir, relative_path), 'w') do |f|
+        f.write contents
+      end
+    end
+
+    it "requires 'eydeploy.rb' and adds any defined methods to the deploy" do
+      write_eydeploy 'eydeploy.rb'
+      @deploy.require_custom_tasks.should be_true
+      @deploy.got_new_methods.should == 'from the file on disk'
+    end
+
+    it "falls back to 'config/eydeploy.rb'" do
+      write_eydeploy 'config/eydeploy.rb'
+      @deploy.require_custom_tasks.should be_true
+      @deploy.got_new_methods.should == 'from the file on disk'
+    end
+
+    it "lets you super up from any defined methods" do
+      write_eydeploy 'eydeploy.rb', "def value() super << ' + derived' end"
+
+      class TestDeploySuper < TestQuietDeploy
+        def value() 'base' end
+      end
+
+      deploy = TestDeploySuper.new(@config)
+      deploy.require_custom_tasks.should be_true
+      deploy.value.should == "base + derived"
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -07:00
+date: 2010-06-03 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,5 +142,6 @@ signing_key:
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
+- spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/spec_helper.rb