ext 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,4 +1,8 @@
-March 29, 20011 Version 1.0.0 released
+July 19, 2011 Version 1.0.1 released
+- Fixed a small bug preventing subprojects with a revision associated with them
+  from having their name displayed when updating.
+
+March 29, 2011 Version 1.0.0 released
 - Added scm_opts and <scm_name>_opts .externals file options with
   (_co|_ex|_st|_up) suffixed versions for passing options to the underlying
   SCM executable.

data/README

@@ -82,9 +82,6 @@ update_ignore   Adds all paths to subprojects that are
                 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>]...
-
 version         Displays the version number of externals and exits.
 
 

data/lib/externals/ext.rb

@@ -1,7 +1,5 @@
 require 'externals/project'
-require 'externals/old_project'
 require 'externals/configuration/configuration'
-require 'externals/configuration/old_configuration'
 require 'optparse'
 require 'externals/command'
 require 'externals/extensions/symbol'
@@ -10,7 +8,7 @@ module Externals
   #exit status
   OBSOLETE_EXTERNALS_FILE = 15
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -70,8 +68,6 @@ module Externals
       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>]..."],
     [:version, "Displays the version number of externals and exits."],
   ]
 
@@ -92,10 +88,6 @@ module Externals
       require "externals/scms/#{project}" if project =~ /_project.rb$/
     end
 
-    Dir.entries(File.join(File.dirname(__FILE__), '..', 'externals','old_scms')).each do |project|
-      require "externals/old_scms/#{project}" if project =~ /_project.rb$/
-    end
-
     Dir.entries(PROJECT_TYPES_DIRECTORY).each do |type|
       require File.join(PROJECT_TYPES_DIRECTORY, type) if type =~ /\.rb$/
     end
@@ -188,28 +180,10 @@ module Externals
 
 
       Dir.chdir(main_options[:workdir] || ".") do
-        if command == :upgrade_externals_file
-          main_options[:upgrade_externals_file] = true
-        elsif command != :help && command != :version
-          if externals_file_obsolete?
-            puts "your .externals file Appears to be in an obsolete format"
-            puts "Please run 'ext upgrade_externals_file' to migrate it to the new format"
-            exit OBSOLETE_EXTERNALS_FILE
-          end
-        end
-
         self.new(main_options).send(command, args, sub_options)
       end
     end
 
-    def self.externals_file_obsolete?
-      return false if !File.exists?('.externals')
-
-      open('.externals', 'r') do |f|
-        f.read =~ /^\s*\[git\]\s*$|^\s*\[main\]\s*$|^\s*\[svn\]\s*$/
-      end
-    end
-
     def print_commands(commands)
       commands.each do |command|
         puts Command.new(*command)
@@ -306,31 +280,6 @@ module Externals
     def initialize options = {}
       super()
 
-      if options[:upgrade_externals_file]
-        type ||= options[:type]
-
-
-        if type
-          install_project_type type
-        else
-
-          possible_project_types = self.class.project_types.select do |project_type|
-            self.class.project_type_detector(project_type).detected?
-          end
-
-          if possible_project_types.size > 1
-            raise "We found multiple project types that this could be: #{possible_project_types.join(',')}
-Please use
- the --type option to tell ext which to use."
-          elsif possible_project_types.empty?
-            install_project_type OldConfiguration::Configuration.new[:main][:type]
-          else
-            install_project_type possible_project_types.first
-          end
-        end
-        return
-      end
-
       scm = configuration['.']
       scm = scm['scm'] if scm
       scm ||= options[:scm]
@@ -376,10 +325,6 @@ Please use
       Externals.module_eval("#{scm.to_s.cap_first}Project", __FILE__, __LINE__)
     end
 
-    def self.old_project_class(scm)
-      Externals.module_eval("Old#{scm.to_s.cap_first}Project", __FILE__, __LINE__)
-    end
-
     def self.project_classes
       retval = []
       registered_scms.each do |scm|
@@ -704,29 +649,6 @@ Please use the --type option to tell ext which to use."
       reload_configuration
     end
 
