mina-rails-tools 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5242ae48aecf33e80ed2ba1b510cc4ceafa441
-  data.tar.gz: 7f3f5b31c827d4a5c6bd9455317840ecda4225eb
+  metadata.gz: 0b1ec0a24ccf8326ac0f432baee756bf25e0191f
+  data.tar.gz: c69caa75b329a4320855f9458a5ff9187a2dddaf
 SHA512:
-  metadata.gz: 3b3c616152026bc8f56da7ac4143d00c017ea91390b82b60cb0d2bb21b340582ee4bdc762810a7769cece5fa183ff12a01cfa3843778edcc470c7a2b43fa151c
-  data.tar.gz: fb0ff6b8dfc7a740fa41a55a18f4e65a539d6211e137f6107659456af62110beefe92cab3c6da023fc7c36efa34accea3491fc6adf0779eed4941b85cc8b7a43
+  metadata.gz: 8b7bbfb3051c57118b6302a15ea8a45df6ebd8298686637145f48d83b44f7d1db5144d8d32085e65e3be0cf33cbaf2e53741405f0215f962c1e97a7f4d21ec41
+  data.tar.gz: 0d577df6d81c040332d449ca6806c5bd1d7342410723018bff29479aec0479e4ce29cba36290592ed8ce3adfedea69849169c954911f7fe17a883e069ddcaf1f

data/lib/mina/extras/apt.rb

@@ -1,66 +1,66 @@
 set_default :apt_source, :us
 
 def apt_get(package)
-  queue echo_cmd "sudo apt-get install #{package} -y"
+  command echo_cmd "sudo apt-get install #{package} -y"
 end
 
 namespace :apt do
   namespace :get do
-    
+
     task :install do
       apt_get("#{ENV["i"]}")
     end
-    
+
     task :update do
-      queue "sudo apt-get update"
+      command "sudo apt-get update"
     end
-    
+
     task :nginx do
       apt_get("nginx")
     end
-    
+
     task :git do
       apt_get("git-core")
     end
-    
+
     task :redis do
       apt_get("redis-server")
     end
-    
+
     task :mysql do
-      apt_get("mysql-server-5.5")
+      apt_get("mysql-server-5.6")
     end
-    
+
     task :"build-essential" do
       apt_get("build-essential")
     end
-    
+
     task :"libmysqlclient-dev" do
       apt_get("libmysqlclient-dev")
     end
-    
+
     task :"libssl-dev" do
       apt_get("libssl-dev")
     end
-    
+
     task :"libreadline-dev" do
       apt_get("libreadline-dev")
     end
-    
+
     task :"libsqlite3-dev" do
       apt_get("libsqlite3-dev")
     end
-    
+
     task :"python-setuptools" do
       apt_get("python-setuptools")
     end
-    
+
     task :imagemagick do
       apt_get("imagemagick")
     end
-    
+
     task :"libmagickwand-dev" do
       apt_get("libmagickwand-dev")
     end
   end
-end
+end

data/lib/mina/extras/brew.rb

@@ -1,5 +1,5 @@
 def brew_install(package)
-  queue echo_cmd "sudo brew install #{package} -y"
+  command echo_cmd "sudo brew install #{package} -y"
 end
 
 

data/lib/mina/extras/extra.rb

@@ -27,10 +27,10 @@ task :setup => :environment  do
     end
   end
   
-  queue %{echo "-----> (!!!) You now need to run 'mina sudoer_setup' to run the parts that require sudoer user (!!!)"}
+  command %{echo "-----> (!!!) You now need to run 'mina sudoer_setup' to run the parts that require sudoer user (!!!)"}
   
   # if sudoer?
-  #   queue %{echo "-----> (!!!) You now need to run 'mina sudoer_setup' to run the parts that require sudoer user (!!!)"}
+  #   command %{echo "-----> (!!!) You now need to run 'mina sudoer_setup' to run the parts that require sudoer user (!!!)"}
   # else
   #   invoke :sudoer_setup
   # end
@@ -57,7 +57,7 @@ namespace :extra do
     end.uniq
     
     folders.map do |dir|
-      queue echo_cmd %{mkdir -p "#{deploy_to}/shared/#{dir}"}
+      command echo_cmd %{mkdir -p "#{deploy_to}/shared/#{dir}"}
     end
   end
   

data/lib/mina/extras/gem.rb

@@ -1,5 +1,5 @@
 def gem_install(package, options=nil)
