spring 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ab248b060de48656183c39be797c8eb377d1eb
-  data.tar.gz: 94bb1ce1cd992afa8930576f76a7c3d6678d9b5e
+  metadata.gz: 30764feb6f0f2e8031cb5b8b6728ec6ff27384d9
+  data.tar.gz: 08edd60b72a8e467acd95c1a0d1a3dec611d54c9
 SHA512:
-  metadata.gz: 87bbd18c5b6e8370a741472faa21d7933541227307be14306d050244e2cd523d81ffa88afefcd015419c8a2fd54edcfd394192d7ab02af76c3c718826f536f28
-  data.tar.gz: 1048881582aa1e47d94602144911752f208e57ae956d225f93b33310851074269f34785ce05dbf8deb19590fe084a617a238a49734de1f5cfba5858d18636251
+  metadata.gz: d2457ae2573cfb0ea9a28889094b6851ac1fa46917ead02db9454c04502765f2093be0adb2e0aba31b89b325159ec888d4ae452cdf5f51df996882d0c14624e4
+  data.tar.gz: 337f36f3422ad3dc34f07b4a5567a30cc82dc962dd486b5650a86a8d748e3cf93ab6b5a2479db2481c9091ae07a110ae521429d4cf03ab03c4c6883331ae9159

data/README.md

@@ -228,6 +228,7 @@ You can add these to your Gemfile for additional commands:
   to use `rake test path/to/test` to run a particular test/directory.
 * [spring-commands-teaspoon](https://github.com/alejandrobabio/spring-commands-teaspoon.git)
 * [spring-commands-m](https://github.com/gabrieljoelc/spring-commands-m.git)
+* [spring-commands-rubocop](https://github.com/p0deje/spring-commands-rubocop)
 
 ## Use without adding to bundle
 

data/lib/spring/client/binstub.rb

@@ -13,10 +13,9 @@ module Spring
       # should cause the "unsprung" version of the command to run.
       LOADER = <<CODE
 begin
-  spring_bin_path = File.expand_path('../spring', __FILE__)
-  load spring_bin_path
+  load File.expand_path('../spring', __FILE__)
 rescue LoadError => e
-  raise unless e.message.end_with? spring_bin_path, 'spring/binstub'
+  raise unless e.message.include?('spring')
 end
 CODE
 
@@ -51,6 +50,7 @@ CODE
       BINSTUB_VARIATIONS = Regexp.union [
         %{begin\n  load File.expand_path("../spring", __FILE__)\nrescue LoadError\nend\n},
         %{begin\n  load File.expand_path('../spring', __FILE__)\nrescue LoadError\nend\n},
+        %{begin\n  spring_bin_path = File.expand_path('../spring', __FILE__)\n  load spring_bin_path\nrescue LoadError => e\n  raise unless e.message.end_with? spring_bin_path, 'spring/binstub'\nend\n},
         LOADER
       ]
 

data/lib/spring/test/acceptance_test.rb

@@ -275,6 +275,13 @@ module Spring
       end
 
       test "binstub upgrade with new binstub variations" do
+        expected = <<-RUBY.gsub(/^          /, "")
+          #!/usr/bin/env ruby
+          #{Spring::Client::Binstub::LOADER.strip}
+          require 'bundler/setup'
+          load Gem.bin_path('rake', 'rake')
+        RUBY
+
         # older variation with double quotes
         File.write(app.path("bin/rake"), <<-RUBY.strip_heredoc)
           #!/usr/bin/env ruby
@@ -286,36 +293,38 @@ module Spring
           load Gem.bin_path('rake', 'rake')
         RUBY
 
+        assert_success "bin/spring binstub rake", stdout: "bin/rake: upgraded"
+        assert_equal expected, app.path("bin/rake").read
+
         # newer variation with single quotes
-        File.write(app.path("bin/rails"), <<-RUBY.strip_heredoc)
+        File.write(app.path("bin/rake"), <<-RUBY.strip_heredoc)
           #!/usr/bin/env ruby
           begin
             load File.expand_path('../spring', __FILE__)
           rescue LoadError
           end
-          APP_PATH = File.expand_path('../../config/application',  __FILE__)
-          require_relative '../config/boot'
-          require 'rails/commands'
+          require 'bundler/setup'
+          load Gem.bin_path('rake', 'rake')
         RUBY
 
-        assert_success "bin/spring binstub --all", stdout: "upgraded"
+        assert_success "bin/spring binstub rake", stdout: "bin/rake: upgraded"
+        assert_equal expected, app.path("bin/rake").read
 
-        expected = <<-RUBY.gsub(/^          /, "")
+        # newer variation which checks end of exception message
+        File.write(app.path("bin/rake"), <<-RUBY.strip_heredoc)
           #!/usr/bin/env ruby
-          #{Spring::Client::Binstub::LOADER.strip}
+          begin
+            spring_bin_path = File.expand_path('../spring', __FILE__)
+            load spring_bin_path
+          rescue LoadError => e
+            raise unless e.message.end_with? spring_bin_path, 'spring/binstub'
+          end
           require 'bundler/setup'
           load Gem.bin_path('rake', 'rake')
         RUBY
-        assert_equal expected, app.path("bin/rake").read
 
-        expected = <<-RUBY.gsub(/^          /, "")
-          #!/usr/bin/env ruby
-          #{Spring::Client::Binstub::LOADER.strip}
-          APP_PATH = File.expand_path('../../config/application',  __FILE__)
-          require_relative '../config/boot'
-          require 'rails/commands'
-        RUBY
-        assert_equal expected, app.path("bin/rails").read
+        assert_success "bin/spring binstub rake", stdout: "bin/rake: upgraded"
+        assert_equal expected, app.path("bin/rake").read
       end
 
       test "binstub remove with new binstub variations" do

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

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