svn-command 0.0.9 → 0.0.10

data/Readme

@@ -204,6 +204,59 @@ You can now do commands like this:
 
 (The standard svn command only accepts a single source and a single destination.)
 
+=== <tt>commit</tt>
+
+==== --skip-notification / --covert
+
+Added a --skip-notification / --covert option which (assuming you have your post-commit hook set up to do this), will suppress the sending out of a commit notification e-mail.
+
+This is useful if you're committing large/binary files that would normally cause the commit mailer to hang. (True, the commit mailer script should really be smart enough not to hang in the first place, but let's assume we don't have the luxury of being able to fix it...)
+
+For this option to have any effect, you will need to set up your repository similar to this:
+
+/var/www/svn/code/hooks/pre-revprop-change
+
+  REPOS="$1"
+  REV="$2"
+  USER="$3"
+  PROPNAME="$4"
+  ACTION="$5"
+
+  if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
+  if [ "$PROPNAME" = "svn:skip_commit_notification_for_next_commit" ]; then exit 0; fi
+
+  echo "Changing revision properties other than those listed in $0 is prohibited" >&2
+  exit 1
+
+/var/www/svn/code/hooks/post-commit
+
+  #!/bin/bash
+
+  REPOS="$1"
+  REV="$2"
+
+  previous_revision=`expr $REV - 1`
+  skip_commit_notification=`svnlook propget $REPOS --revprop svn:skip_commit_notification_for_next_commit -r $previous_revision`
+
+  if [[ $skip_commit_notification == 'true' ]]; then
+      # Skipping
+  else
+      svnnotify \
+          --repos-path $REPOS \
+          --revision $REV \
+          --subject-prefix "[your repository name]" \
+          --revision-url 'http://code/?rev=%s' \
+          --to code-commit-watchers@yourdomain.com \
+          --handler HTML::ColorDiff \
+          --subject-cx \
+          --with-diff \
+          --author-url 'mailto:%s' \
+          --footer "Powered by SVN-Notify <http://search.cpan.org/~dwheeler/SVN-Notify-2.62/lib/SVN/Notify.pm>" \
+          --max-diff-length 1000
+  fi
+
+
+
 ===Help
 
 You can, of course, get a lits of the custom commands that have been added by using <tt>svn help</tt>. They will be listed at the end.
@@ -212,7 +265,7 @@ You can, of course, get a lits of the custom commands that have been added by us
 
 * --no-color (since color is on by default)
 * --dry-run  (see what /usr/bin/svn command it _would_ have executed if you weren't just doing a dry run -- useful for debugging if nothing else)
-* --show-commands (prints out the /usr/bin/svn commands before executing them)
+* --print-commands (prints out the /usr/bin/svn commands before executing them)
 * --debug    (sets $debug = true)
 
 ==<tt>colordiff</tt>
@@ -249,6 +302,22 @@ This is a limitation of Console::Command.
 Fix: Show the whole thing, including this line:
   Fetching external item into 'glass/rails_backend/vendor/plugins/our_extensions'
 
+
+This doesn't work:
+  svn propget svn:skip_commit_notification_for_next_commit --revprop -r 2498 http://code.qualitysmith.com/ --dry-run
+  In execute(). Was about to execute this command via method :exec:
+  "/usr/bin/svn propget --revprop -r 2498 http://code.qualitysmith.com/ svn:skip_commit_notification_for_next_commit"
+
+  > svn propget svn:skip_commit_notification_for_next_commit --revprop -r 2498 http://code.qualitysmith.com/
+  svn: Either a URL or versioned item is required
+
+Have to do:
+  svn propget svn:skip_commit_notification_for_next_commit http://code.qualitysmith.com/applications/profiler_test --revprop -r 2498
+
+or
+  > /usr/bin/svn propget svn:skip_commit_notification_for_next_commit --revprop -r 2498 http://code.qualitysmith.com/
+
+
 === Slowness
 
 Is it slower than just running /usr/bin/svn directly? You betcha it is!

data/bin/svn

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require_gem 'facets', '>=1.8.20'
+gem 'facets', '>=1.8.20'
 require 'facets/core/kernel/require_local'
 require_local '../lib/svn_command.rb'
 Subversion::SvnCommand.execute

data/lib/subversion.rb

@@ -6,19 +6,20 @@ require 'rexml/document'
 require 'rexml/xpath'
 require 'rubygems'
 
-require_gem 'facets', '>=1.8.51'
+gem 'facets', '>=1.8.51'
 require 'facets/core/kernel/require_local'
 require 'facets/core/enumerable/uniq_by'
 require 'facets/core/kernel/silence_stream'
 
-require_gem 'qualitysmith_extensions', '>=0.0.3'
+gem 'qualitysmith_extensions', '>=0.0.3'
 
 # Had a lot of trouble getting ActiveSupport to load without giving errors! Eventually gave up on that idea since I only needed it for mattr_accessor and Facets supplies that.
-#require_gem 'activesupport'  # mattr_accessor
+#gem 'activesupport'  # mattr_accessor
 #require 'active_support'
 #require 'active_support/core_ext/module/attribute_accessors'
 #require 'facets/core/class/cattr'
-require_local "attribute_accessors"
+gem 'qualitysmith_extensions'
+require 'qualitysmith_extensions/module/attribute_accessors'
 
 # Wraps the Subversion shell commands for Ruby.
 module Subversion
@@ -267,6 +268,12 @@ module Subversion
     #
   end
 
+  def self.print_commands_for(&block)
+    old_print_commands, @@print_commands = @@print_commands, true
+    yield
+    @@print_commands = old_print_commands
+  end
+
 protected
   def self.execute(*args)
     options = args.last.is_a?(Hash) ? args.pop : {}
@@ -323,6 +330,15 @@ protected
   end
 end
 
+
+
+
+
+
+
+
+
+
 module Subversion
   # Represents an "externals container", which is a directory that has the <tt>svn:externals</tt> property set to something useful.
   # Each ExternalsContainer contains a set of "entries", which are the actual directories listed in the <tt>svn:externals</tt>

data/lib/subversion_extensions.rb

@@ -1,6 +1,6 @@
 # Tested by: ../test/subversion_extensions_test.rb
 
-require_gem 'colored'
+gem 'colored'
 require 'colored'
 
 class Array

data/lib/svn_command.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 
-require_gem 'facets', '>=1.8.51'
+gem 'facets', '>=1.8.51'
 #require 'facets/more/command'    # Not until they include my changes
 require 'facets/core/string/margin'
 require 'facets/core/kernel/require_local'
 require 'facets/core/array/select'      # select!
 require 'facets/core/kernel/with'       # returning
 
-require_gem 'qualitysmith_extensions', '>=0.0.3'
+gem 'qualitysmith_extensions', '>=0.0.3'
 require 'qualitysmith_extensions/enumerable/enum'
 require 'qualitysmith_extensions/array/expand_ranges'
 require 'qualitysmith_extensions/array/shell_escape'
@@ -19,7 +19,7 @@ require 'English'
 require 'pp'
 require 'termios'
 require 'stringio'
-require_gem 'colored'
+gem 'colored'
 require 'colored'  # Lets us do "a".white.bold instead of "\033[1ma\033[0m"
 require_local '../lib/subversion'
 require_local '../lib/subversion_extensions'
@@ -96,9 +96,14 @@ module Subversion
     def __dry_run
       Subversion::dry_run = true
     end
-    def __show_commands
+
+    def __print_commands
       Subversion::print_commands = true
     end
+    # Don't want to hide svn's own -v/--verbose flag
+    alias_method :__Verbose,        :__print_commands
+    alias_method :__show_commands,  :__print_commands
+    alias_method :_V,               :__print_commands
 
     #-----------------------------------------------------------------------------------------------------------------------------
     # Default/dynamic behavior
@@ -182,9 +187,20 @@ module Subversion
           [:__encoding] => 1,
         }.merge(SvnCommand::standard_remote_command_options), self
       )
+      def __skip_notification
+        @skip_notification = true
+      end
+      alias_method :__covert, :__skip_notification
     end
     def commit(*args)
+      Subversion.print_commands_for do
+        svn :capture, "propset svn:skip_commit_notification_for_next_commit true --revprop -r #{Subversion.latest_revision}", :prepare_args => false
+      end if @skip_notification
       svn :exec, 'commit', *(['--force-log'] + args)
+
+      # :todo:
+      # Add some logic to automatically skip the commit e-mail if the size of the files to be committed exceeds a threshold of __ MB.
+      # (Performance idea: Only check the size of the files if svn st includes (bin)?)
     end
 
     # Ideas:
@@ -756,9 +772,14 @@ End
   private
     def svn(method, *args)
       subcommand = args[0]
+      options = args.last.is_a?(Hash) ? args.last : {}
       args = (
         [subcommand] + 
-        prepare_args(args[1..-1] || []) + 
+        (
+          (options[:prepare_args] == false) ? 
+            [] : 
+            (prepare_args(args[1..-1] || []))
+        ) + 
         [:method => method]
       )
       # puts "in svn(): about to call Subversion#execute(#{args.inspect})"

data/test/shared/test_helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
 require 'rubygems'
-require_gem 'qualitysmith_extensions'
+gem 'qualitysmith_extensions'
 require 'qualitysmith_extensions/test/all'
 require File.expand_path(File.dirname(__FILE__)+'/' + 'test_helpers/test_colorizer')

data/test/shared/test_helpers/test_colorizer.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require_gem 'colored'
+gem 'colored'
 require 'test/unit'
 require 'colored'
 

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'stubba'
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require_local "shared/test_helper"
 
-require_gem 'qualitysmith_extensions', '>=0.0.3'
+gem 'qualitysmith_extensions', '>=0.0.3'
 require 'qualitysmith_extensions/test/assert_exception.rb'
 require 'qualitysmith_extensions/kernel/capture_output.rb'
 require 'qualitysmith_extensions/kernel/simulate_input.rb'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
-date: 2007-03-26 00:00:00 -07:00
+  version: 0.0.10
+date: 2007-03-30 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -25,12 +25,12 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Tyler Rick
 files: 
 - lib/svn_command.rb
 - lib/subversion.rb
-- lib/attribute_accessors.rb
 - lib/subversion_extensions.rb
 - test/test_helper.rb
 - test/subversion_extensions_test.rb

data/lib/attribute_accessors.rb

@@ -1,44 +0,0 @@
-# Extends the module object with module and instance accessors for class attributes, 
-# just like the native attr* accessors for instance attributes.
-class Module # :nodoc:
-  def mattr_reader(*syms)
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-        
-        def self.#{sym}
-          @@#{sym}
-        end
-
-        def #{sym}
-          @@#{sym}
-        end
-      EOS
-    end
-  end
-  
-  def mattr_writer(*syms)
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-        
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
-      EOS
-    end
-  end
-  
-  def mattr_accessor(*syms)
-    mattr_reader(*syms)
-    mattr_writer(*syms)
-  end
-end