ext 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+October 9, 2011 Version 1.0.4 released
+- Dependency on programs such as rm, rmdir, cp, etc, removed.  Now only
+  dependent on the actual SCM executables (and gzip to run the tests.)
+- Tests have been restructured and now take significantly much less time to run.
+- Fixed a bug caused by a file failing to be packaged with the rest of the
+  1.0.3 gem.
+
 September 28, 2011 Version 1.0.3 released
 - "up" now changes branches of subprojects
 - Subversion branch support added

data/README

@@ -33,6 +33,8 @@ ext [OPTIONS] <command> [repository] [-b <branch>] [path]
                            '--scm svn'.
   -b, --branch BRANCH      The branch you want the subproject to checkout when
                            doing 'ext install'
+  -r, --revision REVISION  The revision 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

data/Rakefile

@@ -10,79 +10,6 @@ $LOAD_PATH << File.join(root_dir, 'lib')
 
 require File.join(root_dir, 'lib', 'externals', 'ext')
 
-desc "Creates the starting repositories needed to run the tests.
-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
-      %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}`
-        puts `svnadmin load #{p} < #{p}.svn`
-      end
-
-      puts `git clone --bare git://github.com/azimux/engines.git engines.git`
-
-      %w(acts_as_list ssl_requirement).each do |p|
-        puts `git clone --bare git://github.com/rails/#{p}.git #{p}.git`
-      end
-
-      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
-
 Rake::TestTask.new('test') do |task|
   task.libs = [File.expand_path('lib'),File.expand_path('test')]
   task.pattern = './test/test_*.rb'
@@ -132,7 +59,7 @@ the main project.}
   specification.email = "azimux@gmail.com"
   specification.homepage = "http://nopugs.com/ext-tutorial"
 
-  specification.test_files = FileList['test/test_*.rb']
+  specification.test_files = FileList['test/test_*.rb', 'test/setup/*.gz']
 
   specification.bindir = "bin"
   specification.executables = ['ext']

data/lib/externals/ext.rb

@@ -2,10 +2,14 @@ require 'externals/project'
 require 'externals/configuration/configuration'
 require 'optparse'
 require 'externals/command'
-require 'externals/extensions/symbol'
+require 'fileutils'
+
+Dir.entries(File.join(File.dirname(__FILE__), 'extensions')).each do |extension|
+  require "externals/extensions/#{extension}" if extension =~ /.rb$/
+end
 
 module Externals
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -79,9 +83,8 @@ module Externals
 
   COMMANDS = FULL_COMMANDS + SHORT_COMMANDS + MAIN_COMMANDS
 
-  Dir.entries(File.join(File.dirname(__FILE__), 'extensions')).each do |extension|
-    require "externals/extensions/#{extension}" if extension =~ /.rb$/
-  end
+  COULD_NOT_DETERMINE_SCM = 1
+  NO_EXTERNALS_FILE = 2
 
   Dir.entries(File.join(File.dirname(__FILE__), '..', 'externals','scms')).each do |project|
     require "externals/scms/#{project}" if project =~ /_project.rb$/
@@ -92,6 +95,9 @@ module Externals
   end
 
   class Ext
+    include FileUtils
+    extend FileUtils
+
     attr_accessor :path_calculator
 
     def self.project_types
@@ -143,6 +149,11 @@ module Externals
         *"The branch you want the
         subproject to checkout when doing 'ext install'".lines_by_width(summary_width)
       ) {|branch| sub_options[:branch] = main_options[:branch] = branch}
+      opts.on("--revision REVISION", "-r REVISION",
+        String,
+        *"The revision you want the
+        subproject to checkout when doing 'ext install'".lines_by_width(summary_width)
+      ) {|revision| sub_options[:revision] = main_options[:revision] = revision}
       opts.on("--force_removal", "-f",
         String,
         *"When doing an uninstall of a subproject,
@@ -401,7 +412,10 @@ Please use
     end
 
     def install args, options
-      init args, options unless File.exists? '.externals'
+      if !File.exists? '.externals'
+        STDERR.puts "This project does not appear to be managed by externals.  Try 'ext init' first"
+        exit NO_EXTERNALS_FILE
+      end
       repository = args[0]
       path = args[1]
 
@@ -412,10 +426,11 @@ Please use
       scm ||= infer_scm(repository)
 
       unless scm
-        raise "Unable to determine SCM from the repository name.
+        STDERR.puts "Unable to determine SCM from the repository name.
 You need to either specify the scm used to manage the subproject
 that you are installing. Use an option to specify it
 (such as --git or --svn)"
+        exit COULD_NOT_DETERMINE_SCM
       end
 
       project = self.class.project_class(scm).new(:repository => repository,
@@ -427,6 +442,7 @@ that you are installing. Use an option to specify it
       raise "already exists" if configuration[path]
 
       project.branch = options[:branch] if options[:branch]
+      project.revision = options[:revision] if options[:revision]
 
       attributes = project.attributes.dup
       attributes.delete(:path)
@@ -456,7 +472,7 @@ that you are installing. Use an option to specify it
 
       if options[:force_removal]
         Dir.chdir File.dirname(project.path) do
-          `rm -rf #{File.basename(project.path)}`
+          rm_rf File.basename(project.path)
         end
       end
     end
@@ -670,7 +686,7 @@ commands below if you actually wish to delete them."
       repository = args[0]
       path = args[1] || "."
 
-      main_project = do_checkout_or_export repository, path, options, :checkout
+      main_project = do_checkout_or_export repository, path, options, :export
 
       if path == "."
         path = main_project.name

data/lib/externals/extensions/file_utils.rb

@@ -0,0 +1,40 @@
+require 'fileutils'
+
+FileUtils.class_eval do
+  # simulates cp -a
+  def cp_a source, dest, options = {}
+    cp_r source, dest, options.merge(:preserve => true)
+  end
+
+  # calls rm_rf if the file exists
+  def rm_rf_ie file, options = {}
+    rm_rf file, options if File.exists? file
+  end
+
+  # calls rmdir if the file exists and is empty
+  def rmdir_if_empty_ie path
+    rmdir path if File.exists?(path) && dir_empty?(path)
+  end
+
+  # calls rmdir if the file exists
+  def rmdir_ie path
+    rmdir path if File.exists?(path)
+  end
+
+  alias rm_rf_old rm_rf
+  #going to try to give a delay after calling rm if necessary...
+  def rm_rf *args
+    rm_rf_old *args
+    tries = 0
+    while File.exists?(args[0]) && tries < 10
+      sleep 1
+      tries += 1
+    end
+  end
+
+  def dir_empty? path
+    File.directory?(path) && 
+      File.exists?(path) &&
+      !Dir.entries(path).detect{|entry| !["..","."].include?(entry)}
+  end
+end

data/lib/externals/extensions/string.rb

@@ -8,7 +8,6 @@ String.class_eval do
   end
 
   #avoid collision
-  raise unless instance_methods.include?("lines")
   raise if instance_methods.include?("lines_by_width")
   def lines_by_width(width = 32)
     width ||= 32
@@ -36,4 +35,5 @@ String.class_eval do
 
     lines
   end
+
 end

data/lib/externals/project.rb

@@ -1,4 +1,5 @@
 require 'externals/extensions/symbol'
+require 'fileutils'
 
 module Externals
   OPTS_SUFFIXES = ["co", "up", "st", "ex"]  unless const_defined?('OPTS_SUFFIXES')
@@ -9,6 +10,8 @@ module Externals
 
   class Project
     attr_accessor :parent
+    include FileUtils
+    extend FileUtils
 
     def self.attr_attr_accessor *names
       names = [names].flatten

data/lib/externals/scms/git_project.rb

@@ -12,8 +12,7 @@ module Externals
 
       puts "path is #{path} repository is #{repository}"
       if path != '.'
-        (rmdircmd = "rmdir #{path}")
-        `#{rmdircmd}` if File.exists?(path)
+        rmdir_ie path
       end
 
       dest = path
@@ -118,8 +117,7 @@ module Externals
 
     def ex *args
       if path != '.'
-        (rmdircmd = "rmdir #{path}")
-        `#{rmdircmd}` if File.exists? path
+        rmdir_ie path
       end
 
       dest = path
@@ -176,6 +174,7 @@ module Externals
     #this is a test helper method
     def self.add_all
       puts `git add .`
+      raise unless $? == 0
     end
 
     def ignore_contains? path

data/lib/externals/scms/svn_project.rb

@@ -9,8 +9,7 @@ module Externals
     public
     def co *args
       # delete path if not empty
-      rmdircmd = "rmdir #{path}"
-      `#{rmdircmd}` if File.exists? path
+      rmdir_ie path
 
       if File.exists? path
         up
@@ -26,7 +25,9 @@ module Externals
 
         puts(svncocmd = "svn #{opts} co #{url} #{path}")
         puts `#{svncocmd}`
-        raise unless $? == 0
+        unless $? == 0
+          raise
+        end
 
         change_to_revision "co"
       end
@@ -44,8 +45,7 @@ module Externals
 
     def ex *args
       # delete path if not empty
-      (rmdircmd = "rmdir #{path}")
-      `#{rmdircmd}`
+      rmdir_ie path
 
       url = repository
 
@@ -58,8 +58,7 @@ module Externals
         url += "@#{revision}"
       end
 
-      `#{rmdircmd}` if File.exists? path
-      puts(svncocmd = "svn #{scm_opts_ex} export #{repository} #{path}")
+      puts(svncocmd = "svn #{scm_opts_ex} export #{url} #{path}")
       puts `#{svncocmd}`
     end
 
@@ -77,10 +76,8 @@ module Externals
     end
 
     def up *args
-      # delete path if not empty
-      rmdircmd = "rmdir #{path}"
-      `#{rmdircmd}` if File.exists? path
-
+      # delete path if empty
+      rmdir_if_empty_ie path
 
       if File.exists? path
         puts "updating #{path}:"
@@ -142,6 +139,7 @@ module Externals
 
       status.split("\n").grep(/^\?/).each do |to_add|
         puts `svn add #{to_add.gsub(/^\?\s*/,"")}`
+        raise unless $? == 0
       end
     end
 
@@ -151,7 +149,7 @@ module Externals
 
     def current_branch
       require_repository
-      branch = info_url.gsub(repository, "")
+      branch = info_url.gsub(/\/+/, "/").gsub(repository.gsub(/\/+/, "/"), "")
       if branch == repository
         raise "Could not determine branch from URL #{info_url}.
     Does not appear have a substring of #{repository}"

data/lib/externals/test/basic_git_repository.rb

@@ -0,0 +1,41 @@
+require 'externals/test/repository'
+
+module Externals
+  module Test
+    class BasicGitRepository < Repository
+      def initialize
+        super "basic", "git"
+      end
+
+      def build_here
+        mkdir name
+
+        Dir.chdir("#{name}") do
+          `git init`
+          raise unless $? == 0
+
+          open 'readme.txt', 'w' do |f|
+            f.write "readme.txt Line 1
+            Line 2
+            Line 3"
+          end
+
+          `git add .`
+          raise unless $? == 0
+          `git commit -m "added readme.txt"`
+          raise unless $? == 0
+
+          open 'readme.txt', 'a' do |f|
+            f.write "line 4"
+          end
+
+          `git add .`
+          raise unless $? == 0
+          `git commit -m "added a line to readme.txt"`
+          raise unless $? == 0
+        end
+      end
+
+    end
+  end
+end

data/lib/externals/test/engines.rb

@@ -0,0 +1,11 @@
+require 'externals/test/repository'
+
+module Externals
+  module Test
+    class Engines < GitRepositoryFromInternet
+      def initialize
+        super "engines.git", "git", "git://github.com/azimux"
+      end
+    end
+  end
+end

data/lib/externals/test/engines_with_branch1.rb

@@ -0,0 +1,36 @@
+require 'externals/test/repository'
+require 'externals/test/engines'
+
+module Externals
+  module Test
+    class EnginesWithBranch1 < Repository
+      def initialize
+        super "engines.git", File.join("git", "with_branch1")
+        dependents.merge!(
+          :other_engines => Engines.new
+        )
+      end
+
+      #builds the test repository in the current directory
+      def build_here
+        rm_rf_ie name
+
+        puts `git clone --bare #{dependents[:other_engines].clean_dir} #{name}`
+        raise unless $? == 0
+
+        rm_rf_ie "workdir"
+        mkdir "workdir"
+        Dir.chdir 'workdir' do
+          `git clone #{clean_dir}`
+          raise unless $? == 0
+          Dir.chdir name.gsub(".git", "") do
+            `git push origin master:branch1`
+            raise unless $? == 0
+          end
+        end
+        rm_rf_ie "workdir"
+      end
+
+    end
+  end
+end