crazycode-cap-recipes 0.4.1 → 0.4.2

data/Rakefile

@@ -1,12 +1,12 @@
 =begin
 Using Jeweler for Gem Packaging...
 
-  * Update the version and release version to github: 
+  * Update the version and release version to github:
     $ rake version:bump:patch && rake release && rake gemcutter:release
-    
+
   * Build and install the latest version locally:
     $ rake install
-    
+
 =end
 
 require 'rake'
@@ -23,6 +23,10 @@ begin
     s.description = "Battle-tested capistrano recipes for debian, passenger, apache, hudson, delayed_job, juggernaut, rubygems, backgroundrb, rails and more"
     s.authors = ["crazycode"]
     s.rubyforge_project = 'crazycode-cap-recipes'
+
+    s.add_dependency "capistrano"
+    s.add_dependency "json"
+    s.add_dependency "addressable"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
 :minor: 4
-:patch: 1
+:patch: 2
 :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.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = %q{2011-08-22}
+  s.date = %q{2011-08-23}
   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,24 +120,24 @@ 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
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<capistrano>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
     else
+      s.add_dependency(%q<capistrano>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<addressable>, [">= 0"])
     end
   else
+    s.add_dependency(%q<capistrano>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<addressable>, [">= 0"])
   end
 end
 

data/lib/cap_recipes/tasks/cmdb.rb

@@ -18,52 +18,25 @@ Capistrano::Configuration.instance(true).load do |configuration|
   set :deploy_id_file, ".deploy_id"
   set :tag, ""
 
-  role :app do
+  role :app, :primary => true do
     CmdbService.get_app_role("#{cse_base}", deploy_unit_code, deploy_stage)
   end
+  role :single, "1.1.1.1"
 
   namespace :cmdb do
 
-
-    task :start do
-      if File.exists? deploy_id_file
-        puts "Previous Deploy NOT Complete, please run 'cap cmdb:failback' first."
-        exit(1)
-      end
-
-      deploy_id = CmdbService.start_deploy("#{cse_base}", deploy_unit_code, deploy_stage, tag)
-
-      open(deploy_id_file, 'w') do |f|
-        f.write deploy_id
-      end
-    end
-
-    desc "set current deploy FAILBACK!"
-    task :failback do
-      deploy_id = CmdbService.get_deploy_id(deploy_id_file)
-      unless deploy_id.nil?
-        CmdbService.complete_deploy(cse_base, deploy_unit_code, deploy_id, false, "capistrano部署失败，撤销发布")
-      end
-    end
-
-    desc "set current deploy success DONE!"
-    task :done do
-      deploy_id = CmdbService.get_deploy_id(deploy_id_file)
-      puts "deploy_id=#{deploy_id}, file=#{deploy_id_file}"
-      CmdbService.complete_deploy(cse_base, deploy_unit_code, deploy_id, true, "通过capistrano部署成功")
-      File.delete deploy_id_file
-    end
-
     desc "deploy to tomcat"
-    task :deploy_to_tomcat do
-      cmdb.start
-      deploy_id = CmdbService.get_deploy_id(deploy_id_file) || CmdbService.start_deploy("#{cse_base}", deploy_unit_code, deploy_stage, tag)
-      puts "deploy_id=#{deploy_id}"
-
-      gitdeploy.deploy
-      tomcat.restart
-
-      cmdb.done
+    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, tag) }
+      begin
+        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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crazycode-cap-recipes
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - crazycode
@@ -14,10 +15,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +08:00
+date: 2011-08-23 00:00:00 +08:00
 default_executable: cap-recipes
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: capistrano
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Battle-tested capistrano recipes for debian, passenger, apache, hudson, delayed_job, juggernaut, rubygems, backgroundrb, rails and more
 email: crazycode@gmail.com
 executables: 
@@ -137,6 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -145,6 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -155,11 +199,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Battle-tested capistrano recipes for passenger, delayed_job, and more
-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
+test_files: []
+