app-deploy 0.7.2 → 0.8.0

data/CHANGES

@@ -1,5 +1,8 @@
 = app-deploy changes history
 
+== app-deploy 0.8.0 / 2010-03-22
+ * extracted remote tasks from install tasks
+
 == app-deploy 0.7.2 / 2009-12-21
  * fixed timeout, call to_i on timeout argument.
  * fixed signal:reload taking args

data/README

@@ -14,47 +14,48 @@ by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
 
 $ rake -T app
 (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
-rake app:deploy                                        # deploy to master state
-rake app:deploy:after                                  # after deploy hook for you to override
-rake app:deploy:before                                 # before deploy hook for you to override
-rake app:gem:install                                   # install gems
-rake app:gem:reinstall                                 # reinstall gems
-rake app:gem:uninstall                                 # uninstall gems
-rake app:git[cmd]                                      # generic git cmd walk through all dependency
-rake app:git:clone                                     # clone repoitory from github
-rake app:git:pull                                      # pull anything from origin
-rake app:git:stash                                     # make anything reflect master state
-rake app:git:submodule                                 # init and update submodule
-rake app:install                                       # install this application
-rake app:install:after                                 # after install hook for you to override
-rake app:install:before                                # before install hook for you to override
-rake app:install:remote[hosts,git,cd,branch,script]    # remote installation
-rake app:install:remote:setup[user,file,hosts,script]  # upload a tarball and untar to user home, then useradd
-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[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
+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
+rake app:deploy                                       # deploy to master state
+rake app:deploy:after                                 # after deploy hook for you to override
+rake app:deploy:before                                # before deploy hook for you to override
+rake app:gem:install                                  # install gems
+rake app:gem:reinstall                                # reinstall gems
+rake app:gem:uninstall                                # uninstall gems
+rake app:git[cmd]                                     # generic git cmd walk through all dependency
+rake app:git:clone                                    # clone repoitory from github
+rake app:git:pull                                     # pull anything from origin
+rake app:git:stash                                    # make anything reflect master state
+rake app:git:submodule                                # init and update submodule
+rake app:install                                      # install this application
+rake app:install:after                                # after install hook for you to override
+rake app:install:before                               # before install hook for you to override
+rake app:install:remote[hosts,git,cd,branch,script]   # remote installation
+rake app:nginx:kill[signal]                           # send a signal to nginx
+rake app:nginx:reload                                 # reload config
+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:remote:setup[user,file,hosts,script]         # upload a tarball and untar to user home, then useradd
+rake app:remote:sh[hosts,script]                      # invoke a shell script on remote machines
+rake app:remote:upload[file,hosts,path]               # upload a file to remote machines
+rake app:remote:useradd[user,hosts,script]            # create a user on remote machines
+rake app:server:reload                                # reload nginx(passenger)
+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,name,timeout]  # 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,name,timeout]            # 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/example/bin/README

@@ -0,0 +1,11 @@
+
+$ ./bin/start.sh   # start or restart server with git HEAD
+$ ./bin/restart.sh # restart server with local modification
+
+$ ./bin/update.sh  # update to latest version, and call ./bin/start.sh
+$ ./bin/install.sh # install the entire application, and call ./bin/start.sh
+
+$ ./bin/remote_install.sh # useradd on each node and execute ./bin/install.sh on them
+$ ./bin/remote_update.sh  # call ./bin/update.sh on each node
+
+$ ./bin/remote_sh.sh 'command' # execute `command' on each node

data/example/bin/install.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
+gem install rake
 rake app:install
 ./bin/start.sh

data/example/bin/remote_install.sh

@@ -1,9 +1,13 @@
 #!/bin/sh
 
-rake app:install:remote:setup user=cas file=ssh.tgz hosts=root@10.0.0.101,root@10.0.0.106,root@10.0.0.111,root@10.0.0.116,root@10.0.0.121
+source .bash_profile
 
-rake app:install:remote hosts=cas@10.0.0.101,cas@10.0.0.106,cas@10.0.0.111,cas@10.0.0.116,cas@10.0.0.121 \
-                          git=git@github.com:godfat/cas.git \
-                           cd=~ \
-                       branch=origin/stable \
-                       script=./bin/install.sh
+rake app:remote:useradd user=$project hosts=$nodes
+
+rake app:remote:install hosts=$nodes \
+                          git=git@github.com:godfat/$project.git \
+                           cd=/home/$project \
+                       branch=origin/$branch \
+                       script="git submodule init; git submodule update; gem install rake; ./roodo-rc/install.rb; chown $project:$project -R ."
+
+rake app:remote:sh hosts=$hosts script='./bin/install.sh'

data/example/bin/remote_restart.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+source .bash_profile
+
+rake app:remote:sh hosts=$hosts script=./bin/restart.sh

data/example/bin/remote_sh.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+source .bash_profile
+
+rake app:remote:sh hosts=$hosts script="$1"

data/example/bin/remote_update.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-rake app:install:remote:sh hosts=cas@10.0.0.101,cas@10.0.0.106,cas@10.0.0.111,cas@10.0.0.116,cas@10.0.0.121 script=./bin/update.sh
+source .bash_profile
+
+rake app:remote:sh hosts=$hosts script=./bin/update.sh

data/example/bin/restart.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# restart server with local modification
+rake app:server:restart

data/example/bin/start.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
+# start or restart server with git HEAD
+# i.e. it would remove all local modification
 rake app:deploy

data/example/bin/update.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 git fetch
-git stash
-git checkout origin/stable
+git reset --hard origin/$branch
 git submodule update
 ./bin/start.sh

data/lib/app-deploy.rb

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

data/lib/app-deploy/install.rake

@@ -18,67 +18,7 @@ namespace :app do
                       :after]
 
     desc 'remote installation'
