spring 1.1.1 → 1.2.0

data/lib/spring/test/watcher_test.rb

@@ -0,0 +1,167 @@
+require "tmpdir"
+require "fileutils"
+require "timeout"
+require "active_support/core_ext/numeric/time"
+
+module Spring
+  module Test
+    class WatcherTest < ActiveSupport::TestCase
+      runnables.delete self # prevent Minitest running this class
+
+      LATENCY = 0.001
+      TIMEOUT = 1
+
+      attr_accessor :dir
+
+      def watcher_class
+        raise NotImplementedError
+      end
+
+      def watcher
+        @watcher ||= watcher_class.new(dir, LATENCY)
+      end
+
+      def setup
+        @dir = File.realpath(Dir.mktmpdir)
+      end
+
+      def teardown
+        FileUtils.remove_entry_secure @dir
+        watcher.stop
+      end
+
+      def touch(file, mtime = nil)
+        options = {}
+        options[:mtime] = mtime if mtime
+        FileUtils.touch(file, options)
+      end
+
+      def assert_stale
+        timeout = Time.now + TIMEOUT
+        sleep LATENCY until watcher.stale? || Time.now > timeout
+        assert watcher.stale?
+      end
+
+      def assert_not_stale
+        sleep LATENCY * 10
+        assert !watcher.stale?
+      end
+
+      test "starting with no file" do
+        file = "#{@dir}/omg"
+        touch file, Time.now - 2.seconds
+
+        watcher.start
+        watcher.add file
+
+        assert_not_stale
+        touch file, Time.now
+        assert_stale
+      end
+
+      test "is stale when a watched file is updated" do
+        file = "#{@dir}/omg"
+        touch file, Time.now - 2.seconds
+
+        watcher.add file
+        watcher.start
+
+        assert_not_stale
+        touch file, Time.now
+        assert_stale
+      end
+
+      test "is stale when removing files" do
+        file = "#{@dir}/omg"
+        touch file, Time.now
+
+        watcher.add file
+        watcher.start
+
+        assert_not_stale
+        FileUtils.rm(file)
+        assert_stale
+      end
+
+      test "is stale when files are added to a watched directory" do
+        subdir = "#{@dir}/subdir"
+        FileUtils.mkdir(subdir)
+
+        watcher.add subdir
+        watcher.start
+
+        assert_not_stale
+        touch "#{subdir}/foo", Time.now - 1.minute
+        assert_stale
+      end
+
+      test "is stale when a file is changed in a watched directory" do
+        subdir = "#{@dir}/subdir"
+        FileUtils.mkdir(subdir)
+        touch "#{subdir}/foo", Time.now - 1.minute
+
+        watcher.add subdir
+        watcher.start
+
+        assert_not_stale
+        touch "#{subdir}/foo", Time.now
+        assert_stale
+      end
+
+      test "adding doesn't wipe stale state" do
+        file = "#{@dir}/omg"
+        file2 = "#{@dir}/foo"
+        touch file, Time.now - 2.seconds
+        touch file2, Time.now - 2.seconds
+
+        watcher.add file
+        watcher.start
+
+        assert_not_stale
+
+        touch file, Time.now
+        watcher.add file2
+
+        assert_stale
+      end
+
+      test "on stale" do
+        file = "#{@dir}/omg"
+        touch file, Time.now - 2.seconds
+
+        stale = false
+        watcher.on_stale { stale = true }
+
+        watcher.add file
+        watcher.start
+
+        touch file, Time.now
+
+        Timeout.timeout(1) { sleep 0.01 until stale }
+        assert stale
+
+        # Check that we only get notified once
+        stale = false
+        sleep LATENCY * 3
+        assert !stale
+      end
+
+      test "add relative path" do
+        File.write("#{dir}/foo", "foo")
+        watcher.add "foo"
+        assert_equal ["#{dir}/foo"], watcher.files.to_a
+      end
+
+      test "add dot relative path" do
+        File.write("#{dir}/foo", "foo")
+        watcher.add "./foo"
+        assert_equal ["#{dir}/foo"], watcher.files.to_a
+      end
+
+      test "add non existent file" do
+        watcher.add './foobar'
+        assert watcher.files.empty?
+      end
+    end
+  end
+end

data/lib/spring/test.rb

@@ -0,0 +1,15 @@
+require "active_support/test_case"
+
+module Spring
+  module Test
+    class << self
+      attr_accessor :root
+    end
+
+    require "spring/test/application"
+    require "spring/test/application_generator"
+    require "spring/test/rails_version"
+    require "spring/test/watcher_test"
+    require "spring/test/acceptance_test"
+  end
+end

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/spring/watcher/polling.rb

@@ -1,3 +1,5 @@
+require "spring/watcher"
+
 module Spring
   module Watcher
     class Polling < Abstract

data/lib/spring/watcher.rb

@@ -9,15 +9,11 @@ module Spring
   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
+    if method.is_a?(Class)
       @watch_method = method
+    else
+      require "spring/watcher/#{method}"
+      @watch_method = Watcher.const_get(method.to_s.gsub(/(^.|_.)/) { $1[-1].upcase })
     end
   end
 

data/test/acceptance_test.rb

@@ -0,0 +1,4 @@
+require "helper"
+
+class AcceptanceTest < Spring::Test::AcceptanceTest
+end

data/test/helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
 require "bundler/setup"
-require "active_support/test_case"
 require "minitest/autorun"
 
-TEST_ROOT = File.expand_path('..', __FILE__)
+require "spring/test"
+Spring::Test.root = File.expand_path('..', __FILE__)

data/test/unit/commands_test.rb

@@ -7,7 +7,17 @@ class CommandsTest < ActiveSupport::TestCase
     assert_equal 'test', command.env(['test'])
   end
 
-  test 'console command ignores first argument if it is a flag' do
+  test 'console command sets rails environment from -e option' do
+    command = Spring::Commands::RailsConsole.new
+    assert_equal 'test', command.env(['-e', 'test'])
+  end
+
+  test 'console command sets rails environment from --environment option' do
+    command = Spring::Commands::RailsConsole.new
+    assert_equal 'test', command.env(['--environment=test'])
+  end
+
+  test 'console command ignores first argument if it is a flag except -e and --environment' do
     command = Spring::Commands::RailsConsole.new
     assert_nil command.env(['--sandbox'])
   end
@@ -27,6 +37,18 @@ class CommandsTest < ActiveSupport::TestCase
     assert_nil command.env(['puts 1+1'])
   end
 
