svn-command 0.0.6 → 0.0.7

data/Readme

@@ -36,7 +36,7 @@ And for some reason I seem to have to restart my terminal after doing the chmod
 
 *Important*: You need the gem's +bin+ directory to be added to the <b><i>front</i></b> of your path. This requires adding/editing a <tt>PATH=</tt> command in your <tt>~/.bash_profile</tt> (or equivalent). For example:
 
-  export PATH=`ls -d /usr/lib/ruby/gems/1.8/gems/svn-command* | tail -n1`/bin:$PATH
+  export PATH=`ls -d /usr/lib/ruby/gems/1.8/gems/svn-command* --color=never | tail -n1`/bin:$PATH
  
 Or hard-code the path, if you _really_ want to:
 
@@ -246,6 +246,9 @@ only this format:
   --diff-cmd colordiff
 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'
+
 === Slowness
 
 Is it slower than just running /usr/bin/svn directly? You betcha it is!
@@ -267,4 +270,27 @@ Take the best ideas from these and incorporate:
 
 Possibly switch to LazySvn.
 
-http://wiki.qualitysmith.com/svn-command
+After you save/edit/set an svn:externals, it should try to automatically pretty up the margins/alignment for you.
+
+Color menu_item for do you want to edit this external yes/no
+
+  ====================================================================================================
+  Diff of externals (**don't forget to commit these too!**):
+  ----------------------------------------------------------------------------------------------------
+to use ANSI underlines/colors
+
+Done, I think:
+  Make sure to show errors! 
+  ~/svn st * wasn't showing an error it should have been
+  > /usr/bin/svn status change_all_externals.rb change_all_externals.sh devscripts frontend glass glass.net potluck shared
+  svn: 'change_all_externals.rb' is not a working copy
+
+  If wrapped svn ever exits with an error code (such as 1), we ought to throw a fit as well
+
+  If there is an error during an update, such as this one:
+    Fetching external item into 'glass/rails_backend/vendor/plugins/our_extensions'
+    svn: REPORT request failed on '/!svn/vcc/default'
+    svn: Cannot replace a directory from within
+  it will not be displayed on screen. At least if it's an external that had the error.
+
+More at: http://wiki.qualitysmith.com/svn-command

data/bin/change_all_externals.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require 'find'
+
+Find.find(ARGV[0]) do |path|
+  if FileTest.directory?(path)
+    if File.basename(path)[0] == ?.   # Don't look in directories beginning with .
+      Find.prune       # Don't look any further into this directory.
+    else
+      ext = `svn pg svn:externals #{path} 2>&1`.strip
+      next if ext =~ /not under version control/
+      next if ext =~ /not a working copy/
+      next if path =~ /plugins\//
+      if ext.size > 0 and ext =~ /_tasks/
+        puts "-"*80
+        puts path
+        puts ext
+        
+#        puts "svn up #{path}"
+#        puts `svn up #{path}`
+#        puts "svn pe svn:externals #{path}"
+#        exec "svn pe svn:externals #{path}" if fork.nil?
+#        Process.wait
+#        puts `svn up #{path}`
+#        puts "svn ci #{path} -m \"Fixing svn:externals\""
+#        puts `svn ci #{path} -m \"Fixing svn:externals\"`
+      end
+      
+      next
+    end
+  end
+end
+

data/bin/change_all_externals.sh

@@ -0,0 +1,13 @@
+svn pe svn:externals svn/code/gemables/dev_scripts/tasks
+svn ci svn/code/gemables/dev_scripts/tasks -m 'Fixed svn:externals'
+svn pe svn:externals svn/code/gemables/our_extensions/tasks
+svn ci svn/code/gemables/our_extensions/tasks -m 'Fixed svn:externals'
+svn pe svn:externals svn/code/applications/underlord/vendor/plugins
+svn ci svn/code/applications/underlord/vendor/plugins -m 'Fixed svn:externals'
+svn pe svn:externals svn/glass/rails_backend/vendor/plugins
+svn ci svn/glass/rails_backend/vendor/plugins -m 'Fixed svn:externals'
+svn pe svn:externals svn/glass.net/backend/vendor/plugins
+svn ci svn/glass.net/backend/vendor/plugins -m 'Fixed svn:externals'
+svn pe svn:externals svn/glass.net/shops/vendor/plugins
+svn ci svn/glass.net/shops/vendor/plugins -m 'Fixed svn:externals'
+

data/lib/subversion.rb

@@ -142,10 +142,11 @@ module Subversion
     status.sub!(/(Performing status.*)/m, '')
   end
 
-  # Returns an array of external *items*
+  # Returns an array of externals *items*. These are the actual externals listed in an svn:externals property.
   # Example:
-  #   gemables/extensions/tasks/shared
-  #   gemables/extensions/doc_include/template
+  #   vendor/a
+  #   vendor/b
+  # Where 'vendor' is an ExternalsContainer containing external items 'a' and 'b'.
   def self.externals_items(path = './')
     status = status_the_section_before_externals(path)
     return [] if status.nil?
@@ -288,14 +289,12 @@ protected
     valid_options = [:capture, :exec, :popen]
     case method
       when :capture
-        silence_stream($stderr) {
-          `#{command}` 
-        }
+        `#{command} 2>&1` 
       when :exec
         #Kernel.exec *args
         Kernel.exec command
       when :popen
-        # This is just an idea of how maybe we could speed up the performance a bit. Rather than waiting until the command completes
+        # This is just an idea of how maybe we could improve the LATENCY. Rather than waiting until the command completes
         # (which can take quite a while for svn status sometimes since it has to walk the entire directory tree), why not process
         # the output from /usr/bin/svn *in real-time*??
         #
@@ -339,8 +338,12 @@ module Subversion
       #p @entries
     end
 
+    def has_entries?
+      @entries.size > 0
+    end
+
     def to_s
-      "#{container_dir}\n" +
+      "#{container_dir.bold}\n" +
         entries.chomp.map { |line|
           "  * " + line
         }.join

data/lib/subversion_extensions.rb

@@ -13,12 +13,31 @@ class String
   def colorize_svn_status_lines
     if Subversion.color
       self.gsub(/^ *\?/) { $&.yellow.bold}.
-           gsub(/^ *A/) { $&.green.bold}.
-           gsub(/^ *M/) { $&.green.bold}.
-           gsub(/^ *D/) { $&.magenta.bold}.
-           gsub(/^ *C/) { $&.red.bold}.
-           gsub(/^ *~/) { $&.red.bold}.
-           gsub(/^ *!/) { $&.red.bold}
+           gsub(/^ *A/)  { $&.green.bold}.
+           gsub(/^ *M/)  { $&.green.bold}.
+           gsub(/^ *D/)  { $&.magenta.bold}.
+           gsub(/^ *C/)  { $&.red.bold}.
+           gsub(/^ *~/)  { $&.red.bold}.
+           gsub(/^ *!/)  { $&.red.bold}
+    else
+      self
+    end
+  end
+  def colorize_svn_update_lines
+    if Subversion.color
+      self.gsub(/^ *U\s/)  { $&.yellow.bold}.
+           gsub(/^ *A\s/)  { $&.green.bold}.
+           gsub(/^ *M\s/)  { $&.green.bold}.
+           gsub(/^ *D\s/)  { $&.magenta.bold}.
+           gsub(/^ *C\s/)  { $&.red.bold}
+    else
+      self
+    end
+  end
+  def colorize_svn_diff
+    if Subversion.color
+      self.gsub(/^(Index: )(.*)$/) { $2.underline}.
+           gsub(/^=+\n/, '') 
     else
       self
     end
@@ -28,7 +47,7 @@ end
 
 # These are methods used by the SvnCommand for filtering and whatever else it needs...
 # It could probably be moved into SvnCommand, but I thought it might be good to at least make it *possible* to use them apart from SvnCommand.
-# Rename to Subversion::Filters ? Then would each_unadded fit?
+# Rename to Subversion::Filters ? Then each_unadded would be an odd man out.
 module Subversion
   module Extensions
     Interesting_status_flags = ["M", "A", "D", "?"]
@@ -68,7 +87,7 @@ module Subversion
         # Eventually we may want it to include this whole block, but only iff there is something updated for this external.
       }.reject { |line|
         line =~ /^External at revision/
-      }.join
+      }.join.colorize_svn_update_lines
       # Also get rid of all but one "At revision _."?
     end
 
@@ -91,5 +110,10 @@ module Subversion
       }
     end
 
+    # This is just a wrapper for Subversion.diff that adds some color
+    def self.diff(*args)
+      output = Subversion.diff(*args).colorize_svn_diff.add_exit_code_error
+    end
+
   end
 end

data/lib/svn_command.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 require_gem 'facets', '>=1.8.51'
-require 'facets/more/command'
+#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!
@@ -11,15 +11,15 @@ require 'qualitysmith_extensions/enumerable/enum'
 require 'qualitysmith_extensions/array/expand_ranges'
 require 'qualitysmith_extensions/array/shell_escape'
 require 'qualitysmith_extensions/file_test/binary_file'
+require 'qualitysmith_extensions/console/command'
 
 require 'extensions/symbol'   # to_proc
+require 'English'
 require 'pp'
 require 'termios'
 require 'stringio'
 require_gem 'colored'
-require 'colored'
-                    # Lets us do "(a)".white.bold instead of "(\033[1ma\033[0m)"
-#- Warning: Make sure you have the *right* color gem! gem install color --source require.errtheblog.com
+require 'colored'  # Lets us do "(a)".white.bold instead of "(\033[1ma\033[0m)"
 require_local '../lib/subversion'
 require_local '../lib/subversion_extensions'
 
