svnauto 1.0.0

data/lib/sc/repository.rb

@@ -0,0 +1,108 @@
+################################################################################
+#
+# 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 SC
+  ################################################################################
+  class Repository 
+    ################################################################################
+    # The URL to the repository
+    attr_accessor :url
+
+    ################################################################################
+    # The name the user gave for this repository
+    attr_accessor :name
+    
+    ################################################################################
+    # The local directory where checkouts happen
+    attr_accessor :workspace
+
+    ################################################################################
+    # Additional options to send to svn
+    attr_accessor :options
+
+    ################################################################################
+    # Prompt the user to enter the necessary attributes for a repository
+    def self.ask
+      options = {}
+
+      options[:name] = Constants::TERMINAL.ask("Repository Name (used with sc -r): ")
+      options[:url]  = Constants::TERMINAL.ask("Repository URL: ")
+
+      url = URI.parse(options[:url])
+      if url.scheme.nil? and Constants::TERMINAL.agree("Repository URL is missing protocol, assume it's local? ")
+        url.scheme = 'file'
+      end
+
+      if url.scheme.downcase == 'file'
+        url.path = File.expand_path(url.path)
+
+        if !File.exist?(url.path) and Constants::TERMINAL.agree("Local repository does not exist, should I create it? ")
+          create_local(url.path)
+        end
+
+        options[:url] = "file://#{url.path}"
+      end
+
+      options[:workspace] = Constants::TERMINAL.ask("Directory where checkouts go (can be relative to ~/): ") do |q|
+        q.default = default_workspace(options[:name])
+      end
+
+      self.new(options)
+    end
+
+    ################################################################################
+    def self.create_local (path)
+      Dir.mkdir(path) unless File.exist?(path)
+      system('svnadmin', 'create', path, '--fs-type', 'fsfs') or exit 1
+    end
+
+    ################################################################################
+    def self.default_workspace (name)
+      "develop/#{name.gsub(/[^\w_-]+/, '_').downcase}"
+    end
+
+    ################################################################################
+    # setup the details for a repository object
+    def initialize (options={})
+      @url        = options[:url]
+      @name       = options[:name]
+      @workspace  = options[:workspace]
+      @options    = options[:options]
+    end
+    
+    ################################################################################
+    # get the full path for the workspace
+    def workspace
+      Path.absolute_from_home(@workspace || self.class.default_workspace(@name))
+    end
+
+    ################################################################################
+    # convert the repository to a string
+    def to_s 
+      "#{@name} (#{@url})"
+    end
+
+  end
+end
+################################################################################

data/lib/sc/svn.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 SC
+  class Svn
+    ################################################################################
+    # Run a svn subcommand
+    def self._svn (*args)
+      subcommand =  caller(0)[0].sub(/^.*:in\s`([^']+).*$/, '\1')
+      shell_line = "#{subcommand} #{args.join(' ')}"
+
+      Constants::TERMINAL.say(Constants::TERMINAL.color("svn #{shell_line}", :yellow)) if $DEBUG
+
+      if block_given?
+        `svn #{shell_line} 2>&1`.each {|line| yield(line)}
+      else
+        system("svn #{shell_line}") 
+      end
+
+      if $? != 0 and !['info', 'list', 'merge'].include?(subcommand)
+        raise "svn command failed: #{shell_line}"
+      end
+      
+      $? == 0
+    end
+    
+    ################################################################################
+    # Check to see if the given path exists in the repository
+    def self.has_path (path)
+      self.list(path) do |line|
+        return false if line.match(/^svn:/)
+      end
+
+      true
+    end
+    
+    ################################################################################
+    # create a branch using svn copy
+    def self.branch (project, source, dest)
+      return if self.has_path(dest)
+
+      relative_dest = dest.sub("#{project.url}/", '')
+      dest_dirs = relative_dest.split(/\//)
+      dest_dirs.pop # don't need the last one
+      dest_path = project.url
+
+      branch_or_tag = dest.match(/branches/) ? 'branch' : 'tag'
+
+      dest_dirs.each do |dir|
+        dest_path << "/#{dir}"
+        self.mkdir('-m', "'#{Constants::ME}: creating #{branch_or_tag} path #{dest_path}'", dest_path) unless self.has_path(dest_path)
+      end
+
+      self.copy('-m', "'#{Constants::ME}: creating #{branch_or_tag} #{relative_dest}'", source, dest)
+    end
+
+    ################################################################################
+    # some magic to add class methods for each svn subcommand
+    class << self
+      `svn help 2>&1`.each do |line|
+        if line.match(/^Available subcommands/) .. line.match(/^\s*$/)
+          next if line.match(/^Available/) # there has to be a better way
+          subcommand = line.chomp.strip
+          subcommand.sub!(/\s.*$/, '')
+          next if line.match(/^\s*$/)
+          eval "alias #{subcommand} _svn"
+        end
+
+        raise "the svn command line client is not in your path" unless $? == 0
+      end
+    end
+
+  end
+end
+################################################################################

data/lib/sc/version.rb

@@ -0,0 +1,111 @@
+################################################################################
+#
+# 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 SC
+  ################################################################################
+  # 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
+  # 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.
+  #
+  class Version
+    ################################################################################
+    # version objects can be compared
+    include Comparable
+
+    ################################################################################
+    # major release number
+    attr_reader :major
+
+    ################################################################################
+    # minor release number
+    attr_reader :minor
+    
+    ################################################################################
+    # macro release number
+    attr_reader :macro
+
+    ################################################################################
+    # the encoded version number for sorting
+    attr_reader :encoded
+
+    ################################################################################
+    # create a new version object with the given version
+    def initialize (version_string)
+      parse_version(version_string)
+    end
+
+    ################################################################################
+    # convert back to a string
+    def to_s
+      str = "#{@major}.#{@minor}"
+      str << ".#{@macro}" unless @macro.nil?
+      str
+    end
+
+    ################################################################################
+    # give back just major.minor
+    def major_minor
+      "#{@major}.#{@minor}"
+    end
+
+    ################################################################################
+    # update encoding and whatnot on change
+    [:major, :minor, :macro].each do |part|
+      define_method "#{part}=", lambda { |value| 
+        instance_variable_set("@#{part}", value)
+        parse_version(self.to_s)
+      }
+    end
+
+    ################################################################################
+    # allow comparison
+    def <=> (other)
+      @encoded <=> other.encoded
+    end
+
+    ################################################################################
+    private
+
+    ################################################################################
+    def parse_version (version_string)
+      @major, @minor, @macro = version_string.split(/\./, 3)
+
+      @encoded = [@major, @minor, @macro].inject("") do |enc, i|
+        part = i.dup if i
+        part ||= '0'
+        raise "malformed version string #{version_string}, part #{part}" unless part.match(/^\d+$/)
+        enc << part.rjust(6, '0')
+      end
+    end
+
+  end
+  ################################################################################
+end
+################################################################################

data/test/projfiles/file_one

@@ -0,0 +1,3 @@
+Line One
+Line Two
+Line Three

data/test/projfiles/file_two

@@ -0,0 +1,3 @@
+Line One
+Line Two
+Line Three

data/test/setup.rb

@@ -0,0 +1,97 @@
+require 'sc'
+$DEBUG = true
+require 'test/unit'
+
+module SC
+  module Test
+    ################################################################################
+    def setup
+      @config_file = File.join(File.dirname(__FILE__), 'sc_config_file.yml')
+      ENV[SC::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)
+
+      cf = SC::ConfigFile.new
+      cf[:repositories] << SC::Repository.new({
+        :url        => "file://#{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)
+    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
+    end
+
+    ################################################################################
+    def run_sc (args)
+      args[1,0] = '--force' if $add_force_flag
+      SC::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
+
+      system("cd #{to}; svn add *; svn ci -m add")
+    end
+
+    ################################################################################
+    def checkout
+      run_sc(%W(checkout))
+      assert(File.exist?(File.join(@sandbox, 'test-trunk')))
+    end
+
+    ################################################################################
+    def setup_project_files
+      checkout
+      add_files(File.join(@sandbox, 'test-trunk'))
+    end
+    
+    ################################################################################
+    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")))
+      assert(File.exist?(File.join(@sandbox, "test-rel-#{version.major_minor}")))
+    end
+
+    ################################################################################
+    def interactive
+      $inside_interactive ||= 0
+      $inside_interactive +=  1
+
+      $add_force_flag = true if $inside_interactive == 1
+      yield
+      $add_force_flag = false if $inside_interactive == 1
+
+      if $inside_interactive == 1
+        teardown
+        setup
+        yield
+      end
+
+      $inside_interactive -= 1
+    end
+
+  end
+end

data/test/test_bug.rb

@@ -0,0 +1,55 @@
+require 'test/setup.rb'
+
+class TestBug < Test::Unit::TestCase
+  include SC::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')))
+
+      @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|
+        prop << line.chomp
+      end
+
+      assert_equal('1.0', prop.strip)
+    end
+  end
+
+  ################################################################################
+  def test_good_close
+    interactive do
+      test_create
+
+      File.open(File.join(@should_checkout_to, 'file_one'), 'a') do |file|
+        file << "Line for Bug Fix 1"
+      end
+
+      Dir.chdir(@should_checkout_to) do
+        SC::Svn.commit('-m', "'testing merge'")
+      end
+
+      run_sc(%W(bug --close 1))
+
+      has_line = false
+      SC::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|
+        has_line = true if line.match(/Line for Bug Fix 1/)
+      end
+    end
+  end
+
+end