app-deploy 0.7.1 → 0.7.2

data/CHANGES

@@ -1,5 +1,11 @@
 = app-deploy changes history
 
+== app-deploy 0.7.2 / 2009-12-21
+ * fixed timeout, call to_i on timeout argument.
+ * fixed signal:reload taking args
+ * moved timeout to be last argument.
+ * added AppDeploy.invoke to wrap Task#invoke
+
 == app-deploy 0.7.1 / 2009-12-17
  * a way better task dependency management
  * fixed that every task can be only invoked once,

data/app-deploy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{app-deploy}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   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-17}
+  s.date = %q{2009-12-21}
   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,25 @@ namespace :app do
     [:start, :stop, :restart, :reload].each{ |cmd|
       desc "#{cmd} nginx(passenger)"
       task cmd do
-        Rake::Task["app:nginx:#{cmd}"].invoke(
-          '/home/app/config/nginx.conf',
-          '/home/app/nginx/sbin/nginx')
+        task = Rake::Task["app:nginx:#{cmd}"]
+        args = task.arg_names.map{ |name|
+          case name
+            when :config; '/home/app/config/nginx.conf'
+            when :nginx;  '/home/app/nginx/sbin/nginx'
+            else;         nil
+          end
+        }
+        task.invoke(args)
+
+        # or
+        AppDeploy.invoke("app:nginx:#{cmd}",
+          :config => '/home/app/config/nginx.conf',
+          :nginx  => '/home/app/nginx/sbin/nginx')
+
+        # or
+        ENV['config'] = '/home/app/config/nginx.conf'
+        ENV['nginx']  = '/home/app/nginx/sbin/nginx'
+        Rake::Task["app:nginx:#{cmd}"].invoke
       end
     }
   end

data/lib/app-deploy/remote.rake

@@ -0,0 +1,63 @@
+
+namespace :app do
+  namespace :remote do
+    task :default, [:hosts, :git, :cd, :branch, :script] do |t, args|
+      unless [args[:hosts], args[:git]].all?
+        puts 'please fill your arguments like:'
+        puts "  > rake app:install:remote[#{args.names.join(',').upcase}]"
+        exit(1)
+      end
+
+      cd     = args[:cd]     || '~'
+      branch = args[:branch] || 'master'
+      tmp    = "app-deploy-#{Time.now.to_i}"
+
+      chdir = "cd #{cd}"
+      clone = "git clone #{args[:git]} /tmp/#{tmp}"
+      setup = "find /tmp/#{tmp} -maxdepth 1 '!' -name #{tmp} -exec mv -f '{}' #{cd} ';'"
+      rmdir = "rmdir /tmp/#{tmp}"
+      check = "git checkout #{branch}"
+
+      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'
+    task :sh, [:hosts, :script] do |t, args|
+      args[:hosts].split(',').map{ |host|
+        script = args[:script].gsub('"', '\\"')
+        Thread.new{ sh "ssh #{host} \"#{script}\"" }
+      }.each(&:join)
+    end
+
+    desc 'upload a file to remote machines'
+    task :upload, [:file, :hosts, :path] do |t, args|
+      args[:hosts].split(',').each{ |host|
+        sh "scp #{args[:file]} #{host}:#{args[:path]}"
+      }
+    end
+
+    desc 'create a user on remote machines'
+    task :useradd, [:user, :hosts, :script] do |t, args|
+      useradd = "sudo useradd -m #{args[:user]}"
+      args[:hosts].split(',').each{ |host|
+        script = "#{useradd}; #{args[:script]}".gsub('"', '\\"')
+        sh "ssh #{host} \"#{script}\""
+      }
+    end
+
+    desc 'upload a tarball and untar to user home, then useradd'
+    task :setup, [:user, :file, :hosts, :script] do |t, args|
+      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
+end

data/lib/app-deploy/signal.rake

@@ -12,16 +12,16 @@ ns = namespace :app do
     end
 
     desc 'terminate a process with a pidfile'
-    task :stop, [:pidfile, :timeout, :name] do |t, args|
+    task :stop, [:pidfile, :name, :timeout] do |t, args|
       # sh "kill -TERM `cat tmp/pids/nginx.pid`"
       AppDeploy.term(args[:pidfile], args[:name], args[:timeout] || 5)
     end
 
     desc 'restart a process with a pidfile'
-    task :restart, [:script, :pidfile, :timeout, :name] => [:stop, :start]
+    task :restart, [:script, :pidfile, :name, :timeout] => [:stop, :start]
 
     desc 'send HUP to a process with a pidfile'
-    task :reload, [:pidfile, :name] do
+    task :reload, [:pidfile, :name] do |t, args|
       # sh 'kill -HUP `cat tmp/pids/nginx.pid`'
       AppDeploy.kill_pidfile('HUP', args[:pidfile], args[:name])
     end

data/lib/app-deploy/utils.rb

@@ -1,6 +1,13 @@
 
 module AppDeploy
   module_function
+  # wrap Rake::Task#invoke for named arguments
+  def invoke task_name, hash
+    task = Rake::Task[task_name]
+    args = task.arg_names.map{ |name| hash[name] }
+    task.invoke(*args)
+  end
+
   def always_reenable tasks
     tasks.each{ |t| t.enhance{ |tt| tt.reenable } }
   end
@@ -152,7 +159,7 @@ module AppDeploy
   def term pid_path, name = nil, limit = 5, wait = 0.1
     require 'timeout'
     pid = AppDeploy.kill_pidfile('TERM', pid_path, name)
-    timeout(limit){
+    Timeout.timeout(limit.to_i){
       if pid
         while true
           Process.kill('TERM', pid)

data/lib/app-deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: app-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 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-17 00:00:00 +08:00
+date: 2009-12-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ extra_rdoc_files:
 - lib/app-deploy/install.rake
 - lib/app-deploy/nginx.rake
 - lib/app-deploy/rack.rake
+- lib/app-deploy/remote.rake
 - lib/app-deploy/server.rake
 - lib/app-deploy/signal.rake
 - lib/app-deploy/thin.rake
@@ -82,6 +83,7 @@ files:
 - lib/app-deploy/nginx.rake
 - lib/app-deploy/rack.rake
 - lib/app-deploy/rack_cluster.rb
+- lib/app-deploy/remote.rake
 - lib/app-deploy/server.rake
 - lib/app-deploy/signal.rake
 - lib/app-deploy/thin.rake