spring 0.9.1 → 1.1.0

data/lib/spring/env.rb

@@ -1,18 +1,30 @@
 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('.'))
-      @log_file = File.open(ENV["SPRING_LOG"] || "/dev/null", "a")
+      @root         = root
+      @project_root = root
+      @log_file     = File.open(ENV["SPRING_LOG"] || "/dev/null", "a")
+    end
+
+    def root
+      @root ||= Spring.application_root_path
+    end
+
+    def project_root
+      @project_root ||= Spring.project_root_path
     end
 
     def version
@@ -20,13 +32,17 @@ module Spring
     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(project_root.to_s)
+    end
+
     def socket_path
-      tmp_path.join("spring")
+      tmp_path.join(application_id)
     end
 
     def socket_name
@@ -34,7 +50,7 @@ module Spring
     end
 
     def pidfile_path
-      tmp_path.join("spring.pid")
+      tmp_path.join("#{application_id}.pid")
     end
 
     def pid
@@ -49,7 +65,7 @@ module Spring
     end
 
     def server_running?
-      pidfile = pidfile_path.open('r')
+      pidfile = pidfile_path.open('r+')
       !pidfile.flock(File::LOCK_EX | File::LOCK_NB)
     rescue Errno::ENOENT
       false
@@ -60,23 +76,9 @@ module Spring
       end
     end
 
-    def bundle_mtime
-      [Bundler.default_lockfile, Bundler.default_gemfile].select(&:exist?).map(&:mtime).max
-    end
-
     def log(message)
-      log_file.puts "[#{Time.now}] #{message}"
+      log_file.puts "[#{Time.now}] [#{Process.pid}] #{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,19 +1,13 @@
-require "socket"
-require "thread"
+module Spring
+  ORIGINAL_ENV = ENV.to_hash
+end
 
-require "spring/configuration"
-require "spring/env"
+require "spring/boot"
 require "spring/application_manager"
-require "spring/process_title_updater"
-require "spring/json"
 
-# Must be last, as it requires bundler/setup
+# Must be last, as it requires bundler/setup, which alters the load path
 require "spring/commands"
 
-# readline must be required before we setpgid, otherwise the require may hang,
-# if readline has been built against libedit. See issue #70.
-require "readline"
-
 module Spring
   class Server
     def self.boot
@@ -24,7 +18,7 @@ module Spring
 
     def initialize(env = Env.new)
       @env          = env
-      @applications = Hash.new { |h, k| h[k] = ApplicationManager.new(self, k) }
+      @applications = Hash.new { |h, k| h[k] = ApplicationManager.new(k) }
       @pidfile      = env.pidfile_path.open('a')
       @mutex        = Mutex.new
     end
@@ -41,16 +35,12 @@ module Spring
       ignore_signals
       set_exit_hook
       set_process_title
-      watch_bundle
       start_server
     end
 
     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
 
@@ -78,13 +68,7 @@ module Spring
     end
 
     def rails_env_for(args, default_rails_env)
-      command = Spring.command(args.first)
-
-      if command.respond_to?(:env)
-        env = command.env(args.drop(1))
-      end
-
-      env || default_rails_env
+      Spring.command(args.first).env(args.drop(1)) || default_rails_env
     end
 
     # Boot the server into the process group of the current session.
@@ -97,7 +81,7 @@ module Spring
     # Ignore SIGINT and SIGQUIT otherwise the user typing ^C or ^\ on the command line
     # will kill the server/application.
     def ignore_signals
-      IGNORE_SIGNALS.each { |sig| trap(sig,  "IGNORE") }
+      IGNORE_SIGNALS.each { |sig| trap(sig, "IGNORE") }
     end
 
     def set_exit_hook
@@ -108,13 +92,13 @@ module Spring
     end
 
     def shutdown
-      @applications.values.each(&:stop)
-
       [env.socket_path, env.pidfile_path].each do |path|
         if path.exist?
           path.unlink rescue nil
         end
       end
+
+      @applications.values.map { |a| Thread.new { a.stop } }.map(&:join)
     end
 
     def write_pidfile
@@ -140,13 +124,5 @@ module Spring
         "spring server | #{env.app_name} | started #{distance} ago"
       }
     end
-
-    def watch_bundle
-      @bundle_mtime = env.bundle_mtime
-    end
-
-    def application_starting
-      @mutex.synchronize { exit if env.bundle_mtime != @bundle_mtime }
-    end
   end
 end

data/lib/spring/version.rb

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

data/lib/spring/watcher/abstract.rb

@@ -22,7 +22,7 @@ module Spring
         @files       = Set.new
         @directories = Set.new
         @stale       = false
-        @io_listener = nil
+        @listeners   = []
       end
 
       def add(*items)
@@ -55,15 +55,14 @@ module Spring
         @stale
       end
 
-      def mark_stale
-        @stale = true
-        @io_listener.write "." if @io_listener
+      def on_stale(&block)
+        @listeners << block
       end
 
-      def to_io
-        read, write = IO.pipe
-        @io_listener = write
-        read
+      def mark_stale
+        return if stale?
+        @stale = true
+        @listeners.each(&:call)
       end
 
       def restart

data/spring.gemspec

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