RubyGems - ext - Versions diffs - 1.0.3 → 1.0.4 - Mend

ext 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

data/CHANGELOG +7 -0
data/README +2 -0
data/Rakefile +1 -74
data/bin/ext +0 -0
data/lib/externals/ext.rb +25 -9
data/lib/externals/extensions/file_utils.rb +40 -0
data/lib/externals/extensions/string.rb +1 -1
data/lib/externals/project.rb +3 -0
data/lib/externals/scms/git_project.rb +3 -4
data/lib/externals/scms/svn_project.rb +10 -12
data/lib/externals/test/basic_git_repository.rb +41 -0
data/lib/externals/test/engines.rb +11 -0
data/lib/externals/test/engines_with_branch1.rb +36 -0
data/lib/externals/test/fake_rails_repository.rb +112 -0
data/lib/externals/test/git_repository_from_internet.rb +19 -0
data/lib/externals/test/modules_svn_branches_repository.rb +72 -0
data/lib/externals/test/modules_svn_repository.rb +41 -0
data/lib/externals/test/rails_app_git_branches.rb +100 -0
data/lib/externals/test/rails_app_git_repository.rb +55 -0
data/lib/externals/test/rails_app_svn_branches.rb +132 -0
data/lib/externals/test/rails_app_svn_repository.rb +106 -0
data/lib/externals/test/rails_app_unmanaged.rb +25 -0
data/lib/externals/test/repository.rb +188 -0
data/lib/externals/test/svn_repository_from_dump.rb +27 -0
data/lib/externals/test/svn_repository_helper.rb +10 -0
data/lib/externals/test_case.rb +16 -307
data/test/setup/empty_plugin.svn.gz +0 -0
data/test/setup/foreign_key_migrations.svn.gz +0 -0
data/test/setup/redhillonrails_core.svn.gz +0 -0
data/test/test_checkout_git.rb +16 -25
data/test/test_checkout_with_subprojects_git.rb +109 -193
data/test/test_checkout_with_subprojects_svn.rb +239 -294
data/test/test_file_utils_extensions.rb +29 -0
data/test/test_freeze_to_revision.rb +46 -85
data/test/test_git_project_extract_name.rb +10 -8
data/test/test_init_git.rb +19 -29
data/test/test_projects.rb +87 -93
data/test/test_rails_detection.rb +12 -17
data/test/test_string_extensions.rb +32 -30
data/test/test_svn_branches.rb +227 -383
data/test/test_touch_emptydirs.rb +39 -34
data/test/test_version.rb +18 -16
metadata +47 -23

data/test/test_rails_detection.rb CHANGED

@@ -2,26 +2,21 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib') if $0 == __FILE__
 require 'externals/test_case'
 require 'externals/ext'
+require 'externals/test/rails_app_unmanaged'
 module Externals
-  class TestRailsDetection < TestCase
-    include ExtTestCase
-    def setup
-      destroy_rails_application
-      create_rails_application
-    end
-    def teardown
-      destroy_rails_application
-    end
-    def test_detection
-      detector = Ext.project_type_detector('rails')
+  module Test
+    class TestRailsDetection < TestCase
+      include ExtTestCase
+      def test_detection
+        repository = RailsAppUnmanaged.new
+        detector = Ext.project_type_detector('rails')
-      assert !detector.detected?
-      Dir.chdir(rails_application_dir) do
-        assert detector.detected?
+        assert !detector.detected?
+        Dir.chdir(repository.clean_dir) do
+          assert detector.detected?
+        end
       end
     end
   end

data/test/test_string_extensions.rb CHANGED

@@ -4,46 +4,48 @@ require 'externals/test_case'
 require 'externals/ext'
 module Externals
-  class TestStringExtensions < TestCase
-    include ExtTestCase
-    def test_classify
-      assert_equal "yourmom".classify, "Yourmom"
-      assert_equal "your_mom".classify, "YourMom"
-      assert_equal "lol_your_mom".classify, "LolYourMom"
-      assert_equal "".classify, ""
-    end
+  module Test
+    class TestStringExtensions < TestCase
+      include ExtTestCase
+      def test_classify
+        assert_equal "yourmom".classify, "Yourmom"
+        assert_equal "your_mom".classify, "YourMom"
+        assert_equal "lol_your_mom".classify, "LolYourMom"
+        assert_equal "".classify, ""
+      end
-    def test_lines_by_width
-      assert_equal [
-        "this",
-        "is a",
-        "test"
+      def test_lines_by_width
+        assert_equal [
+          "this",
+          "is a",
+          "test"
         ],
           "this is a test".lines_by_width(4)
-      assert_equal [
-        "this",
-        "is",
-        "a",
-        "test"
+        assert_equal [
+          "this",
+          "is",
+          "a",
+          "test"
         ],
           "this is a test".lines_by_width(2)
-      assert_equal ["this is a test"], "this is a test".lines_by_width
+        assert_equal ["this is a test"], "this is a test".lines_by_width
-      assert_equal [
-        "The working directory to execute",
-        "commands from. Use this if for",
-        "some reason you cannot execute",
-        "ext from the main project's",
-        "directory (or if it's just",
-        "inconvenient, such as in a",
-        "script or in a Capistrano task)"
-      ],
-        "The working directory to execute commands from.  Use this if for some reason you
+        assert_equal [
+          "The working directory to execute",
+          "commands from. Use this if for",
+          "some reason you cannot execute",
+          "ext from the main project's",
+          "directory (or if it's just",
+          "inconvenient, such as in a",
+          "script or in a Capistrano task)"
+        ],
+          "The working directory to execute commands from.  Use this if for some reason you
         cannot execute ext from the main project's directory (or if it's just inconvenient, such as in a script
         or in a Capistrano task)".lines_by_width
+      end
     end
   end
 end

data/test/test_svn_branches.rb CHANGED

@@ -1,501 +1,345 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
 require 'externals/test_case'
 require 'externals/ext'
+require 'externals/test/rails_app_svn_branches'
 module Externals
-  class TestSvnBranches < TestCase
-    include ExtTestCase
-    def teardown
-      destroy_rails_application
-      destroy_with_svn_branches_repository
-      destroy_with_svn_branches_modules_repository
-      Dir.chdir File.join(root_dir, 'test') do
-        parts = 'workdir/checkout/rails_app/vendor/plugins/foreign_key_migrations/lib/red_hill_consulting/foreign_key_migrations/active_record/connection_adapters/.svn/text-base/table_definition.rb.svn-base'.split('/')
-        if File.exists? File.join(*parts)
-          Dir.chdir File.join(*(parts[0..-2])) do
-            File.delete parts[-1]
-          end
+  module Test
+    class TestSvnBranches < TestCase
+      include ExtTestCase
+      def test_checkout_with_subproject
+        mode = "checkout"
+        repository = RailsAppSvnBranches.new
+        repository.prepare
+        assert File.exists?(File.join(repository.clean_dir, "db"))
+        workdir = File.join(root_dir, 'test', "tmp", "workdir", mode, "svn", "branches")
+        mkdir_p workdir
+        if File.exists?(File.join(workdir, "rails_app"))
+          rm_r File.join(workdir, "rails_app")
         end
-        `rm -rf workdir`
-      end
-    end
-    def setup
-      teardown
+        Dir.chdir workdir do
+          source = repository.clean_url
+          if windows?
+            source = source.gsub(/\\/, "/")
+          end
-      create_rails_application
+          puts "About to #{mode} #{source}"
+          Ext.run mode, "--svn", source, "-b", "current", 'rails_app'
-      create_with_svn_branches_repository
-      create_with_svn_branches_modules_repository
-      initialize_with_svn_branches_repository
-      initialize_with_svn_branches_modules_repository
-    end
+          Dir.chdir 'rails_app' do
+            assert File.exists?('.svn')
-    def test_checkout_with_subproject
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir checkout`
-          Dir.chdir 'checkout' do
-            source = with_svn_branches_repository_url
-            if windows?
-              source = source.gsub(/\\/, "/")
+            %w(redhillonrails_core acts_as_list).each do |proj|
+              ignore_text = `svn propget svn:ignore vendor/plugins`
+              puts "ignore_text is:"
+              puts ignore_text
+              assert(ignore_text =~ /^#{proj}$/)
             end
-            puts "About to checkout #{source}"
-            Ext.run "checkout", "--svn", source, "-b", "current", 'rails_app'
+            ignore_text = `svn propget svn:ignore vendor`
+            assert(ignore_text =~ /^rails$/)
-            Dir.chdir 'rails_app' do
-              assert File.exists?('.svn')
+            %w(redhillonrails_core acts_as_list engines).each do |proj|
+              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+            end
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                ignore_text = `svn propget svn:ignore vendor/plugins`
-                puts "ignore_text is:"
-                puts ignore_text
-                assert(ignore_text =~ /^#{proj}$/)
-              end
+            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-              ignore_text = `svn propget svn:ignore vendor`
-              assert(ignore_text =~ /^rails$/)
+            assert File.exists?(File.join('vendor', 'rails', '.git'))
-              %w(foreign_key_migrations redhillonrails_core acts_as_list engines).each do |proj|
-                assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
-              end
+            assert File.exists?(File.join('modules', 'modules.txt'))
-              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
-              assert File.exists?(File.join('vendor', 'rails', '.git'))
+            ext = Ext.new
+            main_project = ext.main_project
+            engines = ext.subproject("engines")
+            modules = ext.subproject("modules")
-              assert File.exists?(File.join('modules', 'modules.txt'))
+            assert_equal "current", main_project.current_branch
-              assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
+            assert_equal "edge", engines.current_branch
+            assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
-              ext = Ext.new
-              main_project = ext.main_project
-              engines = ext.subproject("engines")
-              modules = ext.subproject("modules")
+            assert_equal "current", modules.current_branch
+            assert_equal "current", ext.configuration["modules"]["branch"]
+gi
+            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
-              assert_equal "current", main_project.current_branch
+            `svn switch #{[source, "branches", "new_branch"].join("/")}`
+            unless $? == 0
+              raise
+            end
-              assert_equal "edge", engines.current_branch
-              assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
-              assert_equal "current", modules.current_branch
-              assert_equal "current", ext.configuration["modules"]["branch"]
+            assert !main_project.ignore_contains?("vendor/rails")
-              `svn switch #{[source, "branches", "new_branch"].join("/")}`
-              unless $? == 0
-                raise
-              end
+            ext = Ext.new
+            main_project = ext.main_project
+            engines = ext.subproject("engines")
+            modules = ext.subproject("modules")
-              assert !main_project.ignore_contains?("vendor/rails")
+            assert_equal "branches/new_branch", main_project.current_branch
-              ext = Ext.new
-              main_project = ext.main_project
-              engines = ext.subproject("engines")
-              modules = ext.subproject("modules")
+            assert_equal "edge", engines.current_branch
+            assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "branches/new_branch", main_project.current_branch
+            assert_equal "current", modules.current_branch
+            assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
-              assert_equal "edge", engines.current_branch
-              assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
+            Ext.run "up"
-              assert_equal "current", modules.current_branch
-              assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
+            assert File.exists?(File.join(%w(vendor plugins ssl_requirement)))
+            assert File.exists?(File.join(%w(vendor plugins empty_plugin)))
-              Ext.run "up"
+            Dir.chdir File.join("vendor",'plugins', "ssl_requirement") do
+              assert `git show HEAD` =~ /^\s*commit\s*#{
+              repository.dependents[:ssl_requirement].attributes[:revision]
+}\s*$/i
+            end
-              assert_equal "branches/new_branch", main_project.current_branch
+            assert_equal "branches/new_branch", main_project.current_branch
-              assert_equal "branch1", engines.current_branch
-              assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "branch1", engines.current_branch
+            assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "branches/branch2", modules.current_branch
-              assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
+            assert_equal "branches/branch2", modules.current_branch
+            assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
-              assert File.read(File.join('modules', 'modules.txt')) =~
-                /line 2 of modules.txt ... this is branch2!/
+            assert File.read(File.join('modules', 'modules.txt')) =~
+              /line 2 of modules.txt ... this is branch2!/
-              `svn switch #{[source, "current"].join("/")}`
-              ext = Ext.new
-              main_project = ext.main_project
-              engines = ext.subproject("engines")
-              modules = ext.subproject("modules")
+            `svn switch #{[source, "current"].join("/")}`
+            ext = Ext.new
+            main_project = ext.main_project
+            engines = ext.subproject("engines")
+            modules = ext.subproject("modules")
-              assert_equal "current", main_project.current_branch
+            assert_equal "current", main_project.current_branch
-              assert_equal "branch1", engines.current_branch
-              assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "branch1", engines.current_branch
+            assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "branches/branch2", modules.current_branch
-              assert_equal "current", ext.configuration["modules"]["branch"]
-              assert File.read(File.join('modules', 'modules.txt')) =~
-                /line 2 of modules.txt ... this is branch2!/
+            assert_equal "branches/branch2", modules.current_branch
+            assert_equal "current", ext.configuration["modules"]["branch"]
+            assert File.read(File.join('modules', 'modules.txt')) =~
+              /line 2 of modules.txt ... this is branch2!/
-              Ext.run "up"
-              ext = Ext.new
-              main_project = ext.main_project
-              engines = ext.subproject("engines")
-              modules = ext.subproject("modules")
+            Ext.run "up"
+            ext = Ext.new
+            main_project = ext.main_project
+            engines = ext.subproject("engines")
+            modules = ext.subproject("modules")
-              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-              assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exists?(File.join('vendor', 'rails', '.git'))
-              assert_equal "current", main_project.current_branch
+            assert_equal "current", main_project.current_branch
-              assert_equal "edge", engines.current_branch
-              assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "edge", engines.current_branch
+            assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "current", modules.current_branch
-              assert_equal "current", ext.configuration["modules"]["branch"]
-              assert File.read(File.join('modules', 'modules.txt')) !~
-                /line 2 of modules.txt ... this is branch2!/
-              assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
+            assert_equal "current", modules.current_branch
+            assert_equal "current", ext.configuration["modules"]["branch"]
+            assert File.read(File.join('modules', 'modules.txt')) !~
+              /line 2 of modules.txt ... this is branch2!/
+            assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
-              assert main_project.ignore_contains?("vendor/rails")
+            assert main_project.ignore_contains?("vendor/rails")
-              # let's test the switch command.
-              capture = StringIO.new
-              begin
-                $stdout = capture
+            # let's test the switch command.
+            capture = StringIO.new
+            begin
+              $stdout = capture
-                Ext.run "switch", "branches/new_branch"
+              Ext.run "switch", "branches/new_branch"
-                ext = Ext.new
-                main_project = ext.main_project
-                engines = ext.subproject("engines")
-                modules = ext.subproject("modules")
+              ext = Ext.new
+              main_project = ext.main_project
+              engines = ext.subproject("engines")
+              modules = ext.subproject("modules")
-              ensure
-                $stdout = STDOUT
-              end
-              capture = capture.string
+            ensure
+              $stdout = STDOUT
+            end
+            capture = capture.string
-              assert_equal "branches/new_branch", main_project.current_branch
+            assert_equal "branches/new_branch", main_project.current_branch
-              assert_equal "branch1", engines.current_branch
-              assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "branch1", engines.current_branch
+            assert_equal "branch1", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "branches/branch2", modules.current_branch
-              assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
+            assert_equal "branches/branch2", modules.current_branch
+            assert_equal "branches/branch2", ext.configuration["modules"]["branch"]
-              assert capture =~ /WARNING:/
-              assert capture =~ /rm\s+-rf?\s+vendor.rails/
-              assert capture.scan(/rm/).size == 1
+            assert capture =~ /WARNING:/
+            assert capture =~ /rm\s+-rf?\s+vendor.rails/
+            assert capture.scan(/rm/).size == 1
-              assert !main_project.ignore_contains?("vendor/rails")
+            assert !main_project.ignore_contains?("vendor/rails")
-              `rm -rf vendor/rails`
+            [
+              %w(vendor rails),
+              %w(vendor plugins ssl_requirement),
+              %w(vendor plugins empty_plugin)
+            ].each do |dir|
+              rm_r File.join(*dir)
               unless $? == 0
                 raise
               end
