app-deploy 0.7.0 → 0.7.1

data/CHANGES

@@ -1,5 +1,12 @@
 = app-deploy changes history
 
+== app-deploy 0.7.1 / 2009-12-17
+ * a way better task dependency management
+ * fixed that every task can be only invoked once,
+   now nginx, unicorn, and signal tasks can be invoked
+   twice or above by Task#reenable.
+ http://blogger.godfat.org/2009/12/app-deploy-released-3-ruby-rake-mutual.html
+
 == app-deploy 0.7.0 / 2009-12-16
  * pid management rewritten
  * added signal tasks to deal with any pidfile process

data/app-deploy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{app-deploy}
-  s.version = "0.6.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (aka godfat 真常)"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2009-12-17}
   s.description = %q{ rake tasks for deployment}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "README", "Rakefile", "TODO", "app-deploy.gemspec", "example/Rakefile", "example/bin/install.sh", "example/bin/remote_install.sh", "example/bin/remote_update.sh", "example/bin/start.sh", "example/bin/update.sh", "example/daemon_cluster.yaml", "example/rack_cluster.yaml", "lib/app-deploy/daemon.rake", "lib/app-deploy/deploy.rake", "lib/app-deploy/deprecated/merb.rake", "lib/app-deploy/deprecated/mongrel.rake", "lib/app-deploy/gem.rake", "lib/app-deploy/git.rake", "lib/app-deploy/install.rake", "lib/app-deploy/nginx.rake", "lib/app-deploy/rack.rake", "lib/app-deploy/server.rake", "lib/app-deploy/signal.rake", "lib/app-deploy/thin.rake", "lib/app-deploy/unicorn.rake"]

data/example/Rakefile

@@ -83,9 +83,9 @@ namespace :app do
     [:start, :stop, :restart, :reload].each{ |cmd|
       desc "#{cmd} nginx(passenger)"
       task cmd do
-        ENV['config'] = '/home/app/config/nginx.conf'
-        ENV['nginx']  = '/home/app/nginx/sbin/nginx'
-        Rake::Task["app:nginx:#{cmd}"].invoke
+        Rake::Task["app:nginx:#{cmd}"].invoke(
+          '/home/app/config/nginx.conf',
+          '/home/app/nginx/sbin/nginx')
       end
     }
   end

data/lib/app-deploy.rb

@@ -1,6 +1,6 @@
 
+require 'app-deploy/utils'
+
 %w[ deploy gem git install server rack daemon signal nginx unicorn].each{ |task|
   load "app-deploy/#{task}.rake"
 }
-
-require 'app-deploy/utils'

data/lib/app-deploy/install.rake

@@ -38,10 +38,8 @@ namespace :app do
         rmdir = "rmdir /tmp/#{tmp}"
         check = "git checkout #{branch}"
 
-        ENV['script'] =
-          "#{chdir}; #{clone}; #{setup}; #{rmdir}; #{check}; #{args[:script]}"
-
-        Rake::Task['app:install:remote:sh'].invoke
+        script = "#{chdir}; #{clone}; #{setup}; #{rmdir}; #{check}; #{args[:script]}"
+        Rake::Task['app:install:remote:sh'].invoke(args[:hosts], script)
       end
 
       desc 'invoke a shell script on remote machines'
@@ -70,13 +68,15 @@ namespace :app do
 
       desc 'upload a tarball and untar to user home, then useradd'
       task :setup, [:user, :file, :hosts, :script] do |t, args|
-        ENV['path'] = "/tmp/app-deploy-#{Time.now.to_i}"
-        Rake::Task['app:install:remote:upload'].invoke
-
-        ENV['script'] = "sudo -u #{args[:user]} tar -zxf #{ENV['path']}" +
-                            " -C /home/#{args[:user]};" +
-                        " rm #{ENV['path']}; #{args[:script]}"
-        Rake::Task['app:install:remote:useradd'].invoke
+        path = "/tmp/app-deploy-#{Time.now.to_i}"
+        Rake::Task['app:install:remote:upload'].invoke(
+          args[:file], args[:hosts], path)
+
+        script = "sudo -u #{args[:user]} tar -zxf #{path}" +
+                     " -C /home/#{args[:user]};"           +
+                 " rm #{path}; #{args[:script]}"
+        Rake::Task['app:install:remote:useradd'].invoke(
+          args[:user], args[:hosts], script)
       end
 
     end # of remote

data/lib/app-deploy/nginx.rake

@@ -1,22 +1,19 @@
 
-namespace :app do
+ns = namespace :app do
   namespace :nginx do
 
     desc 'start nginx, default config is config/nginx.conf'
     task :start, [:config, :nginx] do |t, args|
