guard-rails 0.3.4 → 0.4.0

data/.gitignore

@@ -1,6 +1,9 @@
-*.gem
-.bundle
+.rvmrc
+.rspec
 Gemfile.lock
+
+*.gem
+
+.bundle/
 pkg/*
-.rvmrc
-tmp/
+tmp/

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - ree
   - 2.0.0
+  - ree
+  - jruby
 script: "bundle exec rake spec"

data/Gemfile

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

data/README.md

@@ -5,12 +5,29 @@
 [![Dependency Status](https://gemnasium.com/ranmocy/guard-rails.png)](https://gemnasium.com/ranmocy/guard-rails)
 [![Code Climate](https://codeclimate.com/github/ranmocy/guard-rails.png)](https://codeclimate.com/github/ranmocy/guard-rails)
 
-## Want to restart your Rails development server whilst you work? Now you can!
+## Main repository
+Currently, the official fork repository is at [ranmocy/guard-rails](http://github.com/ranmocy/guard-rails).
+Please, come here and communicate with me.
 
-    guard 'rails', :port => 5000 do
-      watch('Gemfile.lock')
-      watch(%r{^(config|lib)/.*})
-    end
+## Install
+
+Please make sure to have [Guard](https://github.com/guard/guard) installed before continue.
+
+Add Guard::Rails to your `Gemfile`:
+
+```ruby
+group :development do
+  gem 'guard-rails'
+end
+```
+
+Add the default Guard::Rails template to your `Guardfile` by running:
+
+```bash
+$ guard init rails
+```
+
+Now I can automatically restart your Rails development server as your files changed!
 
 ## Lots of fun options growing!
 
@@ -20,6 +37,7 @@
 * `:force_run` kills any process that's holding the listen port before attempting to (re)start Rails (**default `false`**)
 * `:pid_file` specify your pid\_file (**default `tmp/pids/[RAILS_ENV].pid`**)
 * `:port` is the server port number (**default `3000`**)
+* `:root` lets you specify the Rails root, i.e. for using guard-rails to run a dummy app within an engine (try `:root => '/spec/dummy'`).
 * `:server` the webserver engine to use (**try `:server => :thin`**)
 * `:start_on_start` will start the server when starting Guard (**default `true`**)
 * `:timeout` waits when restarting the Rails server, in seconds (**default `30`**).
@@ -32,12 +50,15 @@
 * **Multiple instances** use `pid_file` option to run multiple instances with same rails\_env
 
 ## Contribute
-Feel free to fork'n'fix for any willing.
 
-Or
+The best choise to contact me is the Issues and Pull Request system on GitHub.
+Currently the official fork repository is at [ranmocy/guard-rails](http://github.com/ranmocy/guard-rails).
 
-Tell.me in: any.way
+Please, post your issue or pull request there.
+And I will be there as your call.
 
 ## Philosophy
 
+* **All Platforms** MRI is the main test case. But will be tested under REE and JRuby.
+* **Live in edge** I am tested under Ruby 1.8.7, 1.9.3, 2.0.0 with newest gems. Will be rewrited to fit Ruby 2.0.0 when I am released as version 1.0.0.
 * [Semantic Version](http://semver.org/)

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/version_task'
 Rake::VersionTask.new
 
 include Rake::DSL if defined?(Rake::DSL)
-RVM_PREFIX = "rvm 1.8.7@guard-rails,1.9.3-p327@guard-rails,2.0.0@guard-rails do"
+RVM_PREFIX = "rvm 1.8.7,1.9.3-p327,2.0.0 do"
 
 
 namespace :spec do

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/lib/guard/rails.rb

@@ -33,15 +33,14 @@ module Guard
     end
 
     def start
-      server = options[:server] ? "#{options[:server]} and " : ""
-      UI.info "Guard::Rails will now restart your app on port #{options[:port]} using #{server}#{options[:environment]} environment."
+      UI.info "[Guard::Rails] will restart #{options[:server]} on port #{options[:port]} in #{options[:environment]}."
       reload("start") if options[:start_on_start]
     end
 
     def reload(action = "restart")
-      action_cap = action.capitalize
-      UI.info "#{action_cap}ing Rails..."
-      Notifier.notify("Rails #{action}ing on port #{options[:port]} in #{options[:environment]} environment...", :title => "#{action_cap}ing Rails...", :image => :pending)
+      title = "#{action.capitalize}ing Rails..."
+      UI.info title
+      Notifier.notify("Rails #{action}ing on port #{options[:port]} in #{options[:environment]}...", :title => title, :image => :pending)
       if runner.restart
         UI.info "Rails #{action}ed, pid #{runner.pid}"
         Notifier.notify("Rails #{action}ed on port #{options[:port]}.", :title => "Rails #{action}ed!", :image => :success)

data/lib/guard/rails/runner.rb

@@ -7,8 +7,8 @@ module Guard
     attr_reader :options
 
     def initialize(options)
-      @env     = ENV
       @options = options
+      @root = options[:root] ? File.expand_path(options[:root]) : Dir.pwd
     end
 
     def start
@@ -20,11 +20,11 @@ module Guard
     def stop
       if File.file?(pid_file)
         pid = File.read(pid_file).strip
-        system %{kill -SIGINT #{pid}}
+        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} >&2 2>/dev/null}
+        system "kill -KILL #{pid} >&2 2>/dev/null"
         FileUtils.rm pid_file, :force => true
       end
     end
@@ -34,9 +34,29 @@ module Guard
       start
     end
 
-    def build_rails_command
-      return %{#{options[:CLI]} --pid #{pid_file}} if options[:CLI]
+    def build_command
+      command = build_cli_command if options[:CLI]
+      command ||= build_zeus_command if options[:zeus]
+      command ||= build_rails_command
+      "sh -c 'cd #{@root} && #{command} &'"
+    end
+
+    def pid_file
+      File.expand_path(options[:pid_file] || File.join(@root, "tmp/pids/#{options[:environment]}.pid"))
+    end
+
+    def pid
+      File.file?(pid_file) ? File.read(pid_file).to_i : nil
+    end
 
+    def sleep_time
+      options[:timeout].to_f / MAX_WAIT_COUNT.to_f
+    end
+
+    private
+
+    # command builders
+    def build_options
       rails_options = [
         options[:daemon] ? '-d' : nil,
         options[:debugger] ? '-u' : nil,
@@ -46,32 +66,31 @@ module Guard
         options[:server],
       ]
 
-      zeus_options = [
-        options[:zeus_plan] || 'server',
-      ]
-
-      # omit env when use zeus
-      @env['RAILS_ENV'] = options[:environment] if options[:environment] && options[:zeus].nil?
-      rails_runner = options[:zeus] ? "zeus #{zeus_options.join(' ')}" : "rails server"
-
-      %{#{rails_runner} #{rails_options.join(' ')}}
+      rails_options.join(' ')
     end
 
-    def pid_file
-      File.expand_path(options[:pid_file] || "tmp/pids/#{options[:environment]}.pid")
+    def build_cli_command
+      "#{options[:CLI]} --pid #{pid_file}"
     end
 
-    def pid
-      File.file?(pid_file) ? File.read(pid_file).to_i : nil
+    def build_zeus_command
+      zeus_options = [
+        options[:zeus_plan] || 'server',
+      ]
+
+      # To avoid warning of Zeus
+      # Since setup RAILS_ENV is useless for Zeus
+      ENV['RAILS_ENV'] = nil
+      "zeus #{zeus_options.join(' ')} #{build_options}"
     end
 
-    def sleep_time
-      options[:timeout].to_f / MAX_WAIT_COUNT.to_f
+    def build_rails_command
+      ENV['RAILS_ENV'] = options[:environment] if options[:environment]
+      "rails server #{build_options}"
     end
 
-    private
     def run_rails_command!
-      Process.spawn @env, build_rails_command
+      system build_command
     end
 
     def has_pid?
@@ -84,14 +103,15 @@ module Guard
 
     def kill_unmanaged_pid!
       if pid = unmanaged_pid
-        system %{kill -KILL #{pid}}
+        system "kill -KILL #{pid}"
         FileUtils.rm pid_file
         wait_for_no_pid
       end
     end
 
     def unmanaged_pid
-      %x{lsof -n -i TCP:#{options[:port]}}.each_line { |line|
+      file_list = `lsof -n -i TCP:#{options[:port]}`
+      file_list.each_line { |line|
         if line["*:#{options[:port]} "]
           return line.split("\s")[1]
         end
@@ -100,6 +120,7 @@ module Guard
     end
 
     private
+
     def wait_for_pid
       wait_for_pid_loop
     end
@@ -118,4 +139,3 @@ module Guard
     end
   end
 end
-

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

@@ -31,47 +31,62 @@ describe Guard::RailsRunner do
         runner.pid.should be_nil
       end
     end
+
+    context 'custom rails root given' do
+      let(:options) { default_options.merge(:root => 'spec/dummy') }
+      let(:pid) { 12345 }
+
+      before do
+        FileUtils.mkdir_p File.split(runner.pid_file).first
+        File.open(runner.pid_file, 'w') { |fh| fh.print pid }
+      end
+
+      it "should point to the right pid file" do
+        runner.pid_file.should match %r{spec/dummy/tmp/pids/development.pid}
+      end
+    end
+
   end
 
-  describe '#build_rails_command' do
+  describe '#build_command' do
     context "CLI" do
       let(:custom_cli) { 'custom_CLI_command' }
       let(:options) { default_options.merge(:CLI => custom_cli) }
       it "should have only custom CLI" do
-        runner.build_rails_command.should match(%r{#{custom_cli} --pid })
+        runner.build_command.should match(%r{#{custom_cli} --pid })
       end
 
       let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
       let(:options) { default_options.merge(:CLI => custom_cli, :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{#{custom_cli} --pid #{pid_file_path}})
+        runner.build_command.should match(%r{#{custom_cli} --pid #{pid_file_path}})
       end
     end
 
     context "daemon" do
       it "should should not have daemon switch" do
-        runner.build_rails_command.should_not match(%r{ -d})
+        runner.build_command.should_not match(%r{ -d})
       end
     end
 
     context "no daemon" do
       let(:options) { default_options.merge(:daemon => true) }
       it "should have a daemon switch" do
-        runner.build_rails_command.should match(%r{ -d})
+        runner.build_command.should match(%r{ -d})
       end
     end
 
     context "development" do
       it "should have environment switch to development" do
-        runner.build_rails_command.should match(%r{ -e development})
+        runner.build_command.should match(%r{ -e development})
       end
     end
 
     context "test" do
       let(:options) { default_options.merge(:environment => 'test') }
       it "should have environment switch to test" do
-        runner.build_rails_command.should match(%r{ -e test})
+        runner.build_command.should match(%r{ -e test})
       end
     end
 
@@ -79,7 +94,7 @@ describe Guard::RailsRunner do
       let(:options) { default_options.merge(:debugger => true) }
 
       it "should have a debugger switch" do
-        runner.build_rails_command.should match(%r{ -u})
+        runner.build_command.should match(%r{ -u})
       end
     end
 
@@ -87,14 +102,14 @@ describe Guard::RailsRunner do
       let(:options) { default_options.merge(:server => 'thin') }
 
       it "should have the server name" do
-        runner.build_rails_command.should match(%r{thin})
+        runner.build_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}})
+        runner.build_command.should match(%r{ --pid #{pid_file_path}})
       end
     end
 
@@ -104,26 +119,26 @@ describe Guard::RailsRunner do
 
       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}})
+        runner.build_command.should match(%r{ --pid #{pid_file_path}})
       end
     end
 
     context "zeus enabled" do
       let(:options) { default_options.merge(:zeus => true) }
       it "should have zeus in command" do
-        runner.build_rails_command.should match(%r{zeus server })
+        runner.build_command.should match(%r{zeus server })
       end
 
       context "custom zeus plan" do
         let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server') }
         it "should use custom zeus plan" do
-          runner.build_rails_command.should match(%r{zeus test_server})
+          runner.build_command.should match(%r{zeus test_server})
         end
 
         context "custom server" do
           let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server', :server => 'thin') }
           it "should use custom server" do
-            runner.build_rails_command.should match(%r{zeus test_server .* thin})
+            runner.build_command.should match(%r{zeus test_server .* thin})
           end
         end
       end
@@ -131,12 +146,20 @@ describe Guard::RailsRunner do
 
     context "zeus disabled" do
       it "should not have zeus in command" do
-        runner.build_rails_command.should_not match(%r{zeus server })
+        runner.build_command.should_not match(%r{zeus server })
       end
 
       let(:options) { default_options.merge(:zeus_plan => 'test_server') }
       it "should have no effect of command" do
-        runner.build_rails_command.should_not match(%r{test_server})
+        runner.build_command.should_not match(%r{test_server})
+      end
+    end
+
+    context 'custom rails root' do
+      let(:options) { default_options.merge(:root => 'spec/dummy') }
+
+      it "should have a cd with the custom rails root" do
+        runner.build_command.should match(%r{cd .*/spec/dummy &&})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,72 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: guard
   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
+  prerelease: false
   name: rspec
   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
+  prerelease: false
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: version
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    none: false
 description: Restart Rails when things change in your app
 email:
 - john@coswellproductions.com
@@ -106,26 +106,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1932031982324360863
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: '0'
+      hash: -3396796811439526258
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1932031982324360863
+      version: '0'
+      hash: -3396796811439526258
+  none: false
 requirements: []
 rubyforge_project: guard-rails
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Guard your Rails to always be there.