+            end
-              assert File.read(File.join('modules', 'modules.txt')) =~
-                /line 2 of modules.txt ... this is branch2!/
+            assert File.read(File.join('modules', 'modules.txt')) =~
+              /line 2 of modules.txt ... this is branch2!/
-              capture = StringIO.new
-              begin
-                $stdout = capture
+            capture = StringIO.new
+            begin
+              $stdout = capture
-                Ext.run "switch", "current"
-                ext = Ext.new
-                main_project = ext.main_project
-                engines = ext.subproject("engines")
-                modules = ext.subproject("modules")
+              Ext.run "switch", "current"
+              ext = Ext.new
+              main_project = ext.main_project
+              engines = ext.subproject("engines")
+              modules = ext.subproject("modules")
-              ensure
-                $stdout = STDOUT
-              end
+            ensure
+              $stdout = STDOUT
+            end
-              capture = capture.string
+            capture = capture.string
-              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-              assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exists?(File.join('vendor', 'rails', '.git'))
-              assert_equal "current", main_project.current_branch
+            assert_equal "current", main_project.current_branch
-              assert_equal "edge", engines.current_branch
-              assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "edge", engines.current_branch
+            assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
-              assert_equal "current", modules.current_branch
-              assert_equal "current", ext.configuration["modules"]["branch"]
+            assert_equal "current", modules.current_branch
+            assert_equal "current", ext.configuration["modules"]["branch"]
-              assert capture !~ /WARNING:/
-              assert capture !~ /rm\s+-rf?\s+vendor.rails/
-              assert main_project.ignore_contains?("vendor/rails")
-              assert capture.scan(/rm/).size == 0
+            assert capture !~ /WARNING:/
+            assert capture !~ /rm\s+-rf?\s+vendor.rails/
+            assert main_project.ignore_contains?("vendor/rails")
+            assert capture.scan(/rm/).size == 0
-              assert File.read(File.join('modules', 'modules.txt')) !~
-                /line 2 of modules.txt ... this is branch2!/
-              assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
-            end
+            assert File.read(File.join('modules', 'modules.txt')) !~
+              /line 2 of modules.txt ... this is branch2!/
+            assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
           end
         end
       end
-    end
-    def test_update_with_missing_subproject_git
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir update`
-          Dir.chdir 'update' do
-            source = with_svn_branches_repository_url
-            if windows?
-              source = source.gsub(/\\/, "/")
-            end
-            puts "About to checkout #{source}"
-            Ext.run "checkout", "--svn", "-b", "current", source, 'rails_app'
-            Dir.chdir 'rails_app' do
-              pretests = proc do
-                assert File.exists?('.svn')
-                assert !File.exists?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
-                assert File.read(".externals") =~ /rails/
-                assert File.read(".externals") !~ /ssl_requirement/
-              end
-              pretests.call
-              #add a project
-              Dir.chdir File.join(root_dir, 'test') do
-                `mkdir rails_app`
-                Dir.chdir 'workdir' do
-                  Ext.run "checkout", "--svn", "-b", "current", source, 'rails_app'
-                  Dir.chdir "rails_app" do
-                    #install a new project
-                    Ext.run "install", File.join(root_dir, 'test', 'cleanreps', 'ssl_requirement.git')
+      def test_export_with_subproject
+        mode = "export"
-                    SvnProject.add_all
+        repository = RailsAppSvnBranches.new
+        repository.prepare
-                    puts `svn commit -m "added another subproject (ssl_requirement)"`
-                  end
-                end
-              end
+        assert File.exists?(File.join(repository.clean_dir, "db"))
-              pretests.call
+        workdir = File.join(root_dir, 'test', "tmp", "workdir", mode, "svn", "branch_test")
+        mkdir_p workdir
-              #update the project and make sure ssl_requirement was added and checked out
-              Ext.run "update"
-              assert File.read(".externals") =~ /ssl_requirement/
-              assert File.exists?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
-            end
-          end
+        if File.exists?(File.join(workdir,"rails_app"))
+          rm_r File.join(workdir, "rails_app")
         end
-      end
-    end
-    def test_update_with_missing_subproject_by_revision_git
-      subproject = "ssl_requirement"
-      revision = "aa2dded823f8a9b378c22ba0159971508918928a"
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir update`
-          Dir.chdir 'update' do
-            source = with_svn_branches_repository_url
-            puts "About to checkout #{source}"
-            Ext.run "checkout", "--svn", source, "-b", "current", 'rails_app'
-            Dir.chdir 'rails_app' do
-              pretests = proc do
-                assert File.exists?('.svn')
-                assert !File.exists?(File.join('vendor', 'plugins', subproject, 'lib'))
-                assert File.read(".externals") =~ /rails/
-                assert File.read(".externals") !~ /#{subproject}/
-              end
-              pretests.call
-              #add a project
-              Dir.chdir File.join(root_dir, 'test') do
-                Dir.chdir File.join('workdir') do
-                  Ext.run "checkout", "--svn", source, "-b", "current", 'rails_app'
-                  Dir.chdir File.join("rails_app") do
-                    #install a new project
-                    Ext.run "install", File.join(root_dir, 'test', 'cleanreps', "#{subproject}.git")
-                    Dir.chdir File.join("vendor",'plugins', subproject) do
-                      assert `git show HEAD` !~ /^\s*commit\s*#{revision}\s*$/i
-                    end
-                    #freeze it to a revision
-                    Ext.run "freeze", subproject,  revision
-                    Dir.chdir File.join("vendor",'plugins', subproject) do
-                      regex = /^\s*commit\s*#{revision}\s*$/i
-                      output = `git show HEAD`
-                      result = output =~ regex
-                      unless result
-                        puts "Expecting output to match #{regex} but it was: #{output}"
-                      end
-                      assert result
-                    end
-                    SvnProject.add_all
-                    puts `svn commit -m "added another subproject (#{subproject}) frozen to #{revision}"`
-                  end
-                  `rm -rf rails_app`
-                end
-              end
-              pretests.call
+        Dir.chdir workdir do
+          source = repository.clean_url
+          if windows?
+            source = source.gsub(/\\/, "/")
+          end
-              #update the project and make sure ssl_requirement was added and checked out at the right revision
-              Ext.run "update"
-              assert File.read(".externals") =~ /ssl_requirement/
+          puts "About to #{mode} #{source}"
+          Ext.run mode, "--svn", source, "-b", "current", 'rails_app'
-              assert File.exists?(File.join('vendor', 'plugins', subproject, 'lib'))
+          Dir.chdir 'rails_app' do
+            assert !File.exists?('.svn')
-              Dir.chdir File.join("vendor",'plugins', subproject) do
-                assert `git show HEAD` =~ /^\s*commit\s*#{revision}\s*$/i
-              end
+            %w(redhillonrails_core).each do |proj|
+              assert !File.exists?(File.join('vendor', 'plugins',proj, '.svn'))
             end
