svn-command 0.0.7 → 0.0.8

data/lib/subversion.rb

@@ -329,6 +329,7 @@ module Subversion
   # Each ExternalsContainer contains a set of "entries", which are the actual directories listed in the <tt>svn:externals</tt>
   # property and are "pulled into" the directory.
   class ExternalsContainer
+    ExternalItem = Struct.new(:name, :repository_path)
     attr_reader :container_dir
     attr_reader :entries
 
@@ -342,10 +343,26 @@ module Subversion
       @entries.size > 0
     end
 
+    def entries_structs
+      entries.chomp.enum(:each_line).map { |line|
+        line =~ /^(\S+)\s*(\S+)/
+        ExternalItem.new($1, $2)
+      }
+    end
+
     def to_s
-      "#{container_dir.bold}\n" +
-        entries.chomp.map { |line|
-          "  * " + line
+      entries_structs = entries_structs()
+      longest_item_name = 
+        [
+          entries_structs.map { |entry|
+            entry.name.size
+          }.max,
+          25
+        ].max
+      
+      container_dir.bold + "\n" +
+        entries_structs.map { |entry|
+          "  * " + entry.name.ljust(longest_item_name + 1) + entry.repository_path + "\n"
         }.join
     end
 

data/lib/svn_command.rb

@@ -5,6 +5,7 @@ require_gem 'facets', '>=1.8.51'
 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'
 require 'qualitysmith_extensions/enumerable/enum'
@@ -19,7 +20,7 @@ require 'pp'
 require 'termios'
 require 'stringio'
 require_gem 'colored'
-require 'colored'  # Lets us do "(a)".white.bold instead of "(\033[1ma\033[0m)"
+require 'colored'  # Lets us do "a".white.bold instead of "\033[1ma\033[0m"
 require_local '../lib/subversion'
 require_local '../lib/subversion_extensions'
 
@@ -47,6 +48,9 @@ class String
     self << "Exited with error!".bold.red if !$?.success?
     self
   end
+  def relativize_path
+    self.gsub(File.expand_path(FileUtils.getwd) + '/', '')   # Simplify the directory by removing the working directory from it, if possible
+  end
 end
 
 Subversion.extend(Subversion::Extensions)
@@ -67,7 +71,7 @@ module Subversion
     # This shouldn't be necessary. Console::Command should allow introspection. But until such time...
     @@subcommand_list = [
       'each_unadded',
-      'externals', 'externals_containers', 'edit_externals', 'externalize',
+      'externals_items', 'externals_outline', 'externals_containers', 'edit_externals', 'externalize',
       'ignore',
       'get_message', 'set_message', 'edit_message',
       'view_commits'
@@ -247,9 +251,9 @@ module Subversion
           # :todo: Finish...
 
         when nil
-          puts "You are using svn-command, a replacement/wrapper for the standard svn command."
-          puts "svn-command is installed at: #{$0}"
-          puts "Use the full path to bypass this wrapper: #{Subversion.executable}"
+          puts "You are using " + 's'.green.bold + 'v'.cyan.bold + 'n'.magenta.bold + '-' + 'c'.red.bold + 'o'.cyan.bold + 'm'.blue.bold + 'm'.yellow.bold + 'a'.green.bold + 'n'.white.bold + 'd'.green.bold + ", a colorful, useful replacement/wrapper for the standard svn command."
+          puts "svn-command is installed at: " + $0.bold
+          puts "Use the full path to bypass this wrapper: " + Subversion.executable.bold
           puts
           puts Subversion.help(subcommand).gsub(<<End, '')
 
@@ -532,21 +536,60 @@ End
     #   vendor/a
     #   vendor/b
     # Where 'vendor' is an ExternalsContainer containing external items 'a' and 'b'.
+    # (Use the -o/--omit-repository-path option if you just want the external paths/names without the repository paths)
+    module ExternalsItems
+      def __omit_repository_path
+        @omit_repository_path = true
+      end
+      alias_method :__omit_repository, :__omit_repository_path
+      alias_method :_o,                :__omit_repository_path
+      alias_method :_name_only,        :__omit_repository_path
+    end
     def externals_items(directory = "./")
-      puts Subversion.externals_items(directory).map { |external|
-        external.to_s
+      longest_path_name = 25
+
+      externals_structs = Subversion.externals_containers(directory).map do |external|
+        returning(
+          external.entries_structs.map do |entry|
+              Struct.new(:path, :repository_path).new(
+                File.join(external.container_dir, entry.name).relativize_path,
+                entry.repository_path
+              )
+            end
+        ) do |entries_structs|
+          longest_path_name = 
+            [
+              longest_path_name,
+              entries_structs.map { |entry|
+                entry.path.size
+              }.max
+            ].max
+        end
+      end
+
+      puts '(Use the -o/--omit-repository-path option if you just want the external paths/names without the repository paths)' unless @omit_repository_path
+      puts externals_structs.map { |entries_structs|
+        entries_structs.map { |entry|
+          entry.path.ljust(longest_path_name + 1) +
+            (@omit_repository_path ? '' : entry.repository_path)
+        }
       }
     end
+    alias_subcommand :ei             => :externals_items
+    alias_subcommand :externals_list => :externals_items
+    alias_subcommand :el             => :externals_items
+    alias_subcommand :externals      => :externals_items
+    alias_subcommand :e              => :externals_items
+
 
-    # For every directory that has the svn:externals property set, this lists the contents of the svn:externals property (dir, URL)
-    def externals(directory = "./")
+    # For every directory that has the svn:externals property set, this prints out the container name and then lists the contents of its svn:externals property (dir, URL) as a bulleted list
+    def externals_outline(directory = "./")
       puts Subversion.externals_containers(directory).map { |external|
-        external.to_s.
-          gsub(File.expand_path(Dir.pwd) + '/', '')
+        external.to_s.relativize_path
       }
     end
-    alias_subcommand :e => :externals
-    alias_subcommand :ext => :externals
+    alias_subcommand :e_outline => :externals_outline
+    alias_subcommand :eo        => :externals_outline
 
     # Lists *directories* that have the svn:externals property set.
     def externals_containers(directory = "./")
@@ -554,34 +597,38 @@ End
         external.container_dir
       }
     end
+    alias_subcommand :e_containers => :externals_containers
 
     def edit_externals(directory = nil)
-      
-      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?".black_on_white + ' ' + 'yes'.menu_item(:white) + '/' + 'No'.menu_item(:white) + " > "
-            response = $stdin.getc.chr
-            system command if response.downcase == 'y'
-          rescue Interrupt
-          ensure
-            puts
+      catch :exit do
+        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?".black_on_white + ' ' + 'yes'.menu_item(:white) + '/' + 'No'.menu_item(:white) + " > "
+              response = $stdin.getc.chr
+              system command if response.downcase == 'y'
+            rescue Interrupt
+              puts "Goodbye"
+              throw :exit
+            ensure
+              puts
+            end
           end
+          puts 'Done'
+        else
+          system "#{Subversion.executable} propedit svn:externals #{directory}"
         end
-        puts 'Done'
-      else
-        system "#{Subversion.executable} propedit svn:externals #{directory}"
-      end
+      end # catch :exit
     end
     alias_subcommand :edit_ext => :edit_externals
     alias_subcommand :ee => :edit_externals
@@ -598,10 +645,14 @@ End
       def __as(as); @as = as; end
       def as; @as; end
     end
-    def externalize(repo_path)
-      # :todo: let them pass in local_path as well -- then we would need to accept 2 args, the first one poylmorphic, the second optional
+    #   svn externalize http://your/repo/shared_tasks/tasks --as shared
+    # or
+    #   svn externalize http://your/repo/shared_tasks/tasks shared
+    def externalize(repo_path, as_arg = nil)
+      # :todo: let them pass in local_path as well? -- then we would need to accept 2 -- 3 -- args, the first one poylmorphic, the second optional
+      # :todo: automated test for as_arg/as combo
 
-      Subversion.externalize(repo_path, {:as => as })
+      Subversion.externalize(repo_path, {:as => as || as_arg})
     end
 
 

data/test/shared/test_helper.rb

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

data/test/svn_command_test.rb

@@ -50,7 +50,7 @@ class ArgEscapingTest < BaseSvnCommandTest
     # Don't worry, this'll never happen, because the shell will expand the * *before* it gets to SvnCommand. But if you *did* sneak in an asterisk to SvnCommand.execute somehow, this is what would happen...
     SvnCommand.execute("add dir/* --non-recursive") 
     assert_equal "svn add --non-recursive 'dir/*'", Subversion.executed.join
-    # Actually, I lied... The * will *not* be expanded if there are no matching files. But that seems like a bash/shell problem, not our concern. Demo:
+    # Actually, I lied... The * will *not* be expanded in the (rather uncommon) case that there are *no files matching the glob*. But that seems like a bash/shell problem, not our concern. Demo:
     # > mkdir foo
     # > echo foo/*
     # foo/*
@@ -359,21 +359,30 @@ class SvnExternalsTest < BaseSvnCommandTest
   end
 
 
-  def test_svn_externals
+  def test_svn_externals_outline
     set_up_stubs
-    output = capture_output { SvnCommand.execute('externals') }
+    output = capture_output { SvnCommand.execute('externals_outline') }
 
     assert_contains output, %q(
     |/home/tyler/code/gemables/svn-command/test
-    |  * shared http://code.qualitysmith.com/gemables/test_extensions/lib
+    |  * shared                    http://code.qualitysmith.com/gemables/test_extensions/lib
     |/home/tyler/code/gemables/svn-command/tasks
-    |  * shared                        http://code.qualitysmith.com/gemables/shared_tasks/tasks
+    |  * shared                    http://code.qualitysmith.com/gemables/shared_tasks/tasks
     |/home/tyler/code/gemables/svn-command/doc_include
-    |  * template                      http://code.qualitysmith.com/gemables/template/doc/template
+    |  * template                  http://code.qualitysmith.com/gemables/template/doc/template
     ).margin
     assert_equal [], Subversion.executed
   end
 
+  def test_svn_externals_items
+    set_up_stubs
+    output = capture_output { SvnCommand.execute('externals_items') }
+
+    # :todo:
+
+    assert_equal [], Subversion.executed
+  end
+
   def test_svn_externals_containers
     set_up_stubs
     output = capture_output { SvnCommand.execute('externals_containers') } 

data/test/test_helper.rb

@@ -9,8 +9,8 @@ require_local "shared/test_helper"
 
 require_gem 'qualitysmith_extensions', '>=0.0.3'
 require 'qualitysmith_extensions/test/assert_exception.rb'
-require 'qualitysmith_extensions/capture_output.rb'
-require 'qualitysmith_extensions/simulate_input.rb'
+require 'qualitysmith_extensions/kernel/capture_output.rb'
+require 'qualitysmith_extensions/kernel/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.7
-date: 2007-03-20 00:00:00 -07:00
+  version: 0.0.8
+date: 2007-03-22 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -37,7 +37,6 @@ files:
 - test/subversion_test.rb
 - test/svn_command_test.rb
 - test/shared/test_helper.rb
-- test/shared/test_helpers/assertions.rb
 - test/shared/test_helpers/test_colorizer.rb
 - bin/rscm_test
 - bin/change_all_externals.sh

data/test/shared/test_helpers/assertions.rb

@@ -1,57 +0,0 @@
-# Custom assertions
-class Test::Unit::TestCase
-  def assert_user_error(error_message)
-    assert_tag({
-      :attributes => { :id => "errorExplanation" },
-      :descendant => { 
-        :content => error_message
-      }
-    })
-  end
-
-  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. 
-  #
-  # Options:
-  # * If the optional +:from+ option is supplied, it also asserts that it had that initial value.
-  # * If the optional +:to+ option is supplied, it also asserts that it changed _to_ that value.
-  #
-  # So instead of doing this:
-  #   assert_equal 1, Model.count
-  #   do_something_that_should_cause_count_to_increase
-  #   assert_equal 2, Model.count
-  # we can do this:
-  #   assert_changed(lambda {ErrorType.count}, :from => 1, :to => 2) do
-  #     do_something_that_should_cause_count_to_increase
-  #   end
-  # Or, if we don't care what it's changing _from_ as long as it increases in value _by_ 1, we can write this:
-  #   assert_changed(c = lambda {ErrorType.count}, :to => c.call+1) do
-  #     do_something_that_should_cause_count_to_increase
-  #   end
-  # instead of this:
-  #   before = Model.count
-  #   do_something_that_should_cause_count_to_increase
-  #   assert_equal before + 1, Model.count
-  #
-  def assert_changed(variable, options = {}, &block)
-    expected_from = options.delete(:from) || variable.call
-
-    assert_equal expected_from, variable.call
-
-    failure_message = build_message(failure_message, "The variable was expected to change from <?> to <?> but it didn't", variable.call, options.delete(:to) || "something else")
-    assert_block(failure_message) do
-      before = variable.call
-      yield
-      expected_to = options.delete(:to) || variable.call
-      before != variable.call and variable.call == expected_to
-    end
-  end
-end