app-deploy 0.6.0 → 0.7.0

data/CHANGES

@@ -1,5 +1,45 @@
 = app-deploy changes history
 
+== app-deploy 0.7.0 / 2009-12-16
+ * pid management rewritten
+ * added signal tasks to deal with any pidfile process
+ * switched nginx tasks to use signal tasks as a backend
+ * added unicorn tasks just like the way nginx worked
+
+http://blogger.godfat.org/2009/12/app-deploy-released-2.html
+
+i hate myself... (that always do stupid things)
+
+i would prepare to release app-deploy-0.7.0 tomorrow,
+after some simple testings with the new nginx tasks
+and unicorn tasks, which wrapping signal tasks to
+manage processes with a pid file.
+
+there's no much difference between nginx tasks and
+unicorn tasks. to name a few, the process name,
+config path, and pid path. (plus a ENV option for rack/rails)
+
+that is, rake $ (-- is this Haskell favor i suppose? i mean, $)
+app:signal:start   # => start a process unless pid file existed
+app:signal:stop    # => send TERM to a process, ignore all errors
+app:signal:restart # => stop + start
+app:singal:reload  # => same as stop, but send HUP instead
+app:singal:kill    # send any signal as your wish
+
+then i would start migrating all services from passenger
+to unicorn afterward as i promised to Eric Wong.
+
+*
+
+mogilefs-client and unicorn are both well written.
+i'm an old fogey with large fonts too :p
+there are so many websites with horrible layouts on
+my browsers... especially on safari. firefox is a bit
+better about this. (words won't get overlapped sometimes)
+
+i should try to learn some styles from those two libs.
+and ramaze and innate, i guess.
+
 == app-deploy 0.6.0 / 2009-12-14
  * first release to gemcutter
 

data/README

@@ -1,4 +1,4 @@
-= app-deploy 0.6
+= app-deploy 0.7
 by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -13,7 +13,7 @@ by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
 == FEATURES:
 
 $ rake -T app
-(in /home/photos)
+(in /Users/godfat/project/godfat/app-deploy)
 rake app:daemon:restart[config]                        # restart the daemon cluster
 rake app:daemon:start[config]                          # start the daemon cluster
 rake app:daemon:stop[config]                           # stop the daemon cluster
@@ -36,14 +36,25 @@ rake app:install:remote:setup[user,file,hosts,script]  # upload a tarball and un
 rake app:install:remote:sh[hosts,script]               # invoke a shell script on remote machines
 rake app:install:remote:upload[file,hosts,path]        # upload a file to remote machines
 rake app:install:remote:useradd[user,hosts,script]     # create a user on remote machines
+rake app:nginx:kill[signal]                            # send a signal to nginx
 rake app:nginx:reload                                  # reload config
-rake app:nginx:restart                                 # restart nginx
-rake app:nginx:start[config,nginx]                     # start nginx, default config is config/nginx.conf, nginx is /usr/sbin/nginx
+rake app:nginx:restart[config,nginx,timeout]           # restart nginx
+rake app:nginx:start[config,nginx]                     # start nginx, default config is config/nginx.conf
 rake app:nginx:stop[timeout]                           # stop nginx
 rake app:rack:restart[config]                          # restart the rack cluster
 rake app:rack:start[config]                            # start the rack cluster
 rake app:rack:stop[config]                             # stop the rack cluster
 rake app:server:restart                                # please define your server:restart task
+rake app:signal:kill[signal,pidfile,name]              # send a signal to a process with a pidfile
+rake app:signal:reload[pidfile,name]                   # send HUP to a process with a pidfile
+rake app:signal:restart[script,pidfile,timeout,name]   # restart a process with a pidfile
+rake app:signal:start[script,pidfile]                  # execute a script if pidfile is not existed
+rake app:signal:stop[pidfile,timeout,name]             # terminate a process with a pidfile
+rake app:unicorn:kill[signal]                          # send a signal to unicorn
+rake app:unicorn:reload                                # reload config
+rake app:unicorn:restart[config,env,unicorn,timeout]   # restart unicorn
+rake app:unicorn:start[config,env,unicorn]             # start unicorn, default config is config/unicorn.rb
+rake app:unicorn:stop[timeout]                         # stop unicorn
 
 == SYNOPSIS:
 

data/TODO

@@ -1,9 +1,9 @@
 = app-deploy todo list
 
+* please add test cases!!
+
 * adding sending signal to cluster
 
-* escape \" and \' in options?
-* extract rack-cluster
 * detect binding to port succeeded or not
 * fix default options for rack-cluster
 

data/app-deploy.gemspec

@@ -2,33 +2,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{app-deploy}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
-  s.date = %q{2009-02-09}
-  s.description = %q{rake tasks for deployment}
+  s.authors = ["Lin Jen-Shin (aka godfat 真常)"]
+  s.date = %q{2009-12-16}
+  s.description = %q{ rake tasks for deployment}
   s.email = %q{godfat (XD) godfat.org}
-  s.extra_rdoc_files = ["CHANGES", "README", "TODO", "app-deploy.gemspec", "example/daemon_cluster.yaml", "example/rack_cluster.yaml", "lib/app-deploy/daemon.rake", "lib/app-deploy/deploy.rake", "lib/app-deploy/gem.rake", "lib/app-deploy/git.rake", "lib/app-deploy/install.rake", "lib/app-deploy/merb.rake", "lib/app-deploy/mongrel.rake", "lib/app-deploy/nginx.rake", "lib/app-deploy/rack.rake", "lib/app-deploy/server.rake", "lib/app-deploy/thin.rake"]
-  s.files = ["CHANGES", "README", "Rakefile", "TODO", "app-deploy.gemspec", "example/Rakefile", "example/daemon_cluster.yaml", "example/rack_cluster.yaml", "lib/app-deploy.rb", "lib/app-deploy/daemon.rake", "lib/app-deploy/daemon.rb", "lib/app-deploy/daemon_cluster.rb", "lib/app-deploy/deploy.rake", "lib/app-deploy/gem.rake", "lib/app-deploy/git.rake", "lib/app-deploy/install.rake", "lib/app-deploy/merb.rake", "lib/app-deploy/mongrel.rake", "lib/app-deploy/nginx.rake", "lib/app-deploy/rack.rake", "lib/app-deploy/rack_cluster.rb", "lib/app-deploy/server.rake", "lib/app-deploy/thin.rake", "lib/app-deploy/utils.rb", "lib/app-deploy/version.rb"]
-  s.has_rdoc = true
+  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"]
+  s.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.rb", "lib/app-deploy/daemon.rake", "lib/app-deploy/daemon.rb", "lib/app-deploy/daemon_cluster.rb", "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/rack_cluster.rb", "lib/app-deploy/server.rake", "lib/app-deploy/signal.rake", "lib/app-deploy/thin.rake", "lib/app-deploy/unicorn.rake", "lib/app-deploy/utils.rb", "lib/app-deploy/version.rb"]
   s.homepage = %q{http://github.com/godfat/app-deploy}
-  s.rdoc_options = ["--diagram", "--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
+  s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ludy}
-  s.rubygems_version = %q{1.3.1}
+  s.rubyforge_project = %q{app-deploy}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{rake tasks for deployment}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.4.0"])
+      s.add_development_dependency(%q<bones>, [">= 3.2.0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.4.0"])
+      s.add_dependency(%q<bones>, [">= 3.2.0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.4.0"])
+    s.add_dependency(%q<bones>, [">= 3.2.0"])
   end
 end

data/example/Rakefile

@@ -4,20 +4,12 @@ begin
 rescue LoadError
   puts "app-deploy not found, automaticly downloading and installing..."
 
-  gem_cmd = "#{Gem.ruby} #{`which gem`.strip}"
+  gem_cmd = "#{Gem.ruby} -S gem"
   gem_opt = '--user-install --no-ri --no-rdoc'
   gem_int = "#{gem_cmd} install #{gem_opt}"
 
-  sh "#{gem_int} bones" # need bones to build app-deploy
+  sh "#{gem_int} app-deploy"
 
-  sh 'git clone git://github.com/godfat/app-deploy.git app-deploy'
-  Dir.chdir 'app-deploy'
-
-  sh 'rake clobber'
-  sh 'rake gem:package'
-  sh "#{gem_int} --local pkg/app-deploy-*.gem"
-
-  Dir.chdir '..'
   Gem.refresh
   require 'app-deploy'
 end

data/lib/app-deploy.rb

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

data/lib/app-deploy/nginx.rake

@@ -2,30 +2,40 @@
 namespace :app do
   namespace :nginx do
 
-    desc 'start nginx, default config is config/nginx.conf, nginx is /usr/sbin/nginx'
+    desc 'start nginx, default config is config/nginx.conf'
     task :start, [:config, :nginx] do |t, args|
-      # TODO: extract pid file path
-      if File.exist?('tmp/pids/nginx.pid')
-        puts "WARN: pid file #{'tmp/pids/nginx.pid'} already exists, ignoring."
-      else
-        sh "#{args[:nginx] || '/usr/sbin/nginx'} -c #{args[:config] || 'config/nginx.conf'}"
-      end
-    end
-
-    desc 'reload config'
-    task :reload do
-      # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
-      AppDeploy.hup('tmp/pids/nginx.pid', 'nginx')
+      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
     end
 
     desc 'stop nginx'
     task :stop, [:timeout] do |t, args|
       # sh "kill -TERM `cat tmp/pids/nginx.pid`"
-      AppDeploy.term('tmp/pids/nginx.pid', 'nginx', args[:timeout] || 5)
+      ENV['pidfile'] = 'tmp/pids/nginx.pid'
+      ENV['timeout'] = args[:timeout]
+      ENV['name']    = 'nginx'
+      Rake::Task['app:signal:stop'].invoke
     end
 
     desc 'restart nginx'
-    task :restart => [:stop, :start]
+    task :restart, [:config, :nginx, :timeout] => [:stop, :start]
+
+    desc 'reload config'
+    task :reload do
+      # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
+      ENV['signal'] = 'HUP'
+      Rake::Task['app:nginx:kill'].invoke
+    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
+    end
 
   end # of nginx
 end # of app

data/lib/app-deploy/signal.rake

@@ -2,29 +2,34 @@
 namespace :app do
   namespace :signal do
 
-    desc 'invoke command if not running already.'
-    task :start, [:script, :pid] do |t, args|
-      if File.exist?(args[:pid])
-        puts "WARN: pid file #{args[:pid]} already exists, ignoring."
+    desc 'execute a script if pidfile is not existed'
+    task :start, [:script, :pidfile] do |t, args|
+      if File.exist?(args[:pidfile])
+        puts "WARN: pid file #{args[:pidfile]} already exists, ignoring."
       else
         sh args[:script]
       end
     end
 
-    desc 'send a signal to a process with a pid file'
-    task :kill, [:signal] do |t, args|
-      # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
-      AppDeploy.kill(args[:signal], 'tmp/pids/nginx.pid', 'nginx')
+    desc 'terminate a process with a pidfile'
+    task :stop, [:pidfile, :timeout, :name] do |t, args|
+      # sh "kill -TERM `cat tmp/pids/nginx.pid`"
+      AppDeploy.term(args[:pidfile], args[:name], args[:timeout] || 5)
     end
 
-    desc 'stop nginx'
-    task :stop, [:timeout] do |t, args|
-      # sh "kill -TERM `cat tmp/pids/nginx.pid`"
-      AppDeploy.term('tmp/pids/nginx.pid', 'nginx', args[:timeout] || 5)
+    desc 'restart a process with a pidfile'
+    task :restart, [:script, :pidfile, :timeout, :name] => [:stop, :start]
+
+    desc 'send HUP to a process with a pidfile'
+    task :reload, [:pidfile, :name] do
+      # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
+      AppDeploy.kill_pidfile('HUP', args[:pidfile], args[:name])
     end
 
-    desc 'restart nginx'
-    task :restart => [:stop, :start]
+    desc 'send a signal to a process with a pidfile'
+    task :kill, [:signal, :pidfile, :name] do |t, args|
+      AppDeploy.kill_pidfile(args[:signal], args[:pidfile], args[:name])
+    end
 
-  end # of nginx
+  end # of signal
 end # of app

data/lib/app-deploy/unicorn.rake

@@ -0,0 +1,42 @@
+
+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
+    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
+    end
+
+    desc 'restart unicorn'
+    task :restart, [:config, :env, :unicorn, :timeout] => [:stop, :start]
+
+    desc 'reload config'
+    task :reload do
+      # sh 'kill -HUP `cat tmp/pids/unicorn.pid`'
+      ENV['signal'] = 'HUP'
+      Rake::Task['app:unicorn:kill'].invoke
+    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
+    end
+
+  end # of unicorn
+end # of app

data/lib/app-deploy/utils.rb

@@ -145,45 +145,49 @@ module AppDeploy
     end
   end
 
-  def term pid_path, name = nil, limit = 5
-    if pid = AppDeploy.read_pid(pid_path)
-      puts "Sending TERM to #{name}(#{pid})..."
-
-    else
-      return
-
-    end
-
+  def term pid_path, name = nil, limit = 5, wait = 0.1
     require 'timeout'
-    begin
-      timeout(limit){
+    pid = AppDeploy.kill_pidfile('TERM', pid_path, name)
+    timeout(limit){
+      if pid
         while true
           Process.kill('TERM', pid)
-          sleep(0.1)
+          sleep(wait)
         end
-      }
-    rescue Errno::ESRCH
-      if File.exist?(pid_path)
-        puts "WARN: No such pid: #{pid}, removing #{pid_path}..."
-        File.delete(pid_path)
-      else
-        puts "Killed #{name}(#{pid})"
       end
+    }
+  rescue Errno::ESRCH
+    puts "Killed #{name}(#{pid})"
 
-    rescue Timeout::Error
-      puts "Timeout(#{limit}) killing #{name}(#{pid})"
+  rescue Timeout::Error
+    puts "Timeout(#{limit}) killing #{name}(#{pid})"
 
-    end
   end
 
-  def hup pid_path, name = nil
+  def kill_pidfile signal, pid_path, name = nil
     if pid = AppDeploy.read_pid(pid_path)
-      puts "Sending HUP to #{name}(#{pid})..."
-      Process.kill('HUP', pid)
+      AppDeploy.kill_raise(signal, pid, name)
+      return pid
     end
+    nil
   rescue Errno::ESRCH
     puts "WARN: No such pid: #{pid}, removing #{pid_path}..."
     File.delete(pid_path)
+    nil
+  end
+
+  def kill_pid signal, pid, name = nil
+    AppDeploy.kill_raise(signal, pid, name)
+    pid
+  rescue Errno::ESRCH
+    puts "WARN: No such pid: #{pid}"
+    nil
+  end
+
+  def kill_raise signal, pid, name = nil
+    puts "Sending #{signal} to #{name}(#{pid})..."
+    Process.kill(signal, pid)
+    pid
   end
 
 end

data/lib/app-deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: app-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 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-14 00:00:00 +08:00
+date: 2009-12-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ extra_rdoc_files:
 - lib/app-deploy/server.rake
 - lib/app-deploy/signal.rake
 - lib/app-deploy/thin.rake
+- lib/app-deploy/unicorn.rake
 files: 
 - CHANGES
 - README
@@ -84,6 +85,7 @@ files:
 - lib/app-deploy/server.rake
 - lib/app-deploy/signal.rake
 - lib/app-deploy/thin.rake
+- lib/app-deploy/unicorn.rake
 - lib/app-deploy/utils.rb
 - lib/app-deploy/version.rb
 has_rdoc: true