+  test 'RailsRunner#extract_environment removes -e <env>' do
+    command = Spring::Commands::RailsRunner.new
+    args = ['-b', '-a', '-e', 'test', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
+  end
+
+  test 'RailsRunner#extract_environment removes --environment=<env>' do
+    command = Spring::Commands::RailsRunner.new
+    args = ['-b', '--environment=test', '-a', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
+  end
+
   test "rake command has configurable environments" do
     command = Spring::Commands::Rake.new
     assert_nil command.env(["foo"])

data/test/unit/watcher_test.rb

@@ -1,194 +1,8 @@
 require "helper"
-require "tmpdir"
-require "fileutils"
-require "timeout"
-require "active_support/core_ext/numeric/time"
-require "spring/watcher"
+require "spring/test/watcher_test"
 require "spring/watcher/polling"
-require "spring/watcher/listen"
-
-module WatcherTests
-  LATENCY = 0.001
-  TIMEOUT = 1
-
-  attr_accessor :dir
-
-  def watcher
-    @watcher ||= watcher_class.new(dir, LATENCY)
-  end
-
-  def setup
-    @dir = File.realpath(Dir.mktmpdir)
-  end
-
-  def teardown
-    FileUtils.remove_entry_secure @dir
-    watcher.stop
-  end
-
-  def touch(file, mtime = nil)
-    options = {}
-    options[:mtime] = mtime if mtime
-    FileUtils.touch(file, options)
-  end
-
-  def assert_stale
-    timeout = Time.now + TIMEOUT
-    sleep LATENCY until watcher.stale? || Time.now > timeout
-    assert watcher.stale?
-  end
-
-  def assert_not_stale
-    sleep LATENCY * 10
-    assert !watcher.stale?
-  end
-
-  def test_starting_with_no_file
-    file = "#{@dir}/omg"
-    touch file, Time.now - 2.seconds
-
-    watcher.start
-    watcher.add file
-
-    assert_not_stale
-    touch file, Time.now
-    assert_stale
-  end
-
-  def test_is_stale_when_a_watched_file_is_updated
-    file = "#{@dir}/omg"
-    touch file, Time.now - 2.seconds
-
-    watcher.add file
-    watcher.start
-
-    assert_not_stale
-    touch file, Time.now
-    assert_stale
-  end
-
-  def test_is_stale_when_removing_files
-    file = "#{@dir}/omg"
-    touch file, Time.now
-
-    watcher.add file
-    watcher.start
-
-    assert_not_stale
-    FileUtils.rm(file)
-    assert_stale
-  end
-
-  def test_is_stale_when_files_are_added_to_a_watched_directory
-    subdir = "#{@dir}/subdir"
-    FileUtils.mkdir(subdir)
-
-    watcher.add subdir
-    watcher.start
-
-    assert_not_stale
-    touch "#{subdir}/foo", Time.now - 1.minute
-    assert_stale
-  end
-
-  def test_is_stale_when_a_file_is_changed_in_a_watched_directory
-    subdir = "#{@dir}/subdir"
-    FileUtils.mkdir(subdir)
-    touch "#{subdir}/foo", Time.now - 1.minute
-
-    watcher.add subdir
-    watcher.start
-
-    assert_not_stale
-    touch "#{subdir}/foo", Time.now
-    assert_stale
-  end
-
-  def test_adding_doesnt_wipe_stale_state
-    file = "#{@dir}/omg"
-    file2 = "#{@dir}/foo"
-    touch file, Time.now - 2.seconds
-    touch file2, Time.now - 2.seconds
-
-    watcher.add file
-    watcher.start
-
-    assert_not_stale
-
-    touch file, Time.now
-    watcher.add file2
-
-    assert_stale
-  end
-
-  def test_on_stale
-    file = "#{@dir}/omg"
-    touch file, Time.now - 2.seconds
-
-    watcher.add file
-    watcher.start
-
-    stale = false
-    watcher.on_stale { stale = true }
-
-    touch file, Time.now
-
-    Timeout.timeout(1) { sleep 0.01 until stale }
-    assert stale
-
-    # Check that we only get notified once
-    stale = false
-    sleep LATENCY * 3
-    assert !stale
-  end
-
-  def test_add_relative_path
-    File.write("#{dir}/foo", "foo")
-    watcher.add "foo"
-    assert_equal ["#{dir}/foo"], watcher.files.to_a
-  end
-
-  def test_add_dot_relative_path
-    File.write("#{dir}/foo", "foo")
-    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
-  include WatcherTests
-
-  def watcher_class
-    Spring::Watcher::Listen
-  end
-
-  test "root directories" do
-    begin
-      other_dir_1 = File.realpath(Dir.mktmpdir)
-      other_dir_2 = File.realpath(Dir.mktmpdir)
-      File.write("#{other_dir_1}/foo", "foo")
-      File.write("#{dir}/foo", "foo")
-
-      watcher.add "#{other_dir_1}/foo"
-      watcher.add other_dir_2
-      watcher.add "#{dir}/foo"
-
-      assert_equal [dir, other_dir_1, other_dir_2].sort, watcher.base_directories.sort
-    ensure
-      FileUtils.rmdir other_dir_1
-      FileUtils.rmdir other_dir_2
-    end
-  end
-end
-
-class PollingWatcherTest < ActiveSupport::TestCase
-  include WatcherTests
 
+class PollingWatcherTest < Spring::Test::WatcherTest
   def watcher_class
     Spring::Watcher::Polling
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails application preloader
@@ -46,8 +46,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -80,14 +80,18 @@ files:
 - lib/spring/process_title_updater.rb
 - lib/spring/server.rb
 - lib/spring/sid.rb
+- lib/spring/test.rb
+- lib/spring/test/acceptance_test.rb
+- lib/spring/test/application.rb
+- lib/spring/test/application_generator.rb
+- lib/spring/test/rails_version.rb
+- lib/spring/test/watcher_test.rb
 - lib/spring/version.rb
 - lib/spring/watcher.rb
 - lib/spring/watcher/abstract.rb
-- lib/spring/watcher/listen.rb
 - lib/spring/watcher/polling.rb
 - spring.gemspec
-- test/acceptance/app_test.rb
-- test/acceptance/helper.rb
+- test/acceptance_test.rb
 - test/apps/.gitignore
 - test/helper.rb
 - test/unit/client/help_test.rb
@@ -105,23 +109,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails application preloader
 test_files:
-- test/acceptance/app_test.rb
-- test/acceptance/helper.rb
+- test/acceptance_test.rb
 - test/apps/.gitignore
 - test/helper.rb
 - test/unit/client/help_test.rb
@@ -129,4 +132,3 @@ test_files:
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
 - test/unit/watcher_test.rb
-has_rdoc: 

data/lib/spring/watcher/listen.rb

@@ -1,52 +0,0 @@
-gem "listen", "~> 1.0"
-require "listen"
-require "listen/version"
-
-module Spring
-  module Watcher
-    class Listen < Abstract
-      attr_reader :listener
-
-      def start
-        unless @listener
-          @listener = ::Listen.to(*base_directories, relative_paths: false)
-          @listener.latency(latency)
-          @listener.change(&method(:changed))
-          @listener.start
-        end
-      end
-
-      def stop
-        if @listener
-          @listener.stop
-          @listener = nil
-        end
-      end
-
-      def subjects_changed
-        if @listener && @listener.directories.sort != base_directories.sort
-          restart
-        end
-      end
-
-      def watching?(file)
-        files.include?(file) || file.start_with?(*directories)
-      end
-
-      def changed(modified, added, removed)
-        synchronize do
-          if (modified + added + removed).any? { |f| watching? f }
-            mark_stale
-          end
-        end
-      end
-
-      def base_directories
-        ([root] +
-          files.reject       { |f| f.start_with? root }.map { |f| File.expand_path("#{f}/..") } +
-          directories.reject { |d| d.start_with? root }
-        ).uniq
-      end
-    end
-  end
-end