-    def upgrade_externals_file args, options = {}
-      old = OldConfiguration::Configuration.new
-
-      config = Configuration::Configuration.new_empty
-
-      main = old['main']
-      config.add_empty_section '.'
-
-      config['.'][:scm] = main[:scm]
-      config['.'][:type] = main[:type]
-
-      old.subprojects.each do |subproject|
-        path = subproject.path
-        config.add_empty_section path
-        config[path][:repository] = subproject.repository
-        config[path][:scm] = subproject.scm
-        config[path][:branch] = subproject.branch if subproject.branch
-      end
-
-      config.write('.externals')
-      reload_configuration
-    end
-
     def version(args, options)
       puts Externals::VERSION
     end
@@ -736,16 +658,8 @@ Please use the --type option to tell ext which to use."
     end
 
     def install_project_type name
-      Externals.module_eval("#{name.classify}ProjectType", __FILE__, __LINE__).install
       self.path_calculator = Externals.module_eval("#{name.classify}ProjectType::DefaultPathCalculator", __FILE__, __LINE__)
     end
-    #
-    #
-    #    def self.determine_project_type path = "."
-    #      Dir.chdir path do
-    #        raise "not done"
-    #      end
-    #    end
 
     protected
     def do_checkout_or_export repository, path, options, sym

data/lib/externals/project.rb

@@ -39,14 +39,19 @@ module Externals
     end
 
     def self.scm
-      raise "subclass responsibility"
+      if self == Project
+        raise "subclass responsibility"
+      end
     end
+
     def scm
       self.class.scm
     end
+
     def self.default_branch
       raise "subclass responsibility"
     end
+
     def default_branch
       self.class.default_branch
     end
@@ -177,10 +182,15 @@ module Externals
 
 
     def self.inherited child
-      #create the <scm_name>_opts_co/ex/st/up and <scm_opts>_opts setting
-      #such as svn_opts and svn_opts_co from the main project (stored
-      #in the parrent attribute.)
-      def child.install_scm_opts_methods
+      child.class_eval do
+        def self.scm
+          @scm ||= /^([^:]*::)*([^:]+)Project$/.match(name)[2].downcase
+        end
+
+        #create the <scm_name>_opts_co/ex/st/up and <scm_opts>_opts setting
+        #such as svn_opts and svn_opts_co from the main project (stored
+        #in the parrent attribute.)
+
         raise unless scm && scm != ""
 
         #first we create global <scm_name>_opts accessors that will apply to all
@@ -225,7 +235,6 @@ module Externals
             attributes[name.to_sym] = value
           end
         end
-
       end
     end
 

data/lib/externals/project_types/rails.rb

@@ -1,24 +1,13 @@
 module Externals
   module RailsProjectType
-    def self.install
-      #obj.send(:extend, Externals::RailsProjectType::Project)
-      Externals::OldProject.send(:include, Externals::RailsProjectType::Project)
-    end
-
     class DefaultPathCalculator
       def default_path name
         if name
-          (name == 'rails') ? File.join("vendor","rails") : File.join("vendor","plugins", name)
-        else
-          raise "couldn't figure out project name..."
-        end
-      end
-    end
-
-    module Project
-      def default_path
-        if name
-          (name == 'rails') ? File.join("vendor","rails") : File.join("vendor","plugins", name)
+          if name == 'rails'
+            File.join("vendor","rails")
+          else
+            File.join("vendor","plugins", name)
+          end
         else
           raise "couldn't figure out project name..."
         end
@@ -26,7 +15,6 @@ module Externals
     end
   end
 
-
   class RailsDetector
     def self.detected?
       application_path = File.join('config', 'application.rb')

data/lib/externals/scms/git_project.rb

@@ -69,10 +69,10 @@ module Externals
 
     def up *args
       if File.exists? path
+        puts "updating #{path}:"
         if revision
           change_to_branch_revision "up"
         else
-          puts "updating #{path}:"
           Dir.chdir path do
             puts `git #{scm_opts_up} pull`
           end
@@ -98,13 +98,6 @@ module Externals
         Integer) {sub_options[:scm] = main_options[:scm] = 'git'}
     end
 
-
-    def self.scm
-      "git"
-    end
-
-    install_scm_opts_methods
-
     def self.detected?
       File.exists? ".git"
     end

data/lib/externals/scms/svn_project.rb

@@ -50,10 +50,10 @@ module Externals
 
     def up *args
       if File.exists? path
+        puts "updating #{path}:"
         if revision
           change_to_revision "up"
         else
-          puts "updating #{path}:"
           Dir.chdir path do
             puts `svn #{scm_opts_up} up .`
           end
@@ -73,12 +73,12 @@ module Externals
     def self.scm_path? path
       return true if path =~ /^svn(\+ssh)?:/
 
-# Look for http(s)://svn.*/*
+      # Look for http(s)://svn.*/*
       if path =~ /^https?:\/\/([\w+\-_]+)\.(?:[\w+\-_]+\.)*[\w\-_]+(?:\/|$)/
         return true if $1.downcase == "svn"
       end
 
-# Look for http(s)://*/*svn*/
+      # Look for http(s)://*/*svn*/
       if path =~ /^https?:\/\/(?:[\w+\-_]+\.?)+\/(\w+)/
         return true if $1.downcase.include? "svn"
       end
@@ -91,12 +91,6 @@ module Externals
         Integer) {sub_options[:scm] = main_options[:scm] = 'svn'}
     end
 
-    def self.scm
-      "svn"
-    end
-
-    install_scm_opts_methods
-
     def self.detected?
       File.exists? ".svn"
     end

data/test/test_projects.rb

@@ -6,6 +6,14 @@ module Externals
   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
+
     def test_svn_global_opts
       Dir.chdir File.join(root_dir, 'test') do
         `rm -rf test_svn_global_opts`

metadata

@@ -1,16 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
-  - Miles Georgi
+- Miles Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-07-19 00:00:00 -07:00
 default_executable: ext
 dependencies: []
 
@@ -44,43 +49,38 @@ description: |-
   the main project.
 email: azimux@gmail.com
 executables: 
-  - ext
+- ext
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - Rakefile
-  - README
-  - MIT_LICENSE.txt
-  - CHANGELOG
-  - lib/externals/old_project.rb
-  - lib/externals/command.rb
-  - lib/externals/project.rb
-  - lib/externals/test_case.rb
-  - lib/externals/ext.rb
-  - lib/externals/project_types/rails.rb
-  - lib/externals/old_scms/old_git_project.rb
-  - lib/externals/old_scms/old_svn_project.rb
-  - lib/externals/extensions/string.rb
-  - lib/externals/extensions/symbol.rb
-  - lib/externals/configuration/configuration.rb
-  - lib/externals/configuration/old_configuration.rb
-  - lib/externals/scms/git_project.rb
-  - lib/externals/scms/svn_project.rb
-  - test/test_rails_detection.rb
-  - test/test_string_extensions.rb
-  - test/test_git_project_extract_name.rb
-  - test/test_version.rb
-  - test/test_init_git.rb
-  - test/test_upgrade_externals_file.rb
-  - test/test_checkout_git.rb
-  - test/test_checkout_with_subprojects_svn.rb
-  - test/test_freeze_to_revision.rb
-  - test/test_checkout_with_subprojects_git.rb
-  - test/test_touch_emptydirs.rb
-  - test/test_projects.rb
-  - bin/ext
+- Rakefile
+- README
+- MIT_LICENSE.txt
+- CHANGELOG
+- lib/externals/command.rb
+- lib/externals/configuration/configuration.rb
+- lib/externals/ext.rb
+- lib/externals/extensions/string.rb
+- lib/externals/extensions/symbol.rb
+- lib/externals/project.rb
+- lib/externals/project_types/rails.rb
+- lib/externals/scms/git_project.rb
+- lib/externals/scms/svn_project.rb
+- lib/externals/test_case.rb
+- test/test_checkout_git.rb
+- test/test_checkout_with_subprojects_git.rb
+- test/test_checkout_with_subprojects_svn.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.rb
+- test/test_init_git.rb
+- test/test_projects.rb
+- test/test_rails_detection.rb
+- test/test_string_extensions.rb
+- test/test_touch_emptydirs.rb
+- test/test_version.rb
+- bin/ext
 has_rdoc: true
 homepage: http://nopugs.com/ext-tutorial
 licenses: []
@@ -89,36 +89,41 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ext
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 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_rails_detection.rb
-  - test/test_string_extensions.rb
-  - test/test_git_project_extract_name.rb
-  - test/test_version.rb
-  - test/test_init_git.rb
-  - test/test_upgrade_externals_file.rb
-  - test/test_checkout_git.rb
-  - test/test_checkout_with_subprojects_svn.rb
-  - test/test_freeze_to_revision.rb
-  - test/test_checkout_with_subprojects_git.rb
-  - test/test_touch_emptydirs.rb
-  - test/test_projects.rb
+- test/test_checkout_git.rb
+- test/test_checkout_with_subprojects_git.rb
+- test/test_checkout_with_subprojects_svn.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.rb
+- test/test_init_git.rb
+- test/test_projects.rb
+- test/test_rails_detection.rb
+- test/test_string_extensions.rb
+- test/test_touch_emptydirs.rb
+- test/test_version.rb

data/lib/externals/configuration/old_configuration.rb

@@ -1,167 +0,0 @@
-module Externals
-  module OldConfiguration
-    SECTION_TITLE_REGEX = /^\s*\[(\w+)\]\s*$/
-    SECTION_TITLE_REGEX_NO_GROUPS = /^\s*\[(?:\w+)\]\s*$/
-
-
-    class Section
-      attr_accessor :title_string, :body_string, :title, :rows, :scm
-
-      def main?
-        title == 'main'
-      end
-
-      def initialize title_string, body_string, scm = nil
-        self.title_string = title_string
-        self.body_string = body_string
-        self.scm = scm
-
-        self.title = SECTION_TITLE_REGEX.match(title_string)[1]
-
-        self.scm ||= self.title
-
-        raise "Invalid section title: #{title_string}" unless title
-
-        self.rows = body_string.split(/\n/)
-      end
-
-      def setting key
-        if !main?
-          raise "this isn't a section of the configuration that can contain settings"
-        end
-
-        rows.each do |row|
-          if row =~ /\s*(\w+)\s*=\s*([^#\n]*)(?:#[^\n])?$/ && key.to_s == $1
-            return $2.strip
-          end
-        end
-        nil
-      end
-
-      def [] key
-        setting(key)
-      end
-
-
-      def projects
-        return @projects if @projects
-
-        @projects = []
-
-        if main?
-          @projects = [Ext.old_project_class(self['scm']).new(".", :is_main)]
-        else
-          rows.each do |row|
-            if Project.project_line?(row)
-              @projects << Ext.old_project_class(title).new(row)
-            end
-          end
-          @projects
-        end
-      end
-
-      def add_row(row)
-        rows << row
-
-        self.body_string = body_string.chomp + "\n#{row}\n"
-        clear_caches
-      end
-
-      def clear_caches
-        @projects = nil
-      end
-
-      def to_s
-        "#{title_string}#{body_string}"
-      end
-    end
-
-    class Configuration
-      attr_accessor :file_string
-
-      def sections
-        @sections ||= []
-      end
-
-      def [] title
-        title = title.to_s
-        sections.detect {|section| section.title == title}
-      end
-
-      def add_empty_section  title
-        raise "Section already exists" if self[title]
-        sections << Section.new("\n\n[#{title.to_s}]\n", "")
-      end
-
-      def self.new_empty
-        new nil, true
-      end
-
-      def initialize externals_file = nil, empty = false
-        if empty
-          self.file_string = ''
-          return
-        end
-
-        if !externals_file && File.exists?('.externals')
-          open('.externals', 'r') do |f|
-            externals_file = f.read
-          end
-        end
-
-        externals_file ||= ""
-
-        self.file_string = externals_file
-
-        titles = []
-        externals_file.each_line {|line| titles << line if line =~ SECTION_TITLE_REGEX}
-        bodies = externals_file.split SECTION_TITLE_REGEX_NO_GROUPS
-
-        if titles.size > 0 && bodies.size > 0
-          if titles.size + 1 != bodies.size
-            raise "bodies and sections do not match up"
-          end
-
-          bodies = bodies[1..(bodies.size - 1)]
-
-          (0...(bodies.size)).each do |index|
-            sections << Section.new(titles[index], bodies[index])
-          end
-        end
-      end
-
-      def projects
-        retval = []
-        sections.each do |section|
-          retval += section.projects
-        end
-
-        retval
-      end
-
-      def subprojects
-        retval = []
-        sections.each do |section|
-          retval += section.projects unless section.main?
-        end
-
-        retval
-      end
-
-      def main_project
-        sections.each do |section|
-          return section.projects.first if section.main?
-        end
-        nil
-      end
-
-      def write path = ".externals"
-        open(path, 'w') do |f|
-          sections.each do |section|
-            f.write section.to_s
-          end
-        end
-      end
-    end
-  end
-end

data/lib/externals/old_project.rb

@@ -1,114 +0,0 @@
-module Externals
-  # this regular expression will match a quoted string
-  # it will allow for " to be escaped with "" within the string
-  quoted = '(?:"(?:(?:[^"]*(?:"")?)*)")'
-
-  # this regular expression will match strings of text that are not quoted.  They must appear at the start of a line or after a ,
-  # it will also match empty strings like ,,
-  unquoted = '(?:[^"\\s][^\\s$]*)'
-
-  column = "(#{quoted}|#{unquoted})"
-  PROJECT_LINE_REGEX = Regexp.new("^\\s*#{column}(?:\\s+#{column})?\\s*$")
-
-  class OldProject
-    attr_accessor :branch, :repository, :path
-    attr_writer :is_main, :name
-    
-    def name
-      @name ||= (extract_name(repository))
-    end
-    
-    def main?
-      @is_main
-    end
-
-    def self.scm
-      raise "subclass responsibility"
-    end
-    
-        
-    def scm
-      self.class.scm
-    end
-    
-    
-    def initialize row_string, is_main = false
-      #raise "Abstract class" if self.class == Project
-      
-      #It's the main project
-      self.is_main = is_main || row_string == "."
-        
-      if row_string =~ PROJECT_LINE_REGEX
-        repbranch = trim_quotes($1)
-        self.path = trim_quotes($2)
-        
-        repbranch = repbranch.strip if repbranch
-        
-        if repbranch =~ /^([^\n]*):(\w+)$/
-          self.repository = $1
-          self.branch = $2
-        else
-          self.repository = repbranch
-        end
-        
-        self.path = self.path.strip if self.path
-      else
-        raise "poorly formatted .externals entry: #{row_string}"
-      end
-    end
-    
-    [:co, :ex].each do |method_name|
-      define_method method_name do |args| 
-        raise "subclass responsibility"
-      end
-    end
-  
-    def update_ignore path
-      if !ignore_contains?(path)
-        append_ignore path
-      end
-    end
- 
-    def checkout *args
-      co(*args)
-    end
-    
-    def export *args
-      ex(*args)
-    end
-    
-    def extract_name repository
-      if repository =~ /\/([\w_-]+)(?:\.git)?$/
-        $1
-      end
-    end
-    
-    def path
-      @path || default_path
-    end
-
-    def parent_path
-      File.dirname path
-    end
-    
-    def self.project_line? line
-      #Make sure it's not a comment
-      return false if line =~ /^\s*#/
-      
-      line =~ PROJECT_LINE_REGEX
-    end
-    
-    
-
-    protected
-    def trim_quotes value
-      if value
-        if [value[0].chr, value[-1].chr] == ['"', '"']
-          value[1..-2]
-        else
-          value
-        end
-      end
-    end
-  end
-end

data/lib/externals/old_scms/old_git_project.rb

@@ -1,116 +0,0 @@
-module Externals
-  class OldGitProject < OldProject
-    def co *args
-      puts "path is #{path} repository is #{repository}"
-      if path != '.'
-        (rmdircmd = "rmdir #{path}")
-        `#{rmdircmd}` if File.exists?(path)
-      end
-
-      dest = path
-      dest = '' if dest == '.'
-      dest = "\"#{dest}\"" if dest && !dest.empty?
-
-      puts(gitclonecmd = "git clone \"#{repository}\" #{dest}")
-      puts `#{gitclonecmd}`
-      if branch
-        Dir.chdir path do
-          puts `git checkout --track -b #{branch} origin/#{branch}`
-        end
-      end
-    end
-
-    def ex *args
-      if path != '.'
-        (rmdircmd = "rmdir #{path}")
-        `#{rmdircmd}` if File.exists? path
-      end
-
-      dest = path
-
-      dest = '' if dest == '.'
-
-      dest = "\"#{dest}\"" if dest && !dest.empty?
-
-      puts(gitclonecmd = "git clone --depth 1 \"#{repository}\" #{dest}")
-
-      puts `#{gitclonecmd}`
-      if branch
-        puts `cd #{path}; git checkout --track -b #{branch} origin/#{branch}`
-      end
-    end
-
-    def up *args
-      puts "updating #{path}:"
-      Dir.chdir path do
-        puts `git pull`
-      end
-    end
-
-    def st *args
-      puts "\nstatus for #{path}:"
-      Dir.chdir path do
-        puts `git status`
-      end
-    end
-
-    def self.scm_path? path
-      path =~ /^git:/ || path =~ /.git$/
-    end
-
-    def self.fill_in_opts opts, main_options, sub_options
-      opts.on("--git", "-g", "same as '--scm git'  Uses git to checkout/export the main project",
-        Integer) {sub_options[:scm] = main_options[:scm] = 'git'}
-    end
-
-
-    def self.scm
-      "git"
-    end
-
-    def self.detected?
-      File.exists? ".git"
-    end
-
-    def self.add_all
-      puts `git add .`
-    end
-
-
-    protected
-    def ignore_contains? path
-      text = ignore_text
-      text.split(/\n/).detect {|r| r.strip == path.strip}
-    end
-
-    def ignore_text
-      return '' unless File.exists? '.gitignore'
-      retval = ''
-      open('.gitignore') do |f|
-        retval = f.read
-      end
-      retval
-    end
-
-    def append_ignore path
-      rows = ignore_text || ''
-      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 extract_name s
-      if s =~ /\/([\w_-]+)(?:\.git)?$/
-        $1
-      end
-    end
-  end
-end

data/lib/externals/old_scms/old_svn_project.rb

@@ -1,98 +0,0 @@
-module Externals
-  class OldSvnProject < OldProject
-    def co *args
-      (rmdircmd = "rmdir #{path}")
-
-      `#{rmdircmd}` if File.exists? path
-      puts(svncocmd = "svn co #{repository} #{path}")
-      puts `#{svncocmd}`
-    end
-
-    def ex *args
-      (rmdircmd = "rmdir #{path}")
-
-      `#{rmdircmd}` if File.exists? path
-      puts(svncocmd = "svn export #{repository} #{path}")
-      puts `#{svncocmd}`
-    end
-
-    def up *args
-      puts "updating #{path}:"
-      Dir.chdir path do
-        puts `svn up .`
-      end
-    end
-
-    def st *args
-      puts "\nstatus for #{path}:"
-      Dir.chdir path do
-        puts `svn status`
-      end
-    end
-
-    def self.scm_path? path
-      return true if path =~ /^svn(\+ssh)?:/
-      if path =~ /^https?:\/\/([\w+\-_]+)\.(?:[\w+\-_]+\.)*[\w\-_]+(?:\/|$)/
-        return true if $1.downcase == "svn"
-
-        if path =~ /^https?:\/\/(?:[\w_\-]+\.)*[\w\-_]+\/(\w+)\//
-          return true if $1.downcase == "svn"
-        end
-      end
-
-      false
-    end
-
-    def self.fill_in_opts opts, main_options, sub_options
-      opts.on("--svn", "--subversion","-s", "same as '--scm svn'  Uses subversion to checkout/export the main project",
-        Integer) {sub_options[:scm] = main_options[:scm] = 'svn'}
-    end
-
-    def self.scm
-      "svn"
-    end
-
-    def self.detected?
-      File.exists? ".svn"
-    end
-
-    def self.add_all
-      status = `svn st`
-
-      status.split("\n").grep(/^\?/).each do |to_add|
-        puts `svn add #{to_add.gsub(/^\?\s*/,"")}`
-      end
-    end
-
-
-    protected
-    def ignore_contains? path
-      ignore_text(path) =~ Regexp.new("^\\s*#{File.basename(path)}\\s*$")
-    end
-
-    def append_ignore path
-      parent = File.dirname(path)
-      child = File.basename(path)
-
-      rows = ignore_text(path).split(/\n/)
-
-      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 ignore_text(path)
-      ignore_text = ''
-      Dir.chdir File.dirname(path) do
-        puts(ignore_text = `svn propget svn:ignore`)
-      end
-      ignore_text
-    end
-  end
-end

data/test/test_upgrade_externals_file.rb

@@ -1,86 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
-require 'externals/ext'
-
-module Externals
-  class TestUpgradeExternalsFile < TestCase
-    include ExtTestCase
-    
-    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