sunraise 0.1.2 → 0.1.3

data/lib/deployer.rb

@@ -56,16 +56,23 @@ module SunRaise
 
       log_ok "New commits: \n    #{new_commits.join "\n    "}"
       @new_dir = "pre_release"
-
+      
       ssh_exec [
         "cd #{deploy_path}",
         "rm #{@new_dir} .git_temp previous2 current2 -rf", # if previous deploy was crashed
         "mv current/.git .git_temp", # moving repo dir
-        "cp current #{@new_dir}", # clone sitedir without .git
+        "cp current #{@new_dir} -r", # clone sitedir without .git
         "mv .git_temp #{@new_dir}/.git", # move git in pre_release folder
+      ]
+
+      ssh_exec (conf[:shared_dirs] + conf[:linked_dirs]).map {|dir| "rm #{deploy_path}/#{@new_dir}/#{dir}" }
+
+      ssh_exec [
         "cd #{@new_dir}",
+        "git reset HEAD --hard",
         "git pull origin master"
       ]
+
       log_ok "Forked, git updated"
 
       make_links @new_dir
@@ -99,10 +106,10 @@ module SunRaise
 
     def make_links dist_dir
       links = []
-      conf[:shared_dirs].each do |dir|
+      conf[:shared_dirs].each do |link_to, dir|
         links << "rm #{dir} -rf"
         links << "mkdir #{deploy_path}/shared/#{dir} -p"
-        links << "ln -s #{deploy_path}/shared/#{dir} #{dir}"
+        links << "ln -s #{deploy_path}/shared/#{link_to} #{dir}"
       end
 
       conf[:linked_dirs].each do |dir|
@@ -195,3 +202,4 @@ module SunRaise
 
   end
 end
+

data/sunraise.example

@@ -6,7 +6,7 @@ git_url 'git://github.com/Paxa/sunraise_test_app.git'
 deploy_to '/tmp/deploy/suntest'
 then_link_to '/tmp/www/suntest'
 
-shared_dirs ['lib']
+shared_dirs 'public/stylesheets' => 'css', 'public/javascript' => 'js'
 linked_dirs ['logs', 'tmp']
 
 local_project_path "/home/paxa/Dropbox/sunraise/test/suntest"

data/sunraise.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "sunraise"
-  s.version           = "0.1.2"
+  s.version           = "0.1.3"
   s.summary           = "Super-fast and simple rails deployment."
   s.description       = "Super-fast and simple rails deployment"
   s.author            = "Pavel Evstigneev"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunraise
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Pavel Evstigneev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +03:00
+date: 2010-03-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency