Merge pull request #24 from guard/update_project

minor updates to project (while testing)

Author: e2

.travis.yml

@@ -1,3 +1,5 @@
+bundler_args: --without development
+
 notifications:
   recipients:
     - mark@socialreferral.com
@@ -7,4 +9,6 @@ rvm:
   - 2.0.0
   - 2.1.4
   - jruby-19mode
-script: "bundle exec rake test"
+
+# Use Travis AUFS containers
+sudo: false

Gemfile

@@ -1,4 +1,20 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in guard-process.gemspec
-gemspec
+gemspec development_group: :gem_build_tools
+
+group :gem_build_tools do
+  gem 'rake' # for creating releases
+end
+
+# Note: this is the only group ignored on Travis
+group :development do
+  gem 'guard-minitest', '~> 2.4', require: false
+  gem 'guard-bundler', require: false
+  gem 'pry'
+end
+
+group :test do
+  gem 'minitest', require: false
+  gem 'mocha', require: false
+end

Rakefile

@@ -6,4 +6,3 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
 end
-

guard-process.gemspec

@@ -18,14 +18,8 @@ Gem::Specification.new do |s|
   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', '~> 1.0')
+  s.add_dependency('guard-compat', '~> 1.2', '>= 1.2.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')
+
+  s.add_development_dependency('bundler')
 end

test/guard/process_test.rb

@@ -3,22 +3,17 @@
 
 class GuardProcessTest < MiniTest::Test
   def setup
-    ENV['GUARD_ENV'] = 'test'
+    Guard::UI.stubs(:info)
     @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
+    return unless @guard.process_running?
+
+    @guard.wait_for_stop? ?  @guard.wait_for_stop : @guard.stop
   end
 
   def test_run_all_returns_true

test/test_helper.rb

@@ -1,10 +1,9 @@
 require 'minitest/autorun'
 require 'mocha/setup'
 
-require 'guard/notifier'
 require 'guard/compat/test/helper'
 require 'guard/process'
 
-require 'pry'
+require 'pry' unless ENV['CI'] == 'true'
 
 TEST_ROOT = File.expand_path(File.dirname(__FILE__))