spring 0.0.8 → 1.0.0

data/lib/spring/commands/rake.rb

@@ -0,0 +1,34 @@
+module Spring
+  module Commands
+    class Rake
+      class << self
+        attr_accessor :environment_matchers
+      end
+
+      self.environment_matchers = {
+        :default     => "test",
+        /^test($|:)/ => "test"
+      }
+
+      def env(args)
+        # This is an adaption of the matching that Rake itself does.
+        # See: https://github.com/jimweirich/rake/blob/3754a7639b3f42c2347857a0878beb3523542aee/lib/rake/application.rb#L691-L692
+        if env = args.grep(/^(RAILS|RACK)_ENV=(.*)$/m).last
+          return env.split("=").last
+        end
+
+        self.class.environment_matchers.each do |matcher, environment|
+          return environment if matcher === (args.first || :default)
+        end
+
+        nil
+      end
+
+      def exec_name
+        "rake"
+      end
+    end
+
+    Spring.register_command "rake", Rake.new
+  end
+end

data/lib/spring/commands.rb

@@ -1,6 +1,4 @@
-# If the config/spring.rb contains requires for commands from other gems,
-# then we need to be under bundler.
-require "bundler/setup"
+require "spring/watcher"
 
 module Spring
   @commands = {}
@@ -21,203 +19,22 @@ module Spring
     commands.fetch name
   end
 
-  module Commands
-    class Command
-      @preloads = []
+  require "spring/commands/rails"
+  require "spring/commands/rake"
 
-      def self.preloads
-        @preloads ||= superclass.preloads.dup
-      end
-
-      def self.preloads=(val)
-        @preloads = val
-      end
-
-      def preloads
-        self.class.preloads
-      end
-
-      def setup
-        preload_files
-      end
-
-      private
-
-      def preload_files
-        preloads.each do |file|
-          begin
-            require file
-          rescue LoadError => e
-            $stderr.puts <<-MESSAGE
-The #{self.class} command tried to preload #{file} but could not find it.
-You can configure what to preload in your `config/spring.rb` with:
-  #{self.class}.preloads = %w(files to preload)
-MESSAGE
-          end
-        end
-      end
-    end
-
-    class TestUnit < Command
-      preloads << "test_helper"
-
-      def env(*)
-        "test"
-      end
-
-      def setup
-        $LOAD_PATH.unshift "test"
-        super
-      end
-
-      def call(args)
-        if args.size > 0
-          ARGV.replace args
-          path = File.expand_path(args.first)
-
-          if File.directory?(path)
-            Dir[File.join path, "**", "*_test.rb"].each { |f| require f }
-          else
-            require path
-          end
-        else
-          $stderr.puts "you need to specify what test to run: spring test TEST_NAME"
-        end
-      end
-
-      def description
-        "Execute a Test::Unit test."
-      end
-    end
-    Spring.register_command "testunit", TestUnit.new
-
-    class RSpec < Command
-      preloads << "spec_helper"
-
-      def env(*)
-        "test"
-      end
-
-      def setup
-        $LOAD_PATH.unshift "spec"
-        require 'rspec/core'
-        ::RSpec::Core::Runner.disable_autorun!
-        super
-      end
-
-      def call(args)
-        $0 = "rspec"
-        ::RSpec::Core::Runner.run(args)
-      end
-
-      def description
-        "Execute an RSpec spec."
-      end
-    end
-    Spring.register_command "rspec", RSpec.new
-
-    class Cucumber < Command
-      def env(*)
-        "test"
-      end
-
-      def setup
-        super
-        require 'cucumber'
-      end
-
-      def call(args)
-        ::Cucumber::Cli::Main.execute(args)
-      end
-
-      def description
-        "Execute a Cucumber feature."
-      end
-    end
-    Spring.register_command "cucumber", Cucumber.new
-
-    class Rake < Command
-      def setup
-        super
-        require "rake"
-      end
-
-      def call(args)
-        ARGV.replace args
-        ::Rake.application.run
-      end
-
-      def description
-        "Run a rake task."
-      end
-    end
-    Spring.register_command "rake", Rake.new
-
-    class RailsConsole < Command
-      def env(tail)
-        tail.first if tail.first && !tail.first.index("-")
-      end
-
-      def setup
-        require "rails/commands/console"
-      end
-
-      def call(args)
-        ARGV.replace args
-        ::Rails::Console.start(::Rails.application)
-      end
-
-      def description
-        nil
-      end
-    end
-    Spring.register_command "rails_console", RailsConsole.new
-
-    class RailsGenerate < Command
-      def setup
-        super
-        Rails.application.load_generators
-      end
-
-      def call(args)
-        ARGV.replace args
-        require "rails/commands/generate"
-      end
-
-      def description
-        nil
-      end
-    end
-    Spring.register_command "rails_generate", RailsGenerate.new
-
-    class RailsRunner < Command
-      def env(tail)
-        previous_option = nil
-        tail.reverse.each do |option|
-          case option
-          when /--environment=(\w+)/ then return $1
-          when '-e' then return previous_option
-          end
-          previous_option = option
-        end
-        nil
-      end
+  # Load custom commands, if any.
+  # needs to be at the end to allow modification of existing commands.
+  config = File.expand_path("~/.spring.rb")
+  require config if File.exist?(config)
 
