svnauto 1.0.2 → 1.1.0

data/lib/svnauto/svn_info.rb

@@ -0,0 +1,96 @@
+################################################################################
+#
+# Copyright (C) 2006 Peter J Jones (pjones@pmade.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+################################################################################
+module SvnAuto
+  class SvnInfo
+    ################################################################################
+    # at least for now, it's eaiser to parse via regex instead of XML
+    ATTRIBUTES = [
+      [:path,                 /^Path:\s+(.+)$/],
+      [:url,                  /^URL:\s+(.+)$/],
+      [:repository_root,      /^Repository\s+Root:\s+(.+)$/],
+      [:revision,             /^Revision:\s+(\d+)$/],
+      [:last_change_revision, /^Last\s+Changed\s+Rev:\s+(\d+)$/],
+      [:last_change_date,     /^Last\s+Changed\s+Date:\s+([\d-]+\s+[\d:]+(?:\s+[\d+-]+))/],
+    ]
+
+    ################################################################################
+    # put the attributes on the class
+    ATTRIBUTES.each {|a| attr_accessor a.first}
+    attr_reader :status
+
+    ################################################################################
+    # get info about the given path
+    def self.for (path, raise_on_error=false)
+      info = self.new
+      info.load_for_path(path)
+      raise "svn info command failed for #{path}" if !info.status and raise_on_error
+
+      info
+    end
+
+    ################################################################################
+    # create a new SvnInfo object
+    def initialize (attributes={})
+      ATTRIBUTES.each {|a| instance_variable_set("@#{a.first}", nil)}
+
+      attributes.each do |k,v|
+        raise "bad SvnInfo attribute given to initialize: #{k}" unless ATTRIBUTES.find {|a| a.first == k}
+        instance_variable_set("@#{k}", v)
+      end
+    end
+
+    ################################################################################
+    # parse the output of svn info
+    def load_for_path (path)
+      attributes = ATTRIBUTES.inject({}) {|m, e| m.store(e.first, nil); m}
+
+      @status = Svn.info(path) do |line|
+        ATTRIBUTES.each do |a|
+          if m = line.match(a.last)
+            instance_variable_set("@#{a.first}", m[1])
+            attributes[a.first] = true
+            break
+          end
+        end
+      end
+
+      # no need to check the status of the regexes if svn info failed
+      return @status unless @status
+
+      attributes.each do |k, v|
+        unless v
+          error  = "please report a bug in #{Constants::ME}, I can't parse the output "
+          error << "of 'svn info', specifically, this regex did not match: "
+          error << ATTRIBUTES.find {|a| a.first == k}.last.to_s + ' '
+          error << "please also include the output of 'svn info #{path}'"
+          raise error
+        end
+      end
+
+      @status
+    end
+  end
+end
+################################################################################

data/lib/{sc → svnauto}/version.rb

@@ -22,14 +22,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 ################################################################################
-module SC
+module SvnAuto
   ################################################################################
   # Help deal with version numbers.  Verson numbers are made up of three parts: the major,
   # minor, and macro numbers.  These numbers are separated by periods:
   #
   # MAJOR.MINOR.MACRO as in 1.0.2
   #
-  # In SC, release branches are created for MAJOR.MINOR release numbers.  Release
+  # In SvnAuto, release branches are created for MAJOR.MINOR release numbers.  Release
   # tags are used for MAJOR.MINOR.MACRO.  That means that version 1.1 is open for 
   # bug fixes and feature enhancements, but version 1.1.4 is locked and can't be
   # updated.

data/test/setup.rb

@@ -1,63 +1,59 @@
-require 'sc'
+require 'svnauto'
 $DEBUG = true
 require 'test/unit'
 
-module SC
+module SvnAuto
   module Test
     ################################################################################
     def setup
-      @config_file = File.join(File.dirname(__FILE__), 'sc_config_file.yml')
-      ENV[SC::ConfigFile::ENV_OVERRIDE] = @config_file
+      @config_file = File.expand_path(File.join(File.dirname(__FILE__), 'sc_config_file.yml'))
+      ENV[SvnAuto::ConfigFile::ENV_OVERRIDE] = @config_file
 
       @repository = File.join(File.dirname(__FILE__), 'repos')
       @sandbox    = File.join(File.dirname(__FILE__), 'sandbox')
       @projfiles  = File.join(File.dirname(__FILE__), 'projfiles')
 
-      [@repository, @sandbox].each do |dir|
-        system('mkdir', dir) or raise "mkdir #{dir}: failed"
-      end
-
-      SC::Repository.create_local(@repository)
+      [@repository, @sandbox].each {|d| FileUtils.mkdir(d)}
+      SvnAuto::Repository.create_local(@repository)
 
