sunrise-deploy 0.0.1 → 0.0.2

data/lib/sunrise/deploy/recipes/appication.rb

@@ -11,6 +11,11 @@ module Capistrano
     end
 
     set :strategy, Sunrise::Deploy::Strategy::Simple.new(self)
+    set :rake, "bundle exec rake"
+
+    # Must be set for the password prompt from git to work
+    set :ssh_options, { :forward_agent => true }
+    set :default_run_options, { :pty => true}
 
     _cset :rails_env, "production"
     _cset :rvm_ruby_string, '1.9.3'
@@ -20,12 +25,6 @@ module Capistrano
     _cset :scm_verbose, true
     _cset :branch, "master"
 
-    # Must be set for the password prompt from git to work
-    _cset :ssh_options, { :forward_agent => true }
-    _cset :default_run_options, { :pty => true}
-
-    _cset :rake, "bundle exec rake"
-
     _cset :asset_precompile, true
     _cset :asset_env, "RAILS_GROUPS=assets"
     _cset :assets_prefix, "assets"

data/lib/sunrise/deploy/strategy/simple.rb

@@ -12,7 +12,29 @@ module Sunrise
         protected
 
           def command
-            @command ||= source.sync(revision, deploy_to)
+            #@command ||= source.sync(revision, deploy_to)
+
+            git     = source.command
+            remote  = source.origin
+
+            execute = []
+            execute << "cd #{configuration[:deploy_to]}"
+
+            if remote != 'origin'
+              execute << "#{git} config remote.#{remote}.url #{configuration[:repository]}"
+              execute << "#{git} config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/*"
+            end
+
+            execute << "#{git} checkout #{configuration[:branch]}"
+            execute << "#{git} pull #{remote} #{configuration[:branch]}"
+
+            execute.join(" && ")
+          end
+
+          # Returns the command which will write the identifier of the
+          # revision being deployed to the REVISION file on each host.
+          def mark
+            "(echo #{Time.now} > #{configuration[:deploy_to]}/REVISION)"
           end
       end
     end

data/lib/sunrise/deploy/version.rb

@@ -1,5 +1,5 @@
 module Sunrise
   module Deploy
-    VERSION = "0.0.1".freeze
+    VERSION = "0.0.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: