ext 0.0.10 → 0.1.0

data/test/test_checkout_with_subprojects_git.rb

@@ -28,7 +28,7 @@ module Externals
 
           #install a couple svn managed subprojects
           %w(foreign_key_migrations redhillonrails_core).each do |proj|
-            Ext.run "install", "svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/#{proj}"
+            Ext.run "install", "--svn", "http://redhillonrails.rubyforge.org/svn/trunk/vendor/plugins/#{proj}"
           end
 
           GitProject.add_all
@@ -40,6 +40,15 @@ module Externals
     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

data/test/test_checkout_with_subprojects_svn.rb

@@ -40,15 +40,15 @@ module Externals
 
           #install a couple svn managed subprojects
           %w(foreign_key_migrations redhillonrails_core).each do |proj|
-            Ext.run "install", "svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/#{proj}"
+            Ext.run "install", "--svn", "http://redhillonrails.rubyforge.org/svn/trunk/vendor/plugins/#{proj}"
           end
-          
+
           #install project with a branch
-          Ext.run "install", "git://github.com/azimux/engines.git:edge"
-          
+          Ext.run "install", "git://github.com/azimux/engines.git", "-b", "edge"
+
           #install project with a non-default path
           Ext.run "install", "--svn", "file:///#{modules_repository_dir('svn')}", "modules"
-        
+
           SvnProject.add_all
 
           puts `svn commit -m "created empty rails app with some subprojects"`
@@ -58,6 +58,20 @@ module Externals
 
     def teardown
       destroy_rails_application
+      destroy_test_repository 'svn'
+      destroy_test_modules_repository 'svn'
+
+
+      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`
@@ -92,7 +106,7 @@ module Externals
 
               puts(ignore_text = `svn propget svn:ignore vendor`)
               assert(ignore_text =~ /^rails$/)
-              
+
               Dir.chdir File.join('vendor', 'rails') do
                 assert `git show 92f944818eece9fe4bc62ffb39accdb71ebc32be` =~ /azimux/
               end
@@ -102,11 +116,11 @@ module Externals
               end
 
               assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
-              
+
               assert File.exists?(File.join('modules', 'modules.txt'))
-              
+
               assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
-              
+
               Dir.chdir File.join('vendor','plugins','engines') do
                 assert(`git branch -a` =~ /^\*\s*edge\s*$/)
                 assert(`git branch -a` !~ /^\*\s*master\s*$/)
@@ -116,7 +130,7 @@ module Externals
         end
       end
     end
-    
+
     def test_export_with_subproject
       Dir.chdir File.join(root_dir, 'test') do
         Dir.chdir 'workdir' do
@@ -143,7 +157,7 @@ module Externals
 
               puts(ignore_text = `svn propget svn:ignore vendor`)
               assert(ignore_text =~ /^rails$/)
-              
+
               Dir.chdir File.join('vendor', 'rails') do
                 assert `git show 92f944818eece9fe4bc62ffb39accdb71ebc32be` !~ /azimux/
               end
@@ -155,7 +169,7 @@ module Externals
                 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

data/test/test_upgrade_externals_file.rb

@@ -0,0 +1,84 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+require 'externals/test_case'
+require 'externals/ext'
+
+module Externals
+  class TestUpgradeExternalsFile < TestCase
+    def test_upgrade
+      Dir.chdir File.join(root_dir, 'test') do
+        `rm -rf test_upgrade`
+        `mkdir test_upgrade`
+
+
+        Dir.chdir 'test_upgrade' do
+          open '.externals', 'w' do |f|
+            f.write "[main]
+
+scm = git
+type = rails
+[git]
+
+git://github.com/rails/rails.git
+git://github.com/rails/acts_as_list.git:edge
+[svn]
+
+svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/foreign_key_migrations
+svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/redhillonrails_core"
+          end
+
+          assert Ext.externals_file_obsolete?
+          
+          Ext.run "upgrade_externals_file"
+          assert !Ext.externals_file_obsolete?
+
+          new_text = nil
+          open '.externals', 'r' do |f|
+            new_text = f.read
+          end
+          puts new_text
+
+          config1 = Configuration::Configuration.new(new_text)
+
+          config2 = Configuration::Configuration.new("[.]
+scm = git
+type = rails
+
+[vendor/rails]
+scm = git
+repository = git://github.com/rails/rails.git
+
+[vendor/plugins/acts_as_list]
+scm = git
+repository = git://github.com/rails/acts_as_list.git
+branch = edge
+
+[vendor/plugins/foreign_key_migrations]
+scm = svn
+repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/foreign_key_migrations
+
+[vendor/plugins/redhillonrails_core]
+scm = svn
+repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/redhillonrails_core")
+
+
+          assert(config1.sections.size == 5)
+
+          [[config1, config2], [config2,config1]].each do |array|
+            c1 = array[0]
+            c2 = array[1]
+
+            c1.sections.each do |section|
+              s2 = c2[section.title]
+              assert s2
+              section.attributes.each_pair do |key,value|
+                assert s2[key] == value
+              end
+            end
+          end
+        end
+
+        `rm -rf test_upgrade`
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Miles Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -07:00
+date: 2008-09-24 00:00:00 -07:00
 default_executable: ext
 dependencies: []
 
@@ -25,11 +25,15 @@ files:
 - Rakefile
 - README
 - MIT_LICENSE.txt
-- lib/ext/string.rb
-- lib/ext/symbol.rb
+- lib/extensions/string.rb
+- lib/extensions/symbol.rb
 - lib/externals/command.rb
 - lib/externals/configuration/configuration.rb
+- lib/externals/configuration/old_configuration.rb
 - lib/externals/ext.rb
+- lib/externals/old_project.rb
+- lib/externals/old_scms/old_git_project.rb
+- lib/externals/old_scms/old_svn_project.rb
 - lib/externals/project.rb
 - lib/externals/project_types/rails.rb
 - lib/externals/scms/git_project.rb
@@ -69,3 +73,4 @@ test_files:
 - test/test_rails_detection.rb
 - test/test_string_extensions.rb
 - test/test_touch_emptydirs.rb
+- test/test_upgrade_externals_file.rb