ext 0.1.3 → 0.1.4

data/MIT_LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Miles Georgi, Azimux.com, nopugs.com Consulting
+Copyright (c) 2008-2009 Miles Georgi, Azimux.com, nopugs.com Consulting
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -15,7 +15,7 @@ task :prep_test do
     puts `rm -rf cleanreps`
     Dir.mkdir('cleanreps')
     Dir.chdir('cleanreps') do
-      %w(redhillonrails_core foreign_key_migrations).each do |p|
+      %w(redhillonrails_core foreign_key_migrations empty_plugin).each do |p|
         puts `cp ../setup/#{p}.svn.gz .`
         puts `gzip -d #{p}.svn.gz`
         puts `svnadmin create #{p}`
@@ -24,7 +24,7 @@ task :prep_test do
 
       puts `git clone --bare git://github.com/azimux/engines.git engines.git`
 
-      %w(acts_as_list).each do |p|
+      %w(acts_as_list ssl_requirement).each do |p|
         puts `git clone --bare git://github.com/rails/#{p}.git #{p}.git`
       end
 
@@ -87,7 +87,7 @@ end
 
 gem_specification = Gem::Specification.new do |specification|
   specification.name = 'ext'
-  specification.version = '0.1.3'
+  specification.version = '0.1.4'
   specification.platform = Gem::Platform::RUBY
   specification.rubyforge_project = 'ext'
 

data/lib/externals/scms/git_project.rb

@@ -62,9 +62,13 @@ module Externals
       if revision
         change_to_branch_revision
       else
-        puts "updating #{path}:"
-        Dir.chdir path do
-          puts `git pull`
+        if File.exists? path
+          puts "updating #{path}:"
+          Dir.chdir path do
+            puts `git pull`
+          end
+        else
+          co(*args)
         end
       end
     end
@@ -145,7 +149,7 @@ module Externals
       if ir.size - rows.size != 1
         raise "More than one row found matching #{path} in .gitignore"
       end
-      
+
       open('.gitignore', 'w') do |f|
         f.write "#{rows.compact.join("\n")}\n"
       end

data/lib/externals/scms/svn_project.rb

@@ -43,9 +43,13 @@ module Externals
       if revision
         change_to_revision
       else
-        puts "updating #{path}:"
-        Dir.chdir path do
-          puts `svn up .`
+        if File.exists? path
+          puts "updating #{path}:"
+          Dir.chdir path do
+            puts `svn up .`
+          end
+        else
+          co(*args)
         end
       end
     end
@@ -124,7 +128,7 @@ module Externals
       if ir.size - rows.size != 1
         raise "More than one row found matching #{path} in svn propget svn:ignore"
       end
-      
+
       Dir.chdir(parent) do
         puts `svn propset svn:ignore "#{rows.compact.join("\n")}\n" .`
       end
@@ -134,7 +138,7 @@ module Externals
       rows = ignore_text(path).split(/\n/)
 
       rows.delete_if {|row| row =~ /^\s*$/}
-      
+
       rows
     end
 

data/test/test_checkout_with_subprojects_svn.rb

@@ -130,6 +130,106 @@ module Externals
       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 = repository_dir('svn')
+
+            if windows?
+              source = source.gsub(/\\/, "/")
+            end
+            source = "file:///#{source}"
+
+
+            puts "About to checkout #{source}"
+            Ext.run "checkout", "--svn", 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
+                Dir.chdir File.join('workdir', "rails_app") do
+                  #install a new project
+                  Ext.run "install", File.join(root_dir, 'test', 'cleanreps', 'ssl_requirement.git')
+
+                  SvnProject.add_all
+
+                  puts `svn commit -m "added another subproject (ssl_requirement)"`
+                end
+              end
+
+              pretests.call
+
+              #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
+        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 = repository_dir('svn')
+
+            if windows?
+              source = source.gsub(/\\/, "/")
+            end
+            source = "file:///#{source}"
+
+
+            puts "About to checkout #{source}"
+            Ext.run "checkout", "--svn", 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
+
+              #add a project
+              Dir.chdir File.join(root_dir, 'test') do
+                Dir.chdir File.join('workdir', "rails_app") do
+                  #install a new project
+                  Ext.run "install", "--svn", "file:///#{File.join(root_dir, 'test', 'cleanreps', 'empty_plugin')}"
+
+                  SvnProject.add_all
+
+                  puts `svn commit -m "added another subproject (empty_plugin)"`
+                end
+              end
+
+              pretests.call
+
+              #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
+          end
+        end
+      end
+    end
+
     def test_export_with_subproject
       Dir.chdir File.join(root_dir, 'test') do
         Dir.chdir 'workdir' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Miles Georgi
@@ -9,11 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-10-02 00:00:00 -07:00
 default_executable: ext
 dependencies: []
 
-description: "Provides an SCM agnostic way to manage subprojects with a workflow similar to the scm:externals feature of subversion.  It's particularly useful for rails projects that have some plugins managed by svn and some managed by git.  For example, \"ext install git://github.com/rails/rails.git\" from within a rails application directory will realize that this belongs in the vendor/rails folder. It will also realize that this URL is a git repository and clone it into that folder.  It will also add the vendor/rails folder to the ignore feature for the SCM of the main project.  Let's say that the main project is being managed by subversion.  In that case it adds \"rails\" to the svn:ignore property of the vendor folder.  It also adds the URL to the .externals file so that when this project is checked out via \"ext checkout\" it knows where to fetch the subprojects.  There are several other useful commands, such as init, touch_emptydirs, add_all, export, status.  There's a tutorial at http://nopugs.com/ext-tutorial  The reason I made this project is that I was frustrated by two things:  1.  In my opinion, the workflow for svn:externals is far superior to git-submodule.  2.  Even if git-submodule was as useful as svn:externals, I would still like a uniform way to fetch all of the subprojects regardless of the SCM used to manage the main project."
+description: |-
+  Provides an SCM agnostic way to manage subprojects with a workflow similar
+  to the scm:externals feature of subversion.  It's particularly useful for rails
+  projects that have some plugins managed by svn and some managed by git.
+  
+  For example, "ext install git://github.com/rails/rails.git" from within a rails
+  application directory will realize that this belongs in the vendor/rails folder.
+  It will also realize that this URL is a git repository and clone it into that
+  folder.
+  
+  It will also add the vendor/rails folder to the ignore feature for the SCM of
+  the main project.  Let's say that the main project is being managed by
+  subversion.  In that case it adds "rails" to the svn:ignore property of the
+  vendor folder.  It also adds the URL to the .externals file so that when this
+  project is checked out via "ext checkout" it knows where to fetch the
+  subprojects.
+  
+  There are several other useful commands, such as init, touch_emptydirs, add_all,
+  export, status.  There's a tutorial at http://nopugs.com/ext-tutorial
+  
+  The reason I made this project is that I was frustrated by two things:
+  
+  1.  In my opinion, the workflow for svn:externals is far superior to
+  git-submodule.
+  
+  2.  Even if git-submodule was as useful as svn:externals, I would still like a
+  uniform way to fetch all of the subprojects regardless of the SCM used to manage
+  the main project.
 email: azimux@gmail.com
 executables: 
 - ext
@@ -39,8 +66,10 @@ files:
 - lib/externals/scms/git_project.rb
 - lib/externals/scms/svn_project.rb
 - lib/externals/test_case.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://nopugs.com/ext-tutorial
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -61,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ext
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides an SCM agnostic way to manage subprojects with a workflow similar to the svn:externals feature of subversion.  It's particularly useful for rails projects that have some plugins managed by svn and some managed by git.
 test_files: 
 - test/test_checkout_git.rb