svnauto 1.0.1 → 1.0.2

data/TODO

@@ -1,9 +1,8 @@
 = To Do List
 
-== Before Version 1.0.0
-
-* Create the intro screencast
-
 == Future Versions
 
+* Add reporting tool to report on things such as what bug fixes
+  went into which releases
+* More advanced merging
 * Support letters in version numbers, like 1.1.1a

data/lib/sc/command.rb

@@ -80,6 +80,12 @@ module SC
       instance_eval { @opthash.clear }
     end
 
+    ################################################################################
+    # Was the --force option given to the command?
+    def self.force?
+      instance_eval { @opthash[:force] }
+    end
+
     ################################################################################
     protected
 

data/lib/sc/commands/bug.rb

@@ -43,6 +43,10 @@ module SC
       opthash[:close] = true
     end
 
+    option('-d', '--diff', "Show the changes for the given bug fix") do |val, opthash|
+      opthash[:diff] = true
+    end
+
     option('-t', '--no-trunk', "Don't merge bug fix to the trunk") do |val, opthash|
       opthash[:no_trunk] = true
     end
@@ -56,6 +60,11 @@ module SC
         raise "bug id should be an integer: #{@bug_id}"
       end
 
+      if opthash[:diff]
+        show_diff
+        return
+      end
+
       @version = 
         if opthash[:release]
           Version.new(opthash[:release])
@@ -153,6 +162,11 @@ module SC
         end
       end
     end
+    
+    ################################################################################
+    def show_diff
+      Svn.diff(@project.tags("bug/PRE-#@bug_id"), @project.tags("bug/POST-#@bug_id"))
+    end
 
   end
   ################################################################################

data/lib/sc/commands/config.rb

@@ -35,7 +35,7 @@ module SC
     ################################################################################
     option('-a', '--add', 'Add a repository') do |val, hash|
       config = ConfigFile.new
-      config[:repositories] << Repository.ask
+      config[:repositories] << Repository.ask(config)
       config.save
     end
 

data/lib/sc/constants.rb

@@ -26,7 +26,7 @@ module SC
   module Constants
     ################################################################################
     # The version number for this copy of SC
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
 
     ################################################################################
     # What to call myself

data/lib/sc/dispatcher.rb

@@ -121,6 +121,13 @@ module SC
         end
       end
 
+      # make sure the selected repository is in the config file
+      if !klass.without_repository and !config.find_repository(@project.repository.name)
+        error =  "the selected repository (#{@project.repository.url}) is not in the configuration file, "
+        error << "please use the 'sc config --add' command to add it first."
+        raise error
+      end
+
       process(klass, subcommand_options, @project)
     end
 
@@ -151,6 +158,9 @@ module SC
       command_extras = klass.options.order!(options)
       return unless klass.instance_methods.include?('run')
 
+      # make sure the project object is ready
+      project.prepare(klass.force?)
+
       if klass.args_min and command_extras.length < klass.args_min
         puts usage_for(klass)
         exit 1

data/lib/sc/project.rb

@@ -72,6 +72,12 @@ module SC
       @repository = options[:repository]
     end
 
+    ################################################################################
+    # make sure the project is ready to be used
+    def prepare (force)
+      @repository.prepare(force) if @repository
+    end
+
     ################################################################################
     # get the URL to this project
     def url
@@ -209,14 +215,19 @@ module SC
 
       Dir.chdir(dir) do
         conflicts = false
-
-        Svn.merge(start_tag, end_tag) do |line|
-          conflicts = true if line.match(/^\s*C/)
-          print line
+        Svn.merge(start_tag, end_tag)
+
+        # test to make sure there are no conflicts
+        Svn.status do |line|
+          if line.match(/^\s*C/)
+            conflicts = true
+            Constants::TERMINAL.say(Constants::TERMINAL.color("MERGE CONFLICT: #{line.chomp}", :red))
+          end
         end
 
         if conflicts
           message = "merge failed, you need to resolve conflicts in #{dir} "
+          message << "(use 'svn status' to see files with conflicts) "
           message << yield if block_given?
           raise message
         end

data/lib/sc/repository.rb

@@ -43,11 +43,17 @@ module SC
 
     ################################################################################
     # Prompt the user to enter the necessary attributes for a repository
-    def self.ask
+    def self.ask (config=nil)
       options = {}
 
       options[:name] = Constants::TERMINAL.ask("Repository Name (used with sc -r): ")
-      options[:url]  = Constants::TERMINAL.ask("Repository URL: ")
+
+      options[:url]  = Constants::TERMINAL.ask("Repository URL: ") do |question|
+        if config
+          project = Project.from_cwd(config)
+          question.default = project.repository.url unless project.repository.nil?
+        end
+      end
 
       url = URI.parse(options[:url])
       if url.scheme.nil? and Constants::TERMINAL.agree("Repository URL is missing protocol, assume it's local? ")
@@ -68,7 +74,9 @@ module SC
         q.default = default_workspace(options[:name])
       end
 
-      self.new(options)
+      repository = self.new(options)
+      repository.prepare(false)
+      repository
     end
 
     ################################################################################
@@ -91,6 +99,22 @@ module SC
       @options    = options[:options]
     end
     
+    ################################################################################
+    # make sure the repository is ready to use
+    def prepare (force)
+      workspace_dir = workspace()
+      
+      unless File.exist?(workspace_dir)
+        question = "Create workspace "
+        question << Constants::TERMINAL.color(workspace_dir, :green)
+        question << "? "
+
+        if force or Constants::TERMINAL.agree(question)
+          Pathname.new(workspace_dir).mkpath
+        end
+      end
+    end
+
     ################################################################################
     # get the full path for the workspace
     def workspace

data/lib/sc/svn.rb

@@ -24,6 +24,11 @@
 ################################################################################
 module SC
   class Svn
+    ################################################################################
+    # Since we're using regexes, we can only support one language, so we pick
+    # English.  This setting forces svn to output English.
+    ENV['LC_MESSAGES'] = 'C'
+
     ################################################################################
     # Run a svn subcommand
     def self._svn (*args)

data/lib/sc.rb

@@ -25,6 +25,7 @@
 require 'rubygems'
 require 'highline'
 require 'uri'
+require 'pathname'
 ################################################################################
 require 'sc/constants'
 require 'sc/version'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: svnauto
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-11-06 00:00:00 -07:00
+  version: 1.0.2
+date: 2006-11-10 00:00:00 -07:00
 summary: Wrapper around svn for automating complex tasks
 require_paths: 
 - lib