spring 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ac640c7514d41f28205416b110496f5ddb14d2
-  data.tar.gz: 89b956912fee2b1b75e20c9f06986c33671a4b27
+  metadata.gz: ab103d29ee132ac8637c7ddca8d5c41fc567c31e
+  data.tar.gz: 88e600c6e1d59b4150625769f20f6d543958087c
 SHA512:
-  metadata.gz: 1251675f9d073842dc030e0855161594a31807b80ef64b530d2b8a759b9c6bf075a3cb6eb330e108b19483dcb8fb5d50a19a7e0be7a5c777d55326c56577e767
-  data.tar.gz: a96b76e7742eda3aa9a07ce69f6dc6d6f9de1d6bed809a2b7fc2f165dc49c282214015c229f21e9a157024bc14a4c3a81b2edd596377cee93f7dad70527a0cde
+  metadata.gz: 7b4d762562b8d4c1832bcec43819b6bcc6d9168473095fac089a743c0c421d4450f77e7c0a3cf31902256ed42a3d0fa57e7767cd4a0cf9d0bd55dc24c758f460
+  data.tar.gz: 9c929b2636980dc30486f475caeacb1f3de296420c22e9f0a52c67ce732a8953e28f1b090258a18456d210ce217610e8e4df8ffeb7a1a8ebd0e2b546554235ec

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.0.0
+
+* Enterprise ready secret sauce added
+
+## 0.9.2
+
+* Bugfix: environment variables set by bundler (`BUNDLE_GEMFILE`,
+  `RUBYOPT`, etc...) were being removed from the environment.
+* Ensure we only run the code reloader when files have actually changed.
+  This issue became more prominent with Rails 4, since Rails 4 will now
+  reload routes whenever the code is reloaded (see
+  https://github.com/rails/rails/commit/b9b06daa915fdc4d11e8cfe11a7175e5cd8f104f).
+* Allow spring to be used in a descendant directory of the application
+  root
+* Use the system tmpdir for our temporary files. Previously we used
+  `APP_ROOT/tmp/spring`, which caused problems on filesystems which did
+  not support sockets, and also caused problems if `APP_ROOT` was
+  sufficiently deep in the filesystem to exhaust the operating system's
+  socket name limit. Hence we had a `SPRING_TMP_PATH` environment
+  variable for configuration. We now use `/tmp/spring/[md5(APP_ROOT)]`
+  for the socket and `/tmp/spring/[md5(APP_ROOT)].pid` for the pid file.
+  Thanks @Kriechi for the suggestion. Setting `SPRING_TMP_PATH` no longer
+  has any effect.
+
 ## 0.9.1
 
 * Environment variables which were created during application startup are no

data/README.md

@@ -162,7 +162,7 @@ Custom commands can be specified in the Spring config file. See
 [`lib/spring/commands/`](https://github.com/jonleighton/spring/blob/master/lib/spring/commands/)
 for examples.
 
-You can also install the following gems for additional commands:
+You can add the following gems to your Gemfile for additional commands:
 
 * [spring-commands-rspec](https://github.com/jonleighton/spring-commands-rspec)
 * [spring-commands-cucumber](https://github.com/jonleighton/spring-commands-cucumber)
@@ -198,9 +198,10 @@ speed-up).
 
 Spring will read `~/.spring.rb` and `config/spring.rb` for custom
 settings. Note that `~/.spring.rb` is loaded *before* bundler, but
-`config/spring.rb` is loaded *after* bundler. This means that in
-`~/.spring.rb` you are able to load extra commands without them having
-to be in the bundle of the project you are working on.
+`config/spring.rb` is loaded *after* bundler. So if you have any
+`spring-commands-*` gems installed that you want to be available in all
+projects without having to be added to the project's Gemfile, require
+them in your `~/.spring.rb`.
 
 ### Application root
 
@@ -264,11 +265,6 @@ Spring.watch_method = :listen
 
 You may need to add the [`listen` gem](https://github.com/guard/listen) to your `Gemfile`.
 
-### tmp directory
-
-Spring needs a tmp directory. This will default to `Rails.root.join('tmp', 'spring')`.
-You can set your own configuration directory by setting the `SPRING_TMP_PATH` environment variable.
-
 ## Troubleshooting
 
 If you want to get more information about what spring is doing, you can

data/lib/spring/application.rb

@@ -15,7 +15,6 @@ module Spring
       @mutex      = Mutex.new
       @waiting    = 0
       @exiting    = false
-      @env_keys   = ENV.keys
 
       # Workaround for GC bug in Ruby 2 which causes segfaults if watcher.to_io
       # instances get dereffed.
@@ -99,8 +98,10 @@ module Spring
       connect_database
       setup command
 
-      ActionDispatch::Reloader.cleanup!
-      ActionDispatch::Reloader.prepare!
+      if Rails.application.reloaders.any?(&:updated?)
+        ActionDispatch::Reloader.cleanup!
+        ActionDispatch::Reloader.prepare!
+      end
 
       pid = fork {
         Process.setsid
@@ -108,8 +109,12 @@ module Spring
         IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
 
         ARGV.replace(args)
-        @env_keys.each { |k| ENV.delete k }
-        ENV.update(env)
+
+        # Delete all env vars which are unchanged from before spring started
+        Spring.original_env.each { |k, v| ENV.delete k if ENV[k] == v }
+
+        # Load in the current env vars, except those which *were* changed when spring started
+        env.each { |k, v| ENV[k] ||= v }
 
         connect_database
         srand

data/lib/spring/env.rb

@@ -1,32 +1,43 @@
 require "pathname"
 require "fileutils"
+require "digest/md5"
+require "tmpdir"
 
 require "spring/version"
 require "spring/sid"
+require "spring/configuration"
 
 module Spring
   IGNORE_SIGNALS = %w(INT QUIT)
 
   class Env
-    attr_reader :root, :log_file
+    attr_reader :log_file
 
     def initialize(root = nil)
-      @root     = root || Pathname.new(File.expand_path('.'))
+      @root     = root
       @log_file = File.open(ENV["SPRING_LOG"] || "/dev/null", "a")
     end
 
+    def root
+      @root ||= Spring.application_root_path
+    end
+
     def version
       Spring::VERSION
     end
 
     def tmp_path
-      path = default_tmp_path
+      path = Pathname.new(Dir.tmpdir + "/spring")
       FileUtils.mkdir_p(path) unless path.exist?
       path
     end
 
+    def application_id
+      Digest::MD5.hexdigest(root.to_s)
+    end
+
     def socket_path
-      tmp_path.join("spring")
+      tmp_path.join(application_id)
     end
 
     def socket_name
@@ -34,7 +45,7 @@ module Spring
     end
 
     def pidfile_path
-      tmp_path.join("spring.pid")
+      tmp_path.join("#{application_id}.pid")
     end
 
     def pid
@@ -68,15 +79,5 @@ module Spring
       log_file.puts "[#{Time.now}] #{message}"
       log_file.flush
     end
-
-    private
-
-    def default_tmp_path
-      if ENV['SPRING_TMP_PATH']
-        Pathname.new(ENV['SPRING_TMP_PATH'])
-      else
-        root.join('tmp/spring')
-      end
-    end
   end
 end

data/lib/spring/errors.rb

@@ -15,20 +15,6 @@ module Spring
     end
   end
 
-  class TmpUnwritable < StandardError
-    attr_reader :tmp_path
-
-    def initialize(tmp_path)
-      @tmp_path = tmp_path
-    end
-
-    def message
-      "Spring is unable to create a socket file at #{tmp_path}. You may need to " \
-        "set the SPRING_TMP_PATH environment variable to use a different path. See " \
-        "the documentation for details."
-    end
-  end
-
   class MissingApplication < ClientError
     attr_reader :project_root
 

data/lib/spring/server.rb

@@ -1,3 +1,10 @@
+module Spring
+  class << self
+    attr_reader :original_env
+  end
+  @original_env = ENV.to_hash
+end
+
 require "socket"
 require "thread"
 
@@ -48,9 +55,6 @@ module Spring
     def start_server
       server = UNIXServer.open(env.socket_name)
       log "started on #{env.socket_name}"
-    rescue Errno::EPERM
-      raise TmpUnwritable.new(env.tmp_path)
-    else
       loop { serve server.accept }
     end
 

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "0.9.1"
+  VERSION = "1.0.0"
 end

data/spring.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Rails application preloader}
   gem.summary       = %q{Rails application preloader}
   gem.homepage      = "http://github.com/jonleighton/spring"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/acceptance/app_test.rb

@@ -179,8 +179,10 @@ class AppTest < ActiveSupport::TestCase
 
   def generate_app
     Bundler.with_clean_env do
+      # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
+
       assert system("(gem list rails --installed --version '#{rails_version}' || " \
-                      "gem install rails --version '#{rails_version}') > /dev/null")
+                      "gem install rails --clear-sources --source http://rubygems.org --version '#{rails_version}') > /dev/null")
 
       # Have to shell out otherwise bundler prevents us finding the gem
       version = `ruby -e 'puts Gem::Specification.find_by_name("rails", "#{rails_version}").version'`.chomp
@@ -197,6 +199,11 @@ class AppTest < ActiveSupport::TestCase
           File.read("#{app_root}/Gemfile") + "gem 'spring-commands-testunit'\n"
         )
       end
+
+      File.write(
+        "#{app_root}/Gemfile",
+        File.read("#{app_root}/Gemfile").sub("https://rubygems.org", "http://rubygems.org")
+      )
     end
   end
 
@@ -485,9 +492,12 @@ class AppTest < ActiveSupport::TestCase
 
       env["OMG"] = "1"
       env["FOO"] = "1"
+      env["RUBYOPT"] = "-rubygems"
 
       assert_success %(#{spring} rails runner 'p ENV["OMG"]'), stdout: "1"
       assert_success %(#{spring} rails runner 'p ENV["BAR"]'), stdout: "bar"
+      assert_success %(#{spring} rails runner 'p ENV.key?("BUNDLE_GEMFILE")'), stdout: "true"
+      assert_success %(#{spring} rails runner 'p ENV["RUBYOPT"]'), stdout: "bundler"
 
       env["OMG"] = "2"
       env.delete "FOO"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -88,7 +88,8 @@ files:
 - test/unit/process_title_updater_test.rb
 - test/unit/watcher_test.rb
 homepage: http://github.com/jonleighton/spring
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,4 +119,3 @@ test_files:
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
 - test/unit/watcher_test.rb
-has_rdoc: