guard-rails 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+script: "bundle exec rake spec"

data/Gemfile

@@ -2,12 +2,18 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in guard-rails.gemspec
 gemspec
-gem 'rake', '0.8.7'
+gem 'rake'
 gem 'fakefs', :require => nil
 gem 'guard'
 gem 'guard-rspec'
 
-# TODO: make this more OS-independent...like the rest of the gem
-gem 'growl'
-gem 'rb-fsevent'
+require 'rbconfig'
+if Config::CONFIG['target_os'] =~ /darwin/i
+  gem 'rb-fsevent', '>= 0.3.9'
+  gem 'growl', '~> 1.0.3'
+end
+if Config::CONFIG['target_os'] =~ /linux/i
+  gem 'rb-inotify', '>= 0.5.1'
+  gem 'libnotify', '~> 0.1.3'
+end
 

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](http://travis-ci.org/johnbintz/guard-rails.png)](http://travis-ci.org/johnbintz/guard-rails)
+
 Want to restart your Rails development server whilst you work? Now you can!
 
     guard 'rails', :port => 5000 do

data/Rakefile

@@ -1,24 +1,25 @@
+include Rake::DSL if defined?(Rake::DSL)
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
+
+desc 'Push everywhere!'
+task :push_everywhere do
+  system %{git push origin master}
+  system %{git push guard master}
+end
+
+RSpec::Core::RakeTask.new(:spec)
 
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    current = %x{rvm-prompt v}
-    
-    fail = false
-    %w{1.8.7 1.9.2 ree}.each do |version|
-      puts "Switching to #{version}"
-      system %{rvm #{version}}
-      system %{bundle exec rspec spec}
-      if $?.exitstatus != 0
-        fail = true
-        break
-      end
-    end
-
-    system %{rvm #{current}}
-
-    exit (fail ? 1 : 0)
+    prefix = "rvm 1.8.7,1.9.2,ree ruby"
+    system %{#{prefix} bundle}
+    system %{#{prefix} bundle exec rake spec}
+    exit $?.exitstatus
   end
 end
+
+task :default => 'spec:platforms'

data/lib/guard/rails.rb

@@ -12,7 +12,8 @@ module Guard
         :environment => 'development',
         :start_on_start => true,
         :force_run => false,
-        :timeout => 20
+        :timeout => 20,
+        :server => nil
       }
 
     def initialize(watchers = [], options = {})
@@ -23,7 +24,8 @@ module Guard
     end
 
     def start
-      UI.info "Guard::Rails will now restart your app on port #{options[:port]} using #{options[:environment]} environment."
+      server = options[:server] ? "#{options[:server]} and " : ""
+      UI.info "Guard::Rails will now restart your app on port #{options[:port]} using #{server}#{options[:environment]} environment."
       run_all if options[:start_on_start]
     end
 
@@ -35,7 +37,7 @@ module Guard
         Notifier.notify("Rails restarted on port #{options[:port]}.", :title => "Rails restarted!", :image => :success)
       else
         UI.info "Rails NOT restarted, check your log files."
-        Notifier.notify("Rails NOT restarted, check your log files.", :title => "Rails NOT restarted!", :image => :failure)
+        Notifier.notify("Rails NOT restarted, check your log files.", :title => "Rails NOT restarted!", :image => :failed)
       end
     end
 

data/lib/guard/rails/runner.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Guard
   class RailsRunner
     MAX_WAIT_COUNT = 10
@@ -11,17 +13,14 @@ module Guard
     def start
       kill_unmanaged_pid! if options[:force_run]
       run_rails_command!
-      count = 0
-      while !has_pid? && count < MAX_WAIT_COUNT
-        wait_for_pid_action
-        count += 1
-      end
-      !(count == MAX_WAIT_COUNT)
+      wait_for_pid
     end
 
     def stop
       if File.file?(pid_file)
-        system %{kill -INT #{File.read(pid_file).strip}}
+        system %{kill -KILL #{File.read(pid_file).strip}}
+        wait_for_no_pid if $?.exitstatus == 0
+        FileUtils.rm pid_file
       end
     end
     
@@ -38,6 +37,7 @@ module Guard
       ]
 
       rails_options << '-d' if options[:daemon]
+      rails_options << options[:server] if options[:server]
 
       %{sh -c 'cd #{Dir.pwd} && rails s #{rails_options.join(' ')} &'}
     end
@@ -69,20 +69,38 @@ module Guard
 
     def kill_unmanaged_pid!
       if pid = unmanaged_pid
-        system %{kill -INT #{pid}}
+        system %{kill -KILL #{pid}}
+        FileUtils.rm pid_file
+        wait_for_no_pid
       end
     end
 
     def unmanaged_pid
-      if RbConfig::CONFIG['host_os'] =~ /darwin/
-        %x{lsof -P}.each_line { |line|
-          if line["*:#{options[:port]} "]
-            return line.split("\s")[1]
-          end
-        }
-      end
+      %x{lsof -n -i TCP:#{options[:port]}}.each_line { |line|
+        if line["*:#{options[:port]} "]
+          return line.split("\s")[1]
+        end
+      }
       nil
     end
+
+    private
+    def wait_for_pid
+      wait_for_pid_loop
+    end
+
+    def wait_for_no_pid
+      wait_for_pid_loop(false)
+    end
+
+    def wait_for_pid_loop(check_for_existince = true)
+      count = 0
+      while !(check_for_existince ? has_pid? : !has_pid?) && count < MAX_WAIT_COUNT
+        wait_for_pid_action
+        count += 1
+      end
+      !(count == MAX_WAIT_COUNT)
+    end
   end
 end
 

data/lib/guard/rails/version.rb

@@ -1,4 +1,4 @@
 module GuardRails
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 

data/spec/lib/guard/rails/runner_spec.rb

@@ -46,6 +46,14 @@ describe Guard::RailsRunner do
         runner.build_rails_command.should match(%r{ -d})
       end
     end
+
+    context 'custom server' do
+      let(:options) { default_options.merge(:server => 'thin') }
+
+      it "should have the server name" do
+        runner.build_rails_command.should match(%r{thin})
+      end
+    end
   end
 
   describe '#start' do

data/spec/lib/guard/rails_spec.rb

@@ -41,7 +41,7 @@ describe Guard::Rails do
 
     before do
       Guard::UI.expects(:info).with('Restarting Rails...')
-      Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarting/), anything)
+      Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarting/), has_entry(:image => :pending))
       Guard::RailsRunner.any_instance.stubs(:pid).returns(pid)
     end
 
@@ -54,7 +54,7 @@ describe Guard::Rails do
 
       it "should restart and show the pid file" do
         Guard::UI.expects(:info).with(regexp_matches(/#{pid}/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarted/), anything)
+        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarted/), has_entry(:image => :success))
 
         guard.run_all
       end
@@ -68,7 +68,7 @@ describe Guard::Rails do
       it "should restart and show the pid file" do
         Guard::UI.expects(:info).with(regexp_matches(/#{pid}/)).never
         Guard::UI.expects(:info).with(regexp_matches(/Rails NOT restarted/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails NOT restarted/), anything)
+        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails NOT restarted/), has_entry(:image => :failed))
 
         guard.run_all
       end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-rails
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.0.2
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - John Bintz
@@ -10,41 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -04:00
+date: 2011-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 description: Restart Rails when things change in your app
 email: 
@@ -57,6 +75,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md
@@ -84,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1829971580643100829
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -93,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1829971580643100829
+      hash: 3
       segments: 
       - 0
       version: "0"