spring 1.1.0.beta2 → 1.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be8bb694add40714afc5a6b350c2efc4a5348d0
-  data.tar.gz: 5af55d085e93f225c9d3ad9cdcbf89739a8dc6e4
+  metadata.gz: ec57b11dfce83e9e7ca74433cd0e18e0e4b499f3
+  data.tar.gz: 61e4462c800903ab2d66710ccc92544a2a5f251b
 SHA512:
-  metadata.gz: 38c97ef6b3025ed82fca2d2784ead4c978deaab7226bf8504da55e4e8e7aa9d51ac49f5379ec1d27ab2fa9dd077623b99c8685e9f71c018dbfb74457b9f66958
-  data.tar.gz: d9501f771bdaf0f9b9da74bc4353b6b73baeb99671384034fd8307c90c91ba212aa31e45f868ee6d92bd418da02404570722be2fe2e6a2688acb4600cace8af5
+  metadata.gz: 38741e9b52477feee7d28b28ea299438f46174f89e64ca16a5a34a9b673d723fd9b4830d9a216c958f3b5e2b8f66bc8bea2ca536fcfb498fb8c524ef508771ce
+  data.tar.gz: d0c5bdfcaacf59dae01f4701c2d974675a624485d10efbe6aab155055e773b696d332fc54ba4e24a285ce1127bc16a11f3323f6328d771c34e9fe0cb57898314

data/lib/spring/client/binstub.rb

@@ -36,15 +36,14 @@ unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-  version = match && match[1]
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
 
-  ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-  ENV["GEM_HOME"] = ""
-  Gem.paths = ENV
-
-  gem "spring", version
-  require "spring/binstub"
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
 end
 CODE
 

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.0.beta2"
+  VERSION = "1.1.0.beta3"
 end

data/test/acceptance/helper.rb

@@ -62,7 +62,11 @@ module Spring
       end
 
       def log_file
-        @log_file ||= log_file_path.open("w+")
+        @log_file ||= begin
+          tmp = path("tmp")
+          tmp.mkdir unless tmp.exist?
+          tmp.join("spring.log").open("w+")
+        end
       end
 
       def env
@@ -72,7 +76,7 @@ module Spring
           "HOME"       => user_home.to_s,
           "RAILS_ENV"  => nil,
           "RACK_ENV"   => nil,
-          "SPRING_LOG" => log_file_path.to_s
+          "SPRING_LOG" => log_file.path
         }
       end
 
@@ -258,13 +262,14 @@ module Spring
       end
 
       def system(command)
-        Kernel.system("#{command} > /dev/null") or raise "command failed: #{command}"
-      end
+        if ENV["SPRING_DEBUG"]
+          puts "$ #{command}\n"
+        else
+          command = "#{command} > /dev/null"
+        end
 
-      def bundle
-        return if @bundled
-        application.bundle
-        @bundled = true
+        Kernel.system(command) or raise "command failed: #{command}"
+        puts if ENV["SPRING_DEBUG"]
       end
 
       # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
@@ -295,7 +300,8 @@ module Spring
           end
         end
 
-        bundle
+        install_spring
+
         application.run! "bundle exec rails g scaffold post title:string"
         application.run! "bundle exec rake db:migrate db:test:clone"
       end
@@ -305,23 +311,21 @@ module Spring
       end
 
       def install_spring
-        unless @installed
-          # Need to do this here too because the app may have been generated with
-          # a different ruby
-          bundle
+        return if @installed
 
-          system("gem build spring.gemspec 2>/dev/null")
-          application.run! "gem install ../../../spring-#{Spring::VERSION}.gem", timeout: nil
+        system("gem build spring.gemspec 2>&1")
+        application.run! "gem install ../../../spring-#{Spring::VERSION}.gem", timeout: nil
 
-          FileUtils.rm_rf application.path("bin")
+        application.bundle
 
-          if application.path("bin_original").exist?
-            FileUtils.cp_r application.path("bin_original"), application.path("bin")
-          end
+        FileUtils.rm_rf application.path("bin")
 
-          application.run! "#{application.spring} binstub --all"
-          @installed = true
+        if application.path("bin_original").exist?
+          FileUtils.cp_r application.path("bin_original"), application.path("bin")
         end
+
+        application.run! "#{application.spring} binstub --all"
+        @installed = true
       end
 
       def copy_to(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta2
+  version: 1.1.0.beta3
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport