spring 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43523a4bc5efeee2b0627838cdad0f7792e878e1
-  data.tar.gz: d3c21eda879429eb8ff6765afba0dad6bc57046b
+  metadata.gz: fe523c65977f4083feea0970165a082eb667e6be
+  data.tar.gz: 288444858518c627ddedaa356e1c620300221770
 SHA512:
-  metadata.gz: f18b77496d51c0612c180251f050b90591a5fd931e026ae11fef78dcc42ff11bdb460af2f7c3eeb365c1f91aa1e295e569f67a9037dbdb4df48fa87faaa7574d
-  data.tar.gz: 5cc676a8f1c2f1f2afd0c478cc5a541dbf9160df50a78903e67345ebfecd6521327b233cac349686f21e2bb124a9465509f57db51aa6b3dcf7adeee136e84c82
+  metadata.gz: 57b35faa126834bd1a3f714efb236984c3795288bbd8620a96e3824c1cbd65e1f0bf7049bba288637fa01f86e9ba926ec35bf08aa13a408c6ada4b1b13752841
+  data.tar.gz: 00186aa81a271f2d384c4e10c0c2e18e9b33e2910e6e4dd955194a42abdefe90f4561b4c60c68a21975b10a5fae207376acd5a756ac6edb53fa9559cac633cef

data/bin/spring

@@ -46,4 +46,6 @@ end
 lib = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib) # enable local development
 require 'spring/client'
+# if the user knows that spring is called, do not show running spring
+Spring.quiet = true if $0.include? 'spring'
 Spring::Client.run(ARGV)

data/lib/spring/client/run.rb

@@ -1,3 +1,4 @@
+require "spring/commands"
 require "rbconfig"
 require "socket"
 require "bundler"
@@ -138,6 +139,8 @@ ERROR
         if pid && !pid.empty?
           log "got pid: #{pid}"
 
+          puts "Running via Spring preloader in process #{pid}" unless Spring.quiet
+
           forward_signals(pid.to_i)
           status = application.read.to_i
 

data/lib/spring/configuration.rb

@@ -2,7 +2,7 @@ require "spring/errors"
 
 module Spring
   class << self
-    attr_accessor :application_root
+    attr_accessor :application_root, :quiet
 
     def gemfile
       ENV['BUNDLE_GEMFILE'] || "Gemfile"
@@ -49,4 +49,6 @@ module Spring
       end
     end
   end
+
+  self.quiet = false
 end

data/lib/spring/test/acceptance_test.rb

@@ -47,6 +47,14 @@ module Spring
         assert_output artifacts, expected_output if expected_output
       end
 
+      def refute_output_includes(command, not_expected)
+        artifacts = app.run(*Array(command))
+        not_expected.each do |stream, output|
+          assert !artifacts[stream].include?(output),
+                 "expected #{stream} to not include '#{output}'.\n\n#{app.debug(artifacts)}"
+        end
+      end
+
       def assert_speedup(ratio = DEFAULT_SPEEDUP)
         if ENV['CI']
           yield
@@ -94,6 +102,22 @@ module Spring
         refute app.spring_env.server_running?
       end
 
+      test "tells the user that spring is being used when used automatically via binstubs" do
+        assert_success "bin/rails runner ''", stdout: "Running via Spring preloader in process"
+        assert_success app.spring_test_command, stdout: "Running via Spring preloader in process"
+      end
+
+      test "does not tell the user that spring is being used when the user used spring manually" do
+        refute_output_includes "spring rails runner ''", stdout: "Running via Spring preloader in process"
+        refute_output_includes "spring rake test", stdout: "Running via Spring preloader in process"
+      end
+
+      test "does not tell the user that spring is being used when used automatically via binstubs but quiet is enabled" do
+        File.write("#{app.user_home}/.spring.rb", "Spring.quiet = true")
+        assert_success "bin/rails runner ''"
+        refute_output_includes "bin/rails runner ''", stdout: 'Running via Spring preloader in process'
+      end
+
       test "test changes are picked up" do
         assert_speedup do
           assert_success app.spring_test_command, stdout: "0 failures"
@@ -447,7 +471,7 @@ module Spring
             system(#{app.env.inspect}, "bundle install")
           end
           output = `\#{Rails.root.join('bin/rails')} runner 'require "devise"; puts "done";'`
-          exit output == "done\n"
+          exit output.include? "done\n"
         RUBY
 
         assert_success [%(bin/rails runner 'load Rails.root.join("script.rb")'), timeout: 60]

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport