spring 0.0.7 → 0.0.8

data/test/unit/commands_test.rb

@@ -7,7 +7,7 @@ class CommandsTest < ActiveSupport::TestCase
       real_stderr = $stderr
       $stderr = StringIO.new('')
 
-      command = Spring::Commands::Test.new
+      command = Spring::Commands::TestUnit.new
       command.call([])
 
       assert_equal "you need to specify what test to run: spring test TEST_NAME\n", $stderr.string
@@ -50,4 +50,29 @@ class CommandsTest < ActiveSupport::TestCase
       $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'])
+  end
+
+  test 'console command ignores first argument if it is a flag' do
+    command = Spring::Commands::RailsConsole.new
+    assert_nil command.env(['--sandbox'])
+  end
+
+  test 'Runner#env sets rails environment from command-line option' do
+    command = Spring::Commands::RailsRunner.new
+    assert_equal 'test', command.env(['-e', 'test', 'puts 1+1'])
+  end
+
+  test 'RailsRunner#env sets rails environment from long form of command-line option' do
+    command = Spring::Commands::RailsRunner.new
+    assert_equal 'test', command.env(['--environment=test', 'puts 1+1'])
+  end
+
+  test 'RailsRunner#env ignores insignificant arguments' do
+    command = Spring::Commands::RailsRunner.new
+    assert_nil command.env(['puts 1+1'])
+  end
 end

data/test/unit/watcher_test.rb

@@ -0,0 +1,171 @@
+require "helper"
+require "tmpdir"
+require "fileutils"
+require "active_support/core_ext/numeric/time"
+require "spring/watcher"
+require "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_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_can_io_select
+    file = "#{@dir}/omg"
+    touch file, Time.now - 2.seconds
+
+    watcher.add file
+    watcher.start
+
+    Thread.new {
+      sleep LATENCY * 3
+      touch file, Time.now
+    }
+
+    assert IO.select([watcher], [], [], 1), "IO.select timed out before watcher was readable"
+    assert watcher.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
+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
+
+  def watcher_class
+    Spring::Watcher::Polling
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -60,12 +61,13 @@ files:
 - bin/spring
 - lib/spring/application.rb
 - lib/spring/application_manager.rb
-- lib/spring/application_watcher.rb
 - lib/spring/client.rb
 - lib/spring/client/binstub.rb
 - lib/spring/client/command.rb
 - 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
@@ -76,6 +78,10 @@ files:
 - lib/spring/server.rb
 - lib/spring/sid.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/apps/rails-3-2/.gitignore
@@ -145,10 +151,10 @@ files:
 - test/apps/rails-3-2/vendor/assets/stylesheets/.gitkeep
 - test/apps/rails-3-2/vendor/plugins/.gitkeep
 - test/helper.rb
-- test/unit/application_watcher_test.rb
 - test/unit/client/help_test.rb
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
+- test/unit/watcher_test.rb
 homepage: http://github.com/jonleighton/spring
 licenses: []
 post_install_message: 
@@ -169,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails application preloader
@@ -242,7 +248,7 @@ test_files:
 - test/apps/rails-3-2/vendor/assets/stylesheets/.gitkeep
 - test/apps/rails-3-2/vendor/plugins/.gitkeep
 - test/helper.rb
-- test/unit/application_watcher_test.rb
 - test/unit/client/help_test.rb
 - test/unit/commands_test.rb
 - test/unit/process_title_updater_test.rb
+- test/unit/watcher_test.rb

data/lib/spring/application_watcher.rb

@@ -1,43 +0,0 @@
-module Spring
-  class ApplicationWatcher
-    attr_reader :mtime, :files, :globs
-
-    def initialize
-      @files = []
-      @globs = []
-      @mtime = nil
-    end
-
-    def add_files(new_files)
-      files.concat new_files.select { |f| File.exist?(f) }
-      files.uniq!
-      reset
-    end
-
-    def add_globs(new_globs)
-      globs.concat new_globs
-      reset
-    end
-
-    def reset
-      @mtime = compute_mtime
-    end
-
-    def stale?
-      mtime < compute_mtime
-    end
-
-    private
-
-    def compute_mtime
-      expanded_files.map { |f| File.mtime(f).to_f }.max || 0
-    rescue Errno::ENOENT
-      # if a file does no longer exist, the watcher is always stale.
-      Float::MAX
-    end
-
-    def expanded_files
-      files + Dir["{#{globs.join(",")}}"]
-    end
-  end
-end

data/test/unit/application_watcher_test.rb

@@ -1,67 +0,0 @@
-require "helper"
-require "fileutils"
-require "active_support/core_ext/numeric/time"
-require "spring/application_watcher"
-
-class ApplicationWatcherTest < ActiveSupport::TestCase
-  def setup
-    @dir = "/tmp/spring"
-    FileUtils.mkdir(@dir)
-  end
-
-  def teardown
-    FileUtils.rm_r(@dir)
-  end
-
-  def touch(file, mtime = nil)
-    options = {}
-    options[:mtime] = mtime if mtime
-    FileUtils.touch(file, options)
-  end
-
-  test "file mtime" do
-    file = "#{@dir}/omg"
-    touch file, Time.now - 2.seconds
-
-    watcher = Spring::ApplicationWatcher.new
-    watcher.add_files [file]
-
-    assert !watcher.stale?
-    touch file, Time.now
-    assert watcher.stale?
-  end
-
-  test "tolerates enoent" do
-    file = "#{@dir}/omg"
-    touch file
-
-    watcher = Spring::ApplicationWatcher.new
-    watcher.add_files [file]
-
-    assert !watcher.stale?
-    FileUtils.rm(file)
-    assert watcher.stale?
-  end
-
-  test "accepts glob patterns" do
-    FileUtils.mkdir("#{@dir}/1")
-    FileUtils.mkdir("#{@dir}/2")
-
-    watcher = Spring::ApplicationWatcher.new
-    watcher.add_globs ["#{@dir}/1/*.rb", "#{@dir}/2/*"]
-
-    assert !watcher.stale?
-
-    touch "#{@dir}/1/foo", Time.now - 1.minute
-    assert !watcher.stale?
-
-    touch "#{@dir}/1/foo.rb", 2.seconds
-    assert watcher.stale?
-
-    watcher.reset
-    assert !watcher.stale?
-
-    touch "#{@dir}/2/foo", Time.now
-    assert watcher.stale?
-  end
-end