spring 0.0.9 → 0.0.10

data/lib/spring/server.rb

@@ -4,6 +4,7 @@ require "thread"
 require "spring/env"
 require "spring/application_manager"
 require "spring/process_title_updater"
+require "spring/json"
 
 # Must be last, as it requires bundler/setup
 require "spring/commands"
@@ -43,13 +44,14 @@ module Spring
     def serve(client)
       client.puts env.version
 
-      app_client       = client.recv_io
-      command          = JSON.parse(client.read(client.gets.to_i))
-      args, client_env = command.values_at('args', 'env')
+      app_client = client.recv_io
+      command    = JSON.load(client.read(client.gets.to_i))
+
+      args, default_rails_env = command.values_at('args', 'default_rails_env')
 
       if Spring.command?(args.first)
         client.puts
-        client.puts @applications[rails_env_for(args, client_env)].run(app_client)
+        client.puts @applications[rails_env_for(args, default_rails_env)].run(app_client)
       else
         client.close
       end
@@ -57,14 +59,14 @@ module Spring
       raise e unless client.eof?
     end
 
-    def rails_env_for(args, client_env)
+    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 || client_env['RAILS_ENV'] || client_env['RACK_ENV'] || 'development'
+      env || default_rails_env
     end
 
     # Boot the server into the process group of the current session.

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/spring/watcher.rb

@@ -1,25 +1,30 @@
 require "spring/watcher/abstract"
-require "spring/watcher/listen"
-require "spring/watcher/polling"
 
 module Spring
   class << self
     attr_accessor :watch_interval
     attr_writer :watcher
+    attr_reader :watch_method
+  end
+
+  def self.watch_method=(method)
+    case method
+    when :polling
+      require_relative "watcher/polling"
+      @watch_method = Watcher::Polling
+    when :listen
+      require_relative "watcher/listen"
+      @watch_method = Watcher::Listen
+    else
+      @watch_method = method
+    end
   end
 
   self.watch_interval = 0.2
+  self.watch_method = :polling
 
   def self.watcher
-    @watcher ||= watcher_class.new(Spring.application_root_path, watch_interval)
-  end
-
-  def self.watcher_class
-    if Watcher::Listen.available?
-      Watcher::Listen
-    else
-      Watcher::Polling
-    end
+    @watcher ||= watch_method.new(Spring.application_root_path, watch_interval)
   end
 
   def self.watch(*items)

data/lib/spring/watcher/abstract.rb

@@ -36,6 +36,8 @@ module Spring
           end
         end
 
+        items = items.select(&:exist?)
+
         items.each do |item|
           if item.directory?
             directories << item.realpath.to_s

data/lib/spring/watcher/listen.rb

@@ -1,27 +1,18 @@
+gem "listen", "~> 1.0"
+require "listen"
+require "listen/version"
+
 module Spring
   module Watcher
     class Listen < Abstract
       attr_reader :listener
 
-      def self.available?
-        require "listen"
-        require "listen/version"
-        true
-      rescue LoadError
-        false
-      end
-
       def start
         unless @listener
           @listener = ::Listen.to(*base_directories, relative_paths: false)
           @listener.latency(latency)
           @listener.change(&method(:changed))
-
-          if ::Listen::VERSION >= "1.0.0"
-            @listener.start
-          else
-            @listener.start(false)
-          end
+          @listener.start
         end
       end
 

data/test/acceptance/app_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 require 'io/wait'
 require "timeout"
@@ -6,6 +7,9 @@ require "spring/env"
 require "pty"
 
 class AppTest < ActiveSupport::TestCase
+  # Runtimes on the CI tend to be a bit more volatile, so make
+  # the ratio more permissive
+  DEFAULT_SPEEDUP = ENV['CI'] ? 0.8 : 0.6
   DEFAULT_TIMEOUT = ENV['CI'] ? 30 : 10
 
   def app_root
@@ -114,7 +118,7 @@ class AppTest < ActiveSupport::TestCase
     assert_output artifacts, expected_output if expected_output
   end
 
-  def assert_speedup(ratio = 0.6)
+  def assert_speedup(ratio = DEFAULT_SPEEDUP)
     @times = []
     yield
     assert (@times.last / @times.first) < ratio, "#{@times.last} was not less than #{ratio} of #{@times.first}"
@@ -233,11 +237,17 @@ class AppTest < ActiveSupport::TestCase
       gemfile = app_root.join("Gemfile")
       gemfile_contents = gemfile.read
       File.write(gemfile, gemfile_contents.sub(%{# gem 'listen'}, %{gem 'listen'}))
+
+      config_path = "#{app_root}/config/spring.rb"
+      config_contents = File.read(config_path)
+      File.write(config_path,config_contents + "\nSpring.watch_method = :listen")
+
       app_run "bundle install", timeout: nil
 
       assert_success "#{spring} rails runner 'puts Spring.watcher.class'", stdout: "Listen"
       assert_app_reloaded
     ensure
+      File.write(config_path,config_contents)
       File.write(gemfile, gemfile_contents)
       assert_success "bundle check"
     end
@@ -316,9 +326,13 @@ class AppTest < ActiveSupport::TestCase
   end
 
   test "runner command sets Rails environment from command-line options" do
-    # Not using "test" environment here to avoid false positives on Travis (where "test" is default)
-    assert_success "#{spring} rails runner -e staging 'puts Rails.env'", stdout: "staging"
-    assert_success "#{spring} rails runner --environment=staging 'puts Rails.env'", stdout: "staging"
+    assert_success "#{spring} rails runner -e production 'puts Rails.env'", stdout: "production"
+    assert_success "#{spring} rails runner --environment=production 'puts Rails.env'", stdout: "production"
+  end
+
+  test "forcing rails env via environment variable" do
+    env['RAILS_ENV'] = 'production'
+    assert_success "#{spring} rake -p 'Rails.env'", stdout: "production"
   end
 
   test "exit code for failing specs" do
@@ -327,11 +341,6 @@ class AppTest < ActiveSupport::TestCase
     assert_failure "#{spring} rspec"
   end
 
-  test "selecting rails environment for rake" do
-    env['RAILS_ENV'] = 'staging'
-    assert_success "#{spring} rake -p 'ENV[\"RAILS_ENV\"]'", stdout: "staging"
-  end
-
   test "changing the Gemfile restarts the server" do
     begin
       gemfile = app_root.join("Gemfile")

data/test/apps/rails-3-2/Gemfile

@@ -4,7 +4,4 @@ gem 'rails', '~> 3.2.0'
 gem 'sqlite3'
 gem 'rspec'
 
-# gem 'listen'
-gem 'rb-inotify', :require => false  # linux
-gem 'rb-fsevent', :require => false  # mac os x
-gem 'rb-kqueue',  :require => false  # bsd
+# gem 'listen', '~> 1.0'

data/test/apps/rails-3-2/config/spring.rb

@@ -1,5 +1,5 @@
 class CustomCommand
-  def call(args)
+  def call
     puts "omg"
   end
 end

data/test/unit/commands_test.rb

@@ -2,41 +2,6 @@ require "helper"
 require "spring/commands"
 
 class CommandsTest < ActiveSupport::TestCase
-  test 'children of Command have inheritable accessor named "preload"' do
-    command1, command2 = 2.times.map { Class.new(Spring::Commands::Command) }
-
-    command1.preloads << "foo"
-    assert_equal ["foo"], command1.preloads
-    assert_equal [], command2.preloads
-
-    command2.preloads << "bar"
-    assert_equal ["foo"], command1.preloads
-    assert_equal ["bar"], command2.preloads
-
-    command1.preloads = ["omg"]
-    assert_equal ["omg"], command1.preloads
-    assert_equal ["bar"], command2.preloads
-
-    command3 = Class.new(command1)
-    command3.preloads << "foo"
-    assert_equal ["omg", "foo"], command3.preloads
-    assert_equal ["omg"], command1.preloads
-  end
-
-  test "prints error message when preloaded file does not exist" do
-    begin
-      original_stderr = $stderr
-      $stderr = StringIO.new('')
-      my_command_class = Class.new(Spring::Commands::Command)
-      my_command_class.preloads = %w(i_do_not_exist)
-
-      my_command_class.new.setup
-      assert_match /The #<Class:0x[0-9a-f]+> command tried to preload i_do_not_exist but could not find it./, $stderr.string
-    ensure
-      $stderr = original_stderr
-    end
-  end
-
   test 'console command sets rails environment from command-line option' do
     command = Spring::Commands::RailsConsole.new
     assert_equal 'test', command.env(['test'])

data/test/unit/watcher_test.rb

@@ -3,8 +3,8 @@ require "tmpdir"
 require "fileutils"
 require "active_support/core_ext/numeric/time"
 require "spring/watcher"
-
-raise "listen not loaded" unless Spring::Watcher::Listen.available?
+require "spring/watcher/polling"
+require "spring/watcher/listen"
 
 module WatcherTests
   LATENCY = 0.001
@@ -135,6 +135,11 @@ module WatcherTests
     watcher.add "./foo"
     assert_equal ["#{dir}/foo"], watcher.files.to_a
   end
+
+  def test_add_non_existant_file
+    watcher.add './foobar'
+    assert watcher.files.empty?
+  end
 end
 
 class ListenWatcherTest < ActiveSupport::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,13 +67,18 @@ files:
 - lib/spring/client/help.rb
 - lib/spring/client/rails.rb
 - lib/spring/client/run.rb
-- lib/spring/client/start.rb
 - lib/spring/client/status.rb
 - lib/spring/client/stop.rb
 - lib/spring/commands.rb
+- lib/spring/commands/cucumber.rb
+- lib/spring/commands/rails.rb
+- lib/spring/commands/rake.rb
+- lib/spring/commands/rspec.rb
+- lib/spring/commands/testunit.rb
 - lib/spring/configuration.rb
 - lib/spring/env.rb
 - lib/spring/errors.rb
+- lib/spring/json.rb
 - lib/spring/process_title_updater.rb
 - lib/spring/server.rb
 - lib/spring/sid.rb

data/lib/spring/client/start.rb

@@ -1,17 +0,0 @@
-module Spring
-  module Client
-    class Start < Command
-      def self.description
-        "Boot the spring server (this happens automatically when you run a command)"
-      end
-
-      def call
-        # Require spring/server before bundler so that it doesn't have to be in
-        # the bundle
-        require "spring/server"
-        require "bundler/setup"
-        Spring::Server.boot
-      end
-    end
-  end
-end