Merge pull request #455 from sonalkr132/notif-running

print spring client pid on command run

Author: grosser

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)

lib/spring/client/run.rb

@@ -1,3 +1,4 @@
+require "spring/commands"
 require "rbconfig"
 require "socket"
 require "bundler"
@@ -138,6 +139,8 @@ def run_command(client, application)
         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
 

lib/spring/configuration.rb

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

lib/spring/test/acceptance_test.rb

@@ -47,6 +47,14 @@ def assert_failure(command, expected_output = nil)
         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 @@ def without_gem(name)
         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 @@ def exec_name
             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]