crazycode-cap-recipes 0.4.12 → 0.4.13

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 12
+:patch: 13
 :build: 

data/crazycode-cap-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crazycode-cap-recipes}
-  s.version = "0.4.12"
+  s.version = "0.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = %q{2011-08-29}
+  s.date = %q{2011-09-01}
   s.default_executable = %q{cap-recipes}
   s.description = %q{Battle-tested capistrano recipes for debian, passenger, apache, hudson, delayed_job, juggernaut, rubygems, backgroundrb, rails and more}
   s.email = %q{crazycode@gmail.com}

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

@@ -56,12 +56,6 @@ Capistrano::Configuration.instance(true).load do |configuration|
     task :tag do
       gitdeploy.setup_local
 
-      tag_name = configuration[:tag] || configuration[:build_version]
-      if tag_name.nil?
-        raise "NO tag. pls use -s tag=xxx set tag_name"
-      end
-
-
       system "cd #{local_gitrepo}; git checkout #{branch}; git fetch; git merge origin/#{branch};"
 
 
@@ -78,7 +72,15 @@ Capistrano::Configuration.instance(true).load do |configuration|
         end
       end
 
-      system "cd #{local_gitrepo}; git add .; git commit -m 'tag with #{tag_name}'; git tag #{tag_name};"
+      tag_name = configuration[:tag] || configuration[:build_version]
+      if tag_name.nil?
+        build_msg = war_name.empty? ? "all" : war_name
+        system "cd #{local_gitrepo}; git add .; git commit -m 'build for #{build_msg}'"
+        # raise "NO tag. pls use -s tag=xxx set tag_name"
+      else
+        system "cd #{local_gitrepo}; git add .; git commit -m 'tag with #{tag_name}'; git tag #{tag_name};"
+      end
+
 
       # push tags and latest code
       system "cd #{local_gitrepo}; git push origin #{branch}"
@@ -115,6 +117,11 @@ Capistrano::Configuration.instance(true).load do |configuration|
 
 
     def self.update_repository_local_command(name, war)
+      unless war.start_with?('/')
+        war_path = "#{local_base_dir}/#{war}"
+      else
+        war_path = war
+      end
       [
        "cd #{local_gitrepo}",
        "if [ -e #{local_gitrepo}/#{name} ]",
@@ -122,7 +129,7 @@ Capistrano::Configuration.instance(true).load do |configuration|
        "fi",
        "mkdir -p #{local_gitrepo}/#{name}",
        "cd #{local_gitrepo}/#{name}",
-       "jar -xf #{local_base_dir}/#{war}"
+       "jar -xf #{war_path}"
       ].join("; ")
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 12
-  version: 0.4.12
+  - 13
+  version: 0.4.13
 platform: ruby
 authors: 
 - crazycode
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 +08:00
+date: 2011-09-01 00:00:00 +08:00
 default_executable: cap-recipes
 dependencies: 
 - !ruby/object:Gem::Dependency