-      cf = SC::ConfigFile.new
-      cf[:repositories] << SC::Repository.new({
-        :url        => "file://#{File.expand_path(@repository)}", 
+      cf = SvnAuto::ConfigFile.new
+      cf[:repositories] << SvnAuto::Repository.new({
+        :url        => SvnAuto::Path.to_url(File.expand_path(@repository)), 
         :name       => "test", 
         :workspace  => File.expand_path(@sandbox)
       })
       cf.save
 
-      run_sc(%W(create -f test))
-      @project = SC::Project.new(:name => 'test', :repository => cf[:repositories].first)
+      run_sva(%W(create -f test))
+      @project = SvnAuto::Project.new(:name => 'test', :repository => cf[:repositories].first)
     end
 
     ################################################################################
     def teardown
       File.unlink(@config_file) if File.exists?(@config_file)
-
-      [@repository, @sandbox].each do |dir|
-        system('rm', '-rf', dir) or raise "rm -rf #{dir}: failed"
-      end
+      [@repository, @sandbox].each {|d| FileUtils.rm_rf(d)}
     end
 
     ################################################################################
-    def run_sc (args)
+    def run_sva (args)
       args[1,0] = '--force' if $add_force_flag
-      SC::Dispatcher.new.run(%W(-rtest -ptest).concat(args))
+      SvnAuto::Dispatcher.new.run(%W(-rtest -ptest).concat(args))
     end
 
     ################################################################################
     def add_files (to)
-      %W(file_one file_two).each do |file|
-        system('cp', File.join(@projfiles, file), to)
-      end
+      files = %W(file_one file_two)
+      files.each {|f| FileUtils.cp(File.join(@projfiles, f), to)}
 
-      system("cd #{to}; svn add *; svn ci -m add")
+      Dir.chdir(to) do
+        files.each {|f| SvnAuto::Svn.add(f)}
+        SvnAuto::Svn.commit('-m', 'add')
+      end
     end
 
     ################################################################################
     def checkout
-      run_sc(%W(checkout))
+      run_sva(%W(checkout))
       assert(File.exist?(File.join(@sandbox, 'test-trunk')))
     end
 
@@ -70,8 +66,8 @@ module SC
     ################################################################################
     def make_release (version, *extras)
       setup_project_files
-      run_sc(['release', '-f', extras, version.to_s].flatten)
-      assert(SC::Svn.has_path(@project.release("#{version.major_minor}/file_one")))
+      run_sva(['release', '-f', extras, version.to_s].flatten)
+      assert(SvnAuto::Svn.has_path(@project.release("#{version.major_minor}/file_one")))
       assert(File.exist?(File.join(@sandbox, "test-rel-#{version.major_minor}")))
     end
 
@@ -84,7 +80,7 @@ module SC
       yield
       $add_force_flag = false if $inside_interactive == 1
 
-      if $inside_interactive == 1
+      if $inside_interactive == 1 and !SvnAuto::Path.windows?
         teardown
         setup
         yield

data/test/test_bug.rb

@@ -1,21 +1,21 @@
 require 'test/setup.rb'
 
 class TestBug < Test::Unit::TestCase
-  include SC::Test
+  include SvnAuto::Test
 
   ################################################################################
   def test_create
     interactive do
-      make_release(SC::Version.new('1.0'))
-      run_sc(%W(bug -r 1.0 1))
-      assert(SC::Svn.has_path(@project.branches('bug/1/file_one')))
-      assert(SC::Svn.has_path(@project.tags('bug/PRE-1/file_one')))
+      make_release(SvnAuto::Version.new('1.0'))
+      run_sva(%W(bug -r 1.0 1))
+      assert(SvnAuto::Svn.has_path(@project.branches('bug/1/file_one')))
+      assert(SvnAuto::Svn.has_path(@project.tags('bug/PRE-1/file_one')))
 
       @should_checkout_to = File.join(@sandbox, 'test-bug-1')
       assert(File.exist?(@should_checkout_to))
 
       prop = ''
-      SC::Svn.propget(SC::Bug::REL_BRN_PROP, @should_checkout_to) do |line|
+      SvnAuto::Svn.propget(SvnAuto::Bug::REL_BRN_PROP, @should_checkout_to) do |line|
         prop << line.chomp
       end
 
@@ -33,20 +33,20 @@ class TestBug < Test::Unit::TestCase
       end
 
       Dir.chdir(@should_checkout_to) do
-        SC::Svn.commit('-m', "'testing merge'")
+        SvnAuto::Svn.commit('-m', "'testing merge'")
       end
 
-      run_sc(%W(bug --close 1))
+      run_sva(%W(bug --close 1))
 
       has_line = false
-      SC::Svn.cat(@project.branches('rel/1.0/file_one')) do |line|
+      SvnAuto::Svn.cat(@project.branches('rel/1.0/file_one')) do |line|
         has_line = true if line.match(/Line for Bug Fix 1/)
       end
 
       assert(has_line)
 
       has_line = false
-      SC::Svn.cat("#{@project.trunk}/file_one") do |line|
+      SvnAuto::Svn.cat("#{@project.trunk}/file_one") do |line|
         has_line = true if line.match(/Line for Bug Fix 1/)
       end
     end

data/test/test_checkout.rb

@@ -1,7 +1,7 @@
 require 'test/setup.rb'
 
 class TestCheckout < Test::Unit::TestCase
-  include SC::Test
+  include SvnAuto::Test
 
   ################################################################################
   def test_trunk
@@ -11,8 +11,8 @@ class TestCheckout < Test::Unit::TestCase
   ################################################################################
   def test_release
     interactive do
-      make_release(SC::Version.new('1.0'))
-      run_sc(%W(checkout -r 1.0))
+      make_release(SvnAuto::Version.new('1.0'))
+      run_sva(%W(checkout -r 1.0))
       assert(File.exist?(File.join(@sandbox, 'test-rel-1.0')))
     end
   end

data/test/test_create.rb

@@ -1,7 +1,7 @@
 require 'test/setup.rb'
 
 class TestCreate < Test::Unit::TestCase
-  include SC::Test
+  include SvnAuto::Test
 
   ################################################################################
   def test_setup
@@ -12,7 +12,7 @@ class TestCreate < Test::Unit::TestCase
 
       # check the project layout
       @project.directories.each do |path|
-        assert(SC::Svn.has_path(path))
+        assert(SvnAuto::Svn.has_path(path))
       end
     end
   end
@@ -21,7 +21,7 @@ class TestCreate < Test::Unit::TestCase
   # Force create a new project outside of setup
   def test_create
     interactive do
-      run_sc(%W(create myproject))
+      run_sva(%W(create myproject))
       assert(File.exist?(File.join(@sandbox, 'myproject-trunk')))
     end
   end

data/test/test_experimental.rb

@@ -1,15 +1,15 @@
 require 'test/setup.rb'
 
 class TestExperimental < Test::Unit::TestCase
-  include SC::Test
+  include SvnAuto::Test
 
   ################################################################################
   def test_create
     interactive do
       setup_project_files
-      run_sc(%W(exp testexp))
-      assert(SC::Svn.has_path(@project.branches('exp/testexp/file_one')))
-      assert(SC::Svn.has_path(@project.tags('exp/PRE-testexp/file_one')))
+      run_sva(%W(exp testexp))
+      assert(SvnAuto::Svn.has_path(@project.branches('exp/testexp/file_one')))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/PRE-testexp/file_one')))
       assert(File.exist?(File.join(@sandbox, 'test-exp-testexp', 'file_one')))
     end
   end
@@ -21,8 +21,8 @@ class TestExperimental < Test::Unit::TestCase
 
       ################################################################################
       add_line(File.join(@sandbox, 'test-trunk'), 'file_one', "A line that needs to be merged to the exp branch")
-      run_sc(%W(exp --up testexp))
-      assert(SC::Svn.has_path(@project.tags('exp/UP1-testexp')))
+      run_sva(%W(exp --up testexp))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/UP1-testexp')))
       cat_match(@project.branches('exp/testexp/file_one'), /exp branch/)
 
       ################################################################################
@@ -32,8 +32,8 @@ class TestExperimental < Test::Unit::TestCase
 
       ################################################################################
       add_line(File.join(@sandbox, 'test-trunk'), 'file_one', "Another line a-b-c-d")
-      run_sc(%W(exp --up testexp))
-      assert(SC::Svn.has_path(@project.tags('exp/UP2-testexp')))
+      run_sva(%W(exp --up testexp))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/UP2-testexp')))
       cat_match(@project.branches('exp/testexp/file_one'), /a-b-c-d/)
     end
   end
@@ -43,43 +43,58 @@ class TestExperimental < Test::Unit::TestCase
     interactive do
       test_up
 
-      run_sc(%W(exp --down testexp))
-      assert(SC::Svn.has_path(@project.tags('exp/DOWN1-testexp')))
+      run_sva(%W(exp --down testexp))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/DOWN1-testexp')))
       cat_match(File.join(@project.trunk, 'file_two'), /Hello World/)
 
       add_line(File.join(@sandbox, 'test-exp-testexp'), 'file_two', "FreeBSD")
-      run_sc(%W(exp --down testexp))
-      assert(SC::Svn.has_path(@project.tags('exp/DOWN2-testexp')))
+      run_sva(%W(exp --down testexp))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/DOWN2-testexp')))
       cat_match(File.join(@project.trunk, 'file_two'), /FreeBSD/)
 
       add_line(File.join(@sandbox, 'test-exp-testexp'), 'file_two', "Mac OS X")
-      run_sc(%W(exp --down testexp))
-      assert(SC::Svn.has_path(@project.tags('exp/DOWN3-testexp')))
+      run_sva(%W(exp --down testexp))
+      assert(SvnAuto::Svn.has_path(@project.tags('exp/DOWN3-testexp')))
       cat_match(File.join(@project.trunk, 'file_two'), /Mac OS X/)
     end
   end
 
+  ################################################################################
+  def test_branch_at_revision
+    interactive do
+      setup_project_files
+      trunk_info = SvnAuto::SvnInfo.for(@project.trunk, true)
+
+      add_line(File.join(@sandbox, 'test-trunk'), 'file_two', "Should only be on the trunk")
+      cat_match(File.join(@project.trunk, 'file_two'), /Should only be on the trunk/)
+
+      run_sva(%W(exp --revision #{trunk_info.revision} testexp))
+      cat_match(@project.branches('exp/testexp/file_two'), /Should only be on the trunk/, true)
+    end
+  end
+
   ################################################################################
   def add_line (dir, file, line)
     Dir.chdir(dir) do
-      SC::Svn.update
+      SvnAuto::Svn.update
 
       File.open(file, 'a') do |file|
         file << "#{line}\n"
       end
 
-      SC::Svn.commit('-m', 'test')
+      SvnAuto::Svn.commit('-m', 'test')
     end
   end
 
   ################################################################################
-  def cat_match (file, re)
+  def cat_match (file, re, negate=false)
     has_line = false
 
-    SC::Svn.cat(file) do |line|
+    SvnAuto::Svn.cat(file) do |line|
       has_line = true if line.match(re)
     end
 
+    has_line = !has_line if negate
     assert(has_line)
   end
 

data/test/test_externals.rb

@@ -0,0 +1,55 @@
+require 'test/setup.rb'
+
+class TestExternals < Test::Unit::TestCase
+  include SvnAuto::Test
+
+  ################################################################################
+  def test_lock
+    setup_project_files
+
+    SvnAuto::Dispatcher.new.run(%W(-rtest create -f ext))
+    add_files(File.join(@sandbox, 'ext-trunk'))
+    assert(File.exist?(File.join(@sandbox, 'ext-trunk')))
+
+    repos = File.expand_path(@repository)
+
+    Dir.chdir(File.join(@sandbox, 'test-trunk')) do 
+      SvnAuto::Svn.propset('svn:externals', "ext #{SvnAuto::Path.to_url(repos)}/ext/trunk", '.')
+      SvnAuto::Svn.update
+      SvnAuto::Svn.commit('-m', 'adding-ext')
+
+      assert(File.directory?('ext'))
+      assert(File.exist?(File.join('ext', 'file_one')))
+      assert_equal("#{SvnAuto::Path.to_url(repos)}/ext/trunk", SvnAuto::SvnInfo.for('ext').url)
+
+      run_sva(%W(ext --lock ext))
+      assert(File.directory?('ext'))
+      assert(File.exist?(File.join('ext', 'file_one')))
+      assert_equal("#{SvnAuto::Path.to_url(repos)}/test/trunk/ext", SvnAuto::SvnInfo.for('ext').url)
+    end
+  end
+
+  ################################################################################
+  def test_unlock
+    # reuse the test_lock method to prepare the external for us
+    test_lock
+    repos = File.expand_path(@repository)
+
+    Dir.chdir(File.join(@sandbox, 'test-trunk')) do 
+      run_sva(%W(ext --unlock ext))
+      assert_equal("#{SvnAuto::Path.to_url(repos)}/ext/trunk", SvnAuto::SvnInfo.for('ext').url)
+    end
+  end
+
+  ################################################################################
+  def test_fail_on_uncommitted
+    # reuse the test_lock method to prepare the external for us
+    test_lock
+
+    Dir.chdir(File.join(@sandbox, 'test-trunk')) do 
+      File.open('file_one', 'a') {|file| file << "test\n"}
+      assert_raises(RuntimeError) {run_sva(%W(ext --unlock ext))}
+    end
+  end
+
+end