ext 0.1.2 → 0.1.3

data/README

@@ -21,6 +21,7 @@ forms apply the action to all sub projects.
 
 The commands and usage are as follows (from 'ext help'):
 There's a tutorial available at http://nopugs.com/ext-tutorial
+There's a tutorial available at http://nopugs.com/ext-tutorial
 
 ext [OPTIONS] <command> [repository] [-b <branch>] [path]
     -g, --git                        same as '--scm git'  Uses git to checkout/export the main project
@@ -28,6 +29,7 @@ ext [OPTIONS] <command> [repository] [-b <branch>] [path]
     -t, --type TYPE                  The type of project the main project is.  For example, 'rails'.
         --scm SCM                    The SCM used to manage the main project.  For example, '--scm svn'.
     -b, --branch BRANCH              The branch you want the subproject to checkout when doing 'ext install'
+    -f, --force_removal              When doing an uninstall of a subproject, remove it's files and subfolders, too.
     -w, --workdir DIR                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)
@@ -37,27 +39,17 @@ ext [OPTIONS] <command> [repository] [-b <branch>] [path]
 
 
 Commands that apply to the main project or the .externals file:
-update_ignore, install, init, touch_emptydirs, help, upgrade_externals_file
+freeze, help, init, install, touch_emptydirs, uninstall, update_ignore, upgrade_externals_file
 
-update_ignore   Adds all paths to subprojects that are
-                registered in .externals to the ignore feature of the
-                main project.  This is automatically performed by install,
-                and so you probably only will run this if you are manually
-                maintaining .externals
-
-install         Usage: ext install <repository> [-b <branch>] [path]
-                Registers <repository> in .externals under the appropriate
-                SCM.  Checks out the project, and also adds it to the ignore
-                feature offered by the SCM of the main project.  If the SCM
-                type is not obvious from the repository URL, use the --scm,
-                --git, or --svn flags.
-
-freeze          ext freeze project [REVISION]
+freeze          Usage: ext freeze project [REVISION]
+                
                 Locks a subproject into a specific revision/branch.  If no
                 revision is supplied, the current revision/branch of the
                 project will be used.  You can specify the project by name
                 or path.
 
+help            You probably just ran this command just now.
+
 init            Creates a .externals file containing only [main]
                 It will try to determine the SCM used by the main project,
                 as well as the project type.  You don't have to specify
@@ -65,12 +57,29 @@ init            Creates a .externals file containing only [main]
                 isn't supported.  It just means that when using 'install'
                 that you'll want to specify the path.
 
+install         Usage: ext install <repository> [-b <branch>] [path]
+                Registers <repository> in .externals under the appropriate
+                SCM.  Checks out the project, and also adds it to the ignore
+                feature offered by the SCM of the main project.  If the SCM
+                type is not obvious from the repository URL, use the --scm,
+                --git, or --svn flags.
+
 touch_emptydirs Recurses through all directories from the
                 top and adds a .emptydir file to any empty directories it
                 comes across.  Useful for dealing with SCMs that refuse to
                 track empty directories (such as git, for example)
 
-help            You probably just ran this command just now.
+uninstall       Usage: ext uninstall [-f|--force_removal] <project>
+                Removes a subproject from being tracked by ext.  If you
+                want the files associated with this subproject deleted as well
+                (if, for example, you wish to reinstall it from a different
+                repository) then you can use the -f option to remove the files.
+
+update_ignore   Adds all paths to subprojects that are
+                registered in .externals to the ignore feature of the
+                main project.  This is automatically performed by install,
+                and so you probably only will run this if you are manually
+                maintaining .externals
 
 upgrade_externals_fileConverts the old format that stored
                 as [main][svn][git] to [<path1>][<path2>]...
@@ -107,8 +116,11 @@ co, ex, st, up
 
 co              Like checkout, but skips the main project and
                 only checks out subprojects.
+
 ex              Like export, but skips the main project.
+
 st              Like status, but skips the main project.
+
 up              Like update, but skips the main project.
 
 The externals project is copyright 2008 by Miles Georgi, nopugs.com, azimux.com

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'find'
 
 root_dir = File.dirname(__FILE__)
 
@@ -10,7 +11,7 @@ If you plan on running the tests, you only need
  to run this once."
 task :prep_test do
   Dir.chdir File.join(root_dir, 'test') do
-    
+
     puts `rm -rf cleanreps`
     Dir.mkdir('cleanreps')
     Dir.chdir('cleanreps') do
@@ -21,11 +22,59 @@ task :prep_test do
         puts `svnadmin load #{p} < #{p}.svn`
       end
 
-      %w(acts_as_list rails).each do |p|
+      puts `git clone --bare git://github.com/azimux/engines.git engines.git`
+
+      %w(acts_as_list).each do |p|
         puts `git clone --bare git://github.com/rails/#{p}.git #{p}.git`
       end
-      
-      puts `git clone --bare git://github.com/azimux/engines.git engines.git`
+
+      if File.exists? 'C:\\tmp\\rails'
+        puts `cp -a C:\\tmp\\rails full_rails`
+      elsif File.exists? '/tmp/rails'
+        puts `cp -a /tmp/rails full_rails`
+      else
+        puts `git clone git://github.com/rails/rails.git full_rails`
+      end
+      puts `cp -a full_rails fake_rails`
+
+      #let's make the repo smaller by removing all but 1 file from each
+      #directory to save time
+      Dir.chdir 'fake_rails' do
+        puts `rm -rf .git`
+        raise "something wrong with rm" if File.exists? '.git'
+      end
+
+      dirs = []
+      Find.find('fake_rails') do |f|
+        dirs << f if File.directory?(f)
+      end
+
+      dirs.each do |dir|
+        files = Dir.entries(dir)
+
+        Dir.chdir(dir) do
+          files = files.select {|e|e != ".gitignore" && File.file?(e)}.sort
+          files.shift #let's keep the first file in the list.
+          files.each do |file|
+            File.delete(file)
+          end
+        end
+      end
+
+      raise "why is rails already here?" if File.exists? 'rails.git'
+
+      Dir.mkdir('rails.git')
+
+      Dir.chdir('rails.git') do
+        puts `git init --bare`
+      end
+
+      Dir.chdir 'fake_rails' do
+        puts `git init`
+        puts `git add .`
+        puts `git commit -m "rails with all but 1 file per directory deleted"`
+        puts `git push ../rails.git master`
+      end
     end
   end
 end
@@ -38,7 +87,7 @@ end
 
 gem_specification = Gem::Specification.new do |specification|
   specification.name = 'ext'
-  specification.version = '0.1.2'
+  specification.version = '0.1.3'
   specification.platform = Gem::Platform::RUBY
   specification.rubyforge_project = 'ext'
 

data/lib/externals/configuration/configuration.rb

@@ -21,7 +21,7 @@ module Externals
 
       SETTING_REGEX = /^\s*([\.\w_-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
       SET_SETTING_REGEX = /^(\s*(?:[\.\w_-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
-      
+
       def attributes
         retval = {}
         rows.each do |row|
@@ -60,7 +60,7 @@ module Externals
         end
         value
       end
-      
+
       def rm_setting key
         key = key.to_s
         found = nil
@@ -135,7 +135,7 @@ module Externals
         title = title.to_s
         sections.detect {|section| section.title == title}
       end
-      
+
       def []= title, hash
         add_empty_section title
         section = self[title]
@@ -144,6 +144,13 @@ module Externals
         end
       end
 
+      def remove_section sec
+        sec = sections.detect{|section| section.title == sec}
+
+        raise "No section found in config file for #{sec}" unless sec
+        sections.delete(sec)
+      end
+
       def add_empty_section  title
         raise "Section already exists" if self[title]
         sections << Section.new("[#{title.to_s}]", "")
@@ -207,7 +214,7 @@ module Externals
           f.write to_s
         end
       end
-      
+
       def to_s
         sections.map(&:to_s).join("\n\n")
       end

data/lib/externals/ext.rb

@@ -38,35 +38,41 @@ module Externals
     [:up, "Like update, but skips the main project."]
   ]
   MAIN_COMMANDS_HASH = [
-    [:update_ignore, "Adds all paths to subprojects that are
-      registered in .externals to the ignore feature of the
-      main project.  This is automatically performed by install,
-      and so you probably only will run this if you are manually
-      maintaining .externals"],
-    [:install, "ext install <repository> [-b <branch>] [path]",
-      "Registers <repository> in .externals under the appropriate
-      SCM.  Checks out the project, and also adds it to the ignore
-      feature offered by the SCM of the main project.  If the SCM
-      type is not obvious from the repository URL, use the --scm,
-      --git, or --svn flags."],
     [:freeze, "ext freeze project [REVISION]", %{
       Locks a subproject into a specific revision/branch.  If no
       revision is supplied, the current revision/branch of the
       project will be used.  You can specify the project by name
       or path.}],
+    [:help, "You probably just ran this command just now."],
     [:init, "Creates a .externals file containing only [main]
       It will try to determine the SCM used by the main project,
       as well as the project type.  You don't have to specify
       a project type if you don't want to or if your project type
       isn't supported.  It just means that when using 'install'
       that you'll want to specify the path."],
+    [:install, "ext install <repository> [-b <branch>] [path]",
+      "Registers <repository> in .externals under the appropriate
+      SCM.  Checks out the project, and also adds it to the ignore
+      feature offered by the SCM of the main project.  If the SCM
+      type is not obvious from the repository URL, use the --scm,
+      --git, or --svn flags."],
     [:touch_emptydirs, "Recurses through all directories from the
       top and adds a .emptydir file to any empty directories it
       comes across.  Useful for dealing with SCMs that refuse to
       track empty directories (such as git, for example)"],
-    [:help, "You probably just ran this command just now."],
+    [:uninstall, "ext uninstall [-f|--force_removal] <project>",
+      "Removes a subproject from being tracked by ext.  If you
+      want the files associated with this subproject deleted as well
+      (if, for example, you wish to reinstall it from a different
+      repository) then you can use the -f option to remove the files."],
+    [:update_ignore, "Adds all paths to subprojects that are
+      registered in .externals to the ignore feature of the
+      main project.  This is automatically performed by install,
+      and so you probably only will run this if you are manually
+      maintaining .externals"],
     [:upgrade_externals_file, "Converts the old format that stored
       as [main][svn][git] to [<path1>][<path2>]..."],
+
   ]
 
 
@@ -133,6 +139,8 @@ module Externals
         String) {|scm| sub_options[:scm] = main_options[:scm] = scm}
       opts.on("--branch BRANCH", "-b BRANCH", "The branch you want the subproject to checkout when doing 'ext install'",
         String) {|branch| sub_options[:branch] = main_options[:branch] = branch}
+      opts.on("--force_removal", "-f", "When doing an uninstall of a subproject, remove it's files and subfolders, too.",
+        String) {|branch| sub_options[:force_removal] = true}
       opts.on("--workdir DIR", "-w DIR", "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)",
@@ -286,7 +294,7 @@ module Externals
       configuration
     end
 
-    def initialize options
+    def initialize options = {}
       super()
 
       if options[:upgrade_externals_file]
@@ -458,6 +466,27 @@ that you are installing. Use an option to specify it
       update_ignore args, orig_options
     end
 
+    def uninstall args, options
+      #init args, options unless File.exists? '.externals'
+      raise "Hmm... there's no .externals file in this directory." if !File.exists? '.externals'
+
+      project = subproject_by_name_or_path(args[0])
+
+      raise "No such project named #{args[0]}" unless project
+
+      main_project.drop_from_ignore project.path
+
+
+      configuration.remove_section(project.path)
+      configuration.write '.externals'
+
+      if options[:force_removal]
+        Dir.chdir File.dirname(project.path) do
+          `rm -rf #{File.basename(project.path)}`
+        end
+      end
+    end
+
     def update_ignore args, options
       #path = args[0]
 

data/lib/externals/project.rb

@@ -110,7 +110,24 @@ module Externals
       line =~ PROJECT_LINE_REGEX
     end
 
+    #test helper method
+    def assert_e_dne_i_ni assert, exists, doesnt = [], ignored = exists, notignored = []
+      ignored.each do |proj|
+        assert.call(ignore_text("vendor/plugins/#{proj}") =~ /#{proj}$/)
+      end
+
+      notignored.each do |proj|
+        assert.call(ignore_text("vendor/plugins/#{proj}") !~ /#{proj}$/)
+      end
 
+      exists.each do |proj|
+        assert.call File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+      end
+
+      doesnt.each do |proj|
+        assert.call !File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+      end
+    end
 
     protected
     def trim_quotes value

data/lib/externals/scms/git_project.rb

@@ -99,11 +99,11 @@ module Externals
     end
 
     def ignore_contains? path
-      text = ignore_text
+      text = ignore_text(path)
       text.split(/\n/).detect {|r| r.strip == path.strip}
     end
 
-    def ignore_text
+    def ignore_text(path)
       return '' unless File.exists? '.gitignore'
       retval = ''
       open('.gitignore') do |f|
@@ -112,16 +112,40 @@ module Externals
       retval
     end
 
+    def ignore_rows(path)
+      rows = ignore_text(path) || ''
+
+      rows = rows.split(/\n/)
+
+      rows.delete_if {|row| row =~ /^\s*$/}
+
+      rows
+    end
+
     def append_ignore path
-      rows = ignore_text || ''
+      rows = ignore_rows(path)
+
       return if rows.index path.strip
 
-      rows = rows.split(/\n/)
       rows << path.strip
 
-      rows.delete_if {|row| row =~ /^\s*$/}
+      open('.gitignore', 'w') do |f|
+        f.write "#{rows.compact.join("\n")}\n"
+      end
+    end
+
+    def drop_from_ignore path
+      ir = ignore_rows(path)
+      rows = ir.select {|row| row.strip != path.strip}
 
+      if rows.size == ir.size
+        raise "row not found matching #{path} in .gitignore"
+      end
 
+      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

@@ -99,23 +99,49 @@ module Externals
       parent = File.dirname(path)
       child = File.basename(path)
 
-      rows = ignore_text(path).split(/\n/)
+      rows = ignore_rows(path)
 
       return if rows.detect {|row| row.strip == child.strip}
 
       rows << child.strip
 
-      rows.delete_if {|row| row =~ /^\s*$/}
+      Dir.chdir(parent) do
+        puts `svn propset svn:ignore "#{rows.compact.join("\n")}\n" .`
+      end
+    end
+
+    def drop_from_ignore path
+      parent = File.dirname(path)
+      child = File.basename(path).strip
+
+      ir = ignore_rows(path)
+      rows = ir.select {|row| row.strip != child}
 
+      if rows.size == ir.size
+        raise "row not found matching #{path} in svn propget svn:ignore"
+      end
+
+      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
     end
 
+    def ignore_rows(path)
+      rows = ignore_text(path).split(/\n/)
+
+      rows.delete_if {|row| row =~ /^\s*$/}
+      
+      rows
+    end
+
     def ignore_text(path)
       ignore_text = ''
       Dir.chdir File.dirname(path) do
-        puts(ignore_text = `svn propget svn:ignore`)
+        ignore_text = `svn propget svn:ignore`
       end
       ignore_text
     end

data/test/test_checkout_with_subprojects_git.rb

@@ -5,8 +5,8 @@ require 'externals/ext'
 module Externals
   class TestCheckoutWithSubprojectsGit < TestCase
     include ExtTestCase
-    
-    
+
+
     def setup
       destroy_rails_application
       create_rails_application
@@ -52,34 +52,64 @@ module Externals
         end
         `rm -rf workdir`
       end
-      #      Dir.chdir File.join(root_dir, 'test') do
-      #        `rm -rf workdir`
-      #      end
-      #XXX
+      Dir.chdir File.join(root_dir, 'test') do
+        `rm -rf workdir`
+      end
     end
 
-
     def test_checkout_with_subproject
       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}"
+            puts "About to checkout #{source}"
             Ext.run "checkout", "--git", source
 
             Dir.chdir 'rails_app' do
               assert File.exists?('.git')
 
               assert File.exists?('.gitignore')
+              mp = Ext.new.main_project
+
+              mp.assert_e_dne_i_ni proc{|a|assert(a)},%w(foreign_key_migrations redhillonrails_core acts_as_list)
+            end
+          end
+        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 = File.join(root_dir, 'test', 'workdir', 'rails_app')
+            puts "About to checkout #{source}"
+            Ext.run "checkout", "--git", source
+
+            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 = []
+
+              #let's uninstall acts_as_list
+              Ext.run "uninstall", "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
+
+              Ext.run "uninstall", "-f", "foreign_key_migrations"
+
+              projs_ni << projs_i.delete('foreign_key_migrations')
+
+              projs_dne = []
+              projs_dne << projs.delete('foreign_key_migrations')
 
-              %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.exists?(File.join('vendor', 'plugins',proj, 'lib'))
-              end
+              mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, projs_dne, projs_i, projs_ni
             end
           end
         end

data/test/test_checkout_with_subprojects_svn.rb

@@ -5,7 +5,7 @@ require 'externals/ext'
 module Externals
   class TestCheckoutWithSubprojectsSvn < TestCase
     include ExtTestCase
-    
+
     def setup
       destroy_rails_application
       create_rails_application
@@ -75,10 +75,9 @@ module Externals
       end
 
 
-      #      Dir.chdir File.join(root_dir, 'test') do
-      #        `rm -rf workdir`
-      #      end
-      #XXX
+      Dir.chdir File.join(root_dir, 'test') do
+        `rm -rf workdir`
+      end
     end
 
 
@@ -109,16 +108,14 @@ 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
-
               %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('vendor', 'rails', '.git'))
+
               assert File.exists?(File.join('modules', 'modules.txt'))
 
               assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
@@ -141,7 +138,7 @@ module Externals
             source = repository_dir('svn')
 
             if windows?
-              source = source.gsub(/\\/, "/")
+              source.gsub!(/\\/, "/")
             end
             source = "file:///#{source}"
 
@@ -184,5 +181,50 @@ module Externals
         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 = File.join(root_dir, 'test', 'workdir', 'rails_app')
+            source = repository_dir('svn')
+
+            if windows?
+              source = source.gsub(/\\/, "/")
+              #source.gsub!(/^[A-Z]:[\/\\]/, "")
+            end
+            source = "file:///#{source}"
+
+            puts "About to checkout #{source}"
+            Ext.run "checkout", "--svn", source, "rails_app"
+
+            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 = []
+
+              #let's uninstall acts_as_list
+              Ext.run "uninstall", "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
+
+              Ext.run "uninstall", "-f", "foreign_key_migrations"
+
+              projs_ni << projs_i.delete('foreign_key_migrations')
+
+              projs_dne = []
+              projs_dne << projs.delete('foreign_key_migrations')
+
+              mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, projs_dne, projs_i, projs_ni
+            end
+          end
+        end
+      end
+    end
   end
 end

data/test/test_freeze_to_revision.rb

@@ -5,7 +5,7 @@ require 'externals/ext'
 module Externals
   class TestFreezeToRevision < TestCase
     include ExtTestCase
-    
+
     def setup
       destroy_rails_application
       create_rails_application
@@ -54,10 +54,9 @@ module Externals
         end
         `rm -rf workdir`
       end
-      #      Dir.chdir File.join(root_dir, 'test') do
-      #        `rm -rf workdir`
-      #      end
-      #XXX
+      Dir.chdir File.join(root_dir, 'test') do
+        `rm -rf workdir`
+      end
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Miles Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -07:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: ext
 dependencies: []