ey-deploy 1.1.1 → 1.1.2

data/lib/ey-deploy/deploy.rb

@@ -225,7 +225,7 @@ module EY
           cmd << " --framework-env '#{c.environment}'"
           cmd << " --current-role '#{server.role}'"
           cmd << " --current-name '#{server.name}'" if server.name
-          cmd << " --config '#{c.config}'" if c.config
+          cmd << " --config '#{c[:config]}'" if c.has_key?(:config)
           cmd
         end
       end

data/lib/ey-deploy/strategies/git.rb

@@ -59,7 +59,12 @@ module EY
 
       def checkout
         info "~> Deploying revision #{short_log_message(to_checkout)}"
-        logged_system("#{git} checkout -q '#{to_checkout}'") || logged_system("#{git} reset -q --hard '#{to_checkout}'")
+        in_git_work_tree do
+          (logged_system("git checkout -q '#{to_checkout}'") ||
+            logged_system("git reset -q --hard '#{to_checkout}'")) &&
+            logged_system("git submodule update --init") &&
+            logged_system("git clean -dfq")
+        end
       end
 
       def to_checkout
@@ -81,8 +86,16 @@ module EY
       end
 
     private
+      def in_git_work_tree
+        Dir.chdir(git_work_tree) { yield }
+      end
+
+      def git_work_tree
+        opts[:repository_cache]
+      end
+
       def git
-        "git --git-dir #{opts[:repository_cache]}/.git --work-tree #{opts[:repository_cache]}"
+        "git --git-dir #{git_work_tree}/.git --work-tree #{git_work_tree}"
       end
 
       def branch?(ref)

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/integration_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "deploying an application" do
+  module EY::Strategies::IntegrationSpec::Helpers
+    def update_repository_cache
+    end
+
+    def create_revision_file_command
+    end
+
+    def short_log_message(revision)
+      
+    end
+    
+  end
+
+  class FullTestDeploy < EY::Deploy
+    def initialize(*)
+      super
+      @infos = []
+      @debugs = []
+    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 restart
+      # do nothing
+    end
+
+  end
+
+  before(:each) do
+    # set up EY::Server
+    # run a deploy
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey-deploy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -07:00
+date: 2010-08-11 00:00:00 -07:00
 default_executable: ey-deploy
 dependencies: []
 
@@ -240,6 +240,7 @@ files:
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
+- spec/integration_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler
@@ -289,6 +290,7 @@ test_files:
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
+- spec/integration_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler