guard-process 1.0.1 → 1.0.2

data/.travis.yml

@@ -4,6 +4,7 @@ notifications:
     - andre@socialreferral.com
 rvm:
   - 1.9.2
+  - 1.9.3
   - jruby
 script: "bundle exec rake test"
 env: "JRUBY_OPTS='--1.9' "

data/README.md

@@ -2,7 +2,7 @@ Guard::Process [![Build Status](https://secure.travis-ci.org/socialreferral/guar
 ==============
 Guard to run continues processes.
 
-This gem requires Ruby 1.9.2 or JRuby in 1.9 mode.
+This gem requires Ruby 1.9.2, 1.9.3 or JRuby in 1.9 mode.
 
 Usage
 -----
@@ -10,6 +10,8 @@ Please read the [Guard documentation](https://github.com/guard/guard#readme) to
 
 There is also an exellent screencast available on [Railscasts](http://railscasts.com/episodes/264-guard)
 
+Additionally there is a great introductory article on [Intridea Blog](http://intridea.com/2011/8/25/hire-a-guard-for-your-project) mentioning Guard::Process.
+
 Guardfile
 ---------
 You can add as many process Guards as you want, an example Guardfile:

data/guard-process.gemspec

@@ -4,7 +4,7 @@ require 'rbconfig' unless defined?(RbConfig)
 
 Gem::Specification.new do |s|
   s.name        = "guard-process"
-  s.version     = "1.0.1"
+  s.version     = "1.0.2"
   s.authors     = ["Mark Kremer"]
   s.email       = ["mark@socialreferral.com"]
   s.homepage    = ""
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('guard', '>= 0.4.2')
+  s.add_dependency('spoon', '~> 0.0.1')
+  s.add_dependency('ffi', '~> 1.0.9')
   s.add_development_dependency('minitest')
   s.add_development_dependency('mocha')
   s.add_development_dependency('guard-minitest')

data/lib/guard/process.rb

@@ -1,13 +1,13 @@
 require 'guard'
 require 'guard/guard'
+require 'spoon'
 
 module Guard
   class Process < Guard
     def initialize(watchers = [], options = {})
-      @process = nil
       @pid = nil
-      @command = options.fetch(:command).split
-      @env = options[:env]
+      @command = options.fetch(:command).split(" ")
+      @env = options[:env] || {}
       @name = options[:name]
       @stop_signal = options[:stop_signal] || "TERM"
       super
@@ -23,18 +23,23 @@ module Guard
 
     def start
       UI.info("Starting process #{@name}")
-      @command.unshift(@env) if @env
-      @process = IO.popen(@command)
+      original_env = {}
+      @env.each_pair do |key, value|
+        original_env[key] = ENV[key]
+        ENV[key] = value
+      end
+      @pid = Spoon.spawnp(*@command)
+      original_env.each_pair do |key, value|
+        ENV[key] = value
+      end
       UI.info("Started process #{@name}")
-      @pid = @process.pid
     end
 
     def stop
-      if @process
+      if @pid
         UI.info("Stopping process #{@name}")
-        ::Process.kill(@stop_signal, @process.pid)
+        ::Process.kill(@stop_signal, @pid)
         ::Process.waitpid(@pid) rescue Errno::ESRCH
-        @process.close
         @pid = nil
         UI.info("Stopped process #{@name}")
       end

data/test/guard/process_test.rb

@@ -1,9 +1,10 @@
 require_relative '../test_helper'
+require 'timeout'
 
 class GuardProcessTest < MiniTest::Unit::TestCase
   def setup
     ENV['GUARD_ENV'] = 'test'
-    @command = "#{File.expand_path(File.dirname(__FILE__) + '/../run_me.rb')}"
+    @command = "ruby #{TEST_ROOT}/run_me.rb"
     @name = "RunMe"
     @options = {:command => @command, :name => @name}
     @guard = Guard::Process.new([], @options)
@@ -23,13 +24,6 @@ class GuardProcessTest < MiniTest::Unit::TestCase
     @guard.run_on_change("")
   end
 
-  def test_env_is_passed_to_io_popen_if_given
-    @options[:env] = {'VAR1' => 'VALUE 1', 'VAR2' => 'VALUE 2'}
-    IO.expects(:popen).with([@options[:env], @command]).returns(stub_everything)
-    @guard = Guard::Process.new([], @options)
-    @guard.start
-  end
-
   def test_start_runs_command_and_stop_stops_it
     Guard::UI.expects(:info).with("Starting process #{@name}")
     Guard::UI.expects(:info).with("Started process #{@name}")
@@ -48,17 +42,43 @@ class GuardProcessTest < MiniTest::Unit::TestCase
     assert @guard.process_running?
   end
 
-  def test_commands_are_formatted_correctly_with_and_without_env
-    @options = {:command => 'echo test test', :name => 'EchoProcess'}
-    @env     = {'VAR3' => 'VALUE 3'}
+  def test_start_sets_env_properly
+    ENV['VAR1'] = 'VALUE A'
+    @options[:env] = {'VAR1' => 'VALUE 1', 'VAR3' => 'VALUE 2'}
 
-    IO.expects(:popen).with(["echo", "test", "test"]).returns(stub_everything)
-    IO.expects(:popen).with([@env, "echo", "test", "test"]).returns(stub_everything)
+    environment_file = "#{TEST_ROOT}/test_environment.txt"
+    File.delete(environment_file) if File.exists?(environment_file)
 
     @guard = Guard::Process.new([], @options)
-    @guard.start and @guard.stop
+    @guard.start
+
+    # Check the environment
+    assert_equal ENV['VAR1'], 'VALUE A'
+    assert_nil ENV['VAR2']
+    assert_nil ENV['VAR3']
+
+    # Wait for run_me.rb to write the environment details to file
+    Timeout.timeout(30) do
+      until File.exist?("#{TEST_ROOT}/test_environment.txt") do
+        sleep 0.5
+      end
+    end
+
+    # Read the written environment and convert it to a Hash, and get rid of the file
+    written_env = Hash[File.read("#{TEST_ROOT}/test_environment.txt").split("\n").map {|l| l.split(" = ")}]
+    File.delete("#{TEST_ROOT}/test_environment.txt")
+
+    # Verify that the written environment matches what was set in options[:env]
+    assert_equal 'VALUE 1', written_env['VAR1']
+    assert_equal nil, written_env['VAR2']
+    assert_equal 'VALUE 2', written_env['VAR3']
+  end
+
+  def test_commands_are_formatted_properly_for_spoon
+    @options = {:command => 'echo test test', :name => 'EchoProcess', :env => {"VAR1" => "VALUE 1"}}
+    ::Process.stubs(:kill).returns(true)
 
-    @options[:env] = @env
+    Spoon.expects(:spawnp).with("echo", "test", "test").returns(stub_everything)
 
     @guard = Guard::Process.new([], @options)
     @guard.start and @guard.stop

data/test/run_me.rb

@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
+
+file_name = "#{File.expand_path(File.dirname(__FILE__))}/test_environment.txt"
+
+File.open(file_name, 'w') do |file|
+  file.write("VAR1 = #{ENV['VAR1']}\n")
+  file.write("VAR2 = #{ENV['VAR2']}\n")
+  file.write("VAR3 = #{ENV['VAR3']}\n")
+end
+
 loop do
-  puts "#{Time.now}: running..."
   sleep 1
 end
+

data/test/test_helper.rb

@@ -2,3 +2,5 @@ require 'minitest/unit'
 require 'minitest/autorun'
 require 'mocha'
 require 'guard/process'
+
+TEST_ROOT = File.expand_path(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-process
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-08 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &11464980 !ruby/object:Gem::Requirement
+  requirement: &8618500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,32 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *11464980
+  version_requirements: *8618500
+- !ruby/object:Gem::Dependency
+  name: spoon
+  requirement: &8617860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *8617860
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &8617120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *8617120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11464440 !ruby/object:Gem::Requirement
+  requirement: &8616540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11464440
+  version_requirements: *8616540
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &11463840 !ruby/object:Gem::Requirement
+  requirement: &8615820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11463840
+  version_requirements: *8615820
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &11463300 !ruby/object:Gem::Requirement
+  requirement: &8615140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11463300
+  version_requirements: *8615140
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &11432120 !ruby/object:Gem::Requirement
+  requirement: &8614520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11432120
+  version_requirements: *8614520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11431540 !ruby/object:Gem::Requirement
+  requirement: &8613900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11431540
+  version_requirements: *8613900
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &11430540 !ruby/object:Gem::Requirement
+  requirement: &8613120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11430540
+  version_requirements: *8613120
 description: Guard extension to run cli processes
 email:
 - mark@socialreferral.com
@@ -109,7 +130,6 @@ files:
 - test/guard/process_test.rb
 - test/run_me.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -130,10 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -228258594788711827
+      hash: 3990963759899305213
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Guard extension to run cli processes