ey-deploy 0.2.6 → 0.2.7

data/lib/ey-deploy/deploy.rb

@@ -13,6 +13,7 @@ module EY
       puts "~> Starting full deploy"
 
       copy_repository_cache
+      create_revision_file
       bundle
       symlink_configs
       migrate
@@ -183,4 +184,4 @@ module EY
       dep.send(opts["default_task"])
     end
   end
-end
+end

data/lib/ey-deploy/server.rb

@@ -1,7 +1,10 @@
 require 'open-uri'
+require 'ey-deploy/verbose_system'
 
 module EY
   class Server < Struct.new(:hostname, :role, :name)
+    include VerboseSystem
+
     def self.config=(config)
       @@config = config
     end

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

@@ -1,22 +1,31 @@
+require 'ey-deploy/verbose_system'
+
 module EY
   module Strategies
     class Git
       module Helpers
         def update_repository_cache
-          klass = Module.nesting[1]
+          strategy.fetch
+          strategy.checkout
+        end
 
-          strategy = klass.new(
+        def create_revision_file
+          strategy.create_revision_file(c.release_path)
+        end
+
+        def strategy
+          klass = Module.nesting[1]
+          klass.new(
             :repository_cache => c.repository_cache,
             :app => c.app,
             :repo => c.repo,
-            :branch => c.branch
+            :ref => c.branch
           )
-
-          strategy.fetch
-          strategy.checkout
         end
       end
 
+      include VerboseSystem
+
       attr_reader :opts
 
       def initialize(opts)
@@ -26,14 +35,24 @@ module EY
 
       def fetch
         if File.directory?(File.join(opts[:repository_cache], ".git"))
-          `#{git} fetch origin`
+          system("#{git} fetch origin")
         else
-          `git clone #{opts[:repo]} #{opts[:repository_cache]}`
+          system("git clone #{opts[:repo]} #{opts[:repository_cache]}")
         end
       end
 
       def checkout
-        `#{git} reset --hard origin/#{opts[:branch]}`
+        to_checkout = if branch?(opts[:ref])
+                        "origin/#{opts[:ref]}"
+                      else
+                        opts[:ref]
+                      end
+
+        system("#{git} checkout '#{to_checkout}'") || system("#{git} reset --hard '#{to_checkout}'")
+      end
+
+      def create_revision_file(dir)
+        `#{git} show --pretty=format:"%H" | head -1 > "#{dir}/REVISION"`
       end
 
     private
@@ -41,6 +60,10 @@ module EY
         "git --git-dir #{opts[:repository_cache]}/.git --work-tree #{opts[:repository_cache]}"
       end
 
+      def branch?(ref)
+        `#{git} branch -r`.map { |x| x.strip }.include?("origin/#{ref}")
+      end
+
       def set_up_git_ssh(app)
         # hold references to the tempfiles so they don't get finalized
         # unexpectedly; tempfile finalization unlinks the files

data/lib/ey-deploy/verbose_system.rb

@@ -0,0 +1,12 @@
+module EY
+  module VerboseSystem
+    def self.instance_id
+      @instance_id ||= `curl http://169.254.169.254/latest/meta-data/instance-id 2>/dev/null`
+    end
+
+    def system(cmd)
+      puts "::   #{EY::VerboseSystem.instance_id} running #{cmd}"
+      super
+    end
+  end
+end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = "0.2.6"
-end
+  VERSION = "0.2.7"
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ey-deploy
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,37 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: rake
-  requirement: *id001
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: json
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: json
-  requirement: *id002
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -63,6 +58,7 @@ files:
 - lib/ey-deploy/server.rb
 - lib/ey-deploy/strategies/git.rb
 - lib/ey-deploy/task.rb
+- lib/ey-deploy/verbose_system.rb
 - lib/ey-deploy/version.rb
 - lib/ey-deploy.rb
 - lib/vendor/thor/bin/rake2thor
@@ -101,8 +97,6 @@ files:
 - lib/vendor/thor/Thorfile
 - LICENSE
 - README.rdoc
-- spec/ey-deploy_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://engineyard.com
 licenses: []
@@ -113,27 +107,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   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 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances