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_file_utils_extensions.rb ADDED

@@ -0,0 +1,29 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib') if $0 == __FILE__
+require 'externals/test_case'
+require 'externals/ext'
+module Externals
+  module Test
+    class TestFileUtilsExtensions < TestCase
+      include ExtTestCase
+      def test_dir_empty
+        workdir = File.join root_dir, "test", "tmp", "extensions", "file_utils"
+        rm_rf_ie workdir
+        !dir_empty? workdir
+        mkdir_p workdir
+        assert dir_empty?(workdir)
+        somefile = File.join(workdir, "somefile")
+        touch somefile
+        assert !dir_empty?(workdir)
+        rm_rf somefile
+        assert dir_empty? workdir
+      end
+    end
+  end
+end

data/test/test_freeze_to_revision.rb CHANGED

@@ -1,111 +1,72 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
 require 'externals/test_case'
 require 'externals/ext'
+require 'externals/test/rails_app_git_repository'
 module Externals
-  class TestFreezeToRevision < TestCase
-    include ExtTestCase
+  module Test
+    class TestFreezeToRevision < TestCase
+      include ExtTestCase
-    def setup
-      destroy_rails_application
-      create_rails_application
+      def test_freeze_to_revision
+        repository = RailsAppGitRepository.new
+        repository.prepare
-      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
-        end
-        `rm -rf workdir`
-        `mkdir workdir`
-        `cp -r #{rails_application_dir} workdir`
-        Dir.chdir File.join('workdir','rails_app') do
-          Ext.run "touch_emptydirs"
-          `git init`
-          Ext.run "init"
-          raise " could not create .externals"  unless File.exists? '.externals'
-          Ext.run "install", File.join(root_dir, 'test', 'cleanreps', "acts_as_list.git")
-          #install a couple svn managed subprojects
-          %w(foreign_key_migrations redhillonrails_core).each do |proj|
-            Ext.run "install", "--svn", 'file:///' + File.join(root_dir, 'test', 'cleanreps', proj)
-          end
-          Dir.chdir File.join('vendor', 'plugins', 'foreign_key_migrations') do
-            assert `svn info` !~ /^.*:\s*2\s*$/i
-          end
-          Ext.run "freeze", "foreign_key_migrations", "2"
-          Ext.run "freeze", "acts_as_list", "9baff190a52c05cc542bfcaa7f77a91ce669f2f8"
-          GitProject.add_all
-          `git commit -m "created empty rails app with some subprojects"`
-        end
-      end
-    end
-    def teardown
-      destroy_rails_application
-      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
-        end
-        `rm -rf workdir`
-      end
-      Dir.chdir File.join(root_dir, 'test') do
-        `rm -rf workdir`
-      end
-    end
+        assert File.exists?(File.join(repository.clean_dir, ".git"))
+        workdir = File.join(root_dir, 'test', "tmp", "workdir", "checkout", "git")
+        mkdir_p workdir
-    def test_freeze_to_revision
-      Dir.chdir File.join(root_dir, 'test') do
-        Dir.chdir 'workdir' do
-          `mkdir checkout`
-          Dir.chdir 'checkout' do
-            source = File.join(root_dir, 'test', 'workdir', 'rails_app')
-            puts "About to checkout #{ source}"
-            Ext.run "checkout", "--git", source
+        Dir.chdir workdir do
+          rm_r repository.name if File.exists? repository.name
+          source = repository.clean_dir
+          puts "About to checkout #{source}"
+          Ext.run "checkout", "--git", source
-            Dir.chdir 'rails_app' do
-              assert File.exists?('.git')
+          Dir.chdir repository.name do
+            assert File.exists?('.git')
-              assert File.exists?('.gitignore')
+            assert File.exists?('.gitignore')
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                assert(File.read('.gitignore') =~ /^vendor[\/\\]plugins[\/\\]#{proj}$/)
-              end
+            %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
+              assert(File.read('.gitignore') =~ /^vendor[\/\\]plugins[\/\\]#{proj}$/)
+            end
-              Dir.chdir File.join('vendor', 'plugins') do
-                Dir.chdir 'acts_as_list' do
-                  %w(8771a632dc26a7782800347993869c964133ea29
+            Dir.chdir File.join('vendor', 'plugins') do
+              Dir.chdir 'acts_as_list' do
+                %w(8771a632dc26a7782800347993869c964133ea29
                   27a941c80ccaa8afeb9bfecb84c0ff098d8ba962
                   9baff190a52c05cc542bfcaa7f77a91ce669f2f8
-                  ).each do |hash|
-                    assert `git show #{hash}` =~ /^commit\s*#{hash}$/i
-                  end
-                  assert `git show HEAD` !~ /^\s*commit\s*8771a632dc26a7782800347993869c964133ea29\s*$/i
-                  assert `git show HEAD` =~ /^\s*commit\s*9baff190a52c05cc542bfcaa7f77a91ce669f2f8\s*$/i
-                end
-                Dir.chdir 'foreign_key_migrations' do
-                  assert `svn info` =~ /^.*:\s*2\s*$/i
+                ).each do |hash|
+                  assert `git show #{hash}` =~ /^commit\s*#{hash}$/i
+                  raise unless $? == 0
                 end
               end
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              Dir.chdir 'foreign_key_migrations' do
+                assert `svn info` =~ /^.*:\s*2\s*$/i
               end
             end
+            ext = Ext.new
+            acts_as_list = ext.subproject("acts_as_list")
+            assert `git show HEAD` !~ /^\s*commit\s*8771a632dc26a7782800347993869c964133ea29\s*$/i
+            raise unless $? == 0
+            r = repository.dependents[:acts_as_list].attributes[:revision]
+            assert r =~ /^[a-f0-9]{40}$/
+            assert_equal r,
+              acts_as_list.current_revision
+            `git show HEAD` =~ /^\s*commit\s*#{r}\s*$/i
+            raise unless $? == 0
+            %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
+              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+            end
           end
         end
       end
     end
   end
 end

data/test/test_git_project_extract_name.rb CHANGED

@@ -4,15 +4,17 @@ require 'externals/ext'
 require 'stringio'
 module Externals
-  class TestGitProjectExtractName < TestCase
-    include ExtTestCase
+  module Test
+    class TestGitProjectExtractName < TestCase
+      include ExtTestCase
-    def test_extract_name
-      project = Externals::GitProject.new({})
-      assert_equal "test", project.extract_name("git://domain.com/test.git")
-      assert_equal "test", project.extract_name("git@domain.com:test.git")
-      assert_equal "test", project.extract_name("test.git")
-      assert_equal "test", project.extract_name("test")
+      def test_extract_name
+        project = Externals::GitProject.new({})
+        assert_equal "test", project.extract_name("git://domain.com/test.git")
+        assert_equal "test", project.extract_name("git@domain.com:test.git")
+        assert_equal "test", project.extract_name("test.git")
+        assert_equal "test", project.extract_name("test")
+      end
     end
   end
 end

data/test/test_init_git.rb CHANGED

@@ -1,42 +1,32 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
 require 'externals/test_case'
 require 'externals/ext'
+require 'externals/test/basic_git_repository'
 module Externals
-  class TestInitGit < TestCase
-    include ExtTestCase
-    def setup
-      initialize_test_git_repository
-      Dir.chdir File.join(root_dir, 'test') do
-        `mkdir workdir`
-        Dir.chdir 'workdir' do
-          `cp -r #{repository_dir('git')} .`
-        end
-      end
-    end
+  module Test
+    class TestInitGit < TestCase
+      include ExtTestCase
-    def teardown
-      destroy_test_repository 'git'
-      Dir.chdir File.join(root_dir, 'test') do
-        `rm -rf workdir`
-      end
-    end
+      def test_init
+        repository = BasicGitRepository.new
+        repository.prepare
-    def test_repository_created
-      assert File.exists?(File.join(repository_dir('git'), '.git'))
-    end
+        assert File.exists?(File.join(repository.clean_dir, ".git"))
+        workdir = File.join(root_dir, 'test', "tmp", "workdir")
+        mkdir_p workdir
-    def test_init
-      Dir.chdir File.join(root_dir, 'test') do
-        `mkdir workdir`
+        Dir.chdir workdir do
+          delete_if_dirty(repository.name)
+          if !File.exists?(repository.name)
+            cp_a repository.clean_dir, "."
+          end
-        Dir.chdir 'workdir' do
-          Dir.chdir 'gitrepo' do
+          mark_dirty(repository.name)
+          Dir.chdir repository.name do
             assert !File.exists?('.externals')
             Ext.run "init"
             assert File.exists?('.externals')

data/test/test_projects.rb CHANGED

@@ -3,36 +3,27 @@ require 'externals/test_case'
 require 'externals/ext'
 module Externals
-  class TestProjects < TestCase
-    include ExtTestCase
-    def setup
-      teardown
-    end
-    def teardown
-      Dir.chdir File.join(root_dir, 'test') do
-        `rm -rf test_svn_global_opts`
-      end
-    end
-    def test_project_scm
-      assert_equal "svn", SvnProject.scm
-      assert_equal "git", GitProject.scm
-      assert_raise RuntimeError do
-        Project.scm
+  module Test
+    class TestProjects < TestCase
+      include ExtTestCase
+      def test_project_scm
+        assert_equal "svn", SvnProject.scm
+        assert_equal "git", GitProject.scm
+        assert_raise RuntimeError do
+          Project.scm
+        end
       end
-    end
-    def test_svn_global_opts
-      Dir.chdir File.join(root_dir, 'test') do
-        `rm -rf test_svn_global_opts`
-        `mkdir test_svn_global_opts`
+      def test_svn_global_opts
+        Dir.chdir File.join(root_dir, 'test') do
+          rm_rf "test_svn_global_opts" if File.exists? "test_svn_global_opts"
+          mkdir "test_svn_global_opts"
-        Dir.chdir 'test_svn_global_opts' do
-          open '.externals', 'w' do |f|
-            f.write "[.]
+          begin
+            Dir.chdir 'test_svn_global_opts' do
+              open '.externals', 'w' do |f|
+                f.write "[.]
 scm = git
 type = rails
@@ -44,27 +35,27 @@ branch = edge
 [vendor/plugins/foreign_key_migrations]
 scm = svn
 repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/foreign_key_migrations
-            "
-          end
+                "
+              end
-          #test no scm_opts set...
+              #test no scm_opts set...
-          ext = Ext.new
+              ext = Ext.new
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, nil
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, nil
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up, nil
-          assert_equal ext.main_project.scm_opts, nil
-          assert_equal ext.main_project.scm_opts_co, nil
-          assert_equal ext.main_project.scm_opts_up, nil
-          assert_equal ext.main_project.git_opts, nil
-          assert_equal ext.main_project.svn_opts, nil
-          assert_equal ext.main_project.git_opts_up, nil
-          assert_equal ext.main_project.svn_opts_up, nil
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, nil
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, nil
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up, nil
+              assert_equal ext.main_project.scm_opts, nil
+              assert_equal ext.main_project.scm_opts_co, nil
+              assert_equal ext.main_project.scm_opts_up, nil
+              assert_equal ext.main_project.git_opts, nil
+              assert_equal ext.main_project.svn_opts, nil
+              assert_equal ext.main_project.git_opts_up, nil
+              assert_equal ext.main_project.svn_opts_up, nil
-          open '.externals', 'w' do |f|
-            f.write "[.]
+              open '.externals', 'w' do |f|
+                f.write "[.]
 scm = git
 type = rails
@@ -78,33 +69,33 @@ branch = edge
 scm_opts = --trust-server-cert --non-interactive
 scm = svn
 repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/foreign_key_migrations
-            "
-          end
-          #test scm_opts set... no _co, _up, etc.
-          ext = Ext.new
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, "--verbose"
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, "--verbose"
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up, "--verbose"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts,
-            "--trust-server-cert --non-interactive"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_co,
-            "--trust-server-cert --non-interactive"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_up,
-            "--trust-server-cert --non-interactive"
-          assert_equal ext.main_project.scm_opts, nil
-          assert_equal ext.main_project.scm_opts_co, nil
-          assert_equal ext.main_project.scm_opts_up, nil
-          assert_equal ext.main_project.git_opts, nil
-          assert_equal ext.main_project.svn_opts, nil
-          assert_equal ext.main_project.git_opts_up, nil
-          assert_equal ext.main_project.svn_opts_up, nil
-          #test global options and specific action options
-          open '.externals', 'w' do |f|
-            f.write "[.]
+                "
+              end
+              #test scm_opts set... no _co, _up, etc.
+              ext = Ext.new
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, "--verbose"
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, "--verbose"
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up, "--verbose"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts,
+                "--trust-server-cert --non-interactive"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_co,
+                "--trust-server-cert --non-interactive"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_up,
+                "--trust-server-cert --non-interactive"
+              assert_equal ext.main_project.scm_opts, nil
+              assert_equal ext.main_project.scm_opts_co, nil
+              assert_equal ext.main_project.scm_opts_up, nil
+              assert_equal ext.main_project.git_opts, nil
+              assert_equal ext.main_project.svn_opts, nil
+              assert_equal ext.main_project.git_opts_up, nil
+              assert_equal ext.main_project.svn_opts_up, nil
+              #test global options and specific action options
+              open '.externals', 'w' do |f|
+                f.write "[.]
 scm = git
 type = rails
 svn_opts = --trust-server-cert
@@ -122,31 +113,34 @@ branch = edge
 scm_opts_co = --non-interactive
 scm = svn
 repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/foreign_key_migrations
-            "
+                "
+              end
+              ext = Ext.new
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, "--verbose"
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, "--verbose"
+              assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up,
+                "--made-up-option --verbose"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts,
+                "--trust-server-cert"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_co,
+                "--non-interactive --trust-server-cert"
+              assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_up,
+                "--svn-up --trust-server-cert"
+              assert_equal ext.main_project.scm_opts, "--main-project-opts --verbose"
+              assert_equal ext.main_project.scm_opts_co, "--main-project-opts --verbose"
+              assert_equal ext.main_project.scm_opts_up, "--main-project-opts --verbose"
+              assert_equal ext.main_project.git_opts, "--verbose"
+              assert_equal ext.main_project.svn_opts, "--trust-server-cert"
+              assert_equal ext.main_project.git_opts_up, "--verbose"
+              assert_equal ext.main_project.svn_opts_up, "--svn-up --trust-server-cert"
+            end
+          ensure
+            rm_rf "test_svn_global_opts" if File.exists? "test_svn_global_opts"
           end
-          ext = Ext.new
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts, "--verbose"
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_co, "--verbose"
-          assert_equal ext.subproject_by_name_or_path('acts_as_list').scm_opts_up,
-            "--made-up-option --verbose"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts,
-            "--trust-server-cert"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_co,
-            "--non-interactive --trust-server-cert"
-          assert_equal ext.subproject_by_name_or_path('foreign_key_migrations').scm_opts_up,
-            "--svn-up --trust-server-cert"
-          assert_equal ext.main_project.scm_opts, "--main-project-opts --verbose"
-          assert_equal ext.main_project.scm_opts_co, "--main-project-opts --verbose"
-          assert_equal ext.main_project.scm_opts_up, "--main-project-opts --verbose"
-          assert_equal ext.main_project.git_opts, "--verbose"
-          assert_equal ext.main_project.svn_opts, "--trust-server-cert"
-          assert_equal ext.main_project.git_opts_up, "--verbose"
-          assert_equal ext.main_project.svn_opts_up, "--svn-up --trust-server-cert"
-          `rm -rf test_svn_global_opts`
         end
       end
     end