guard-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b195229aa6f2eb27fb7111e5334b979caadcb9b7
-  data.tar.gz: 47fbf9313b7d2d860c1764b08a5fed6cbd04dbf0
+  metadata.gz: 95174474f7158b781f56e351d7069b1d89ac7d94
+  data.tar.gz: 9d2ad0756d2e990cf619a093bf72ce687a6723ec
 SHA512:
-  metadata.gz: 3966da96186c6951e4001a97c7e769e56160ac22d86ac4b21d6e2e86455b64d52f2d2b7a2f140214a8aa6f11694e3645998f5b24a9a27fc454d613ec8e3ced1a
-  data.tar.gz: 2a692e06815d3fb62976378c2e872060fab44855df3aefd85021f5e9e1fe40729e860bc156bdc72c48c8e80add3d1f176fa05da53a5f558cad4c4262d6775abe
+  metadata.gz: 2ce575bea742462c421ec00c2675bcabd303a64148cf644189ee1f1fc70382183102443bd8be5f0bfdbc38f1cc8877d5e4f5dbe98fb2eceb4baa9e34c04a9be4
+  data.tar.gz: d851c55f50720226db322ca3c1914610e30d3f9bf7a454751c314230326541b1e01720532029083707dfe06f75135eea9dc47d761dabec3b3d65192ca90d4624

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guard-rails (0.5.1)
+    guard-rails (0.5.2)
       guard (~> 2.0)
 
 GEM
@@ -24,41 +24,41 @@ GEM
     guard-bundler (2.0.0)
       bundler (~> 1.0)
       guard (~> 2.2)
-    guard-rspec (4.2.9)
+    guard-rspec (4.2.10)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     libnotify (0.8.3)
       ffi (>= 1.0.11)
-    listen (2.7.5)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.6)
+    lumberjack (1.0.9)
     metaclass (0.0.4)
     method_source (0.8.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
     rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.1)
+    rspec-expectations (2.99.1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec-mocks (2.99.1)
     slop (3.5.0)
     spoon (0.0.4)
       ffi

data/Guardfile

@@ -4,9 +4,10 @@
 guard 'bundler' do
   watch('Gemfile')
   watch(/^.+\.gemspec/)
+  watch('VERSION')
 end
 
-guard 'rspec', :cli => "--color --format documentation" do
+guard 'rspec', cmd: "bundle exec rspec --color --format documentation" do
   watch('Gemfile.lock')
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }

data/Rakefile

@@ -21,10 +21,12 @@ end
 
 task :default => 'spec:platforms'
 
+# Add to .git/config:
+# [remote "all"]
+#   url = git@github.com:ranmocy/guard-rails.git
+#   url = git@gitcafe.com:ranmocy/guard-rails.git
 desc 'Push everywhere!'
 task :publish do
-  system %{git push origin}
-  system %{git push gitcafe}
-  system %{git push origin --tags}
-  system %{git push gitcafe --tags}
+  system %{git push all}
+  system %{git push all --tags}
 end

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/guard/rails/runner.rb

@@ -87,17 +87,23 @@ module Guard
       zeus_options = [
         options[:zeus_plan] || 'server',
       ]
-
-      # zeus will check if it runs inside bundler, remove the flag here
-      "RUBYOPT='' zeus #{zeus_options.join(' ')} #{build_options}"
+      "zeus #{zeus_options.join(' ')} #{build_options}"
     end
 
     def build_rails_command
       "rails server #{build_options}"
     end
 
+    def without_bundler_env
+      if defined?(::Bundler)
+        ::Bundler.with_clean_env { yield }
+      else
+        yield
+      end
+    end
+
     def run_rails_command!
-      system(environment, build_command)
+      without_bundler_env { system(environment, build_command) }
     end
 
     def has_pid?

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

@@ -129,10 +129,6 @@ describe Guard::RailsRunner do
         runner.build_command.should match(%r{zeus server })
       end
 
-      it "should remove RUBYOPT env var to pretent running outside bundler" do
-        runner.build_command.should match(%r{RUBYOPT='' })
-      end
-
       context "custom zeus plan" do
         let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server') }
         it "should use custom zeus plan" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard