ext 0.0.10 → 0.1.0

data/README

@@ -17,12 +17,14 @@ short form.  The longer form applies the action to the main project.  The short
 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
 
-ext [OPTIONS] <command> [repository[:branch]] [path]
+ext [OPTIONS] <command> [repository] [-b <branch>] [path]
     -g, --git                        same as '--scm git'  Uses git to checkout/export the main project
     -s, --svn, --subversion          same as '--scm svn'  Uses subversion to checkout/export the main project
     -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'
     -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)
@@ -32,7 +34,7 @@ ext [OPTIONS] <command> [repository[:branch]] [path]
 
 
 Commands that apply to the main project or the .externals file:
-update_ignore, install, init, touch_emptydirs, help
+update_ignore, install, init, touch_emptydirs, help, upgrade_externals_file
 
 update_ignore   Adds all paths to subprojects that are
                 registered in .externals to the ignore feature of the
@@ -40,12 +42,12 @@ update_ignore   Adds all paths to subprojects that are
                 and so you probably only will run this if you are manually
                 maintaining .externals
 
-install         Usage: ext install <repository[:branch]> [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.
+                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.
 
 init            Creates a .externals file containing only [main]
                 It will try to determine the SCM used by the main project,
@@ -61,6 +63,9 @@ touch_emptydirs Recurses through all directories from the
 
 help            You probably just ran this command just now.
 
+upgrade_externals_fileConverts the old format that stored
+                as [main][svn][git] to [<path1>][<path2>]...
+
 
 
 Commands that apply to the main project and all subprojects:
@@ -93,14 +98,10 @@ 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
 and is released under the MIT license.  
 

data/Rakefile

@@ -6,12 +6,12 @@ require 'rake/gempackagetask'
 Rake::TestTask.new('test') do |task|
   task.libs = [File.expand_path('lib'),File.expand_path('test')]
   task.pattern = './test/test_*.rb'
-  task.warning = true
+  #task.warning = true
 end
 
 gem_specification = Gem::Specification.new do |specification|
   specification.name = 'ext'
-  specification.version = '0.0.10'
+  specification.version = '0.1.0'
   specification.platform = Gem::Platform::RUBY
   specification.rubyforge_project = 'ext'
   

data/lib/externals/configuration/configuration.rb

@@ -1,78 +1,104 @@
 module Externals
   module Configuration
-    SECTION_TITLE_REGEX = /^\s*\[(\w+)\]\s*$/
-    SECTION_TITLE_REGEX_NO_GROUPS = /^\s*\[(?:\w+)\]\s*$/
+    SECTION_TITLE_REGEX_NO_GROUPS = /^\s*\[(?:[^\]]*)\]\s*$/
+    SECTION_TITLE_REGEX = /^\s*\[([^\]]*)\]\s*$/
 
 
     class Section
-      attr_accessor :title_string, :body_string, :title, :rows, :scm
+      attr_accessor :title_string, :body_string, :title, :rows
 
-      def main?
-        title == 'main'
-      end
-
-      def initialize title_string, body_string, scm = nil
+      def initialize title_string, body_string
         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/)
+        self.rows = body_string.strip.split(/\n/)
       end
 
-      def setting key
-        if !main?
-          raise "this isn't a section of the configuration that can contain settings"
-        end
 
+      SETTING_REGEX = /^\s*([\.\w_-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
+      SET_SETTING_REGEX = /^(\s*(?:[\.\w_-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
+      
+      def attributes
+        retval = {}
         rows.each do |row|
-          if row =~ /\s*(\w+)\s*=\s*([^#\n]*)(?:#[^\n])?$/ && key.to_s == $1
+          if row =~ SETTING_REGEX
+            retval[$1.strip] = $2.strip
+          end
+        end
+        retval
+      end
+      def setting key
+        rows.each do |row|
+          if row =~ SETTING_REGEX && key.to_s == $1
             return $2.strip
           end
         end
         nil
       end
+      def set_setting key, value
+        key = key.to_s
+        found = nil
+
+        rows.each_with_index do |row, index|
+          if row =~ SETTING_REGEX && key == $1
+            raise "found #{key} twice!" if found
+            found = index
+          end
+        end
+
+        if found
+          if rows[found] !~ SET_SETTING_REGEX
+            raise "thought I found the row, but didn't"
+          end
+          rows[found] = "#{$1}#{value}#{$2}"
+        else
+          rows << "#{key} = #{value}"
+        end
+        value
+      end
 
       def [] key
         setting(key)
       end
+      def []= key, value
+        set_setting(key, value)
+      end
 
 
-      def projects
-        return @projects if @projects
-
-        @projects = []
-
-        if main?
-          @projects = [Ext.project_class(self['scm']).new(".", :is_main)]
-        else
-          rows.each do |row|
-            if Project.project_line?(row)
-              @projects << Ext.project_class(title).new(row)
-            end
-          end
-          @projects
-        end
-      end
+      #      def projects
+      #        return @projects if @projects
+      #
+      #        @projects = []
+      #
+      #        if main?
+      #          @projects = [Ext.project_class(self['scm']).new(".", :is_main)]
+      #        else
+      #          rows.each do |row|
+      #            if Project.project_line?(row)
+      #              @projects << Ext.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
+        #clear_caches
       end
 
-      def clear_caches
-        @projects = nil
-      end
+      #      def clear_caches
+      #        @projects = nil
+      #      end
 
       def to_s
-        "#{title_string}#{body_string}"
+        "[#{title}]\n#{rows.join("\n")}"
       end
     end
 
@@ -88,33 +114,39 @@ module Externals
         sections.detect {|section| section.title == title}
       end
       
+      def []= title, hash
+        add_empty_section title
+        section = self[title]
+        hash.each_pair do |key,value|
+          section[key] = value
+        end
+      end
+
       def add_empty_section  title
         raise "Section already exists" if self[title]
-        sections << Section.new("\n\n[#{title.to_s}]\n", "")
+        sections << Section.new("[#{title.to_s}]", "")
       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
+      def initialize file_string = nil, empty = false
+        self.file_string = file_string
 
-        externals_file ||= ""
+        return if empty
+        raise "I was given no file_string" unless file_string
 
-        self.file_string = externals_file
+        #        if !externals_file && File.exists?('.externals')
+        #          open('.externals', 'r') do |f|
+        #            externals_file = f.read
+        #          end
+        #        end
 
-        titles = externals_file.grep SECTION_TITLE_REGEX
-        bodies = externals_file.split SECTION_TITLE_REGEX_NO_GROUPS
+        #externals_file ||= ""
+
+        titles = file_string.grep SECTION_TITLE_REGEX
+        bodies = file_string.split SECTION_TITLE_REGEX_NO_GROUPS
 
         if titles.size > 0 && bodies.size > 0
           if titles.size + 1 != bodies.size
@@ -129,31 +161,34 @@ module Externals
         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 write path = ".externals"
+      #      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 write path  # = ".externals"
+        raise "no path given" unless path
         open(path, 'w') do |f|
-          sections.each do |section|
-            f.write section.to_s
-          end
+          f.write to_s
         end
       end
+      
+      def to_s
+        sections.map(&:to_s).join("\n\n")
+      end
     end
   end
 end

data/lib/externals/configuration/old_configuration.rb

@@ -0,0 +1,166 @@
+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.grep 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