ext 1.0.2 → 1.0.3

data/lib/externals/scms/svn_project.rb

@@ -3,25 +3,33 @@ require File.join(File.dirname(__FILE__), '..', 'project')
 module Externals
   class SvnProject < Project
     def default_branch
-      nil
+      raise "There is no default_branch for SvnProject"
     end
 
-    private
-    def co_or_up command
-      opts = resolve_opts(command)
+    public
+    def co *args
+      # delete path if not empty
+      rmdircmd = "rmdir #{path}"
+      `#{rmdircmd}` if File.exists? path
 
-      (rmdircmd = "rmdir #{path}")
+      if File.exists? path
+        up
+      else
+        opts = resolve_opts "co"
 
-      `#{rmdircmd}` if File.exists? path
-      puts(svncocmd = "svn #{opts} co #{repository} #{path}")
-      puts `#{svncocmd}`
+        url = repository
 
-      change_to_revision command
-    end
+        if branch
+          require_repository
+          url = [url, branch].join("/")
+        end
 
-    public
-    def co *args
-      co_or_up "co"
+        puts(svncocmd = "svn #{opts} co #{url} #{path}")
+        puts `#{svncocmd}`
+        raise unless $? == 0
+
+        change_to_revision "co"
+      end
     end
 
     def change_to_revision command = ""
@@ -35,10 +43,17 @@ module Externals
     end
 
     def ex *args
+      # delete path if not empty
       (rmdircmd = "rmdir #{path}")
+      `#{rmdircmd}`
 
       url = repository
 
+      if branch
+        require_repository
+        url = [url, branch].join("/")
+      end
+
       if revision
         url += "@#{revision}"
       end
@@ -48,9 +63,32 @@ module Externals
       puts `#{svncocmd}`
     end
 
+    def switch branch_name, options = {}
+      require_repository
+      if current_branch != branch_name
+        Dir.chdir path do
+          url = [repository, branch_name].join("/")
+          `svn #{scm_opts} switch #{url}`
+          unless $? == 0
+            raise "Could not switch to #{url}"
+          end
+        end
+      end
+    end
+
     def up *args
+      # delete path if not empty
+      rmdircmd = "rmdir #{path}"
+      `#{rmdircmd}` if File.exists? path
+
+
       if File.exists? path
         puts "updating #{path}:"
+
+        if branch
+          switch branch
+        end
+
         if revision
           change_to_revision "up"
         else
@@ -59,7 +97,7 @@ module Externals
           end
         end
       else
-        co_or_up "up"
+        co
       end
     end
 
@@ -86,9 +124,12 @@ module Externals
       false
     end
 
-    def self.fill_in_opts opts, main_options, sub_options
-      opts.on("--svn", "--subversion", "same as '--scm svn'  Uses subversion to checkout/export the main project",
-        Integer) {sub_options[:scm] = main_options[:scm] = 'svn'}
+    def self.fill_in_opts opts, main_options, sub_options, options = {}
+      opts.on("--svn", "--subversion",
+        Integer,
+        *"same as '--scm svn'  Uses subversion to
+        checkout/export the main project".lines_by_width(options[:summary_width])
+        ) {sub_options[:scm] = main_options[:scm] = 'svn'}
     end
 
     def self.detected?
@@ -108,6 +149,54 @@ module Externals
       ignore_text(path) =~ Regexp.new("^\\s*#{File.basename(path)}\\s*$")
     end
 
+    def current_branch
+      require_repository
+      branch = info_url.gsub(repository, "")
+      if branch == repository
+        raise "Could not determine branch from URL #{info_url}.
+    Does not appear have a substring of #{repository}"
+      end
+      if branch !~ /^\//
+        raise "Was expecting the branch and repository to be separated by '/'
+      Please file an issue about this at http://github.com/azimux/externals"
+      end
+      branch.gsub(/^\//, "")
+    end
+
+    def self.extract_repository url, branch
+      repository = url.gsub(branch, "")
+      if url == repository
+        raise "Could not determine repository from URL #{info_url}.
+    Does not appear to have the branch #{branch} as a substring"
+      end
+      if repository !~ /\/$/
+        raise "Was expecting the branch and repository to be separated by '/'
+      Please file an issue about this at http://github.com/azimux/externals"
+      end
+      repository.gsub(/\/$/, "")
+    end
+
+    def require_repository
+      if repository.nil? || repository.empty?
+        url = info_url
+        url = "svn+ssh://server/path/repository" unless url
+        puts "to use any branching features with a subversion project, the
+repository must be present in the .externals file.
+
+See http://nopugs.com/ext-svn-branches for more info
+
+The name of the branch should be excluded from the repository URL.
+
+You might need to change your .externals file to contain something like this:
+
+[.]
+scm = svn
+repository = #{info_url}
+        "
+        raise "Cannot use subversion branching features without a repository in .externals file"
+      end
+    end
+
     def append_ignore path
       parent = File.dirname(path)
       child = File.basename(path)
@@ -120,6 +209,7 @@ module Externals
 
       Dir.chdir(parent) do
         puts `svn #{scm_opts} propset svn:ignore "#{rows.compact.join("\n")}\n" .`
+        raise "Could not ignore path, something went wrong in svn." unless $? == 0
       end
     end
 
@@ -167,6 +257,20 @@ module Externals
       end
     end
 
+    def self.info_url scm_opts = ""
+      if `svn #{scm_opts} info` =~ /^\s*URL:\s*([^\s]+)\s*$/
+        $1
+      else
+        raise "Could not get URL from svn info"
+      end
+    end
+
+    def info_url
+      Dir.chdir path do
+        self.class.info_url scm_opts
+      end
+    end
+
     def freeze_involves_branch?
       false
     end

data/lib/externals/test_case.rb

@@ -80,22 +80,110 @@ module Externals
       end
     end
 
+    def with_svn_branches_modules_repository_dir
+      File.expand_path(File.join(repository_dir, with_svn_branches_modules_repository_name))
+    end
+    def with_svn_branches_modules_repository_url
+      url = "file:///#{with_svn_branches_modules_repository_dir}"
+      if windows?
+        url.gsub!(/\\/, "/")
+      end
+      url.gsub("file:////", 'file:///')
+    end
+    def with_svn_branches_repository_url
+      url = "file:///#{with_svn_branches_repository_dir}"
+      if windows?
+        url.gsub!(/\\/, "/")
+      end
+      url.gsub("file:////", 'file:///')
+    end
+
+    def with_svn_branches_modules_repository_name
+      'svnmodulesbranchesrepo'
+    end
+    def with_svn_branches_repository_dir
+      File.expand_path(File.join(repository_dir, with_svn_branches_repository_name))
+    end
+    def with_svn_branches_repository_name
+      'svnbranchesrepo'
+    end
+
+    def destroy_with_svn_branches_modules_repository
+      Dir.chdir repository_dir do
+        `rm -rf #{with_svn_branches_modules_repository_name}`
+      end
+    end
+
+    def destroy_with_svn_branches_repository
+      Dir.chdir repository_dir do
+        `rm -rf #{with_svn_branches_repository_name}`
+      end
+    end
+
+    def create_with_svn_branches_modules_repository
+      Dir.chdir(File.join(root_dir, 'test')) do
+        `mkdir repositories` unless File.exists? 'repositories'
+        Dir.chdir repository_dir do
+          puts `svnadmin create #{with_svn_branches_modules_repository_name}`
+        end
+
+        `mkdir workdir` unless File.exists? 'workdir'
+        Dir.chdir 'workdir' do
+          cmd = "svn checkout \"#{with_svn_branches_modules_repository_url}\""
+          puts "about to run #{cmd}"
+          puts `#{cmd}`
+          raise unless $? == 0
+
+          Dir.chdir with_svn_branches_modules_repository_name do
+            `mkdir branches`
+            `mkdir current`
+
+            SvnProject.add_all
+            puts `svn commit -m "created branch directory structure"`
+            raise unless $? == 0
+
+          end
+          `rm -rf #{with_svn_branches_modules_repository_name}`
+        end
+      end
+    end
+    def create_with_svn_branches_repository
+      Dir.chdir(File.join(root_dir, 'test')) do
+        `mkdir repositories` unless File.exists? 'repositories'
+        Dir.chdir repository_dir do
+          puts `svnadmin create #{with_svn_branches_repository_name}`
+        end
+
+        `mkdir workdir` unless File.exists? 'workdir'
+        Dir.chdir 'workdir' do
+          cmd = "svn checkout \"#{with_svn_branches_repository_url}\""
+          puts "about to run #{cmd}"
+          puts `#{cmd}`
+          raise unless $? == 0
+
+          Dir.chdir with_svn_branches_repository_name do
+            `mkdir branches`
+            `mkdir current`
+
+            SvnProject.add_all
+            puts `svn commit -m "created branch directory structure"`
+            raise unless $? == 0
+
+          end
+          `rm -rf #{with_svn_branches_modules_repository_name}`
+        end
+      end
+    end
+
     def destroy_test_modules_repository scm
       puts(rmcmd = "rm -rf #{modules_repository_dir(scm)}")
       puts `#{rmcmd}`
-      puts(rmcmd = "rm -rf #{modules_repository_dir(scm)}")
-      puts `#{rmcmd}`
     end
 
     def modules_repository_dir scm = nil
-      if scm.nil?
-        File.join(File.dirname(__FILE__), '..', '..', 'test', 'repositories')
-      else
-        File.expand_path(File.join(repository_dir, "#{scm}modulesrepo"))
-      end
+      File.expand_path(File.join(repository_dir, "#{scm}modulesrepo"))
     end
 
-
     def create_rails_application
       Dir.mkdir applications_dir unless File.exists?(applications_dir)
       Dir.chdir applications_dir do
@@ -139,5 +227,119 @@ module Externals
     def rails_application_dir
       File.join(applications_dir, 'rails_app')
     end
+
+    def initialize_with_svn_branches_repository
+      Dir.chdir File.join(root_dir, 'test') do
+        repo_url = with_svn_branches_repository_url
+        
+        Dir.chdir 'workdir' do
+          puts `svn co #{[repo_url, "current"].join("/")} rails_app`
+          raise unless $? == 0
+          Dir.chdir "rails_app" do
+            puts `cp -r #{rails_application_dir}/* .`
+            raise unless $? == 0
+
+            Ext.run "init", "-b", "current"
+
+            # this line is necessary as ext can't perform the necessary
+            # ignores otherwise if vendor and vendor/plugins haven't been added
+            SvnProject.add_all
+
+            raise " could not create .externals"  unless File.exists? '.externals'
+            %w(rails acts_as_list).each do |proj|
+              Ext.run "install", File.join(root_dir, 'test', 'cleanreps', "#{proj}.git")
+            end
+
+            #install a couple svn managed subprojects
+            %w(foreign_key_migrations redhillonrails_core).each do |proj|
+              Ext.run "install", "--svn", "file:///#{File.join(root_dir, 'test', 'cleanreps', proj)}"
+            end
+
+            #install project with a git branch
+            Ext.run "install", File.join(root_dir, 'test', 'cleanreps', 'engines.git'), "-b", "edge"
+
+            #install project with a non-default path and svn branching
+            Ext.run "install", "--svn",
+              "#{with_svn_branches_modules_repository_url}",
+              "-b", "current",
+              "modules"
+
+            SvnProject.add_all
+
+            puts `svn commit -m "created empty rails app with some subprojects"`
+            raise unless $? == 0
+
+            # now let's make a branch in the main project called new_branch
+            `svn copy #{
+            [repo_url, "current"].join("/")
+} #{[repo_url, "branches", "new_branch"].join("/")} -m "creating branch" `
+            raise unless $? == 0
+
+            # let's make a branch in a git subproject:
+            Dir.chdir File.join(%w(vendor plugins engines)) do
+              `git push origin master:branch1`
+              raise unless $? == 0
+            end
+
+            # let's update the .externals file in new_branch to reflect these changes
+            `svn switch #{[repo_url, "branches", "new_branch"].join("/")}`
+            raise unless $? == 0
+
+            # let's remove rails from this branch
+            Ext.run "uninstall", "-f", "rails"
+
+            ext = Ext.new
+            ext.configuration["vendor/plugins/engines"]["branch"] = "branch1"
+            ext.configuration["modules"]["branch"] = "branches/branch2"
+            ext.configuration.write
+
+            SvnProject.add_all
+            `svn commit -m "updated .externals to point to new branches."`
+            raise unless $? == 0
+          end
+
+          `rm -rf rails_app`
+        end
+      end
+    end
+
+    def initialize_with_svn_branches_modules_repository
+      Dir.chdir File.join(root_dir, 'test') do
+        repo_url = with_svn_branches_modules_repository_url
+
+        Dir.chdir 'workdir' do
+          puts `svn co #{[repo_url, "current"].join("/")} modules`
+          raise unless $? == 0
+          Dir.chdir "modules" do
+            if !File.exists? 'modules.txt'
+              open("modules.txt", "w") do |f|
+                f.write "line1 of modules.txt\n"
+              end
+
+              SvnProject.add_all
+              puts `svn commit -m "created modules.txt"`
+              raise unless $? == 0
+            end
+
+            `svn copy #{
+            [repo_url, "current"].join("/")
+} #{[repo_url, "branches", "branch2"].join("/")
+} -m "created branch2"`
+            raise unless $? == 0
+
+            puts `svn switch #{
+            [repo_url, "branches", "branch2"].join("/")
+}`
+            raise unless $? == 0
+            `echo 'line 2 of modules.txt ... this is branch2!' > modules.txt`
+            SvnProject.add_all
+            puts `svn commit -m "changed modules.txt"`
+            raise unless $? == 0
+          end
+        end
+      end
+    end
+
+
   end
 end

data/test/test_checkout_with_subprojects_git.rb

@@ -34,8 +34,30 @@ module Externals
               File.join(root_dir, 'test', 'cleanreps', proj)
           end
 
+          ext = Ext.new
+          main_project = ext.main_project
+
+          unless !main_project.ignore_contains? "vendor/plugins/engines"
+            raise
+          end
           #install project with a branch
           Ext.run "install", File.join(root_dir, 'test', 'cleanreps', 'engines.git'), "-b", "edge"
+          unless main_project.ignore_contains? "vendor/plugins/engines"
+            raise
+          end
+
+          #install fake_rails
+          unless !main_project.ignore_contains? "vendor/rails"
+            raise
+          end
+          Ext.run "install",
+            "--git",
+            File.join(root_dir, 'test', 'cleanreps', 'fake_rails'),
+            "vendor/rails"
+          unless main_project.ignore_contains? "vendor/rails"
+            raise
+          end
+
 
           GitProject.add_all
           `git commit -m "created empty rails app with some subprojects"`
@@ -115,7 +137,12 @@ module Externals
               ext = Ext.new
               assert_equal "new_branch", ext.configuration["vendor/plugins/engines"]["branch"]
 
-              `git add .externals`
+              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+              #let's uninstall rails
+              Ext.run "uninstall", "-f", "rails"
+              assert !File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+
+              GitProject.add_all
               raise unless $? == 0
               `git commit -m "changed branch on engines subproject"`
               raise unless $? == 0
@@ -131,6 +158,7 @@ module Externals
               Ext.run "up"
               assert_equal "master", main_project.current_branch
               assert_equal "edge", engines.current_branch
+              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
               `git checkout new_branch`
               assert_equal "new_branch", main_project.current_branch
@@ -141,7 +169,30 @@ module Externals
               assert_equal "new_branch", engines.current_branch
 
               `git checkout master`
+              Ext.run "up"
               assert_equal "master", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              assert main_project.ignore_contains?("vendor/rails")
+
+              #let's test the switch command!
+              Ext.run "switch", "new_branch"
+              assert_equal "new_branch", main_project.current_branch
+              assert_equal "new_branch", engines.current_branch
+
+              assert !main_project.ignore_contains?("vendor/rails")
+              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+              `rm -rf vendor/rails`
+              assert !File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+              raise unless $? == 0
+
+              Ext.run "switch", "master"
+              assert_equal "master", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+
+              assert main_project.ignore_contains?("vendor/rails")
             end
 
             #now let's check it out again to test "ext checkout -b new_branch"