svnauto 1.0.0

data/lib/sc.rb

@@ -0,0 +1,38 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+require 'rubygems'
+require 'highline'
+require 'uri'
+################################################################################
+require 'sc/constants'
+require 'sc/version'
+require 'sc/config_file'
+require 'sc/svn'
+require 'sc/path'
+require 'sc/project'
+require 'sc/repository'
+require 'sc/command'
+require 'sc/dispatcher'
+################################################################################

data/lib/sc/command.rb

@@ -0,0 +1,118 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+require 'optparse'
+require 'set'
+################################################################################
+module SC
+  ################################################################################
+  class Command
+    ################################################################################
+    VALID_SET_KEYS = Set.new([
+     :name, 
+     :description, 
+     :without_project, 
+     :without_repository,
+     :usage,
+     :args_min,
+     :args_max,
+    ])
+
+    ################################################################################
+    def self.inherited (klass)
+      klass.instance_eval do
+        @options = OptionParser.new
+        @opthash ||= {}
+        @attributes = {}
+      end
+
+      instance_eval do
+        (@commands ||= []) << klass
+      end
+
+      klass.option('-f', '--force', "Don't display any confirmation prompts") do |val, opthash|
+        opthash[:force] = true
+      end
+    end
+
+    ################################################################################
+    def self.commands
+      instance_eval { @commands }
+    end
+
+    ################################################################################
+    def self.options
+      instance_eval { @options }
+    end
+
+    ################################################################################
+    class << self
+      VALID_SET_KEYS.each do |method|
+        define_method(method, lambda {instance_eval{@attributes[method]}})
+      end
+    end
+
+    ################################################################################
+    # reset to a good state, mostly for testing, since commands get run over
+    # and over
+    def self.reset!
+      instance_eval { @opthash.clear }
+    end
+
+    ################################################################################
+    protected
+
+    ################################################################################
+    def self.option (*args, &block)
+      instance_eval do
+        @options.on(*args) do |option|
+          block.call(option, @opthash)
+        end
+      end
+    end
+    
+    ################################################################################
+    def self.set (name, value=true)
+      unless VALID_SET_KEYS.include?(name)
+        raise "invalid set key #{name}, wanted one of #{VALID_SET_KEYS.join(', ')}"
+      end
+
+      instance_eval { @attributes[name] = value }
+    end
+
+    ################################################################################
+    def opthash
+      self.class.instance_eval { @opthash }
+    end
+
+  end
+  ################################################################################
+end
+
+################################################################################
+# load all commands
+Dir.foreach(File.join(File.dirname(__FILE__), 'commands')) do |file|
+  next unless file.match(/\.rb$/)
+  require 'sc/commands/' + file
+end

data/lib/sc/commands/bug.rb

@@ -0,0 +1,161 @@
+################################################################################
+#
+# 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 Bug < Command
+    ################################################################################
+    REL_BRN_PROP = 'sc:bug-fix-release-branch'
+
+    ################################################################################
+    set(:name, :bug)
+    set(:description, "Work with release branch bug fixes")
+    set(:usage, "[options] unique-bug-id")
+    set(:args_min, 1)
+    set(:args_max, 1)
+
+    option('-r', '--release VER', "Create branch off VER rel branch instead of latest rel") do |val, opthash|
+      opthash[:release] = val
+    end
+
+    option('-c', '--close', "Close the bug fix branch") do |val, opthash|
+      opthash[:close] = true
+    end
+
+    option('-t', '--no-trunk', "Don't merge bug fix to the trunk") do |val, opthash|
+      opthash[:no_trunk] = true
+    end
+
+    ################################################################################
+    def run (project, args)
+      @project = project
+      @bug_id = args.first
+
+      unless @bug_id.match(/^\d+/)
+        raise "bug id should be an integer: #{@bug_id}"
+      end
+
+      @version = 
+        if opthash[:release]
+          Version.new(opthash[:release])
+        else
+          project.latest_release_branch
+        end
+
+      opthash[:close] ? close_bug : create_bug_fix_branch
+    end
+    
+    ################################################################################
+    def create_bug_fix_branch
+      if @version.nil?
+        raise "there are no release branches for the #{@project} project"
+      end
+
+      unless Svn.has_path(@project.release(@version))
+        raise "there is no release branch for version #@version"
+      end
+
+      unless opthash[:force]
+        exit unless Constants::TERMINAL.agree("Create bug fix branch for bug " +
+         Constants::TERMINAL.color(@bug_id, :red) + " off release " +
+         Constants::TERMINAL.color(@project.to_s, :green) + "/" +
+         Constants::TERMINAL.color(@version.to_s, :red) + "? ")
+      end
+
+      # create the bug fix branch
+      Svn.branch(@project, @project.release(@version), @project.branches("bug/#@bug_id"))
+
+      # tag the start of the branch for merging later
+      Svn.branch(@project, @project.branches("bug/#@bug_id"), @project.tags("bug/PRE-#@bug_id"))
+
+      # check it out so that we can do the next step
+      dir = @project.checkout(@project.branches("bug/#@bug_id"))
+
+      # record the release branch so we can get back to it later
+      Svn.propset(REL_BRN_PROP, @version.to_s, dir) {|line|}
+      Svn.commit('-m', "'#{Constants::ME}: recording release branch for bug fix #@bug_id'", dir)
+
+      Constants::TERMINAL.say("Created bug fix branch and checked out to: " + 
+        Constants::TERMINAL.color(Path.relative_to_home(dir), :green))
+    end
+
+    ################################################################################
+    def close_bug
+      unless Svn.has_path(@project.branches("bug/#@bug_id"))
+        raise "there isn't a bug fix branch for bug #@bug_id"
+      end
+
+      if Svn.has_path(@project.tags("bug/POST-#@bug_id"))
+         Constants::TERMINAL.say("bug #{Constants::TERMINAL.color(@bug_id, :red)} " +
+           "already closed and merged to release branch, skipping...")
+      else
+        # Figure out which release branch to merge to
+        version = ''
+        Svn.propget(REL_BRN_PROP, @project.branches("bug/#@bug_id")) do |line|
+          version << line.chomp
+        end
+
+        version.strip!
+        if version.empty?
+          raise "Woah! missing #{REL_BRN_PROP} prop on #{@project.branches("bug/#@bug_id")}"
+        end
+
+        version = Version.new(version)
+
+        unless opthash[:force]
+          exit unless Constants::TERMINAL.agree("Merge bug fix branch for bug " +
+           Constants::TERMINAL.color(@bug_id, :red) + " to release " +
+           Constants::TERMINAL.color(@project.to_s, :green) + "/" +
+           Constants::TERMINAL.color(version.to_s, :red) + "? ")
+        end
+
+        # tag the end of the branch
+        Svn.branch(@project, @project.branches("bug/#@bug_id"), @project.tags("bug/POST-#@bug_id"))
+
+        # merge bug fix changes to the release branch
+        @project.merge(version, "bug/PRE-#@bug_id", "bug/POST-#@bug_id") do
+          "then commit your changes, and run this tool again to merge to trunk"
+        end
+      end
+
+      # merge bug fix changes to the trunk
+      if opthash[:no_trunk].nil?
+        question = "Merge bug fix branch for bug "
+        question << Constants::TERMINAL.color(@bug_id, :red) + " to "
+        question << Constants::TERMINAL.color(@project.to_s, :green)
+        question << "/trunk? "
+
+        if opthash[:force] or Constants::TERMINAL.agree(question)
+          @project.merge(nil, "bug/PRE-#@bug_id", "bug/POST-#@bug_id") do
+            "then commit your changes to finish the merge to the trunk"
+          end
+        end
+      end
+    end
+
+  end
+  ################################################################################
+end
+################################################################################
+

data/lib/sc/commands/checkout.rb

@@ -0,0 +1,71 @@
+################################################################################
+#
+# 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 Checkout < Command
+    ################################################################################
+    set(:name, [:checkout, :co])
+    set(:description, "Checkout a project from the repository")
+
+    option('-r', '--release VER', 'Checkout a release instead of the trunk') do |val, opts|
+      opts[:co_release] = Version.new(val)
+    end
+
+    option('-b', '--bug ID', 'Checkout a bug fix branch instead of the trunk') do |val, opts|
+      opts[:co_bug] = val
+    end
+
+    option('-e', '--exp NAME', 'Checkout exp branch NAME instead of the trunk') do |val, opts|
+      opts[:co_exp] = val
+    end
+
+    option('-p', '--prefix PATH', 'Use branch path PATH instead of exp') do |val, opts|
+      opts[:prefix] = val
+    end
+
+    ################################################################################
+    def run (project, args)
+      what = 
+        case
+        when opthash[:co_bug]
+          project.branches("bug/#{opthash[:co_bug]}")
+        when opthash[:co_exp]
+          opthash[:prefix] ||= 'exp'
+          project.branches("#{opthash[:prefix]}/#{opthash[:co_exp]}")
+        when opthash[:co_release]
+          opthash[:co_release]
+        else
+          nil
+        end
+
+      Constants::TERMINAL.say("Checked out to: " + 
+        Constants::TERMINAL.color(Path.relative_to_home(project.checkout(what)), :green))
+    end
+
+  end
+  ################################################################################
+end
+################################################################################
+

data/lib/sc/commands/config.rb

@@ -0,0 +1,58 @@
+################################################################################
+#
+# 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 Config < Command
+    ################################################################################
+    set(:name, :config)
+    set(:description, "Manage sc Configuration")
+    set(:without_repository)
+    set(:without_project)
+
+    ################################################################################
+    option('-a', '--add', 'Add a repository') do |val, hash|
+      config = ConfigFile.new
+      config[:repositories] << Repository.ask
+      config.save
+    end
+
+    ################################################################################
+    option('--color', 'Enable color by default') do |val, hash|
+      config = ConfigFile.new
+      config[:color] = true
+      config.save
+    end
+
+    ################################################################################
+    option('--no-color', 'Disable color by default') do |val, hash|
+      config = ConfigFile.new
+      config[:color] = false
+      config.save
+    end
+
+  end
+  ################################################################################
+end
+################################################################################