svn-command 0.0.8 → 0.0.9

data/lib/subversion.rb

@@ -12,7 +12,6 @@ require 'facets/core/enumerable/uniq_by'
 require 'facets/core/kernel/silence_stream'
 
 require_gem 'qualitysmith_extensions', '>=0.0.3'
-require 'capture_output'
 
 # 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

data/lib/svn_command.rb

@@ -444,44 +444,42 @@ End
           $ignore_dry_run_option = false
           begin
             response = ""
-            loop do
-              puts( ('-'*100).green )
-              puts "What do you want to do with '#{file.white.underline}'?".white.bold
-              begin
-                if !File.exist?(file)
-                  raise "#{file} doesn't seem to exist -- even though it was reported by svn status"
-                end
-                if File.file?(file)
-                  if FileTest.binary_file?(file)
-                    puts "(Binary file -- cannot show preview)".bold
-                  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, threshold = 2000) || ''
-                    print contents
-                    puts if contents[-1] && contents[-1].chr != "\n"    # Make sure we end with a newline character
-                    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:"
-                  Dir.new(file).reject {|f| ['.','..'].include? f}.each do |f|
-                    puts f
-                  end
+
+            puts( ('-'*100).green )
+            puts "What do you want to do with '#{file.white.underline}'?".white.bold
+            begin
+              if !File.exist?(file)
+                raise "#{file} doesn't seem to exist -- even though it was reported by svn status"
+              end
+              if File.file?(file)
+                if FileTest.binary_file?(file)
+                  puts "(Binary file -- cannot show preview)".bold
                 else
-                  raise "#{file} is not a file or directory -- what *is* it then???"
+                  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, threshold = 2000) || ''
+                  print contents
+                  puts if contents[-1] && contents[-1].chr != "\n"    # Make sure we end with a newline character
+                  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:"
+                Dir.new(file).reject {|f| ['.','..'].include? f}.each do |f|
+                  puts f
                 end
+              else
+                raise "#{file} is not a file or directory -- what *is* it then???"
               end
-              print(
-                "Add".menu_item(:green) + ", " +
-                "Delete".menu_item(:red) + ", " +
-                "add to " + "svn:".yellow + "Ignore".menu_item(:yellow) + " property, " + 
-                "or [" + "Enter".white.bold + "] to do nothing > "
-              )
-              response = ""
-              response = $stdin.getc.chr while !['a', 'd', 'i', "\n"].include?(begin response.downcase!; response end)
-
-              break
             end
+            print(
+              "Add".menu_item(:green) + ", " +
+              "Delete".menu_item(:red) + ", " +
+              "add to " + "svn:".yellow + "Ignore".menu_item(:yellow) + " property, " + 
+              "or " + "any other key".white.bold + " to do nothing > "
+            )
+            response = ""
+            response = $stdin.getc.chr # while !['a', 'd', 'i', "\n"].include?(begin response.downcase!; response end)
+
 
             case response
               when 'a'
@@ -513,6 +511,9 @@ End
                 print "\nIgnoring... "
                 Subversion.ignore file
                 puts
+              else
+                # Skip / Do nothing with this file
+                puts
             end
           rescue Interrupt
             puts "Goodbye"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
-date: 2007-03-22 00:00:00 -07:00
+  version: 0.0.9
+date: 2007-03-26 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -39,9 +39,7 @@ files:
 - test/shared/test_helper.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: 

data/bin/change_all_externals.rb

@@ -1,32 +0,0 @@
-#!/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

@@ -1,13 +0,0 @@
-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'
-