crazycode-cap-recipes 0.4.10 → 0.4.11

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 10
+:patch: 11
 :build: 

data/crazycode-cap-recipes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crazycode-cap-recipes}
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   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

@@ -60,9 +60,6 @@ Capistrano::Configuration.instance(true).load do |configuration|
         raise "NO tag. pls use -s tag=xxx set tag_name"
       end
 
-      if war_config.nil? or war_config.size == 0 or !defined? war_name
-        raise 'NO war_config'
-      end
 
       system "cd #{local_gitrepo}; git checkout #{branch}; git fetch; git merge origin/#{branch};"
 
@@ -71,6 +68,9 @@ Capistrano::Configuration.instance(true).load do |configuration|
         puts "name=#{war_name}, war=#{war_path}"
         system update_repository_local_command(war_name, war_path)
       else
+        if war_config.nil? or war_config.size == 0
+          raise 'NO war_config'
+        end
         war_config.each do |config|
           puts "name=#{config[:name]}, war=#{config[:war]}"
           system update_repository_local_command(config[:name], config[:war])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - crazycode