mina-rails-tools 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6cc834f968cf4318442fb6e962ab0a57751da78
-  data.tar.gz: 7c5ee6d964ee90802fc568e7201e7895f30576be
+  metadata.gz: f44e56fe401159e89c228b0cb0839d8dc188360d
+  data.tar.gz: fdd699e445827faa4de26aa1bf99b29e6e1d04bb
 SHA512:
-  metadata.gz: 2d6c717339be2b0c6fd6629200d1a2f3eca872366539c4307559085438a3b1828b6ac1b8390965e4539fc549147a57e5dc24f3a612db950a6d7978c58b80f52b
-  data.tar.gz: bca7a36e46266bc1c54ae82401681dbf012cae1cfaded987544cc19f79ed32181cc337432fa85981e19103dec24c1545437f82dc585dad947b74af67171e75a9
+  metadata.gz: bc7aca8526ae6e0346b8a0736fd0224452987b001c9f06ac593499e9a53f3146c7294de2cdcafd6bfa4aaba434cffc1d0a16fb49cab9b1098d1ec952f913c135
+  data.tar.gz: 2ea1483ab697a428a85606033554b7c884d091f4c26557816f3f9bd8c0115c6491416c333e4ab5a643f6106c09d743e8fea6950b7ee19a5ac026018b754dad28

data/lib/mina/extras/extra.rb

@@ -4,13 +4,11 @@ set :sudoer, "root"
 task :sudo do
   # set :user, sudoer
   set :sudo, true
-  # set :term_mode, :system
 end
 
 task :user do
   # set :user, user
   set :sudo, false
-  # set :term_mode, :system
 end
 
 task :setup => :environment  do
@@ -19,10 +17,10 @@ task :setup => :environment  do
 
   invoke :"nginx:upload"
 
-  if use_unicorn
+  if fetch(:use_unicorn)
     invoke :'unicorn:upload'
 
-    if use_god
+    if fetch(:use_god)
       invoke :'unicorn:god:upload'
     end
   end
@@ -41,10 +39,10 @@ task :sudoer_setup do
   invoke :'nginx:link'
   invoke :'nginx:restart'
 
-  if use_unicorn
+  if fetch(:use_unicorn)
     invoke :'unicorn:link'
 
-    if use_god
+    if fetch(:use_god)
       invoke :'unicorn:god:link'
     end
   end
@@ -52,12 +50,14 @@ end
 
 namespace :extra do
   task :create_shared_paths do
-    folders = shared_paths.map do |path|
-      path.gsub(/\/\S+\.\S+\Z/, "")
-    end.uniq
-
-    folders.map do |dir|
-      command %{mkdir -p "#{fetch(:deploy_to)}/shared/#{dir}"}
+    if fetch(:shared_paths)
+      folders = fetch(:shared_paths).map do |path|
+        path.gsub(/\/\S+\.\S+\Z/, "")
+      end.uniq
+
+      folders.map do |dir|
+        command %{mkdir -p "#{fetch(:deploy_to)}/shared/#{dir}"}
+      end
     end
   end
 
@@ -71,7 +71,7 @@ namespace :extra do
       upload_shared_folder(path, base)
     end
 
-    base = File.join(Dir.pwd, "config", "deploy", "#{server}")
+    base = File.join(Dir.pwd, "config", "deploy", "#{fetch(:server)}")
 
     Dir[File.join(base, "*")].map do |path|
       # File.directory?
@@ -88,7 +88,7 @@ module Mina
   module SshHelpers
     def ssh_command
       args = domain!
-      args = if settings[:sudo] && sudoer?
+      args = if settings[:sudo] && fetch(:sudoer)
                "#{sudoer}@#{args}"
              elsif user?
                "#{user}@#{args}"
@@ -102,6 +102,32 @@ module Mina
 end
 
 
+module Mina
+  module Backend
+    class Remote
+
+      def ssh
+        ensure!(:domain)
+        args = fetch(:domain)
+        p fetch(:sudo), fetch(:sudoer)
+        if fetch(:sudo) && fetch(:sudoer)
+          args = "#{fetch(:sudoer)}@#{fetch(:domain)}" if set?(:user)
+        else
+          args = "#{fetch(:user)}@#{fetch(:domain)}" if set?(:user)
+        end
+        args += " -i #{fetch(:identity_file)}" if set?(:identity_file)
+        args += " -p #{fetch(:port)}" if set?(:port)
+        args += ' -A' if set?(:forward_agent)
+        args += " #{fetch(:ssh_options)}" if set?(:ssh_options)
+        args += ' -tt'
+        "ssh #{args}"
+      end
+
+    end
+  end
+end
+
+
 module Mina
   module Helpers
     def clean_commands!

data/lib/mina/extras/god.rb

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

data/lib/mina/extras/methods.rb

@@ -157,7 +157,7 @@ def check_symlink(destination)
 end
 
 def custom_conf?(conf)
-  Dir[File.join(Dir.pwd, "config", "deploy", "#{server}", "*")].map do |file|
+  Dir[File.join(Dir.pwd, "config", "deploy", "#{fetch(:server)}", "*")].map do |file|
     filename = File.basename(file)
     if filename.gsub(/.erb\Z/, "") == conf.to_s
       return true
@@ -168,7 +168,7 @@ def custom_conf?(conf)
 end
 
 def custom_conf_path(conf)
-  Dir[File.join(Dir.pwd, "config", "deploy", "#{server}", "*")].map do |file|
+  Dir[File.join(Dir.pwd, "config", "deploy", "#{fetch(:server)}", "*")].map do |file|
     filename = File.basename(file)
     if filename.gsub(/.erb\Z/, "") == conf.to_s
       return file

data/lib/mina/extras/rainbows.rb

@@ -1,22 +1,22 @@
 require "mina/extras"
 
 namespace :rainbows do
-  
+
   desc "Rainbows: Parses config file and uploads it to server"
   task :upload => [:'upload:config', :'upload:script']
-  
+
   namespace :upload do
     desc "Parses Rainbows config file and uploads it to server"
     task :config do
       upload_shared_file("rainbows.rb")
     end
-  
+
     desc "Parses Rainbows control script file and uploads it to server"
     task :script do
       upload_shared_file("rainbows_init.sh")
     end
   end
-  
+
   desc "Unicron: startup"
   task :defaults do
     invoke :sudo
@@ -24,13 +24,13 @@ namespace :rainbows do
     command %{sudo chmod u+x /etc/init.d/rainbows-#{fetch(:app)}}
     command "sudo update-rc.d rainbows-#{fetch(:app)} defaults"
   end
-  
+
   task :log do
-    command %{tail -f "#{fetch(:deploy_to)}/#{shared_path}/log/rainbows.log" -n 200}    
+    command %{tail -f "#{fetch(:deploy_to)}/#{fetch(:shared_path)}/log/rainbows.log" -n 200}
   end
-  
+
   task :err_log do
-    command %{tail -f "#{fetch(:deploy_to)}/#{shared_path}/log/rainbows.error.log" -n 200}    
+    command %{tail -f "#{fetch(:deploy_to)}/#{fetch(:shared_path)}/log/rainbows.error.log" -n 200}
   end
 
   desc "Rainbows: Link script files"
@@ -38,7 +38,7 @@ namespace :rainbows do
     invoke :sudo
     extra_echo("Rainbows: Link script file")
     command %{sudo cp '#{fetch(:deploy_to)}/shared/config/rainbows_init.sh' '/etc/init.d/rainbows-#{fetch(:app)}'}
-    
+
     invoke :"rainbows:defaults"
   end
 

data/lib/mina/extras/templates/unicorn.god.erb

@@ -1,10 +1,10 @@
 # http://unicorn.bogomips.org/SIGNALS.html
 
 rails_env = "production"
-rails_root = "<%= "#{fetch(:deploy_to)}/#{current_path!}" %>"
-shared_root = "<%= "#{fetch(:deploy_to)}/#{shared_path!}" %>"
+rails_root = "<%= "#{fetch(:deploy_to)}/#{fetch(:current_path)}" %>"
+shared_root = "<%= "#{fetch(:deploy_to)}/#{fetch(:shared_path)}" %>"
 config = "#{shared_root}/unicorn.rb"
-unicorn_pid = "<%= "#{fetch(:deploy_to)}/#{shared_path!}/pids/unicorn.pid" %>"
+unicorn_pid = "<%= "#{fetch(:deploy_to)}/#{fetch(:shared_path)}/pids/unicorn.pid" %>"
 
 # God.pid_file_directory = File.join("<%= fetch(:deploy_to) %>", "shared", "pids")
 God.watch do |w|
@@ -24,8 +24,8 @@ God.watch do |w|
   # w.pid_file = "#{rails_root}/tmp/pids/unicorn.pid"
   w.pid_file = unicorn_pid
 
-  w.uid = "<%= user! %>"
-  w.gid = "<%= group! %>"
+  w.uid = "<%= fetch(:user) %>"
+  w.gid = "<%= fetch(:group) %>"
 
   w.behavior(:clean_pid_file)
 
@@ -60,10 +60,10 @@ God.watch do |w|
       c.retry_within = 2.hours
     end
   end
-  
+
   # w.transition(:up, :start) do |on|
   #   on.condition(:process_exits) do |c|
   #     c.notify = 'me'
   #   end
   # end
-end
+end

data/lib/mina/extras/templates/unicorn.rb.erb

@@ -1,13 +1,13 @@
-rails_root = "<%= "#{fetch(:deploy_to)}/#{current_path!}" %>"
-rails_env  = "<%= rails_env || "production" %>"
-pid_file   = "<%= "#{fetch(:deploy_to)}/#{shared_path}" %>/pids/unicorn.pid"
+rails_root = "<%= "#{fetch(:deploy_to)}/current" %>"
+rails_env  = "<%= fetch(:rails_env) || "production" %>"
+pid_file   = "<%= "#{fetch(:deploy_to)}/shared" %>/pids/unicorn.pid"
 socket_file= "/tmp/unicorn.<%= fetch(:app) %>.socket"
-log_file   = "<%= "#{fetch(:deploy_to)}/#{shared_path}" %>/log/unicorn.log"
-err_log    = "<%= "#{fetch(:deploy_to)}/#{shared_path}" %>/log/unicorn.error.log"
+log_file   = "<%= "#{fetch(:deploy_to)}/shared" %>/log/unicorn.log"
+err_log    = "<%= "#{fetch(:deploy_to)}/shared" %>/log/unicorn.error.log"
 old_pid    = pid_file + '.oldbin'
 
 timeout 60
-worker_processes <%= unicorn_workers || 2 %>
+worker_processes <%= fetch(:unicorn_workers) || 2 %>
 
 # Listen on a Unix data socket
 listen socket_file, :backlog => 2048

data/lib/mina/extras/templates/unicorn_init.sh.erb

@@ -4,12 +4,12 @@ set -e
 AS_USER=deploy
 TIMEOUT=60
 APP_ROOT="<%= "#{fetch(:deploy_to)}" %>"
-PID_PATH="<%= "#{fetch(:deploy_to)}/#{shared_path!}/pids" %>"
+PID_PATH="<%= "#{fetch(:deploy_to)}/shared/pids" %>"
 PID="$PID_PATH/unicorn.pid"
 ENVIRONMENT="<%= fetch(:rails_env) || "production" %>"
-CONFIG="$APP_ROOT/<%= "#{shared_path!}/unicorn.rb" %>"
+CONFIG="$APP_ROOT/shared/unicorn.rb"
 UARGS="-D -c $CONFIG -E $ENVIRONMENT"
-CMD="cd $APP_ROOT/<%= current_path! %> && bundle exec unicorn_rails $UARGS"
+CMD="cd $APP_ROOT/current && bundle exec unicorn_rails $UARGS"
 action="$1"
 #set -u
 

data/lib/mina/extras/unicorn.rb

@@ -32,7 +32,7 @@ namespace :unicorn do
 
     task :link do
       invoke :sudo
-      command %{sudo cp -rf #{fetch(:deploy_to)}/#{shared_path}/unicorn.god #{god_path}/conf/unicorn-#{fetch(:app)}.god}
+      command %{sudo cp -rf #{fetch(:deploy_to)}/#{fetch(:shared_path)}/unicorn.god #{fetch(:god_path)}/conf/unicorn-#{fetch(:app)}.god}
       invoke :"god:restart"
     end
 
@@ -48,11 +48,11 @@ namespace :unicorn do
   end
 
   task :log do
-    command %{tail -f "#{fetch(:deploy_to)}/#{shared_path}/log/unicorn.log" -n 200}
+    command %{tail -f "#{fetch(:deploy_to)}/#{fetch(:shared_path)}/log/unicorn.log" -n 200}
   end
 
   task :err_log do
-    command %{tail -f "#{fetch(:deploy_to)}/#{shared_path}/log/unicorn.error.log" -n 200}
+    command %{tail -f "#{fetch(:deploy_to)}/#{fetch(:shared_path)}/log/unicorn.error.log" -n 200}
   end
 
   desc "Unicorn: Link script files"
@@ -60,7 +60,7 @@ namespace :unicorn do
     invoke :sudo
     extra_echo("Unicorn: Link script file")
     command %{sudo cp '#{fetch(:deploy_to)}/shared/unicorn_init.sh' '/etc/init.d/unicorn-#{fetch(:app)}'}
-    command %{sudo chown #{user!}:#{group!} /etc/init.d/unicorn-#{fetch(:app)}}
+    command %{sudo chown #{fetch(:user)}:#{fetch(:group)} /etc/init.d/unicorn-#{fetch(:app)}}
     command %{sudo chmod u+x /etc/init.d/unicorn-#{fetch(:app)}}
     # invoke :"unicorn:defaults"
   end

data/lib/mina/extras/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Extras
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-rails-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Joey Lin