-      def call(args)
-        Object.const_set(:APP_PATH, Rails.root.join('config/application'))
-        ARGV.replace args
-        require "rails/commands/runner"
-      end
+  # If the config/spring.rb contains requires for commands from other gems,
+  # then we need to be under bundler.
+  require "bundler/setup"
 
-      def description
-        nil
-      end
-    end
-    Spring.register_command "rails_runner", RailsRunner.new
+  Gem::Specification.map(&:name).grep(/^spring-commands-/).each do |command|
+    require command
   end
 
-  # Load custom commands, if any.
-  # needs to be at the end to allow modification of existing commands.
   config = File.expand_path("./config/spring.rb")
   require config if File.exist?(config)
 end

data/lib/spring/configuration.rb

@@ -4,6 +4,10 @@ module Spring
   class << self
     attr_accessor :application_root
 
+    def gemfile
+      ENV['BUNDLE_GEMFILE'] || "Gemfile"
+    end
+
     def after_fork_callbacks
       @after_fork_callbacks ||= []
     end
@@ -12,7 +16,7 @@ module Spring
       after_fork_callbacks << block
     end
 
-    def verify_environment!
+    def verify_environment
       application_root_path
     end
 
@@ -27,7 +31,7 @@ module Spring
     private
 
     def find_project_root(current_dir = Pathname.new(Dir.pwd))
-      if current_dir.join("Gemfile").exist?
+      if current_dir.join(gemfile).exist?
         current_dir
       elsif current_dir.root?
         raise UnknownProject.new(Dir.pwd)

data/lib/spring/env.rb

@@ -1,17 +1,25 @@
 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
+    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
@@ -19,13 +27,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(root.to_s)
+    end
+
     def socket_path
-      tmp_path.join("spring")
+      tmp_path.join(application_id)
     end
 
     def socket_name
@@ -33,7 +45,7 @@ module Spring
     end
 
     def pidfile_path
-      tmp_path.join("spring.pid")
+      tmp_path.join("#{application_id}.pid")
     end
 
     def pid
@@ -48,12 +60,10 @@ module Spring
     end
 
     def server_running?
-      if pidfile_path.exist?
-        pidfile = pidfile_path.open('r')
-        !pidfile.flock(File::LOCK_EX | File::LOCK_NB)
-      else
-        false
-      end
+      pidfile = pidfile_path.open('r')
+      !pidfile.flock(File::LOCK_EX | File::LOCK_NB)
+    rescue Errno::ENOENT
+      false
     ensure
       if pidfile
         pidfile.flock(File::LOCK_UN)
@@ -61,14 +71,13 @@ module Spring
       end
     end
 
-    private
+    def bundle_mtime
+      [Bundler.default_lockfile, Bundler.default_gemfile].select(&:exist?).map(&:mtime).max
+    end
 
-    def default_tmp_path
-      if ENV['SPRING_TMP_PATH']
-        Pathname.new(ENV['SPRING_TMP_PATH'])
-      else
-        root.join('tmp/spring')
-      end
+    def log(message)
+      log_file.puts "[#{Time.now}] #{message}"
+      log_file.flush
     end
   end
 end

data/lib/spring/errors.rb

@@ -1,7 +1,7 @@
 module Spring
   class ClientError < StandardError; end
 
-  class UnknownProject < ClientError
+  class UnknownProject < StandardError
     attr_reader :current_dir
 
     def initialize(current_dir)