capistrano-background 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541e46741134115bf08cff688da43bc996db3876
-  data.tar.gz: d79827f0ca558bfe4b6a317e29331aa00a84924d
+  metadata.gz: c7cf30a97b71b01cd667c9e7532d3df8bd7aa059
+  data.tar.gz: 2aeaeae84fd996c505c0b30365a558f3d037a2f7
 SHA512:
-  metadata.gz: f18704b8af08ba2a88ec1320a3895b0991dd752096939958db8b1f80762dd92b51395d549420a10225e39100ec18a2f8420e1fd01c72820aa99745dde7b5d601
-  data.tar.gz: a6a98eff21978c67ca95214a15187788526d6b8b7da59ec7a362adf63efb492a5f7668b0c5098b3f8c04319d20aea7d6511aed06363c33eed35d248b96fa0ced
+  metadata.gz: e1be3ae22efe69e4fc54b990f82eb00642e1fefd93ffbe91a2676c2a9a17d720cd904fd3947818a6b6cb630dfdd9d70fe10297d872933606449ee2a04776bc94
+  data.tar.gz: f7aa6be5d1509f1ee1aa89ad826bc37e6e76eb71695fcf51e7a51709c40279cc93a1fcf570d12a403dac6bab864bce0f21162960613ae8dcb72f4d29b88d21ac

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.3 / 2015-11-02
+
+Termniate process correctly.
+
 # v0.1.2 / 2015-11-01
 
 Create project

data/README.md

@@ -7,7 +7,8 @@ Run background process for capistrano.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'capistrano-background'
+gem 'capistrano-background', group: :development
+gem 'terminate'
 ```
 
 And then execute:
@@ -27,7 +28,8 @@ Add your background processes.
 ```Ruby
 add_background_process({
   :id => :scheduler,
-  :execute => [:rake, 'scheduler']
+  :execute => [:rake, 'scheduler'],
+  :timeout => 60 # kill process after waiting this time (seconds)
 })
 ```
 It will run `rake scheduler` in background when deploy. You can also use command:

data/capistrano-background.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano"
+  spec.add_dependency "capistrano", ">= 3.0.0"
+  spec.add_dependency "terminate", ">= 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/capistrano/background.rb

@@ -1,3 +1,4 @@
-if Gem::Specification.find_by_name('capistrano').version >= Gem::Version.new('3.0.0')
+if defined? task
+  require 'capistrano/background/command'
   load File.expand_path('../tasks/background.rake', __FILE__)
 end

data/lib/capistrano/background/command.rb

@@ -0,0 +1,20 @@
+module SSHKit
+  class Command
+    alias_method :orig_in_background, :in_background
+
+    def in_background(&_block)
+      return yield unless options[:run_in_background]
+      pid_file = options[:pid_file]
+      if pid_file.nil?
+        orig_in_background(&_block)
+      else
+        env_str = environment_string
+        if env_str.nil?
+          sprintf("( nohup %s > /dev/null & \\echo $! > #{pid_file})", yield)
+        else
+          sprintf(" && ( #{env_str} nohup %s > /dev/null & \\echo $! > #{pid_file})", yield)
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/background/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Background
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/capistrano/tasks/background.rake

@@ -1,24 +1,3 @@
-module SSHKit
-  class Command
-    alias_method :orig_in_background, :in_background
-
-    def in_background(&_block)
-      return yield unless options[:run_in_background]
-      pid_file = options[:pid_file]
-      if pid_file.nil?
-        orig_in_background(&_block)
-      else
-        env_str = environment_string
-        if env_str.nil?
-          sprintf("( nohup %s > /dev/null & \\echo $! > #{pid_file})", yield)
-        else
-          sprintf(" && ( #{env_str} nohup %s > /dev/null & \\echo $! > #{pid_file})", yield)
-        end
-      end
-    end
-  end
-end
-
 namespace :load do
   task :defaults do
     set :background_default_hooks, true
@@ -43,16 +22,16 @@ namespace :background do
   end
 
   def pid_process_exists?(pid_file)
-    file_exists?(pid_file) and test(*("kill -0 $( cat #{pid_file} )").split(' '))
+    file_exists?(pid_file) && test(*%{kill -0 `cat #{pid_file}`})
   end
 
   def file_exists?(file)
-    test(*("[ -f #{file} ]").split(' '))
+    test(*%{[ -f #{file} ]})
   end
 
   def quiet_process(pid_file)
     if file_exists? pid_file
-      background "kill -USR1 `cat #{pid_file}`"
+      background "kill -TERM `cat #{pid_file}`"
     end
   end
 
@@ -65,9 +44,11 @@ namespace :background do
     end
   end
 
-  def stop_process(pid_file)
+  def stop_process(pid_file, timeout)
     if file_exists? pid_file
-      background "kill -TERM `cat #{pid_file}`" 
+      if pid_process_exists? pid_file
+        rake "terminate `cat #{pid_file}` -- -t #{timeout}" 
+      end
       execute "rm #{pid_file}"
     end
   end
@@ -99,7 +80,7 @@ namespace :background do
       role = options[:role] || :app
       on roles role do
         within release_path do
-          stop_process(get_pid_file(options))
+          stop_process(get_pid_file(options), options[:timeout] || 60)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-background
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chen Yi-Cyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: terminate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,7 @@ files:
 - capistrano-background.gemspec
 - lib/capistrano-background.rb
 - lib/capistrano/background.rb
+- lib/capistrano/background/command.rb
 - lib/capistrano/background/version.rb
 - lib/capistrano/tasks/background.rake
 homepage: https://github.com/emn178/capistrano-background.git