ext 0.0.9 → 0.0.10

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 gem_specification = Gem::Specification.new do |specification|
   specification.name = 'ext'
-  specification.version = '0.0.9'
+  specification.version = '0.0.10'
   specification.platform = Gem::Platform::RUBY
   specification.rubyforge_project = 'ext'
   

data/lib/externals/ext.rb

@@ -292,6 +292,13 @@ Please use
       scm = options[:scm]
 
       scm ||= infer_scm(row)
+      
+      unless scm
+        raise "Unable to determine SCM from the repository name.  
+You need to either specify the scm used to manage the subproject
+that you are installing. Use an option to specify it
+(such as --git or --svn)"
+      end
 
       if !configuration[scm]
         configuration.add_empty_section(scm)

data/lib/externals/test_case.rb

@@ -41,12 +41,12 @@ module Externals
         end
       end
     end
-    
+  
     def destroy_test_repository scm 
       puts(rmcmd = "rm -rf #{repository_dir(scm)}")
       puts `#{rmcmd}`
     end
-    
+   
     def repository_dir scm = nil
       if scm.nil?
         File.join(File.dirname(__FILE__), '..', '..', 'test', 'repositories') 
@@ -54,6 +54,45 @@ module Externals
         File.expand_path(File.join(repository_dir, "#{scm}repo"))
       end
     end
+   
+    def create_test_modules_repository scm
+      Dir.chdir(File.join(File.dirname(__FILE__), '..', '..', 'test')) do
+        `mkdir repositories` unless File.exists? 'repositories'
+        Dir.chdir 'repositories' do
+          puts `svnadmin create #{scm}modulesrepo`
+        end
+        
+        cmd = "svn checkout \"file:///#{File.expand_path(File.join('repositories', "#{scm}modulesrepo"))}\""
+        puts "about to run #{cmd}"
+        puts `#{cmd}`
+        Dir.chdir "#{scm}modulesrepo" do
+          if !File.exists? 'modules.txt'
+            open("modules.txt", "w") do |f|
+              f.write "line1 of modules.txt\n"
+            end
+          
+            SvnProject.add_all
+            puts `svn commit -m "created modules.txt"`
+          end
+        end
+        `rm -rf #{scm}modulesrepo`
+      end
+    end
+    
+    def destroy_test_modules_repository scm 
+      puts(rmcmd = "rm -rf #{modules_repository_dir(scm)}")
+      puts `#{rmcmd}`
+      puts(rmcmd = "rm -rf #{modules_repository_dir(scm)}")
+      puts `#{rmcmd}`
+    end
+    
+    def modules_repository_dir scm = nil
+      if scm.nil?
+        File.join(File.dirname(__FILE__), '..', '..', 'test', 'repositories') 
+      else
+        File.expand_path(File.join(repository_dir, "#{scm}modulesrepo"))
+      end
+    end
     
     
     def create_rails_application

data/test/test_checkout_with_subprojects_svn.rb

@@ -9,6 +9,8 @@ module Externals
       create_rails_application
       destroy_test_repository 'svn'
       initialize_test_svn_repository
+      destroy_test_modules_repository 'svn'
+      create_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('/')
@@ -40,7 +42,13 @@ module Externals
           %w(foreign_key_migrations redhillonrails_core).each do |proj|
             Ext.run "install", "svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/#{proj}"
           end
-
+          
+          #install project with a branch
+          Ext.run "install", "git://github.com/azimux/engines.git: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"`
@@ -89,11 +97,20 @@ module Externals
                 assert `git show 92f944818eece9fe4bc62ffb39accdb71ebc32be` =~ /azimux/
               end
 
-              %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                assert File.exists?(File.join('vendor', 'plugins',proj, 'lib'))
+              %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('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*$/)
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Miles Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-06 00:00:00 -07:00
+date: 2008-09-10 00:00:00 -07:00
 default_executable: ext
 dependencies: []