guard-rails 0.3.0 → 0.3.1

data/Rakefile

@@ -5,9 +5,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 require 'rake/version_task'
-Rake::VersionTask.new do |task|
-  task.with_git_tag = true
-end
+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"
@@ -16,9 +14,8 @@ RVM_PREFIX = "rvm 1.8.7@guard-rails,1.9.3-p327@guard-rails,2.0.0@guard-rails do"
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    system %{#{RVM_PREFIX} bundle}
-    system %{#{RVM_PREFIX} bundle exec rake spec}
-    exit $?.exitstatus if $?.exitstatus != 0
+    exit $?.exitstatus unless system "#{RVM_PREFIX} bundle install"
+    exit $?.exitstatus unless system "#{RVM_PREFIX} bundle exec rake spec"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/guard/rails/runner.rb

@@ -34,15 +34,15 @@ module Guard
     end
 
     def build_rails_command
-      return %{sh -c 'cd #{Dir.pwd} && #{options[:CLI]} --pid #{pid_file} &'} if options[:CLI]
+      return %{#{options[:CLI]} --pid #{pid_file}} if options[:CLI]
 
       rails_options = [
-        options[:daemon] && '-d',
-        options[:debugger] && '-u',
+        options[:daemon] ? '-d' : nil,
+        options[:debugger] ? '-u' : nil,
         '-e', options[:environment],
         '--pid', pid_file,
         '-p', options[:port],
-        options[:server] || '',
+        options[:server],
       ]
 
       zeus_options = [
@@ -52,7 +52,7 @@ module Guard
       # omit env when use zeus
       rails_runner = options[:zeus] ? "zeus #{zeus_options.join(' ')}" : "RAILS_ENV=#{options[:environment]} rails server"
 
-      %{sh -c 'cd #{Dir.pwd} && #{rails_runner} #{rails_options.join(' ')} &'}
+      %{#{rails_runner} #{rails_options.join(' ')}}
     end
 
     def pid_file
@@ -69,7 +69,7 @@ module Guard
 
     private
     def run_rails_command!
-      system build_rails_command
+      system "sh -c '#{build_rails_command}'"
     end
 
     def has_pid?

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

@@ -38,14 +38,14 @@ describe Guard::RailsRunner 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_rails_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_rails_command.should match(%r{#{custom_cli} --pid #{pid_file_path}})
       end
     end
 
@@ -111,20 +111,27 @@ describe Guard::RailsRunner do
     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_rails_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_rails_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})
+          end
         end
       end
     end
 
     context "zeus disabled" do
       it "should not have zeus in command" do
-        runner.build_rails_command.should_not match(%r{ zeus server })
+        runner.build_rails_command.should_not match(%r{zeus server })
       end
 
       let(:options) { default_options.merge(:zeus_plan => 'test_server') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2850314987821883862
+      hash: -2667544480743711932
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2850314987821883862
+      hash: -2667544480743711932
 requirements: []
 rubyforge_project: guard-rails
 rubygems_version: 1.8.23