guard-process 1.0.6 → 1.1.0

data/.gitignore

@@ -1,5 +1,5 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.vagrant
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.vagrant

data/.travis.yml

@@ -1,10 +1,10 @@
-notifications:
-  recipients:
-    - mark@socialreferral.com
-    - andre@socialreferral.com
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-script: "bundle exec rake test"
+notifications:
+  recipients:
+    - mark@socialreferral.com
+    - andre@socialreferral.com
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.4
+  - jruby-19mode
+script: "bundle exec rake test"

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in guard-process.gemspec
-gemspec
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in guard-process.gemspec
+gemspec

data/Guardfile

@@ -1,11 +1,11 @@
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
-end
-
-guard 'minitest' do
-  # with Minitest::Unit
-  watch(%r|^test/(.*)_test\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
-end
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/(.*)_test\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
+end

data/LICENSE

@@ -1,19 +1,19 @@
-Copyright (C) 2011 by SocialReferral
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (C) 2011 by SocialReferral
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,76 +1,80 @@
-# Guard::Process [![Build Status](https://secure.travis-ci.org/guard/guard-process.png)](http://travis-ci.org/guard/guard-process)
-Guard to run processes and commands.
-
-This gem requires Ruby 1.9.2, 1.9.3, 2.0.0 or JRuby in 1.9 mode.
-
-# Usage
-Please read the [Guard documentation](https://github.com/guard/guard#readme) to learn how to use Guard.
-
-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:
-
-``` ruby
-  guard 'process', :name => 'EndlessRunner', :command => 'rails runner Something::ThatGoesOnAndOn' do
-    watch('Gemfile.lock')
-  end
-
-  guard 'process', :name => 'AnotherRunner', :command => ['rails', 'runner', 'AnotherRunner'] do
-    watch('Gemfile.lock')
-  end
-```
-
-# Options
-The following options are available:
-
-- name
-  The display name of your process in Guard, this is shown when Guard::Process is starting and stopping your process
-- command
-  The command to run as you would run it from the command line
-- dir
-  The directory in which you want to run the command, if none is given then Ruby's current working directory is used
-- stop_signal
-  The signal that Guard::Process sends to terminate the process when it needs to stop/restart it. This defaults to 'TERM' (in some cases you may need KILL).
-- dont_stop
-  When a reload is triggered this will not stop the process, instead it will wait for the current process run to finish before starting a new one. This is useful for having guard-process execute commands that don't run constantly that you don't want to interrupt as they run.
-- env
-  A Hash with environmental variables to set for the context where your command runs, like so:
-``` ruby
-  {"SSL_CERTS_DIR" => "/etc/ssl/certs", "JAVA_HOME" => "/usr/local/java"}
-```
-
-# TODO
-
-Clean up the test cases
-
-# Changes
-
-## 1.0.6
-
-- Allow passing in command as an Array as well as a String
-
-## 1.0.5
-
-- Adds the dont_stop option
-
-## 1.0.4
-
-- Adds the dir option
-
-# Development
-- Source hosted on [GitHub](https://github.com)
-- Please report issues and feature requests using [GitHub issues](https://github.com/guard/guard-process/issues)
-
-Pull requests are welcome, please make sure your patches are well tested before contributing. When sending a pull request:
-- Use a topic branch for your change
-- Add tests for your changes using MiniTest::Unit
-- Do not change the version number in the gemspec
-
-# License
-Guard::Process is released under the MIT license.
-
-# Author
-[Mark Kremer](https://github.com/mkremer)
+# Guard::Process [![Build Status](https://secure.travis-ci.org/guard/guard-process.png)](http://travis-ci.org/guard/guard-process)
+Guard to run processes and commands.
+
+This gem requires Ruby 1.9.3, 2.0.0 or JRuby in 1.9 mode.
+
+# Usage
+Please read the [Guard documentation](https://github.com/guard/guard#readme) to learn how to use Guard.
+
+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:
+
+``` ruby
+  guard 'process', :name => 'EndlessRunner', :command => 'rails runner Something::ThatGoesOnAndOn' do
+    watch('Gemfile.lock')
+  end
+
+  guard 'process', :name => 'AnotherRunner', :command => ['rails', 'runner', 'AnotherRunner'] do
+    watch('Gemfile.lock')
+  end
+```
+
+# Options
+The following options are available:
+
+- name
+  The display name of your process in Guard, this is shown when Guard::Process is starting and stopping your process
+- command
+  The command to run as you would run it from the command line. NOTE: You cannot string commands together like you would on the shell with ; or && because of the way guard-process launches its processes, if you need to combine several shell commands you should write a shell script and call from your command.
+- dir
+  The directory in which you want to run the command, if none is given then Ruby's current working directory is used
+- stop_signal
+  The signal that Guard::Process sends to terminate the process when it needs to stop/restart it. This defaults to 'TERM' (in some cases you may need KILL).
+- dont_stop
+  When a reload is triggered this will not stop the process, instead it will wait for the current process run to finish before starting a new one. This is useful for having guard-process execute commands that don't run constantly that you don't want to interrupt as they run.
+- env
+  A Hash with environmental variables to set for the context where your command runs, like so:
+``` ruby
+  {"SSL_CERTS_DIR" => "/etc/ssl/certs", "JAVA_HOME" => "/usr/local/java"}
+```
+
+# TODO
+
+Clean up the test cases
+
+# Changes
+
+## 1.1.0
+
+- Updated for Guard 2.x
+
+## 1.0.6
+
+- Allow passing in command as an Array as well as a String
+
+## 1.0.5
+
+- Adds the dont_stop option
+
+## 1.0.4
+
+- Adds the dir option
+
+# Development
+- Source hosted on [GitHub](https://github.com)
+- Please report issues and feature requests using [GitHub issues](https://github.com/guard/guard-process/issues)
+
+Pull requests are welcome, please make sure your patches are well tested before contributing. When sending a pull request:
+- Use a topic branch for your change
+- Add tests for your changes using MiniTest::Unit
+- Do not change the version number in the gemspec
+
+# License
+Guard::Process is released under the MIT license.
+
+# Author
+[Mark Kremer](https://github.com/mkremer)

data/Rakefile

@@ -1,9 +1,9 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-task :default => :test
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-end
-
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task :default => :test
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+end
+

data/Vagrantfile

@@ -1,13 +1,13 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.hostname = "guard"
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  config.vm.network :private_network, ip: "192.168.33.21"
-  config.vm.provision :shell, :path => "vagrant-provision"
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.hostname = "guard"
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.network :private_network, ip: "192.168.33.21"
+  config.vm.provision :shell, :path => "vagrant-provision"
+end

data/guard-process.gemspec

@@ -1,30 +1,31 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require 'rbconfig' unless defined?(RbConfig)
-
-Gem::Specification.new do |s|
-  s.name        = "guard-process"
-  s.version     = "1.0.6"
-  s.authors     = ["Mark Kremer"]
-  s.email       = ["mark@socialreferral.com"]
-  s.homepage    = ""
-  s.summary     = %q{Guard extension to run cli processes}
-  s.description = %q{Guard extension to run cli processes}
-
-  s.required_ruby_version = '>= 1.9.2'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency('guard', '>= 0.4.2')
-  s.add_dependency('spoon', '~> 0.0.1')
-  s.add_development_dependency('minitest')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('guard-minitest')
-  s.add_development_dependency('guard-bundler')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rb-inotify') if RbConfig::CONFIG['target_os'] == 'linux'
-  s.add_development_dependency('pry')
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'rbconfig' unless defined?(RbConfig)
+
+Gem::Specification.new do |s|
+  s.name        = "guard-process"
+  s.version     = "1.1.0"
+  s.authors     = ["Mark Kremer"]
+  s.email       = ["mark@without-brains.net"]
+  s.homepage    = ""
+  s.summary     = %q{Guard extension to run cli processes}
+  s.description = %q{Guard extension to run cli processes}
+
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency('guard', '>= 2.0.0')
+  s.add_dependency('guard-compat', '~> 0.1', '>= 0.1.1')
+  s.add_dependency('spoon', '~> 0.0.1')
+  s.add_development_dependency('minitest')
+  s.add_development_dependency('mocha')
+  s.add_development_dependency('guard-minitest')
+  s.add_development_dependency('guard-bundler')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rb-inotify') if RbConfig::CONFIG['target_os'] == 'linux'
+  s.add_development_dependency('pry')
+end

data/lib/guard/process.rb

@@ -1,85 +1,84 @@
-require 'guard'
-require 'guard/guard'
-require 'spoon'
-
-module Guard
-  class Process < Guard
-    def initialize(watchers = [], options = {})
-      @pid = nil
-      @command = options.fetch(:command)
-      @command = @command.split(" ") if @command.is_a?(String)
-      @env = options[:env] || {}
-      @name = options[:name]
-      @dir = options[:dir] || Dir.getwd
-      @stop_signal = options[:stop_signal] || "TERM"
-      @dont_stop = options[:dont_stop]
-      super
-    end
-
-    def wait_for_stop?
-      @dont_stop
-    end
-
-    def process_running?
-      begin
-        @pid ? ::Process.kill(0, @pid) : false
-      rescue Errno::ESRCH => e
-        false
-      end
-    end
-
-    def start
-      UI.info("Starting process #{@name}")
-      original_env = {}
-      @env.each_pair do |key, value|
-        original_env[key] = ENV[key]
-        ENV[key] = value
-      end
-      Dir.chdir(@dir) do
-        @pid = Spoon.spawnp(*@command)
-      end
-      original_env.each_pair do |key, value|
-        ENV[key] = value
-      end
-      UI.info("Started process #{@name}")
-    end
-
-    def stop
-      if @pid
-        UI.info("Stopping process #{@name}")
-        begin
-          ::Process.kill(@stop_signal, @pid)
-          ::Process.waitpid(@pid)
-        rescue Errno::ESRCH
-        end
-        @pid = nil
-        UI.info("Stopped process #{@name}")
-      end
-    end
-
-    def wait_for_stop
-      if @pid
-        UI.info("Process #{@name} is still running...")
-        ::Process.waitpid(@pid) rescue Errno::ESRCH
-        UI.info("Process #{@name} has stopped!")
-      end
-    end
-
-    def reload
-      if wait_for_stop?
-        wait_for_stop
-      else
-        stop
-      end
-      start
-    end
-
-    def run_all
-      true
-    end
-
-    def run_on_change(paths)
-      reload
-    end
-  end
-end
+require 'guard/compat/plugin'
+require 'spoon'
+
+module Guard
+  class Process < Plugin
+    def initialize(options = {})
+      @pid = nil
+      @command = options.fetch(:command)
+      @command = @command.split(" ") if @command.is_a?(String)
+      @env = options[:env] || {}
+      @name = options[:name]
+      @dir = options[:dir] || Dir.getwd
+      @stop_signal = options[:stop_signal] || "TERM"
+      @dont_stop = options[:dont_stop]
+      super
+    end
+
+    def wait_for_stop?
+      @dont_stop
+    end
+
+    def process_running?
+      begin
+        @pid ? ::Process.kill(0, @pid) : false
+      rescue Errno::ESRCH => e
+        false
+      end
+    end
+
+    def start
+      UI.info("Starting process #{@name}")
+      original_env = {}
+      @env.each_pair do |key, value|
+        original_env[key] = ENV[key]
+        ENV[key] = value
+      end
+      Dir.chdir(@dir) do
+        @pid = Spoon.spawnp(*@command)
+      end
+      original_env.each_pair do |key, value|
+        ENV[key] = value
+      end
+      UI.info("Started process #{@name}")
+    end
+
+    def stop
+      if @pid
+        UI.info("Stopping process #{@name}")
+        begin
+          ::Process.kill(@stop_signal, @pid)
+          ::Process.waitpid(@pid)
+        rescue Errno::ESRCH
+        end
+        @pid = nil
+        UI.info("Stopped process #{@name}")
+      end
+    end
+
+    def wait_for_stop
+      if @pid
+        UI.info("Process #{@name} is still running...")
+        ::Process.waitpid(@pid) rescue Errno::ESRCH
+        UI.info("Process #{@name} has stopped!")
+      end
+    end
+
+    def reload
+      if wait_for_stop?
+        wait_for_stop
+      else
+        stop
+      end
+      start
+    end
+
+    def run_all
+      true
+    end
+
+    def run_on_change(paths)
+      reload
+    end
+  end
+end

data/lib/guard/process/templates/Guardfile

@@ -1,5 +1,5 @@
-# This is an example with all options that you can specify for guard-process
-guard 'process', :name => 'name of your process', :command => 'ruby path/to/your/file.rb', :env => {"ENV1" => "value 1", "ENV2" => "value 2"}, :stop_signal => "KILL"  do
-  watch('Gemfile.lock')
-end
-
+# This is an example with all options that you can specify for guard-process
+guard 'process', :name => 'name of your process', :command => 'ruby path/to/your/file.rb', :env => {"ENV1" => "value 1", "ENV2" => "value 2"}, :stop_signal => "KILL"  do
+  watch('Gemfile.lock')
+end
+

data/test/guard/process_test.rb

@@ -1,122 +1,122 @@
-require_relative '../test_helper'
-require 'timeout'
-
-class GuardProcessTest < MiniTest::Test
-  def setup
-    ENV['GUARD_ENV'] = 'test'
-    @command = "ruby #{TEST_ROOT}/run_me.rb"
-    @name = "RunMe"
-    @options = {:command => @command, :name => @name}
-    @guard = Guard::Process.new([], @options)
-  end
-
-  def teardown
-    if @guard.process_running?
-      if @guard.wait_for_stop?
-        @guard.wait_for_stop
-      else
-        @guard.stop
-      end
-    end
-    ENV['GUARD_ENV'] = nil
-  end
-
-  def test_run_all_returns_true
-    assert @guard.run_all
-  end
-
-  def test_run_on_change_does_a_reload
-    @guard.expects(:reload)
-    @guard.run_on_change("")
-  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}")
-    @guard.start
-    assert @guard.process_running?
-    Guard::UI.expects(:info).with("Stopping process #{@name}")
-    Guard::UI.expects(:info).with("Stopped process #{@name}")
-    @guard.stop
-    refute @guard.process_running?
-  end
-
-  def test_reload_stops_and_starts_command
-    @guard.expects(:wait_for_stop).never
-    @guard.expects(:stop)
-    @guard.expects(:start).twice
-    @guard.start
-    @guard.reload
-  end
-
-  def test_reload_waits_for_command_to_finish_before_starting_again_if_dont_stop_option_set
-    @options = {:command => "ruby #{TEST_ROOT}/run_2_seconds.rb", :name => '2Seconds', :dont_stop => true}
-    @guard = Guard::Process.new([], @options)
-    @guard.expects(:wait_for_stop).at_least_once
-    @guard.expects(:stop).never
-    @guard.expects(:start).twice
-    @guard.start
-    @guard.reload
-  end
-
-  def test_start_sets_env_properly
-    ENV['VAR1'] = 'VALUE A'
-    @options[:env] = {'VAR1' => 'VALUE 1', 'VAR3' => 'VALUE 2'}
-
-    environment_file = "#{TEST_ROOT}/test_environment.txt"
-    File.delete(environment_file) if File.exists?(environment_file)
-
-    @guard = Guard::Process.new([], @options)
-    @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_changed_working_directory_if_option_dir_is_set
-    @options = {:command => 'ls', :name => 'LsProcess', :dir => TEST_ROOT}
-    Dir.expects(:chdir).with(TEST_ROOT)
-    @guard = Guard::Process.new([], @options)
-    @guard.start and @guard.stop
-  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)
-    ::Process.stubs(:waitpid).returns(true)
-
-    Spoon.expects(:spawnp).with("echo", "test", "test").returns(stub_everything)
-
-    @guard = Guard::Process.new([], @options)
-    @guard.start and @guard.stop
-  end
-
-  def test_commands_may_be_given_in_array_form
-    @options = {:command => ['echo', 'test', 'test'], :name => 'EchoProcess', :env => {"VAR1" => "VALUE 1"}}
-    ::Process.stubs(:kill).returns(true)
-    ::Process.stubs(:waitpid).returns(true)
-
-    Spoon.expects(:spawnp).with("echo", "test", "test").returns(stub_everything)
-
-    @guard = Guard::Process.new([], @options)
-    @guard.start and @guard.stop
-  end
-end
+require_relative '../test_helper'
+require 'timeout'
+
+class GuardProcessTest < MiniTest::Test
+  def setup
+    ENV['GUARD_ENV'] = 'test'
+    @command = "ruby #{TEST_ROOT}/run_me.rb"
+    @name = "RunMe"
+    @options = {:command => @command, :name => @name}
+    @guard = Guard::Process.new(@options)
+  end
+
+  def teardown
+    if @guard.process_running?
+      if @guard.wait_for_stop?
+        @guard.wait_for_stop
+      else
+        @guard.stop
+      end
+    end
+    ENV['GUARD_ENV'] = nil
+  end
+
+  def test_run_all_returns_true
+    assert @guard.run_all
+  end
+
+  def test_run_on_change_does_a_reload
+    @guard.expects(:reload)
+    @guard.run_on_change("")
+  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}")
+    @guard.start
+    assert @guard.process_running?
+    Guard::UI.expects(:info).with("Stopping process #{@name}")
+    Guard::UI.expects(:info).with("Stopped process #{@name}")
+    @guard.stop
+    refute @guard.process_running?
+  end
+
+  def test_reload_stops_and_starts_command
+    @guard.expects(:wait_for_stop).never
+    @guard.expects(:stop)
+    @guard.expects(:start).twice
+    @guard.start
+    @guard.reload
+  end
+
+  def test_reload_waits_for_command_to_finish_before_starting_again_if_dont_stop_option_set
+    @options = {:command => "ruby #{TEST_ROOT}/run_2_seconds.rb", :name => '2Seconds', :dont_stop => true}
+    @guard = Guard::Process.new(@options)
+    @guard.expects(:wait_for_stop).at_least_once
+    @guard.expects(:stop).never
+    @guard.expects(:start).twice
+    @guard.start
+    @guard.reload
+  end
+
+  def test_start_sets_env_properly
+    ENV['VAR1'] = 'VALUE A'
+    @options[:env] = {'VAR1' => 'VALUE 1', 'VAR3' => 'VALUE 2'}
+
+    environment_file = "#{TEST_ROOT}/test_environment.txt"
+    File.delete(environment_file) if File.exists?(environment_file)
+
+    @guard = Guard::Process.new(@options)
+    @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_changed_working_directory_if_option_dir_is_set
+    @options = {:command => 'ls', :name => 'LsProcess', :dir => TEST_ROOT}
+    Dir.expects(:chdir).with(TEST_ROOT)
+    @guard = Guard::Process.new(@options)
+    @guard.start and @guard.stop
+  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)
+    ::Process.stubs(:waitpid).returns(true)
+
+    Spoon.expects(:spawnp).with("echo", "test", "test").returns(stub_everything)
+
+    @guard = Guard::Process.new(@options)
+    @guard.start and @guard.stop
+  end
+
+  def test_commands_may_be_given_in_array_form
+    @options = {:command => ['echo', 'test', 'test'], :name => 'EchoProcess', :env => {"VAR1" => "VALUE 1"}}
+    ::Process.stubs(:kill).returns(true)
+    ::Process.stubs(:waitpid).returns(true)
+
+    Spoon.expects(:spawnp).with("echo", "test", "test").returns(stub_everything)
+
+    @guard = Guard::Process.new(@options)
+    @guard.start and @guard.stop
+  end
+end

data/test/run_2_seconds.rb

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
-
-puts "Running this program for 2 seconds"
-sleep 1
-puts "One more second to go!"
-sleep 1
-puts "Done!"
+#!/usr/bin/env ruby
+
+puts "Running this program for 2 seconds"
+sleep 1
+puts "One more second to go!"
+sleep 1
+puts "Done!"

data/test/run_me.rb

@@ -1,14 +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
-  sleep 1
-end
-
+#!/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
+  sleep 1
+end
+

data/test/test_helper.rb

@@ -1,6 +1,10 @@
-require 'minitest/autorun'
-require 'mocha/setup'
-require 'guard/process'
-require 'pry'
-
-TEST_ROOT = File.expand_path(File.dirname(__FILE__))
+require 'minitest/autorun'
+require 'mocha/setup'
+
+require 'guard/notifier'
+require 'guard/compat/test/helper'
+require 'guard/process'
+
+require 'pry'
+
+TEST_ROOT = File.expand_path(File.dirname(__FILE__))

data/vagrant-provision

@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get update > /dev/null
-apt-get -y install build-essential git-core ruby1.9.1-full ruby1.9.1-dev libyaml-dev libssl-dev zlib1g-dev libreadline-dev openssl libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev autoconf libc6-dev ncurses-dev automake libtool bison libffi-dev
-
-gem install bundler pry
-
-su -c 'cd /vagrant && bundle' vagrant
+#!/usr/bin/env bash
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update > /dev/null
+apt-get -y install build-essential git-core ruby1.9.1-full ruby1.9.1-dev libyaml-dev libssl-dev zlib1g-dev libreadline-dev openssl libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev autoconf libc6-dev ncurses-dev automake libtool bison libffi-dev
+
+gem install bundler pry
+
+su -c 'cd /vagrant && bundle' vagrant

metadata

@@ -1,144 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: guard-process
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Mark Kremer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15931600 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *15931600
 - !ruby/object:Gem::Dependency
-  name: spoon
-  requirement: !ruby/object:Gem::Requirement
+  name: guard-compat
+  requirement: &15931120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *15931120
+- !ruby/object:Gem::Dependency
+  name: spoon
+  requirement: &15930260 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *15930260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15929500 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15929500
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15929040 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15929040
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15928600 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15928600
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15928120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15928120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15927640 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15927640
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15927180 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15927180
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15926680 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15926680
 description: Guard extension to run cli processes
 email:
-- mark@socialreferral.com
+- mark@without-brains.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -161,25 +149,29 @@ files:
 - vagrant-provision
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3112865635849170691
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Guard extension to run cli processes
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 71f3ef6034e8422847c017d3ab4d57541f9abec0
-  data.tar.gz: 62ba22f6dae41b0c8a42d24e8604f67587b39c76
-SHA512:
-  metadata.gz: ccde9ba1a1381c736c3215c2e22589ae911ca87718522be3ffbe4f0670eecbc9f9e6da90f5277b6427720da36ff4a1edfc11d4fea0503798bda730c63cdb2d52
-  data.tar.gz: 25d7266ffc963377bad5441cc551cf98c0f2bc8874351d3b2012417b0b4a3d9db134fbca5afcabeb8de8392181f4422d8e5013e0072db5b03fd0c3075121db0f