crazycode-cap-recipes 0.3.39 → 0.3.39.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 3
-:build:
+:build: 1
 :patch: 39

data/crazycode-cap-recipes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crazycode-cap-recipes}
-  s.version = "0.3.39"
+  s.version = "0.3.39.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]

data/lib/cap_recipes/tasks/gitdeploy/setup.rb

@@ -30,7 +30,7 @@ Capistrano::Configuration.instance(true).load do |configuration|
     "/tmp/localgit_#{application}"
   end
   set :local_gitrepo do
-    "#{local_git_dir}/local_gitrepo"
+    "#{local_git_dir}/#{application}"
   end
 
   namespace :gitdeploy do
@@ -54,6 +54,7 @@ Capistrano::Configuration.instance(true).load do |configuration|
     desc "tag build version. use -s tag=xxx to set tag's name"
     task :tag do
       gitdeploy.setup_local
+
       tag_name = configuration[:tag]
       if tag_name.nil?
         rails "NO tag. pls use -s tag=xxx set tag_name"
@@ -74,13 +75,12 @@ Capistrano::Configuration.instance(true).load do |configuration|
       system "cd #{local_gitrepo}; git add .; git commit -m 'tag with #{tag_name}'; git tag #{tag_name};"
 
       # push tags and latest code
-      system "cd #{local_gitrepo}"
-      system "git push origin #{branch}"
+      system "cd #{local_gitrepo}; git push origin #{branch}"
       if $? != 0
         raise "git push failed"
       end
 
-      system "git push origin #{branch} --tags"
+      system "cd #{local_gitrepo}; git push origin #{branch} --tags"
       if $? != 0
         raise "git push --tags failed"
       end
@@ -110,8 +110,9 @@ Capistrano::Configuration.instance(true).load do |configuration|
 
     def self.update_repository_local_command(name, war)
       [
+       "cd #{local_gitrepo}",
        "if [ -e #{local_gitrepo}/#{name} ]",
-       "then rm -Rf #{local_gitrepo}/#{name}",
+       "then git rm -rf #{local_gitrepo}/#{name}",
        "fi",
        "mkdir -p #{local_gitrepo}/#{name}",
        "cd #{local_gitrepo}/#{name}",

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 39
-  version: 0.3.39
+  - 1
+  version: 0.3.39.1
 platform: ruby
 authors: 
 - crazycode