guard-rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c12d743c819d791cc2c585024b300e5118392ac
-  data.tar.gz: ef27742597aa30664599456c25154915f7c920b6
+  metadata.gz: 039fb7c31f7c5d4e0bc5ed3622d6c4d9802ede96
+  data.tar.gz: 3c7fc89eb25b35983b93e923e819f33873c5cd72
 SHA512:
-  metadata.gz: f38748f3b965b477fed3c3c082bb16ed961b5cbc1c80773fdbb83ba458bdf385164bc8ed3af973e71e8862470be25a3384334fabc40b04bd6a71a3afffb88573
-  data.tar.gz: cf17c0c8b22260272328654d5555864e9c369ce3b3d21fc378cefb8690d105004727e498a776471c1e82674382aa7fae5b62bfa00fb462d4e972b69f0b716bbe
+  metadata.gz: cf9d5ba863181cd4ced07068dd46362402b40cc2539bebe693ff1c62d1f7785d139bad0551f9cca3b942171de48f8983b1383385768bd514cffb3730d2d457a2
+  data.tar.gz: d8eaf8008dbfcf0237ce3df88a18ffbe6f4f467863ed593ab289b24fd6bc5cefcd99a2bf7f0ede9c36e6a29c2cfadb01ef5d0c78bf6b61480c6d877a30da0662

data/README.md

@@ -49,6 +49,12 @@ Now I can automatically restart your Rails development server as your files chan
 
 * **Multiple instances** use `pid_file` option to run multiple instances with same rails\_env
 
+## 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/)
+
 ## Contribute
 
 The best choise to contact me is the Issues and Pull Request system on GitHub.
@@ -57,8 +63,15 @@ Currently the official fork repository is at [ranmocy/guard-rails](http://github
 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/)
+## Contributor
+
+* John Bintz
+* Wanzhang Sheng(Ranmocy)
+* Grant Hutchins and Jonathan Mukai-Heidt
+* Adam Michel
+* Paul Schyska
+* Michel Pavan Macedo
+* Darrin Holst
+* Nathan Broadbent
+* Tim Preston
+* Sidney Burks

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/guard/rails/runner.rb

@@ -41,6 +41,16 @@ module Guard
       "sh -c 'cd \"#{@root}\" && #{command} &'"
     end
 
+    def environment
+      rails_env = if options[:zeus]
+                    nil
+                  else
+                    options[:environment]
+                  end
+
+      { "RAILS_ENV" => rails_env }
+    end
+
     def pid_file
       File.expand_path(options[:pid_file] || File.join(@root, "tmp/pids/#{options[:environment]}.pid"))
     end
@@ -78,19 +88,15 @@ module Guard
         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 build_rails_command
-      ENV['RAILS_ENV'] = options[:environment] if options[:environment]
       "rails server #{build_options}"
     end
 
     def run_rails_command!
-      system build_command
+      system environment, build_command
     end
 
     def has_pid?

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

@@ -164,6 +164,28 @@ describe Guard::RailsRunner do
     end
   end
 
+  describe '#environment' do
+    it "defaults RAILS_ENV to development" do
+      runner.environment["RAILS_ENV"].should == "development"
+    end
+
+    context "with options[:environment]" do
+      let(:options) { default_options.merge(:environment => 'bob') }
+
+      it "defaults RAILS_ENV to nil" do
+        runner.environment["RAILS_ENV"].should == "bob"
+      end
+
+      context "zeus enabled" do
+        let(:options) { default_options.merge(:zeus => true) }
+
+        it "should set RAILS_ENV to nil" do
+          runner.environment["RAILS_ENV"].should be_nil
+        end
+      end
+    end
+  end
+
   describe '#start' do
     let(:kill_expectation) { runner.expects(:kill_unmanaged_pid!) }
     let(:pid_stub) { runner.stubs(:has_pid?) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -118,4 +118,3 @@ test_files:
 - spec/lib/guard/rails/runner_spec.rb
 - spec/lib/guard/rails_spec.rb
 - spec/spec_helper.rb
-has_rdoc: