spring 1.1.3 → 1.2.0

data/{test/acceptance/helper.rb → lib/spring/test/application.rb}

@@ -2,43 +2,6 @@ require "spring/env"
 
 module Spring
   module Test
-    class RailsVersion
-      attr_reader :version
-
-      def initialize(string)
-        @version = Gem::Version.new(string)
-      end
-
-      def rails_3?
-        version < Gem::Version.new("4.0.0")
-      end
-      alias needs_testunit? rails_3?
-
-      def test_command
-        needs_testunit? ? 'bin/testunit' : 'bin/rake test'
-      end
-
-      def controller_tests_dir
-        rails_3? ? 'functional' : 'controllers'
-      end
-
-      def bundles_spring?
-        version.segments.take(2) == [4, 1] || version > Gem::Version.new("4.1")
-      end
-
-      def major
-        version.segments[0]
-      end
-
-      def minor
-        version.segments[1]
-      end
-
-      def to_s
-        version.to_s
-      end
-    end
-
     class Application
       DEFAULT_TIMEOUT = ENV['CI'] ? 30 : 10
 
@@ -238,7 +201,7 @@ module Spring
 
       def bundle
         run! "(gem list bundler | grep bundler) || gem install bundler", timeout: nil, retry: 2
-        run! "bundle update --retry=2", timeout: nil
+        run! "bundle check || bundle update --retry=2", timeout: nil
       end
 
       private
@@ -250,95 +213,5 @@ module Spring
         false
       end
     end
-
-    class ApplicationGenerator
-      attr_reader :version_constraint, :version, :application
-
-      def initialize(version_constraint)
-        @version_constraint = version_constraint
-        @version            = RailsVersion.new(version_constraint.split(' ').last)
-        @application        = Application.new(root)
-        @bundled            = false
-      end
-
-      def root
-        "#{TEST_ROOT}/apps/rails-#{version.major}-#{version.minor}-spring-#{Spring::VERSION}"
-      end
-
-      def system(command)
-        if ENV["SPRING_DEBUG"]
-          puts "$ #{command}\n"
-        else
-          command = "(#{command}) > /dev/null"
-        end
-
-        Kernel.system(command) or raise "command failed: #{command}"
-        puts if ENV["SPRING_DEBUG"]
-      end
-
-      # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
-      def generate
-        Bundler.with_clean_env do
-          system("gem list rails --installed --version '#{version_constraint}' || " \
-                   "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}'")
-
-          @version = RailsVersion.new(`ruby -e 'puts Gem::Specification.find_by_name("rails", "#{version_constraint}").version'`.chomp)
-
-          skips = %w(--skip-bundle --skip-javascript --skip-sprockets)
-          skips << "--skip-spring" if version.bundles_spring?
-
-          system("rails _#{version}_ new #{application.root} #{skips.join(' ')}")
-          raise "application generation failed" unless application.exists?
-
-          FileUtils.mkdir_p(application.gem_home)
-          FileUtils.mkdir_p(application.user_home)
-          FileUtils.rm_rf(application.path("test/performance"))
-
-          File.write(application.gemfile, "#{application.gemfile.read}gem 'spring', '#{Spring::VERSION}'\n")
-
-          if version.needs_testunit?
-            File.write(application.gemfile, "#{application.gemfile.read}gem 'spring-commands-testunit'\n")
-          end
-
-          File.write(application.gemfile, application.gemfile.read.sub("https://rubygems.org", "http://rubygems.org"))
-
-          if application.path("bin").exist?
-            FileUtils.cp_r(application.path("bin"), application.path("bin_original"))
-          end
-        end
-
-        install_spring
-
-        application.run! "bundle exec rails g scaffold post title:string"
-        application.run! "bundle exec rake db:migrate db:test:clone"
-      end
-
-      def generate_if_missing
-        generate unless application.exists?
-      end
-
-      def install_spring
-        return if @installed
-
-        system("gem build spring.gemspec 2>&1")
-        application.run! "gem install ../../../spring-#{Spring::VERSION}.gem", timeout: nil
-
-        application.bundle
-
-        FileUtils.rm_rf application.path("bin")
-
-        if application.path("bin_original").exist?
-          FileUtils.cp_r application.path("bin_original"), application.path("bin")
-        end
-
-        application.run! "#{application.spring} binstub --all"
-        @installed = true
-      end
-
-      def copy_to(path)
-        system("rm -rf #{path}")
-        system("cp -r #{application.root} #{path}")
-      end
-    end
   end
 end

data/lib/spring/test/application_generator.rb

@@ -0,0 +1,121 @@
+module Spring
+  module Test
+    class ApplicationGenerator
+      attr_reader :version_constraint, :version, :application
+
+      def initialize(version_constraint)
+        @version_constraint = version_constraint
+        @version            = RailsVersion.new(version_constraint.split(' ').last)
+        @application        = Application.new(root)
+        @bundled            = false
+      end
+
+      def test_root
+        Pathname.new Spring::Test.root
+      end
+
+      def root
+        test_root.join("apps/rails-#{version.major}-#{version.minor}-spring-#{Spring::VERSION}")
+      end
+
+      def system(command)
+        if ENV["SPRING_DEBUG"]
+          puts "$ #{command}\n"
+        else
+          command = "(#{command}) > /dev/null"
+        end
+
+        Kernel.system(command) or raise "command failed: #{command}"
+        puts if ENV["SPRING_DEBUG"]
+      end
+
+      def generate
+        Bundler.with_clean_env { generate_files }
+        install_spring
+        generate_scaffold
+      end
+
+      # Sporadic SSL errors keep causing test failures so there are anti-SSL workarounds here
+      def generate_files
+        system("gem list rails --installed --version '#{version_constraint}' || " \
+                 "gem install rails --clear-sources --source http://rubygems.org --version '#{version_constraint}'")
+
+        @version = RailsVersion.new(`ruby -e 'puts Gem::Specification.find_by_name("rails", "#{version_constraint}").version'`.chomp)
+
+        skips = %w(--skip-bundle --skip-javascript --skip-sprockets)
+        skips << "--skip-spring" if version.bundles_spring?
+
+        system("rails _#{version}_ new #{application.root} #{skips.join(' ')}")
+        raise "application generation failed" unless application.exists?
+
+        FileUtils.mkdir_p(application.gem_home)
+        FileUtils.mkdir_p(application.user_home)
+        FileUtils.rm_rf(application.path("test/performance"))
+
+        File.write(application.gemfile, "#{application.gemfile.read}gem 'spring', '#{Spring::VERSION}'\n")
+
+        if version.needs_testunit?
+          File.write(application.gemfile, "#{application.gemfile.read}gem 'spring-commands-testunit'\n")
+        end
+
+        File.write(application.gemfile, application.gemfile.read.sub("https://rubygems.org", "http://rubygems.org"))
+
+        if application.path("bin").exist?
+          FileUtils.cp_r(application.path("bin"), application.path("bin_original"))
+        end
+      end
+
+      def generate_if_missing
+        generate unless application.exists?
+      end
+
+      def install_spring
+        return if @installed
+
+        build_and_install_gems
+
+        application.bundle
+
+        FileUtils.rm_rf application.path("bin")
+
+        if application.path("bin_original").exist?
+          FileUtils.cp_r application.path("bin_original"), application.path("bin")
+        end
+
+        application.run! "#{application.spring} binstub --all"
+        @installed = true
+      end
+
+      def manually_built_gems
+        %w(spring)
+      end
+
+      def build_and_install_gems
+        manually_built_gems.each do |name|
+          spec = Gem::Specification.find_by_name(name)
+
+          FileUtils.cd(spec.gem_dir) do
+            FileUtils.rm(Dir.glob("#{name}-*.gem"))
+            system("gem build #{name}.gemspec 2>&1")
+          end
+
+          application.run! "gem install #{spec.gem_dir}/#{name}-*.gem", timeout: nil
+        end
+      end
+
+      def copy_to(path)
+        system("rm -rf #{path}")
+        system("cp -r #{application.root} #{path}")
+      end
+
+      def generate_scaffold
+        application.run! "bundle exec rails g scaffold post title:string"
+        application.run! "bundle exec rake db:migrate db:test:clone"
+      end
+
+      def gemspec(name)
+        "#{Gem::Specification.find_by_name(name).gem_dir}/#{name}.gemspec"
+      end
+    end
+  end
+end

data/lib/spring/test/rails_version.rb

@@ -0,0 +1,40 @@
+module Spring
+  module Test
+    class RailsVersion
+      attr_reader :version
+
+      def initialize(string)
+        @version = Gem::Version.new(string)
+      end
+
+      def rails_3?
+        version < Gem::Version.new("4.0.0")
+      end
+      alias needs_testunit? rails_3?
+
+      def test_command
+        needs_testunit? ? 'bin/testunit' : 'bin/rake test'
+      end
+
+      def controller_tests_dir
+        rails_3? ? 'functional' : 'controllers'
+      end
+
+      def bundles_spring?
+        version.segments.take(2) == [4, 1] || version > Gem::Version.new("4.1")
+      end
+
+      def major
+        version.segments[0]
+      end
+
+      def minor
+        version.segments[1]
+      end
+
+      def to_s
+        version.to_s
+      end
+    end
+  end
+end

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