guard-rails 0.0.3 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/Gemfile

@@ -8,11 +8,11 @@ gem 'guard'
 gem 'guard-rspec'
 
 require 'rbconfig'
-if Config::CONFIG['target_os'] =~ /darwin/i
+if RbConfig::CONFIG['target_os'] =~ /darwin/i
   gem 'rb-fsevent', '>= 0.3.9'
   gem 'growl', '~> 1.0.3'
 end
-if Config::CONFIG['target_os'] =~ /linux/i
+if RbConfig::CONFIG['target_os'] =~ /linux/i
   gem 'rb-inotify', '>= 0.5.1'
   gem 'libnotify', '~> 0.1.3'
 end

data/README.md

@@ -14,7 +14,9 @@ Lots of fun options!
 * `:start_on_start` will start the server when starting Guard (default `true`)
 * `:force_run` kills any process that's holding open the listen port before attempting to (re)start Rails (default `false`).
 * `:daemon` runs the server as a daemon, without any output to the terminal that ran `guard` (default `false`).
+* `: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`).
 
 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.

data/Rakefile

@@ -15,10 +15,10 @@ RSpec::Core::RakeTask.new(:spec)
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    prefix = "rvm 1.8.7,1.9.2,ree ruby"
+    prefix = "rvm 1.8.7,1.9.2,ree,1.9.3 do"
     system %{#{prefix} bundle}
     system %{#{prefix} bundle exec rake spec}
-    exit $?.exitstatus
+    exit $?.exitstatus if $?.exitstatus != 0
   end
 end
 

data/lib/guard/rails.rb

@@ -12,8 +12,9 @@ module Guard
         :environment => 'development',
         :start_on_start => true,
         :force_run => false,
-        :timeout => 20,
-        :server => nil
+        :timeout => 30,
+        :server => nil,
+        :debugger => false
       }
 
     def initialize(watchers = [], options = {})
@@ -26,18 +27,19 @@ module Guard
     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."
-      run_all if options[:start_on_start]
+      reload("start") if options[:start_on_start]
     end
 
-    def run_all
-      UI.info "Restarting Rails..."
-      Notifier.notify("Rails restarting on port #{options[:port]} in #{options[:environment]} environment...", :title => "Restarting Rails...", :image => :pending)
+    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)
       if runner.restart
-        UI.info "Rails restarted, pid #{runner.pid}"
-        Notifier.notify("Rails restarted on port #{options[:port]}.", :title => "Rails restarted!", :image => :success)
+        UI.info "Rails #{action}ed, pid #{runner.pid}"
+        Notifier.notify("Rails #{action}ed on port #{options[:port]}.", :title => "Rails #{action}ed!", :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 => :failed)
+        UI.info "Rails NOT #{action}ed, check your log files."
+        Notifier.notify("Rails NOT #{action}ed, check your log files.", :title => "Rails NOT #{action}ed!", :image => :failed)
       end
     end
 
@@ -47,7 +49,7 @@ module Guard
     end
 
     def run_on_change(paths)
-      run_all
+      reload
     end
   end
 end

data/lib/guard/rails/runner.rb

@@ -23,7 +23,7 @@ module Guard
         FileUtils.rm pid_file
       end
     end
-    
+
     def restart
       stop
       start
@@ -37,6 +37,7 @@ module Guard
       ]
 
       rails_options << '-d' if options[:daemon]
+      rails_options << '-u' if options[:debugger]
       rails_options << options[:server] if options[:server]
 
       %{sh -c 'cd #{Dir.pwd} && rails s #{rails_options.join(' ')} &'}

data/lib/guard/rails/version.rb

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

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

@@ -17,6 +17,7 @@ describe Guard::RailsRunner do
       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
 
@@ -46,6 +47,14 @@ describe Guard::RailsRunner do
         runner.build_rails_command.should match(%r{ -d})
       end
     end
+    
+    context 'debugger' do
+      let(:options) { default_options.merge(:debugger => true) }
+
+      it "should have a debugger switch" do
+        runner.build_rails_command.should match(%r{ -u})
+      end
+    end
 
     context 'custom server' do
       let(:options) { default_options.merge(:server => 'thin') }

data/spec/lib/guard/rails_spec.rb

@@ -19,7 +19,7 @@ describe Guard::Rails do
 
     context 'start on start' do
       it "should show the right message and run startup" do
-        guard.expects(:run_all).once
+        guard.expects(:reload).once
         ui_expectation
         guard.start
       end
@@ -29,52 +29,73 @@ describe Guard::Rails do
       let(:options) { { :start_on_start => false } }
 
       it "should show the right message and not run startup" do
-        guard.expects(:run_all).never
+        guard.expects(:reload).never
         ui_expectation
         guard.start
       end
     end
   end
 
-  describe '#run_all' do
+  describe '#reload' do
     let(:pid) { '12345' }
 
     before do
-      Guard::UI.expects(:info).with('Restarting Rails...')
-      Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarting/), has_entry(:image => :pending))
       Guard::RailsRunner.any_instance.stubs(:pid).returns(pid)
     end
 
     let(:runner_stub) { Guard::RailsRunner.any_instance.stubs(:restart) }
 
-    context 'with pid file' do
+    context 'at start' do
       before do
+        Guard::UI.expects(:info).with('Starting Rails...')
+        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails starting/), has_entry(:image => :pending))
         runner_stub.returns(true)
       end
 
-      it "should restart and show the pid file" do
+      it "should start and show the pid file" do
         Guard::UI.expects(:info).with(regexp_matches(/#{pid}/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarted/), has_entry(:image => :success))
+        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails started/), has_entry(:image => :success))
 
-        guard.run_all
+        guard.reload("start")
       end
     end
 
-    context 'no pid file' do
+    context 'after start' do
       before do
-        runner_stub.returns(false)
+        Guard::RailsRunner.any_instance.stubs(:pid).returns(pid)
+        Guard::UI.expects(:info).with('Restarting Rails...')
+        Guard::Notifier.expects(:notify).with(regexp_matches(/Rails restarting/), has_entry(:image => :pending))
       end
 
-      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/), has_entry(:image => :failed))
+      context 'with pid file' do
+        before do
+          runner_stub.returns(true)
+        end
 
-        guard.run_all
+        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/), has_entry(:image => :success))
+
+          guard.reload
+        end
+      end
+
+      context 'no pid file' do
+        before do
+          runner_stub.returns(false)
+        end
+
+        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/), has_entry(:image => :failed))
+
+          guard.reload
+        end
       end
     end
   end
-  
+
   describe '#stop' do
     it "should stop correctly" do
       Guard::Notifier.expects(:notify).with('Until next time...', anything)
@@ -83,8 +104,8 @@ describe Guard::Rails do
   end
 
   describe '#run_on_change' do
-    it "should run on change" do
-      guard.expects(:run_all).once
+    it "should reload on change" do
+      guard.expects(:reload).once
       guard.run_on_change([])
     end
   end

metadata

@@ -1,79 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard-rails
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - John Bintz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-04 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155769020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2155769020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155768300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2155768300
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2155767740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2155767740
 description: Restart Rails when things change in your app
-email: 
+email:
 - john@coswellproductions.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -89,41 +66,37 @@ files:
 - spec/lib/guard/rails/runner_spec.rb
 - spec/lib/guard/rails_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -954311980352509128
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -954311980352509128
 requirements: []
-
 rubyforge_project: guard-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Restart Rails when things change in your app
-test_files: 
+test_files:
 - spec/lib/guard/rails/runner_spec.rb
 - spec/lib/guard/rails_spec.rb
 - spec/spec_helper.rb