spring 1.0.0 → 1.1.1

data/lib/spring/server.rb

@@ -1,26 +1,13 @@
 module Spring
-  class << self
-    attr_reader :original_env
-  end
-  @original_env = ENV.to_hash
+  ORIGINAL_ENV = ENV.to_hash
 end
 
-require "socket"
-require "thread"
-
-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
@@ -31,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
@@ -48,7 +35,6 @@ module Spring
       ignore_signals
       set_exit_hook
       set_process_title
-      watch_bundle
       start_server
     end
 
@@ -82,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.
@@ -101,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
@@ -112,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
@@ -144,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 = "1.0.0"
+  VERSION = "1.1.1"
 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,7 @@ 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($/)