-      ENV['script']  = "    #{args[:nginx]  || '/usr/sbin/nginx'}"   +
-                       " -c #{args[:config] || 'config/nginx.conf'}"
-      ENV['pidfile'] = 'tmp/pids/nginx.pid'
-      Rake::Task['app:signal:start'].invoke
+      script =     "#{args[:nginx]  || '/usr/sbin/nginx'}"   +
+               " -c #{args[:config] || 'config/nginx.conf'}"
+      Rake::Task['app:signal:start'].invoke(script, 'tmp/pids/nginx.pid')
     end
 
     desc 'stop nginx'
     task :stop, [:timeout] do |t, args|
       # sh "kill -TERM `cat tmp/pids/nginx.pid`"
-      ENV['pidfile'] = 'tmp/pids/nginx.pid'
-      ENV['timeout'] = args[:timeout]
-      ENV['name']    = 'nginx'
-      Rake::Task['app:signal:stop'].invoke
+      Rake::Task['app:signal:stop'].invoke(
+        'tmp/pids/nginx.pid', args[:timeout], 'nginx')
     end
 
     desc 'restart nginx'
@@ -25,17 +22,16 @@ namespace :app do
     desc 'reload config'
     task :reload do
       # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
-      ENV['signal'] = 'HUP'
-      Rake::Task['app:nginx:kill'].invoke
+      Rake::Task['app:nginx:kill'].invoke('HUP')
     end
 
     desc 'send a signal to nginx'
     task :kill, [:signal] do |t, args|
-      ENV['signal']  = args[:signal]
-      ENV['pidfile'] = 'tmp/pids/nginx.pid'
-      ENV['name']    = 'nginx'
-      Rake::Task['app:signal:kill'].invoke
+      Rake::Task['app:signal:kill'].invoke(
+        args[:signal], 'tmp/pids/nginx.pid', 'nginx')
     end
 
   end # of nginx
 end # of app
+
+AppDeploy.always_reenable(ns.tasks)

data/lib/app-deploy/signal.rake

@@ -1,5 +1,5 @@
 
-namespace :app do
+ns = namespace :app do
   namespace :signal do
 
     desc 'execute a script if pidfile is not existed'
@@ -33,3 +33,5 @@ namespace :app do
 
   end # of signal
 end # of app
+
+AppDeploy.always_reenable(ns.tasks)

data/lib/app-deploy/unicorn.rake

@@ -1,23 +1,20 @@
 
-namespace :app do
+ns = namespace :app do
   namespace :unicorn do
 
     desc 'start unicorn, default config is config/unicorn.rb'
     task :start, [:config, :env, :unicorn] do |t, args|
-      ENV['script']  =     "#{args[:unicorn] || 'unicorn'} -D"        +
-                       " -c #{args[:config]  || 'config/unicorn.rb'}" +
-                       " -E #{args[:env]     || 'production'}"
-      ENV['pidfile'] = 'tmp/pids/unicorn.pid'
-      Rake::Task['app:signal:start'].invoke
+      script =     "#{args[:unicorn] || 'unicorn'} -D"        +
+               " -c #{args[:config]  || 'config/unicorn.rb'}" +
+               " -E #{args[:env]     || 'production'}"
+      Rake::Task['app:signal:start'].invoke(script, 'tmp/pids/unicorn.pid')
     end
 
     desc 'stop unicorn'
     task :stop, [:timeout] do |t, args|
       # sh "kill -TERM `cat tmp/pids/unicorn.pid`"
-      ENV['pidfile'] = 'tmp/pids/unicorn.pid'
-      ENV['timeout'] = args[:timeout]
-      ENV['name']    = 'unicorn'
-      Rake::Task['app:signal:stop'].invoke
+      Rake::Task['app:signal:stop'].invoke(
+        'tmp/pids/unicorn.pid', args[:timeout], 'unicorn')
     end
 
     desc 'restart unicorn'
@@ -26,17 +23,16 @@ namespace :app do
     desc 'reload config'
     task :reload do
       # sh 'kill -HUP `cat tmp/pids/unicorn.pid`'
-      ENV['signal'] = 'HUP'
-      Rake::Task['app:unicorn:kill'].invoke
+      Rake::Task['app:unicorn:kill'].invoke('HUP')
     end
 
     desc 'send a signal to unicorn'
     task :kill, [:signal] do |t, args|
-      ENV['signal']  = args[:signal]
-      ENV['pidfile'] = 'tmp/pids/unicorn.pid'
-      ENV['name']    = 'unicorn'
-      Rake::Task['app:signal:kill'].invoke
+      Rake::Task['app:signal:kill'].invoke(
+        args[:signal], 'tmp/pids/unicorn.pid', 'unicorn')
     end
 
   end # of unicorn
 end # of app
+
+AppDeploy.always_reenable(ns.tasks)

data/lib/app-deploy/utils.rb

@@ -1,6 +1,10 @@
 
 module AppDeploy
   module_function
+  def always_reenable tasks
+    tasks.each{ |t| t.enhance{ |tt| tt.reenable } }
+  end
+
   def github; @github ||= []; end
   def dependency opts = {}
     opts = opts.dup

data/lib/app-deploy/version.rb

@@ -1,4 +1,4 @@
 
 module AppDeploy
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: app-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +08:00
+date: 2009-12-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency