singleton_process 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+script: bundle exec rspec spec

data/lib/singleton_process.rb

@@ -1,10 +1,10 @@
-require "singleton_process/version"
-
 require 'pathname'
 
 class SingletonProcess
   class AlreadyRunningError < RuntimeError; end
 
+  VERSION = '0.0.2'
+
   attr_accessor :name, :root_path, :app_name
   private :name=
 
@@ -46,15 +46,15 @@ class SingletonProcess
 
   def running?
     if pidfile_path.exist?
-      pidfile = pidfile_path.open('r')
-      !pidfile.flock(File::LOCK_EX | File::LOCK_NB)
+      local_pidfile = pidfile_path.open('a')
+      !local_pidfile.flock(File::LOCK_EX | File::LOCK_NB)
     else
       false
     end
   ensure
-    if pidfile
-      pidfile.flock(File::LOCK_UN)
-      pidfile.close
+    if local_pidfile
+      local_pidfile.flock(File::LOCK_UN)
+      local_pidfile.close
     end
   end
 

data/singleton_process.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'singleton_process/version'
+require 'singleton_process'
 
 Gem::Specification.new do |gem|
   gem.name          = "singleton_process"
@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'rspec', '~>2.12.0'
+  gem.add_development_dependency 'childprocess', '~>0.3.8'
 end

data/spec/singleton_process_spec.rb

@@ -1,7 +1,8 @@
 require 'timeout'
+require 'tempfile'
 require 'spec_helper'
 
-require_relative '../lib/singleton_process'
+require File.join(File.dirname(__FILE__), '../lib/singleton_process')
 
 describe SingletonProcess do
   let(:random_pid)   { rand(99999)}
@@ -30,12 +31,12 @@ describe SingletonProcess do
     end
 
     it "should accept a root_path." do
-      instance = described_class.new(process_name, root_path: tmp_pathname)
+      instance = described_class.new(process_name, :root_path => tmp_pathname)
       instance.root_path.should eql(tmp_pathname)
     end
 
     it "should convert root_path to a Pathname." do
-      instance = described_class.new(process_name, root_path: '/tmp')
+      instance = described_class.new(process_name, :root_path => '/tmp')
       instance.root_path.should eql(tmp_pathname)
     end
 
@@ -46,7 +47,7 @@ describe SingletonProcess do
     end
 
     it "should accept and save an application name." do
-      instance = described_class.new(process_name, app_name: 'blah')
+      instance = described_class.new(process_name, :app_name => 'blah')
       instance.app_name.should eql('blah')
     end
   end
@@ -60,7 +61,7 @@ describe SingletonProcess do
     end
   end
 
-  describe "lock" do
+  describe "#lock" do
     let(:expected_error) {SingletonProcess::AlreadyRunningError}
 
     context "when it is not already running" do
@@ -103,53 +104,68 @@ describe SingletonProcess do
           ]
         end
 
-        before do
-          require 'open3'
-          require 'io/wait'
+        let(:initial_process_output)  {Tempfile.new('output')}
+        let(:initial_process) do
+          process = ChildProcess.build(*spawn_command)
+          process.io.stderr = process.io.stdout = initial_process_output
+          process
+        end
+
+        let(:second_process_output)  {Tempfile.new('output')}
+        let(:second_process) do
+          process = ChildProcess.build(*spawn_command)
+          process.io.stderr = process.io.stdout = second_process_output
+          process
+        end
+
+        before :all do
+          require 'childprocess'
+          #ChildProcess.posix_spawn = true
         end
 
         after do
-          Process.kill(:KILL, @pid1) rescue nil
-          Process.kill(:KILL, @pid2) rescue nil
+          initial_process.stop
+          second_process.stop
+
+          initial_process_output.close
+          second_process_output.close
         end
 
         it "should raise an error." do
           pidfile_path.exist?.should be_false
-          stdin1, stdout1, stderr1, wait_thr1 = Open3.popen3(*spawn_command)
-          @pid1 = wait_thr1[:pid]
+
+          initial_process.start
 
           start_time = Time.now
-          while Time.now - start_time < 1
+          while Time.now - start_time < 5
             break if pidfile_path.exist?
             sleep 0.01
           end
           pidfile_path.exist?.should be_true
 
-          stdin2, stdout2, stderr2, wait_thr2 = Open3.popen3(*spawn_command)
-          @pid2 = wait_thr2[:pid]
+          second_process.start
 
           begin
-            exit_status = Timeout.timeout(5) { wait_thr2.value }
-          rescue Timeout::Error
+            second_process.poll_for_exit(5)
+          rescue ChildProcess::TimeoutError
             raise "Child process didn't exit properly."
           end
 
-          stderr2.read.should match(/AlreadyRunningError/)
-          exit_status.success?.should be_false
-
-          stdin2.close; stdout2.close; stderr2.close
+          second_process_output.rewind
+          second_process_output.read.should match(/AlreadyRunningError/)
+          second_process.crashed?.should be_true
 
-          Process.kill(:INT, @pid1)
+          Process.kill(:INT, initial_process.pid)
 
           begin
-            exit_status = Timeout.timeout(5) { wait_thr1.value }
+            initial_process.poll_for_exit(5)
           rescue Timeout::Error
             raise "Child process didn't exit properly."
           end
 
-          stdout1.read.should eql("#{successful_output}\n")
-          stdin1.close; stdout1.close; stderr1.close
-          exit_status.success?.should be_true
+          initial_process_output.rewind
+          initial_process_output.read.should eql("#{successful_output}\n")
+          initial_process.exit_code.should eql(0)
         end
       end
     end
@@ -184,7 +200,7 @@ describe SingletonProcess do
 
   describe "#running?" do
     context "when the pid file exists" do
-      let(:pidfile) {pidfile_path.open('r')}
+      let(:pidfile) {pidfile_path.open('a')}
 
       before do
         write_random_pid

metadata

@@ -1,76 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: singleton_process
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  prerelease:
+  version: 0.0.2
 platform: ruby
 authors:
 - Robert Jackson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: childprocess
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 0.3.8
     none: false
-description: Ensure that a given process is only running once. Helpful for ensure
-  that scheduled tasks do not overlap if they run longer than the scheduled interval.
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+    none: false
+  prerelease: false
+  type: :development
+description: Ensure that a given process is only running once. Helpful for ensure that scheduled tasks do not overlap if they run longer than the scheduled interval.
 email:
 - robert.w.jackson@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/singleton_process.rb
-- lib/singleton_process/version.rb
 - singleton_process.gemspec
 - spec/singleton_process_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rjackson/singleton_process
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Ensure that a given process is only running once.
 test_files:
 - spec/singleton_process_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/singleton_process/version.rb

@@ -1,3 +0,0 @@
-class SingletonProcess
-  VERSION = "0.0.1" unless defined?(VERSION)
-end