-    task :remote, [:hosts, :git, :cd, :branch, :script] => 'remote:default'
+    task :remote, [:hosts, :git, :cd, :branch, :script] => 'remote:install'
 
-    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 # of install
 end # of app

data/lib/app-deploy/remote.rake

@@ -1,10 +1,10 @@
 
 namespace :app do
   namespace :remote do
-    task :default, [:hosts, :git, :cd, :branch, :script] do |t, args|
+    task :install, [: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}]"
+        puts "  > rake app:remote:install[#{args.names.join(',').upcase}]"
         exit(1)
       end
 
@@ -19,7 +19,7 @@ namespace :app do
       check = "git checkout #{branch}"
 
       script = "#{chdir}; #{clone}; #{setup}; #{rmdir}; #{check}; #{args[:script]}"
-      Rake::Task['app:install:remote:sh'].invoke(args[:hosts], script)
+      Rake::Task['app:remote:sh'].invoke(args[:hosts], script)
     end
 
     desc 'invoke a shell script on remote machines'
@@ -49,13 +49,13 @@ namespace :app do
     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(
+      Rake::Task['app: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(
+      Rake::Task['app:remote:useradd'].invoke(
         args[:user], args[:hosts], script)
     end
 

data/lib/app-deploy/unicorn.rake

@@ -4,9 +4,14 @@ ns = namespace :app do
 
     desc 'start unicorn, default config is config/unicorn.rb'
     task :start, [:config, :env, :unicorn] do |t, args|
-      script =     "#{args[:unicorn] || 'unicorn'} -D"        +
-               " -c #{args[:config]  || 'config/unicorn.rb'}" +
-               " -E #{args[:env]     || 'production'}"
+      env = if args[:env]
+              " -E #{args[:env]}"
+            else
+              ''
+            end
+
+      script =     "#{args[:unicorn] || 'unicorn'} -D" +
+               " -c #{args[:config]  || 'config/unicorn.rb'}#{env}"
       Rake::Task['app:signal:start'].invoke(script, 'tmp/pids/unicorn.pid')
     end
 

data/lib/app-deploy/version.rb

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: app-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +08:00
+date: 2010-03-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.2.0
-    version: 
+        segments: 
+        - 3
+        - 4
+        - 1
+        version: 3.4.1
+  type: :development
+  version_requirements: *id001
 description: " rake tasks for deployment"
 email: godfat (XD) godfat.org
 executables: []
@@ -35,9 +44,13 @@ extra_rdoc_files:
 - TODO
 - app-deploy.gemspec
 - example/Rakefile
+- example/bin/README
 - example/bin/install.sh
 - example/bin/remote_install.sh
+- example/bin/remote_restart.sh
+- example/bin/remote_sh.sh
 - example/bin/remote_update.sh
+- example/bin/restart.sh
 - example/bin/start.sh
 - example/bin/update.sh
 - example/daemon_cluster.yaml
@@ -63,9 +76,13 @@ files:
 - TODO
 - app-deploy.gemspec
 - example/Rakefile
+- example/bin/README
 - example/bin/install.sh
 - example/bin/remote_install.sh
+- example/bin/remote_restart.sh
+- example/bin/remote_sh.sh
 - example/bin/remote_update.sh
+- example/bin/restart.sh
 - example/bin/start.sh
 - example/bin/update.sh
 - example/daemon_cluster.yaml
@@ -104,18 +121,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: app-deploy
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: rake tasks for deployment