-  queue echo_cmd "sudo gem install #{package} #{options} --no-rdoc --no-ri"
+  command echo_cmd "sudo gem install #{package} #{options} --no-rdoc --no-ri"
 end
 
 namespace :gem do
@@ -11,13 +11,13 @@ namespace :gem do
   namespace :source do
     task :prepare do
       if in_china?
-        queue echo_cmd "sudo gem source -a http://ruby.taobao.org/"
-        queue echo_cmd "sudo gem source -r https://rubygems.org/"
+        command echo_cmd "sudo gem source -a http://ruby.taobao.org/"
+        command echo_cmd "sudo gem source -r https://rubygems.org/"
       end
     end
     
     task :list do
-      queue echo_cmd "sudo gem source"
+      command echo_cmd "sudo gem source"
     end
   end
   

data/lib/mina/extras/god.rb

@@ -10,44 +10,44 @@ set :use_god, true
 namespace :god do
 
   task :setup do
-    queue echo_cmd "sudo mkdir -p #{god_path}/conf"
+    command echo_cmd "sudo mkdir -p #{god_path}/conf"
   end
   
   task :link do
     extra_echo "Relocate god script file"
-    queue echo_cmd %{sudo rm -rf "#{god_service_path}/god"}
-    queue echo_cmd "sudo mkdir -p #{god_path}/conf"
-    queue echo_cmd "sudo chown -R #{user} #{god_path}"
-    queue echo_cmd %{sudo cp "#{god_path}/god.sh" "#{god_service_path}/god"}
-    queue echo_cmd %{sudo chown #{god_user}:#{god_group} "#{god_service_path}/god"}
-    queue echo_cmd %{sudo chmod +x "#{god_service_path}/god"}
-    queue echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
-    queue echo_cmd "sudo update-rc.d god defaults"
+    command echo_cmd %{sudo rm -rf "#{god_service_path}/god"}
+    command echo_cmd "sudo mkdir -p #{god_path}/conf"
+    command echo_cmd "sudo chown -R #{user} #{god_path}"
+    command echo_cmd %{sudo cp "#{god_path}/god.sh" "#{god_service_path}/god"}
+    command echo_cmd %{sudo chown #{god_user}:#{god_group} "#{god_service_path}/god"}
+    command echo_cmd %{sudo chmod +x "#{god_service_path}/god"}
+    command echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
+    command echo_cmd "sudo update-rc.d god defaults"
   end
   
   task :tmp_add_permission do
-    queue echo_cmd "sudo chown -R #{user} #{god_path}"
+    command echo_cmd "sudo chown -R #{user} #{god_path}"
   end
   
   task :set_permission do
-    queue echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
+    command echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
   end
 
   task :upload => [:'upload:script', :'upload:global']
   
   namespace :upload do
     task :script do
-      queue echo_cmd "sudo mkdir -p #{god_path}/conf"
-      queue echo_cmd "sudo chown -R #{user} #{god_path}"
+      command echo_cmd "sudo mkdir -p #{god_path}/conf"
+      command echo_cmd "sudo chown -R #{user} #{god_path}"
       upload_file "god.sh", "#{god_path}/god.sh"
-      queue echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
+      command echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
     end
 
     task :global do
-      queue echo_cmd "sudo mkdir -p #{god_path}/conf"
-      queue echo_cmd "sudo chown -R #{user} #{god_path}"
+      command echo_cmd "sudo mkdir -p #{god_path}/conf"
+      command echo_cmd "sudo chown -R #{user} #{god_path}"
       upload_file 'global.god', "#{god_path}/global.god"
-      queue echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
+      command echo_cmd "sudo chown -R #{god_user}:#{god_group} #{god_path}"
     end    
   end
   
@@ -55,13 +55,13 @@ namespace :god do
     desc "#{action.capitalize} God"
     task action.to_sym do
       invoke :sudo
-      queue %{echo "-----> #{action.capitalize} God"}
-      queue echo_cmd "sudo #{god_service_path}/god #{action}"
+      command %{echo "-----> #{action.capitalize} God"}
+      command echo_cmd "sudo #{god_service_path}/god #{action}"
     end
   end
   
   task :log do
     invoke :sudo
-    queue %{sudo tail -f #{god_log_path}/god.log -n #{ENV["n"] || 200}}
+    command %{sudo tail -f #{god_log_path}/god.log -n #{ENV["n"] || 200}}
   end
 end

data/lib/mina/extras/local.rb

@@ -6,7 +6,7 @@ namespace :local do
     check_key = check_file_exist?(ssh_pub_key_path!) && check_file_exist?(ssh_key_path!)
 
     unless check_key
-      queue "ssh-keygen -t rsa"
+      command "ssh-keygen -t rsa"
     end 
   end
 end

data/lib/mina/extras/methods.rb

@@ -1,17 +1,17 @@
 def mv_config(source, destination)
-  queue %{mv #{deploy_to}/shared/config/#{source} #{deploy_to}/shared/config/#{destination}}
+  command %{mv #{deploy_to}/shared/config/#{source} #{deploy_to}/shared/config/#{destination}}
 end
 
 def extra_echo(desc)
-  queue "echo '--------> #{desc}'"
+  command "echo '--------> #{desc}'"
 end
 
 def extra_echo!(desc)
-  queue! "echo '--------> #{desc}'"
+  command "echo '--------> #{desc}'"
 end
 
 def scp_file(desc, source, destination)
-  to :after_hook do
+  on :after_hook do
     extra_echo("Put #{desc} file to #{destination}")
 
     command = "scp "
@@ -27,7 +27,7 @@ end
 
 def upload_shared_file(filename)
   src = custom_conf_path(filename)
-  
+
   if src
     upload_template src, "#{deploy_to}/shared/#{filename}"
   else
@@ -37,7 +37,7 @@ end
 
 def upload_file(filename, destination)
   src = custom_conf_path(filename)
-  
+
   if src
     upload_template src, destination
   else
@@ -47,15 +47,15 @@ end
 
 def append_template(source, destination)
   desc = File.basename(destination)
-  
+
   if source =~ /erb$/
     contents = parse_template(source)
   else
     contents = File.read(source)
   end
-  
+
   extra_echo("Put #{desc} file to #{destination}")
-  
+
   script = <<EOF
 script=$(cat <<'EOFF'
 #{contents}
@@ -63,22 +63,22 @@ EOFF
 )
 EOF
 
-  queue %{#{script}}
-  queue %{echo "$script" >> #{destination}}
-  queue check_exists(destination)
+  command %{#{script}}
+  command %{echo "$script" >> #{destination}}
+  command check_exists(destination)
 end
 
 def upload_template(source, destination)
   desc = File.basename(destination)
-  
+
   if source =~ /erb$/
     contents = parse_template(source)
   else
     contents = parse_template(source)
   end
-  
+
   extra_echo("Put #{desc} file to #{destination}")
-  
+
   script = <<EOF
 script=$(cat <<'EOFF'
 #{contents}
@@ -86,20 +86,20 @@ EOFF
 )
 EOF
 
-  queue %{#{script}}
-  queue %{echo "$script" > #{destination}}
-  queue check_exists(destination)
+  command %{#{script}}
+  command %{echo "$script" > #{destination}}
+  command check_exists(destination)
 end
 
 def upload_default_template(tpl, destination)
   desc = File.basename(destination)
-  
+
   source = File.join(File.dirname(__FILE__), "templates", "#{tpl}.erb")
-  
+
   contents = parse_template(source)
-  
+
   extra_echo("Put #{desc} file to #{destination}")
-  
+
   script = <<EOF
 script=$(cat <<'EOFF'
 #{contents}
@@ -107,23 +107,23 @@ EOFF
 )
 EOF
 
-  queue %{#{script}}
-  queue %{echo "$script" > #{destination}}
-  queue check_exists(destination)
+  command %{#{script}}
+  command %{echo "$script" > #{destination}}
+  command check_exists(destination)
 end
 
 def upload_shared_folder(folder, base)
-  Dir[File.join(folder, "*")].map do |path|    
+  Dir[File.join(folder, "*")].map do |path|
     if File.directory?(path)
       upload_shared_folder(path)
     else
       filename = File.basename(path)
       shared_folder = path.gsub(base, "").gsub(filename, "").gsub(/\A\//, "").gsub(/\/\Z/, "")
       des = "#{deploy_to}/shared/#{shared_folder}/#{filename.gsub(/\.erb$/, "")}"
-      upload_template path, des      
+      upload_template path, des
     end
   end
-  
+
 end
 
 def parse_template(file)
@@ -163,7 +163,7 @@ def custom_conf?(conf)
       return true
     end
   end
-  
+
   false
 end
 
@@ -174,19 +174,19 @@ def custom_conf_path(conf)
       return file
     end
   end
-  
+
   Dir[File.join(Dir.pwd, "config", "deploy", "shared", "*")].map do |file|
     filename = File.basename(file)
     if filename.gsub(/.erb\Z/, "") == conf.to_s
       return file
     end
   end
-  
+
   false
 end
 
-def queue_echo(s)
-  queue %{echo '#{s}'}
+def command_echo(s)
+  command %{echo '#{s}'}
 end
 
 def check_file_exist?(file)

data/lib/mina/extras/mysql.rb

@@ -6,7 +6,7 @@ namespace :mysql do
   desc "Connect to mysql"
   task :connect do
     extra_echo "Mysql: connect"
-    queue "mysql -u #{mysql_user} #{mysql_pass ? "-p" : ""}"
+    command "mysql -u #{mysql_user} #{mysql_pass ? "-p" : ""}"
   end
     
 end

data/lib/mina/extras/nginx.rb

@@ -19,18 +19,18 @@ namespace :nginx do
     invoke :sudo
     extra_echo("Nginx: Symlink config file")
     
-    queue echo_cmd %{sudo ln -fs "#{deploy_to}/shared/nginx.conf" "#{nginx_conf_path}/#{app!}.conf"}
-    # queue check_symlink nginx_conf_path
+    command echo_cmd %{sudo ln -fs "#{deploy_to}/shared/nginx.conf" "#{nginx_conf_path}/#{app!}.conf"}
+    # command check_symlink nginx_conf_path
   end
     
   desc "Current nginx config"
   task :config do
     invoke :sudo
     
-    queue_echo("#"*80)
-    queue_echo("# File: #{nginx_conf_path}/#{app!}.conf")
-    queue %{sudo cat "#{nginx_conf_path}/#{app!}.conf"}
-    queue_echo("#"*80)
+    command_echo("#"*80)
+    command_echo("# File: #{nginx_conf_path}/#{app!}.conf")
+    command %{sudo cat "#{nginx_conf_path}/#{app!}.conf"}
+    command_echo("#"*80)
   end
   
   %w(stop start restart reload status).each do |action|
@@ -38,7 +38,7 @@ namespace :nginx do
     task action.to_sym do
       invoke :sudo
       extra_echo("Nginx: #{action.capitalize}")
-      queue echo_cmd "sudo service nginx #{action}"
+      command echo_cmd "sudo service nginx #{action}"
     end
   end
 end

data/lib/mina/extras/platform.rb

@@ -11,19 +11,19 @@ end
 desc "Roll backs the lates release"
 task :rollback => :environment do
   extra_echo!("Rolling back to previous release for instance: #{domain}")
-  queue! %[echo "-----> Rolling back to previous release for instance: #{domain}"]
+  command %[echo "-----> Rolling back to previous release for instance: #{domain}"]
 
   # remove latest release folder (active release)
   extra_echo("Deleting active release: ")
 
-  queue %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1]
-  queue! %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1 | xargs -I active rm -rf "#{deploy_to}/releases/active"]
+  command %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1]
+  command %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1 | xargs -I active rm -rf "#{deploy_to}/releases/active"]
 
   # delete existing sym link and create a new symlink pointing to the previous release
   extra_echo("Creating new symlink from the previous release: ")
-  queue %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1]
-  queue! %[rm "#{deploy_to}/current"]
-  queue! %[ls -Art "#{deploy_to}/releases" | sort | tail -n 1 | xargs -I active ln -s "#{deploy_to}/releases/active" "#{deploy_to}/current"]
+  command %[ls "#{deploy_to}/releases" -Art | sort | tail -n 1]
+  command %[rm "#{deploy_to}/current"]
+  command %[ls -Art "#{deploy_to}/releases" | sort | tail -n 1 | xargs -I active ln -s "#{deploy_to}/releases/active" "#{deploy_to}/current"]
   
   invoke :'unicorn:restart'
 end

data/lib/mina/extras/rails.rb

@@ -2,10 +2,10 @@ set_default :log_line, 200
 
 desc "Rails Log"
 task :log => :environment do
-  queue echo_cmd("cd #{deploy_to}/current && tail -f log/production.log -n #{ENV["n"] || log_line}")
+  command echo_cmd("cd #{deploy_to}/current && tail -f log/production.log -n #{ENV["n"] || log_line}")
 end
 
 desc "Rails Console"
 task :console => :environment do
-  queue echo_cmd("cd #{deploy_to}/current && RAILS_ENV=production bundle exec rails c")
+  command echo_cmd("cd #{deploy_to}/current && RAILS_ENV=production bundle exec rails c")
 end

data/lib/mina/extras/rainbows.rb

@@ -20,24 +20,24 @@ namespace :rainbows do
   desc "Unicron: startup"
   task :defaults do
     invoke :sudo
-    queue echo_cmd %{sudo chown root:root /etc/init.d/rainbows-#{app!}}
-    queue echo_cmd %{sudo chmod u+x /etc/init.d/rainbows-#{app!}}
-    queue echo_cmd "sudo update-rc.d rainbows-#{app!} defaults"
+    command echo_cmd %{sudo chown root:root /etc/init.d/rainbows-#{app!}}
+    command echo_cmd %{sudo chmod u+x /etc/init.d/rainbows-#{app!}}
+    command echo_cmd "sudo update-rc.d rainbows-#{app!} defaults"
   end
   
   task :log do
-    queue %{tail -f "#{deploy_to!}/#{shared_path}/log/rainbows.log" -n 200}    
+    command %{tail -f "#{deploy_to!}/#{shared_path}/log/rainbows.log" -n 200}    
   end
   
   task :err_log do
-    queue %{tail -f "#{deploy_to!}/#{shared_path}/log/rainbows.error.log" -n 200}    
+    command %{tail -f "#{deploy_to!}/#{shared_path}/log/rainbows.error.log" -n 200}    
   end
 
   desc "Rainbows: Link script files"
   task :link do
     invoke :sudo
     extra_echo("Rainbows: Link script file")
-    queue echo_cmd %{sudo cp '#{deploy_to}/shared/config/rainbows_init.sh' '/etc/init.d/rainbows-#{app!}'}
+    command echo_cmd %{sudo cp '#{deploy_to}/shared/config/rainbows_init.sh' '/etc/init.d/rainbows-#{app!}'}
     
     invoke :"rainbows:defaults"
   end
@@ -45,19 +45,19 @@ namespace :rainbows do
   desc "Start rainbows"
   task :start do
     extra_echo("Rainbows: Start")
-    queue echo_cmd "/etc/init.d/rainbows-#{app!} start"
+    command echo_cmd "/etc/init.d/rainbows-#{app!} start"
   end
 
   desc "Stop rainbows"
   task :stop do
     extra_echo("Rainbows: Stop")
-    queue echo_cmd "/etc/init.d/rainbows-#{app!} stop"
+    command echo_cmd "/etc/init.d/rainbows-#{app!} stop"
   end
 
   desc "Restart rainbows using 'upgrade'"
   task :restart do
     extra_echo("Rainbows: Restart")
-    queue echo_cmd "/etc/init.d/rainbows-#{app!} upgrade"
+    command echo_cmd "/etc/init.d/rainbows-#{app!} upgrade"
   end
 
 end

data/lib/mina/extras/redis.rb

@@ -3,7 +3,7 @@ namespace :redis do
   desc "Connect to redis"
   task :connect do
     extra_echo "Redis: connect"
-    queue "redis-cli"
+    command "redis-cli"
   end
     
 end

data/lib/mina/extras/system.rb

@@ -1,11 +1,11 @@
 task :health do
-  queue 'ps aux | grep -v grep | grep -v bash | grep -e "bin\/god" -e "unicorn_rails" -e "mongod" -e "nginx" -e "redis" -e "STAT START   TIME COMMAND" -e "bash"'
+  command 'ps aux | grep -v grep | grep -v bash | grep -e "bin\/god" -e "unicorn_rails" -e "mongod" -e "nginx" -e "redis" -e "STAT START   TIME COMMAND" -e "bash"'
 end
 
 task :uptime do
-  queue 'uptime'
+  command 'uptime'
 end
 
 task :gp do
-  queue echo_cmd "ps aux | grep #{ENV["p"]}"
+  command echo_cmd "ps aux | grep #{ENV["p"]}"
 end

data/lib/mina/extras/ubuntu.rb

@@ -7,57 +7,57 @@ set :platform, :ubuntu
 
 def add_user(u)
   invoke :sudo
-  queue "adduser #{u}"
+  command "adduser #{u}"
 end
 
 namespace :ubuntu do
-  
+
   task :before_check do
-    to :before_hook do
+    on :before_hook do
       invoke :"local:check_ssh_key"
     end
   end
-  
+
   namespace :remote do
     task :setup do
       invoke :sudo
-      queue echo_cmd %{mkdir -p ~/.ssh}
+      command echo_cmd %{mkdir -p ~/.ssh}
       append_template(ssh_pub_key_path, ".ssh/authorized_keys")
     end
-    
+
     task :add_deploy do
       invoke :sudo
       add_user("deploy")
-      queue "sudo usermod -a -G www-data deploy"
-      
-      queue echo_cmd "sudo mkdir -p /home/deploy/.ssh"
-      queue echo_cmd "sudo touch /home/deploy/.ssh/authorized_keys"
+      command "sudo usermod -a -G www-data deploy"
+
+      command echo_cmd "sudo mkdir -p /home/deploy/.ssh"
+      command echo_cmd "sudo touch /home/deploy/.ssh/authorized_keys"
       append_template(ssh_pub_key_path, "/home/deploy/.ssh/authorized_keys")
-      queue echo_cmd "sudo chown -R deploy:deploy /home/deploy/.ssh"
-      queue echo_cmd "sudo chmod 664 /home/deploy/.ssh/authorized_keys"
+      command echo_cmd "sudo chown -R deploy:deploy /home/deploy/.ssh"
+      command echo_cmd "sudo chmod 664 /home/deploy/.ssh/authorized_keys"
     end
-    
+
     task :add_ubuntu do
       invoke :sudo
       add_user("ubuntu")
-      queue echo_cmd "sudo groupadd admin"
-      queue echo_cmd "sudo usermod -a -G admin ubuntu"
-      queue echo_cmd "sudo mkdir -p /home/ubuntu/.ssh"
-      queue echo_cmd "sudo touch /home/ubuntu/.ssh/authorized_keys"
+      command echo_cmd "sudo groupadd admin"
+      command echo_cmd "sudo usermod -a -G admin ubuntu"
+      command echo_cmd "sudo mkdir -p /home/ubuntu/.ssh"
+      command echo_cmd "sudo touch /home/ubuntu/.ssh/authorized_keys"
       append_template(ssh_pub_key_path, "/home/ubuntu/.ssh/authorized_keys")
-      queue echo_cmd "sudo chown -R ubuntu:ubuntu /home/ubuntu/.ssh"
-      queue echo_cmd "sudo chmod 664 /home/ubuntu/.ssh/authorized_keys"
+      command echo_cmd "sudo chown -R ubuntu:ubuntu /home/ubuntu/.ssh"
+      command echo_cmd "sudo chmod 664 /home/ubuntu/.ssh/authorized_keys"
     end
   end
-  
+
   namespace :locale do
     task :setup do
       invoke :sudo
-      queue echo_cmd %{sudo locale-gen en_US en_US.UTF8}
-      queue echo_cmd %{sudo sh -c "echo 'LC_ALL=\"en_US.utf8\"' >> /etc/environment"}
+      command echo_cmd %{sudo locale-gen en_US en_US.UTF8}
+      command echo_cmd %{sudo sh -c "echo 'LC_ALL=\"en_US.utf8\"' >> /etc/environment"}
     end
   end
-    
+
   namespace :install do
     task :prepare do
       invoke :"apt:get:update"
@@ -66,38 +66,38 @@ namespace :ubuntu do
     end
 
     task :ruby do
-      in_directory '/tmp' do
-        queue "wget https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.3.tar.gz"
-        queue "tar xf ruby-2.2.3.tar.gz"
-      end      
-      
-      in_directory '/tmp/ruby-2.2.3' do
-        queue "./configure"
-        queue "make"
-        queue "sudo make install"
-        queue "sudo ln -s /usr/local/bin/ruby /usr/bin/ruby"
+      in_path '/tmp' do
+        command "wget https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz"
+        command "tar xf ruby-2.3.1.tar.gz"
+      end
+
+      in_path '/tmp/ruby-2.3.1' do
+        command "./configure"
+        command "make"
+        command "sudo make install"
+        command "sudo ln -s /usr/local/bin/ruby /usr/bin/ruby"
       end
     end
-    
+
     task :rubygems do
-      in_directory '/tmp' do
-        queue "wget http://rubygems.org/rubygems/rubygems-2.4.8.tgz"
-        queue "tar xf rubygems-2.4.8.tgz"
+      in_path '/tmp' do
+        command "wget https://rubygems.org/rubygems/rubygems-2.6.8.tgz"
+        command "tar xf rubygems-2.6.8.tgz"
       end
-      
-      in_directory '/tmp/rubygems-2.4.8' do
-        queue "sudo ruby setup.rb install"
+
+      in_path '/tmp/rubygems-2.6.8' do
+        command "sudo ruby setup.rb install"
       end
-    end 
-        
+    end
+
     task :www do
       invoke :sudo
-      queue echo_cmd "sudo mkdir -p /var/www"
-      queue echo_cmd "sudo chown -R deploy:www-data /var/www"
+      command echo_cmd "sudo mkdir -p /var/www"
+      command echo_cmd "sudo chown -R deploy:www-data /var/www"
     end
-    
+
     task :ssh_key do
-      queue "ssh-keygen -t rsa"
-    end   
-  end    
-end
+      command "ssh-keygen -t rsa"
+    end
+  end
+end

data/lib/mina/extras/unicorn.rb

@@ -22,7 +22,7 @@ namespace :unicorn do
   desc "Unicron: startup"
   task :defaults do
     invoke :sudo
-    queue echo_cmd "sudo update-rc.d unicorn-#{app!} defaults"
+    command echo_cmd "sudo update-rc.d unicorn-#{app!} defaults"
   end
   
   namespace :god do
@@ -32,55 +32,55 @@ namespace :unicorn do
     
     task :link do
       invoke :sudo
-      queue echo_cmd %{sudo cp -rf #{deploy_to}/#{shared_path}/unicorn.god #{god_path}/conf/unicorn-#{app!}.god}
+      command echo_cmd %{sudo cp -rf #{deploy_to}/#{shared_path}/unicorn.god #{god_path}/conf/unicorn-#{app!}.god}
       invoke :"god:restart"
     end
     
     task :start do
       invoke :sudo
-      queue echo_cmd %{sudo god start unicorn_#{app!}}
+      command echo_cmd %{sudo god start unicorn_#{app!}}
     end
     
     task :stop do
       invoke :sudo
-      queue echo_cmd %{sudo god stop unicorn_#{app!}}
+      command echo_cmd %{sudo god stop unicorn_#{app!}}
     end    
   end
   
   task :log do
-    queue %{tail -f "#{deploy_to!}/#{shared_path}/log/unicorn.log" -n 200}    
+    command %{tail -f "#{deploy_to!}/#{shared_path}/log/unicorn.log" -n 200}    
   end
   
   task :err_log do
-    queue %{tail -f "#{deploy_to!}/#{shared_path}/log/unicorn.error.log" -n 200}    
+    command %{tail -f "#{deploy_to!}/#{shared_path}/log/unicorn.error.log" -n 200}    
   end
 
   desc "Unicorn: Link script files"
   task :link do
     invoke :sudo
     extra_echo("Unicorn: Link script file")
-    queue echo_cmd %{sudo cp '#{deploy_to}/shared/unicorn_init.sh' '/etc/init.d/unicorn-#{app!}'}
-    queue echo_cmd %{sudo chown #{user!}:#{group!} /etc/init.d/unicorn-#{app!}}
-    queue echo_cmd %{sudo chmod u+x /etc/init.d/unicorn-#{app!}}
+    command echo_cmd %{sudo cp '#{deploy_to}/shared/unicorn_init.sh' '/etc/init.d/unicorn-#{app!}'}
+    command echo_cmd %{sudo chown #{user!}:#{group!} /etc/init.d/unicorn-#{app!}}
+    command echo_cmd %{sudo chmod u+x /etc/init.d/unicorn-#{app!}}
     # invoke :"unicorn:defaults"
   end
 
   desc "Start unicorn"
   task :start do
     extra_echo("Unicorn: Start")
-    queue echo_cmd "/etc/init.d/unicorn-#{app!} start"
+    command echo_cmd "/etc/init.d/unicorn-#{app!} start"
   end
 
   desc "Stop unicorn"
   task :stop do
     extra_echo("Unicorn: Stop")
-    queue echo_cmd "/etc/init.d/unicorn-#{app!} stop"
+    command echo_cmd "/etc/init.d/unicorn-#{app!} stop"
   end
 
   desc "Restart unicorn using 'upgrade'"
   task :restart do
     extra_echo("Unicorn: Restart")
-    queue echo_cmd "/etc/init.d/unicorn-#{app!} upgrade"
+    command echo_cmd "/etc/init.d/unicorn-#{app!} upgrade"
   end
 
 end

data/lib/mina/extras/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Extras
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

data/mina-rails-tools.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "mina", "0.3.7"
+  spec.add_development_dependency "mina", "~> 1.0"
 end

data/samples/osx/config/deploy.rb

@@ -16,17 +16,17 @@ set :ssh_key_path, "/Users/joey/.ssh/id_rsa"
 
 task :start do
   invoke :sudo
-  queue "whoami"
+  command "whoami"
   invoke :"osx:before_check"
   invoke :"osx:remote:setup"
   invoke :"osx:locale:setup"
   invoke :"osx:install:prepare"
-  mina_cleanup!
   
+  mina_cleanup!
   clean_commands!
   
   invoke :user
-  queue "whoami"
+  command "whoami"
   invoke :"brew:install:mysql"
   invoke :"brew:install:redis"
   invoke :"brew:install:nginx"

data/samples/rails/config/deploy.rb

@@ -0,0 +1,40 @@
+require "mina/bundler"
+require "mina/rails"
+require "mina/git"
+require "mina/extras"
+require "mina/extras/nginx"
+require "mina/extras/unicorn"
+require "mina/extras/god"
+
+Dir[File.join(Dir.pwd, "config", "deploy", "*.rb")].each { |f| load f }
+
+set :user, 'deploy'
+set :group, "www-data"
+set :sudoer, "joey"
+
+set :keep_releases, 5
+set :domain, '192.168.11.107'
+set :deploy_to, "/var/www/test"
+set :shared_paths, ["config/database.yml", "tmp", "log", "pids", "config/application.yml"]
+set :repository, "git@xxxx:test.git"
+# set :branch, "master"
+
+set :app, 'test'
+
+desc "Deploys the current version to the server."
+task :deploy => :environment do
+  deploy do
+    invoke :'git:clone'
+    invoke :'deploy:link_shared_paths'
+    invoke :'bundle:install'
+    invoke :'rails:db_create'
+    invoke :'rails:db_migrate'
+    invoke :'rails:assets_precompile'
+    
+    to :launch do
+      invoke :'unicorn:restart'
+    end
+    
+    invoke :'deploy:cleanup'
+  end
+end

data/samples/ubuntu/config/deploy.rb

@@ -16,7 +16,7 @@ set :ssh_key_path, "/Users/joey/.ssh/id_rsa"
 
 task :start do
   invoke :sudo
-  queue "whoami"
+  command "whoami"
   invoke :"ubuntu:before_check"
   invoke :"ubuntu:remote:setup"
   invoke :"ubuntu:locale:setup"
@@ -28,7 +28,7 @@ task :start do
   clean_commands!
   
   invoke :user
-  queue "whoami"
+  command "whoami"
   invoke :"apt:get:mysql"
   invoke :"apt:get:redis"
   invoke :"apt:get:nginx"

data/samples/ubuntu/prepare.sh

@@ -4,12 +4,14 @@ sudo apt-get install build-essential libssl-dev libreadline-dev
 cd /tmp
 wget https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.3.tar.gz
 tar xf ruby-2.2.3.tar.gz
+cd ruby-2.2.3
 ./configure && make
 sudo make install
 sudo ln -s /usr/local/bin/ruby /usr/bin/ruby
 cd /tmp
 wget http://rubygems.org/rubygems/rubygems-2.4.8.tgz
 tar xf rubygems-2.4.8.tgz
+cd rubygems-2.4.8
 sudo ruby setup.rb install
 
 sudo gem source -a http://ruby.taobao.org/

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mina-rails-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Joey Lin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mina
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '1.0'
 description: ''
 email:
 - joeyoooooo@gmail.com
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -95,6 +95,7 @@ files:
 - samples/osx/config/deploy/shared/global.god.erb
 - samples/osx/config/deploy/shared/god.sh.erb
 - samples/osx/prepare.sh
+- samples/rails/config/deploy.rb
 - samples/ubuntu/config/deploy.rb
 - samples/ubuntu/config/deploy/shared/global.god.erb
 - samples/ubuntu/config/deploy/shared/god.sh.erb
@@ -110,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Extra deploy scripts for rails