guard-rails 0.1.1 → 0.2.0

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rake'
 gem 'fakefs', :require => nil
 gem 'guard'
 gem 'guard-rspec'
+gem 'mocha', '~> 0.12.3'
 
 require 'rbconfig'
 if RbConfig::CONFIG['target_os'] =~ /darwin/i

data/README.md

@@ -1,6 +1,4 @@
-_I'm currently looking for a new maintainer for this project._
-
-[![Build Status](http://travis-ci.org/johnbintz/guard-rails.png)](http://travis-ci.org/johnbintz/guard-rails)
+[![Build Status](https://travis-ci.org/ranmocy/guard-rails.png)](https://travis-ci.org/ranmocy/guard-rails)
 
 Want to restart your Rails development server whilst you work? Now you can!
 
@@ -19,7 +17,7 @@ Lots of fun options!
 * `:debugger` runs the server with the debugger enabled (default `false`). Required ruby-debug gem.
 * `:timeout` waits this number of seconds when restarting the Rails server before reporting there's a problem (default `20`).
 * `:server` lets you specify the webserver engine to use (try `:server => :thin`).
+* `:pid_file` specify your pid_file, so that maybe you can run multiple instances with same rails_env (default `tmp/pids/[RAILS_ENV].pid`).
+* `:zeus` support [zeus](https://github.com/burke/zeus) to boost rails init speed (default `false`).
 
-This is super-alpha, but it works for me! Only really hand-tested in Mac OS X. Feel free to fork'n'fix for other
-OSes, and to add some more real tests.
-
+Feel free to fork'n'fix for any willing.

data/guard-rails.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "guard/rails/version"
 
@@ -6,10 +5,10 @@ Gem::Specification.new do |s|
   s.name        = "guard-rails"
   s.version     = GuardRails::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["John Bintz"]
-  s.email       = ["john@coswellproductions.com"]
-  s.homepage    = ""
-  s.summary     = %q{Restart Rails when things change in your app}
+  s.authors     = ["John Bintz", "Wanzhang Sheng"]
+  s.email       = ["john@coswellproductions.com", "Ranmocy@gmail.com"]
+  s.homepage    = "https://github.com/ranmocy/guard-rails"
+  s.summary     = %q{Guard your Rails to always be there.}
   s.description = %q{Restart Rails when things change in your app}
 
   s.rubyforge_project = "guard-rails"
@@ -22,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'guard', '>= 0.2.2'
 
   s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'mocha', '~> 0.12.3'
 end

data/lib/guard/rails.rb

@@ -14,7 +14,9 @@ module Guard
         :force_run => false,
         :timeout => 30,
         :server => nil,
-        :debugger => false
+        :debugger => false,
+        :pid_file => nil,
+        :zeus => false,
       }
 
     def initialize(watchers = [], options = {})

data/lib/guard/rails/runner.rb

@@ -18,8 +18,12 @@ module Guard
 
     def stop
       if File.file?(pid_file)
-        system %{kill -SIGINT #{File.read(pid_file).strip}}
+        pid = File.read(pid_file).strip
+        system %{kill -SIGINT #{pid}}
         wait_for_no_pid if $?.exitstatus == 0
+
+        # If you lost your pid_file, you are already died.
+        system %{kill -KILL #{pid} > /dev/null 2>&1}
         FileUtils.rm pid_file, :force => true
       end
     end
@@ -33,18 +37,19 @@ module Guard
       rails_options = [
         '-e', options[:environment],
         '-p', options[:port],
-        '--pid', pid_file
+        '--pid', pid_file,
+        options[:daemon] ? '-d' : '',
+        options[:debugger] ? '-u' : '',
+        options[:server].nil? ? '' : options[:server],
       ]
 
-      rails_options << '-d' if options[:daemon]
-      rails_options << '-u' if options[:debugger]
-      rails_options << options[:server] if options[:server]
+      rails_runner = options[:zeus] ? 'zeus' : 'rails'
 
-      %{sh -c 'cd #{Dir.pwd} && RAILS_ENV=#{options[:environment]} rails s #{rails_options.join(' ')} &'}
+      %{sh -c 'cd #{Dir.pwd} && RAILS_ENV=#{options[:environment]} #{rails_runner} s #{rails_options.join(' ')} &'}
     end
 
     def pid_file
-      File.expand_path("tmp/pids/#{options[:environment]}.pid")
+      File.expand_path(options[:pid_file] || "tmp/pids/#{options[:environment]}.pid")
     end
 
     def pid

data/lib/guard/rails/version.rb

@@ -1,4 +1,4 @@
 module GuardRails
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end
 

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

@@ -6,10 +6,10 @@ describe Guard::RailsRunner do
   let(:runner) { Guard::RailsRunner.new(options) }
   let(:environment) { 'development' }
   let(:port) { 3000 }
-  
+
   let(:default_options) { { :environment => environment, :port => port } }
   let(:options) { default_options }
-  
+
   describe '#pid' do
     include FakeFS::SpecHelpers
 
@@ -47,7 +47,7 @@ describe Guard::RailsRunner do
         runner.build_rails_command.should match(%r{ -d})
       end
     end
-    
+
     context 'debugger' do
       let(:options) { default_options.merge(:debugger => true) }
 
@@ -63,6 +63,23 @@ describe Guard::RailsRunner do
         runner.build_rails_command.should match(%r{thin})
       end
     end
+
+    context "no pid_file" do
+      it "should use default pid_file" do
+        pid_file_path = File.expand_path "tmp/pids/development.pid"
+        runner.build_rails_command.should match(%r{ --pid #{pid_file_path}})
+      end
+    end
+
+    context "custom pid_file" do
+      let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
+      let(:options) { default_options.merge(:pid_file => custom_pid_file) }
+
+      it "should use custom pid_file" do
+        pid_file_path = File.expand_path custom_pid_file
+        runner.build_rails_command.should match(%r{ --pid #{pid_file_path}})
+      end
+    end
   end
 
   describe '#start' do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'mocha'
+require 'mocha_standalone'
 
 RSpec.configure do |c|
   c.mock_with :mocha

metadata

@@ -1,67 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
 - John Bintz
+- Wanzhang Sheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: mocha
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.3
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.3
+    none: false
 description: Restart Rails when things change in your app
 email:
 - john@coswellproductions.com
+- Ranmocy@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,36 +83,30 @@ files:
 - spec/lib/guard/rails/runner_spec.rb
 - spec/lib/guard/rails_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/ranmocy/guard-rails
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1845982293298969643
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1845982293298969643
+  none: false
 requirements: []
 rubyforge_project: guard-rails
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Restart Rails when things change in your app
+summary: Guard your Rails to always be there.
 test_files:
 - spec/lib/guard/rails/runner_spec.rb
 - spec/lib/guard/rails_spec.rb