ext 0.0.10 → 0.1.0

data/lib/externals/old_scms/old_git_project.rb

@@ -0,0 +1,116 @@
+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

@@ -0,0 +1,98 @@
+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/lib/externals/project.rb

@@ -1,103 +1,110 @@
-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*$")
+require 'extensions/symbol'
 
+module Externals
   class Project
-    attr_accessor :branch, :repository, :path
-    attr_writer :is_main, :name
+    def self.attr_attr_accessor *names
+      names = [names].flatten
+      names.each do |name|
+        define_method name do 
+          attributes[name.to_sym]
+        end
+        define_method "#{name}=" do |value|
+          attributes[name.to_sym] = value
+        end
+      end
+    end
+    
+    VALID_ATTRIBUTES = [:name, :path, :repository, :branch, :type, :scm].map(&:to_s)
     
+    attr_attr_accessor VALID_ATTRIBUTES
+    def attributes
+      @attributes ||= {}
+    end
     def name
-      @name ||= (extract_name(repository) || File.basename(path))
+      attributes[:name] || extract_name(repository)
     end
-    
-    def main?
-      @is_main
+    def main_project?
+      path == '.'
     end
 
     def self.scm
       raise "subclass responsibility"
     end
-    
-        
     def scm
       self.class.scm
     end
+    def self.default_branch
+      raise "subclass responsibility"
+    end
+    def default_branch
+      self.class.default_branch
+    end
     
-    
-    def initialize row_string, is_main = false
+    def initialize hash
       raise "Abstract class" if self.class == Project
+      raise "expected hash" unless hash.is_a? Hash
       
-      #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
-        self.path = self.path.strip if self.path
+      hash = hash.keys.inject({}) do |new_hash, key|
+        new_hash[key.to_s] = hash[key]
+        new_hash
+      end
+      
+      invalid_attributes = hash.keys - VALID_ATTRIBUTES
+      
+      if !invalid_attributes.empty?
+        raise "invalid attribute(s): #{invalid_attributes.join(', ')}"
+      end
 
-        if repbranch =~ /^([^\n]*):(\w+)$/
-          self.repository = $1
-          self.branch = $2
-        else
-          self.repository = repbranch
-        end
-      else
-        raise "poorly formatted .externals entry: #{row_string}"
+      path = hash.delete('path')
+      
+      hash.keys.each do |key|
+        send("#{key}=", hash[key])
+      end
+      
+      if path && !path.is_a?(String)
+        path = path.default_path(name)
       end
+      self.path = path
     end
-    
+
     [:co, :ex].each do |method_name|
-      define_method method_name do |args| 
+      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(self)
-    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

data/lib/externals/project_types/rails.rb

@@ -1,17 +1,29 @@
 module Externals
   module RailsProjectType
     def self.install
-      Externals::Project.send(:include, Externals::RailsProjectType::Project)
+      #obj.send(:extend, Externals::RailsProjectType::Project)
+      Externals::OldProject.send(:include, Externals::RailsProjectType::Project)
     end
-
-    module Project
-      def default_path row
-        if row.repository =~ /\/([\w_-]*)(?:.git)?$/
-          ($1 == 'rails') ? File.join("vendor","rails") : File.join("vendor","plugins", $1)
+    
+    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)
+        else
+          raise "couldn't figure out project name..."
+        end
+      end
+    end
   end
   
   

data/lib/externals/scms/git_project.rb

@@ -1,5 +1,10 @@
 module Externals
   class GitProject < Project
+    
+    def default_branch
+      'master'
+    end
+    
     def co *args
       puts "path is #{path} repository is #{repository}"
       if path != '.'
@@ -112,5 +117,6 @@ module Externals
         $1
       end
     end
+    
   end
 end

data/lib/externals/scms/svn_project.rb

@@ -1,5 +1,10 @@
 module Externals
   class SvnProject < Project
+    
+    def default_branch
+      nil
+    end
+    
     def co *args
       (rmdircmd = "rmdir #{path}")
 

data/test/test_checkout_git.rb

@@ -14,6 +14,10 @@ module Externals
 
     def teardown
       destroy_test_repository 'git'
+      Dir.chdir File.join(root_dir, 'test') do
+        `rm -rf workdir`
+      end
+  
     end
    
     def test_repository_created