@@ -43,6 +43,10 @@ class String
   def menu_item(color = :white)
     self[0..0].send(color).bold.underline + self[1..-1].send(color)
   end
+  def add_exit_code_error
+    self << "Exited with error!".bold.red if !$?.success?
+    self
+  end
 end
 
 Subversion.extend(Subversion::Extensions)
@@ -201,30 +205,26 @@ module Subversion
 
     def diff(*directories)
       directories = ["./"] if directories.empty?
-      print Subversion.diff(*(directories + @passthrough_options))
+      puts Extensions.diff(*(directories + @passthrough_options))
 
       # Show diff for externals (if there are any)
       output = StringIO.new
       #paths = args.reject{|arg| arg =~ /^-/} || ['./']
       directories.each do |path|
-        (Subversion.externals_containers(path) || []).each do |external|
-          #puts external.to_s
-          external.entries.each do |entry|
-            dir = entry[/^[^ ]+/]
-            #puts "#{external.container_dir} + #{dir}"
-            path = File.join(external.container_dir, dir)
-            diff_output = Subversion.diff(path).strip
+        (Subversion.externals_items(path) || []).each do |item|
+            diff_output = Extensions.diff(item).strip
             unless diff_output == ""
-              output.puts '-'*100
-              output.puts path
+              #output.puts '-'*100
+              #output.puts item.ljust(100, ' ').black_on_white.bold.underline
+              output.puts item.black_on_white.bold
               output.puts diff_output
             end
-          end
         end
       end
       unless output.string == ""
-        puts '='*100
-        puts "Diff of externals (**don't forget to commit these too!**):"
+        #puts '='*100
+        puts (' '*100).yellow.underline
+        puts " Diff of externals (**don't forget to commit these too!**):".ljust(100, ' ').yellow_on_red.bold.underline
         puts output.string
       end
     end
@@ -318,7 +318,7 @@ End
         sources = args
 
         sources.each do |source|
-          puts svn(:capture, 'move', source, destination)
+          puts filtered_svn('move', source, destination)
         end
       else
         svn :exec, 'move', *args
@@ -343,6 +343,7 @@ End
     def status(*args)
       #puts "in status(#{args.inspect})"
       #puts "#{self}.@passthrough_options == #{@passthrough_options.inspect}"
+      #print Subversion::Extensions.status_lines_filter( Subversion.status(*(@passthrough_options + args)) )
       print Subversion::Extensions.status_lines_filter( Subversion.status(*(@passthrough_options + args)) )
     end
 
@@ -358,7 +359,7 @@ End
       )
     end
     def update(*args)
-      print Subversion::Extensions.update_lines_filter( Subversion.update(*prepare_args(args)) )
+      puts Subversion::Extensions.update_lines_filter( Subversion.update(*prepare_args(args)) )
     end
 
 
@@ -452,10 +453,10 @@ End
                   else
                     puts "File contents:"
                     # Only show the first x bytes so that we don't accidentally dump the contens of some 20 GB log file to screen...
-                    contents = File.read(file, 3000) || ''
+                    contents = File.read(file, threshold = 2000) || ''
                     print contents
                     puts if contents[-1] && contents[-1].chr != "\n"    # Make sure we end with a newline character
-                    puts "..." if contents.length >= 3000               # So they know that there may be *more* to the file than what's shown
+                    puts "..." if contents.length >= threshold          # So they know that there may be *more* to the file than what's shown
                   end
                 elsif File.directory?(file)
                   puts "Directory contains:"
@@ -526,6 +527,17 @@ End
     #-----------------------------------------------------------------------------------------------------------------------------
     # Externals-related commands
     
+    # Prints out all the externals *items* for the given directory. These are the actual externals listed in an svn:externals property.
+    # Example:
+    #   vendor/a
+    #   vendor/b
+    # Where 'vendor' is an ExternalsContainer containing external items 'a' and 'b'.
+    def externals_items(directory = "./")
+      puts Subversion.externals_items(directory).map { |external|
+        external.to_s
+      }
+    end
+
     # For every directory that has the svn:externals property set, this lists the contents of the svn:externals property (dir, URL)
     def externals(directory = "./")
       puts Subversion.externals_containers(directory).map { |external|
@@ -533,6 +545,7 @@ End
           gsub(File.expand_path(Dir.pwd) + '/', '')
       }
     end
+    alias_subcommand :e => :externals
     alias_subcommand :ext => :externals
 
     # Lists *directories* that have the svn:externals property set.
