mina-unicorn 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80c4fc1b8579624b751d05cd67ed75bdb1681a1
-  data.tar.gz: a8cc846739c023060b9bf09b1e3257c4f41450cf
+  metadata.gz: 3953720784f4afa682c908bd63633eae2f5ddf36
+  data.tar.gz: e0763a88ccdd4f25f49cec03b743a420042836b1
 SHA512:
-  metadata.gz: 075d88071b5674b7f21c2a2fb2f918e289974bcc8f411a6ce42b8005e000a9beb9f0d9624ae919357e373c092cd520e6509438cf0d1bc289d0bcf07d48398f29
-  data.tar.gz: 55d1d1cdf7d408711ba4d5b53a7712b54b4b79c41bcc29548cc09267ebde51b2183ecebb91cda4626d1a258e3946e1fd8e9224eed1806da85aad950906210d3b
+  metadata.gz: 6fdf3143af1deb7aef4b77593f0ffcdd557ff37b55c9c675a1e6e9ffcf161975ef73a2e0252740361896111190284e78e91df7212a87654e3b86f0a859a2a7d9
+  data.tar.gz: 193a1fd2522318594abb6a788abb98e1ba14c85df580f2d187e502348d687f0c119d717972f72ec93a92824f7c2b3fb3465f038197f8f66ba2a31ab30219b2c1

data/README.md

@@ -54,7 +54,7 @@ $ mina unicorn:start
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/mina-unicorn/fork )
+1. Fork it ( http://github.com/openteam/mina-unicorn/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/mina/unicorn/tasks.rb

@@ -1,35 +1,35 @@
 require 'mina/bundler'
 require 'mina/rails'
+require 'mina/unicorn/utility'
 
 namespace :unicorn do
+  include Mina::Unicorn::Utility
+
   set_default :unicorn_role,      -> { user }
   set_default :unicorn_env,       -> { fetch(:rails_env, 'production') }
   set_default :unicorn_config,    -> { "#{deploy_to}/#{current_path}/config/unicorn.rb" }
   set_default :unicorn_pid,       -> { "#{deploy_to}/#{current_path}/tmp/pids/unicorn.pid"  }
   set_default :unicorn_cmd,       -> { "#{bundle_prefix} unicorn" }
+  set_default :unicorn_restart_sleep_time, -> { 2 }
+
+  desc "Start Unicorn master process"
+  task start: :environment do
+    queue start_unicorn
+  end
 
-  desc "Start unicorn service"
-  task :start => :environment do
-    queue %{
-      echo "-----> Starting unicorn service"
-      #{echo_cmd %[cd #{deploy_to}/#{current_path}; #{unicorn_cmd} -c #{unicorn_config} -D -E #{unicorn_env}]}
-    }
+  desc "Stop Unicorn"
+  task stop: :environment do
+    queue kill_unicorn('QUIT')
   end
 
-  desc "Stop unicorn service"
-  task :stop => :environment do
-    queue %{
-      echo "-----> Stoping unicorn service"
-      #{echo_cmd %[kill -s QUIT `cat #{unicorn_pid}`]}
-    }
+  desc "Immediately shutdown Unicorn"
+  task shutdown: :environment do
+    queue kill_unicorn('TERM')
   end
 
   desc "Restart unicorn service"
-  task :restart => :environment do
-    queue %{
-      echo "-----> Restart unicorn service"
-      #{echo_cmd %[kill -s USR2 `cat #{unicorn_pid}`]}
-    }
+  task restart: :environment do
+    queue restart_unicorn
   end
 end
 

data/lib/mina/unicorn/utility.rb

@@ -0,0 +1,109 @@
+# Ported from: https://github.com/sosedoff/capistrano-unicorn/blob/master/lib/capistrano-unicorn/utility.rb
+
+module Mina
+  module Unicorn
+    module Utility
+
+      # Check if a remote process exists using its pid file
+      #
+      def remote_process_exists?(pid_file)
+        "[ -e #{pid_file} ] && kill -0 `cat #{pid_file}` > /dev/null 2>&1"
+      end
+
+      # Stale Unicorn process pid file
+      #
+      def old_unicorn_pid
+        "#{unicorn_pid}.oldbin"
+      end
+
+      # Command to check if Unicorn is running
+      #
+      def unicorn_is_running?
+        remote_process_exists?(unicorn_pid)
+      end
+
+      # Command to check if stale Unicorn is running
+      #
+      def old_unicorn_is_running?
+        remote_process_exists?(old_unicorn_pid)
+      end
+
+      # Get unicorn master process PID (using the shell)
+      #
+      def get_unicorn_pid(pid_file=unicorn_pid)
+        "`cat #{pid_file}`"
+      end
+
+      # Get unicorn master (old) process PID
+      #
+      def get_old_unicorn_pid
+        get_unicorn_pid(old_unicorn_pid)
+      end
+
+      # Send a signal to a unicorn master processes
+      #
+      def unicorn_send_signal(signal, pid=get_unicorn_pid)
+        "kill -s #{signal} #{pid}"
+      end
+
+      # Kill Unicorns in multiple ways O_O
+      #
+      def kill_unicorn(signal)
+        script = <<-END
+          if #{unicorn_is_running?}; then
+            echo "Stopping Unicorn...";
+            #{unicorn_send_signal(signal)};
+          else
+            echo "Unicorn is not running.";
+          fi;
+        END
+
+        script
+      end
+
+      # Start the Unicorn server
+      #
+      def start_unicorn
+        %Q%
+          if [ -e "#{unicorn_pid}" ]; then
+            if kill -0 `cat #{unicorn_pid}` > /dev/null 2>&1; then
+              echo "Unicorn is already running!";
+              exit 0;
+            fi;
+
+            rm #{unicorn_pid};
+          fi;
+
+          echo "Starting Unicorn...";
+          cd #{deploy_to}/#{current_path} && BUNDLE_GEMFILE=#{bundle_gemfile} #{unicorn_cmd} -c #{unicorn_config} -E #{unicorn_env} -D;
+        %
+      end
+
+      # Restart the Unicorn server
+      #
+      def restart_unicorn
+        %Q%
+          #{duplicate_unicorn}
+
+          sleep #{unicorn_restart_sleep_time}; # in order to wait for the (old) pidfile to show up
+
+          if #{old_unicorn_is_running?}; then
+            #{unicorn_send_signal('QUIT', get_old_unicorn_pid)};
+          fi;
+        %
+      end
+
+      def duplicate_unicorn
+        %Q%
+          if #{unicorn_is_running?}; then
+            echo "Duplicating Unicorn...";
+            #{unicorn_send_signal('USR2')};
+          else
+            #{start_unicorn}
+          fi;
+        %
+      end
+
+    end
+  end
+end

data/lib/mina/unicorn/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Unicorn
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/mina-unicorn.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "mina", "~> 0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - tab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mina
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Unicorn tasks for Mina
 email:
 - tab@openteam.ru
@@ -52,6 +66,7 @@ files:
 - Rakefile
 - lib/mina/unicorn.rb
 - lib/mina/unicorn/tasks.rb
+- lib/mina/unicorn/utility.rb
 - lib/mina/unicorn/version.rb
 - mina-unicorn.gemspec
 homepage: https://github.com/openteam/mina-unicorn