-          end
-        end
-      end
-    end
-    def test_update_with_missing_subproject_svn
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir update`
-          Dir.chdir 'update' do
-            source = with_svn_branches_repository_url
-            puts "About to checkout #{source}"
-            Ext.run "checkout", "--svn", "-b", "current", source, 'rails_app'
-            Dir.chdir 'rails_app' do
-              pretests = proc do
-                assert File.exists?('.svn')
-                assert !File.exists?(File.join('vendor', 'plugins', 'empty_plugin', 'lib'))
-                assert File.read(".externals") =~ /rails/
-                assert File.read(".externals") !~ /empty_plugin/
-              end
-              pretests.call
+            %w(redhillonrails_core acts_as_list engines).each do |proj|
+              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+            end
-              #add a project
-              Dir.chdir File.join(root_dir, 'test') do
-                `mkdir rails_app`
-                Dir.chdir 'workdir' do
-                  Ext.run "checkout", "--svn", "-b", "current", source, 'rails_app'
+            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-                  Dir.chdir "rails_app" do
-                    #install a new project
-                    Ext.run "install", "--svn",
-                      "file:///#{File.join(root_dir, 'test', 'cleanreps', 'empty_plugin')}"
+            assert File.exists?(File.join('vendor', 'rails', '.git'))
-                    SvnProject.add_all
+            assert File.exists?(File.join('modules', 'modules.txt'))
-                    puts `svn commit -m "added another subproject (empty_plugin)"`
-                  end
-                end
-              end
+            assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
-              pretests.call
+            ext = Ext.new
+            assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+            assert_equal "current", ext.configuration["modules"]["branch"]
-              #update the project and make sure ssl_requirement was added and checked out
-              Ext.run "update"
-              assert File.read(".externals") =~ /empty_plugin/
-              assert File.exists?(File.join('vendor', 'plugins', 'empty_plugin', 'lib'))
-            end
+            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
           end
         end
       end
-    end
-    def test_export_with_subproject
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir export`
-          Dir.chdir 'export' do
-            source = with_svn_branches_repository_url
-            puts "About to export #{source}"
-            Ext.run "export", "--svn", "-b", "current", source, 'rails_app'
-            Dir.chdir 'rails_app' do
-              assert File.exists?('.svn')
+      def test_uninstall
+        repository = RailsAppSvnBranches.new
+        repository.prepare
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                puts(ignore_text = `svn propget svn:ignore vendor/plugins`)
-                assert(ignore_text =~ /^#{proj}$/)
-              end
-              puts(ignore_text = `svn propget svn:ignore vendor`)
-              assert(ignore_text =~ /^rails$/)
+        assert File.exists?(File.join(repository.clean_dir, "db"))
-              Dir.chdir File.join('vendor', 'rails') do
-                #can't check this if it's local.  It seems --depth 1 is ignored for
-                #repositories on the local machine.
-                #assert `git show 92f944818eece9fe4bc62ffb39accdb71ebc32be` !~ /azimux/
-              end
+        workdir = File.join(root_dir, 'test', "tmp", "workdir","uninstall","svn","branches")
+        mkdir_p workdir
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                puts "filethere? #{proj}: #{File.exists?(File.join('vendor', 'plugins', proj, 'lib'))}"
-                if !File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
-                  puts "here"
-                end
-                assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
-              end
-              %w(foreign_key_migrations redhillonrails_core).each do |proj|
-                assert !File.exists?(File.join('vendor', 'plugins',proj, '.svn'))
-              end
-              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-            end
-          end
+        if File.exists?(File.join(workdir,"rails_app"))
+          rm_r File.join(workdir, "rails_app")
         end
-      end
-    end
-    def test_uninstall
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir checkout`
-          Dir.chdir 'checkout' do
-            source = with_svn_branches_repository_url
+        Dir.chdir workdir do
+          source = repository.clean_url
-            puts "About to checkout #{source}"
-            Ext.run "checkout", "--svn", "-b", "current", source, "rails_app"
+          puts "About to checkout #{source}"
+          Ext.run "checkout", "--svn", "-b", "current", source, "rails_app"
-            Dir.chdir 'rails_app' do
-              mp = Ext.new.main_project
+          Dir.chdir 'rails_app' do
+            mp = Ext.new.main_project
-              projs = %w(foreign_key_migrations redhillonrails_core acts_as_list)
-              projs_i = projs.dup
-              projs_ni = []
+            projs = %w(redhillonrails_core acts_as_list)
+            projs_i = projs.dup
+            projs_ni = []
-              #let's uninstall acts_as_list
-              Ext.run "uninstall", "acts_as_list"
+            #let's uninstall acts_as_list
+            Ext.run "uninstall", "acts_as_list"
-              projs_ni << projs_i.delete('acts_as_list')
+            projs_ni << projs_i.delete('acts_as_list')
-              mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, [], projs_i, projs_ni
+            mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, [], projs_i, projs_ni
-              Ext.run "uninstall", "-f", "foreign_key_migrations"
+            Ext.run "uninstall", "-f", "redhillonrails_core"
-              projs_ni << projs_i.delete('foreign_key_migrations')
+            projs_ni << projs_i.delete('redhillonrails_core')
-              projs_dne = []
-              projs_dne << projs.delete('foreign_key_migrations')
+            projs_dne = []
+            projs_dne << projs.delete('redhillonrails_core')
-              mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, projs_dne, projs_i, projs_ni
-            end
+            mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, projs_dne, projs_i, projs_ni
           end
         end
       end
-    end
+    end
   end
 end