crazycode-cap-recipes 0.4.5 → 0.4.6

data/VERSION.yml

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

data/crazycode-cap-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crazycode-cap-recipes}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-08-24}
   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}
@@ -120,6 +120,15 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{crazycode-cap-recipes}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Battle-tested capistrano recipes for passenger, delayed_job, and more}
+  s.test_files = [
+    "examples/advanced/deploy.rb",
+    "examples/advanced/deploy/experimental.rb",
+    "examples/advanced/deploy/production.rb",
+    "examples/simple/deploy.rb",
+    "spec/cap/helper.rb",
+    "spec/cap_recipes_spec.rb",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/cap_recipes/tasks/cmdb.rb

@@ -26,17 +26,10 @@ Capistrano::Configuration.instance(true).load do |configuration|
 
     desc "deploy to tomcat"
     task :deploy_to_tomcat, :roles => :single do
-      codes = deploy_unit_code.split(/[,;\s]+/)
-      deploy_hash = Hash.new
-      codes.each {|code| deploy_hash[code] = CmdbService.start_deploy(cse_base, code, deploy_stage, build_version) }
-      begin
+      CmdbService.do_deploy(cse_base, deploy_unit_code, deploy_stage, version.strip) do
         gitdeploy.deploy
         tomcat.restart
-        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, true, "通过capistrano部署成功") }
-      rescue Exception => e
-        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, false, "capistrano部署失败，撤销发布，原因：#{e.message}") }
       end
     end
-
   end
 end

data/lib/cap_recipes/tasks/cmdbutils.rb

@@ -109,4 +109,16 @@ class CmdbService
     deploy_id
   end
 
+  def self.do_deploy(cse_base, unit_code, stage, version)
+      codes = unit_code.split(/[,;\s]+/)
+      deploy_hash = Hash.new
+      codes.each {|code| deploy_hash[code] = CmdbService.start_deploy(cse_base, code, stage, version) }
+
+      begin
+        yield
+        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, true, "通过capistrano部署成功") }
+      rescue Exception => e
+        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, false, "capistrano部署失败，撤销发布，原因：#{e.message}") }
+      end
+  end
 end

data/lib/cap_recipes/tasks/sdpjenkins.rb

@@ -22,9 +22,9 @@ Capistrano::Configuration.instance(true).load do |configuration|
   _cset :shell_commands, "cd #{upload_dir}; ls -all"
   _cset :build_version, "unset version"
 
-  # role :app, :primary => true do
-  #   CmdbService.get_app_role("#{cse_base}", deploy_unit_code, deploy_stage)
-  # end
+  role :app, :primary => true do
+    CmdbService.get_app_role("#{cse_base}", deploy_unit_code, deploy_stage)
+  end
 
   role :single, "1.1.1.1"
 
@@ -60,7 +60,7 @@ Capistrano::Configuration.instance(true).load do |configuration|
         cp file, "#{release_dir}/#{target_name}"
       end
 
-      system "echo \"#{build_version}\" > #{release_dir}/version.txt"
+      system "echo \"#{build_version}\" >> #{release_dir}/version.txt"
 
     end
 
@@ -85,18 +85,16 @@ Capistrano::Configuration.instance(true).load do |configuration|
 
     desc "upload release file, then execute commands"
     task :deploy, :roles => :single do
-      codes = deploy_unit_code.split(/[,;\s]+/)
-      deploy_hash = Hash.new
-      codes.each {|code| deploy_hash[code] = CmdbService.start_deploy(cse_base, code, deploy_stage, tag) }
+      version = build_version
+      if version.empty? && File.exists?("#{release_dir}/version.txt")
+        version = File.open("#{release_dir}/version.txt") { |f| f.extend(Enumerable).inject { |_,ln| ln } }
+      end
+      puts "version=#{version}"
 
-      begin
+      CmdbService.do_deploy(cse_base, deploy_unit_code, deploy_stage, version.strip) do
         upload_file
         execute_commands
-        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, true, "通过capistrano部署成功") }
-      rescue Exception => e
-        deploy_hash.each {|code, deployid| CmdbService.complete_deploy(cse_base, code, deployid, false, "capistrano部署失败，撤销发布，原因：#{e.message}") }
       end
-
     end
 
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: crazycode-cap-recipes
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - crazycode
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +08:00
+date: 2011-08-24 00:00:00 +08:00
 default_executable: cap-recipes
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -179,7 +175,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -188,7 +183,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -199,5 +193,11 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Battle-tested capistrano recipes for passenger, delayed_job, and more
-test_files: []
-
+test_files: 
+- examples/advanced/deploy.rb
+- examples/advanced/deploy/experimental.rb
+- examples/advanced/deploy/production.rb
+- examples/simple/deploy.rb
+- spec/cap/helper.rb
+- spec/cap_recipes_spec.rb
+- spec/spec_helper.rb