@@ -543,15 +556,21 @@ End
     end
 
     def edit_externals(directory = nil)
-      if directory.nil?
-        puts "No directory specified. Editing externals for *all* externals dirs..."
-        Subversion.externals_containers('.').each do |external|
+      
+      if directory.nil? || !Subversion::ExternalsContainer.new(directory).has_entries?
+        if directory.nil?
+          puts "No directory specified. Editing externals for *all* externals dirs..."
+          directory = "./"
+        else
+          puts "Editing externals for *all* externals dirs..."
+        end
+        Subversion.externals_containers(directory).each do |external|
           puts external.to_s
           command = "#{Subversion.executable} propedit svn:externals #{external.container_dir}"
           #puts command
           begin
             #print "Press Ctrl-C to skip, any other key to continue. (This will start up your default editor.) "
-            print "Do you want to edit svn:externals for this directory? y/N > "
+            print "Do you want to edit svn:externals for this directory?".black_on_white + ' ' + 'yes'.menu_item(:white) + '/' + 'No'.menu_item(:white) + " > "
             response = $stdin.getc.chr
             system command if response.downcase == 'y'
           rescue Interrupt
@@ -559,10 +578,10 @@ End
             puts
           end
         end
+        puts 'Done'
       else
         system "#{Subversion.executable} propedit svn:externals #{directory}"
       end
-      puts 'Done'
     end
     alias_subcommand :edit_ext => :edit_externals
     alias_subcommand :ee => :edit_externals
@@ -609,7 +628,7 @@ End
       puts "Message for r#{Subversion.latest_revision} :" if revision == 'head'
 
       $ignore_dry_run_option = true
-      puts svn(:capture, *args)
+      puts filtered_svn(*args)
       $ignore_dry_run_option = false
     end
 
@@ -693,6 +712,13 @@ End
       # puts "in svn(): about to call Subversion#execute(#{args.inspect})"
       Subversion.send :execute, *args
     end
+
+    # Works identically to svn() except that it filters the output and displays a big red error message if /usr/bin/svn exied with an error.
+    def filtered_svn(*args)
+      # We have to use the :capture method if we're going to filter the output.
+      svn(:capture, *args).add_exit_code_error
+    end
+
     def prepare_args(args)
       args.compact!   # nil elements spell trouble
       @passthrough_options + args.shell_escape

data/test/shared/test_helpers/assertions.rb

@@ -9,12 +9,13 @@ class Test::Unit::TestCase
     })
   end
 
-  def assert_contains(container, expected_contents, failure_message = nil)
+  def assert_includes(container, expected_contents, failure_message = nil)
     failure_message = build_message(failure_message, "Container <?> was expected to contain <?> but it didn't", container, expected_contents)
     assert_block(failure_message) do
       container.include?(expected_contents)
     end
   end
+  alias_method :assert_contains, :assert_includes
 
   # Asserts that the block that is passed in causes the value of the specified variable (+variable+) to change.
   # +variable+ should be a Proc that, when evaluated, returns the current value of the variable. 

data/test/shared/test_helpers/test_colorizer.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require_gem 'colored'
+require 'test/unit'
 require 'colored'
 
 module Test::Unit

data/test/svn_command_test.rb

@@ -4,7 +4,13 @@ require_local '../lib/svn_command.rb'
 require 'facets/core/string/to_re'
 require 'yaml'
 
-Subversion.color = false    # Makes testing simpler. We can test that the *colorization* features are working via *manual* testing (they're not as critical).
+Subversion.color = false
+# Makes testing simpler. We can test all the *colorization* features via *manual* testing (since they're not as critical).
+class String
+  def colorize(string, options = {})
+    string
+  end
+end
 
 module Subversion
 class BaseSvnCommandTest < Test::Unit::TestCase

data/test/test_helper.rb

@@ -8,9 +8,9 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require_local "shared/test_helper"
 
 require_gem 'qualitysmith_extensions', '>=0.0.3'
-require 'test/assert_exception.rb'
-require 'capture_output.rb'
-require 'simulate_input.rb'
+require 'qualitysmith_extensions/test/assert_exception.rb'
+require 'qualitysmith_extensions/capture_output.rb'
+require 'qualitysmith_extensions/simulate_input.rb'
 
 require 'subversion'
 if $mock_subversion

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2007-03-15 00:00:00 -07:00
+  version: 0.0.7
+date: 2007-03-20 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -40,7 +40,9 @@ files:
 - test/shared/test_helpers/assertions.rb
 - test/shared/test_helpers/test_colorizer.rb
 - bin/rscm_test
+- bin/change_all_externals.sh
 - bin/command_completion_for_svn_command
+- bin/change_all_externals.rb
 - bin/svn
 - Readme
 test_files: