subwrap 0.3.10 → 0.3.12

data/ProjectInfo.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
-require 'facets/more/filelist' if !defined?(FileList)
+require 'facets/filelist' if !defined?(FileList)
 
 module Project
   PrettyName    = "Subwrap: Enhanced Subversion Command"
   Name          = "subwrap"
   RubyForgeName = "subwrap"
-  Version       = "0.3.10"
+  Version       = "0.3.12"
   Specification = Gem::Specification.new do |s|
     s.name    = Project::Name
     s.summary = "A nifty wrapper command for Subversion's command-line svn client"
@@ -52,6 +52,6 @@ after selecting an option from the menu, but it will work without it.
     s.executables = ['command_completion_for_subwrap', '_subwrap_post_install', 'subwrap']
     #s.executables = "svn"    # Doing this actually causes RubyGems to override the existing /usr/bin/svn during install. Not good!
   end
-end
+end unless defined?(Project)
 
 

data/bin/command_completion_for_subwrap

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'facets/core/kernel/require_local'
+require 'facets/kernel/load'
 require_local '../lib/subwrap/svn_command'
 
 subcommands = (Subversion::SvnCommand.public_instance_methods - Object.methods).sort

data/bin/subwrap

@@ -2,6 +2,6 @@
 
 require 'rubygems'
 gem 'facets', '>=1.8.20'
-require 'facets/core/kernel/require_local'
+require 'facets/kernel/load'
 require_local '../lib/subwrap/svn_command.rb'
 Subversion::SvnCommand.execute

data/bin/svn

@@ -2,6 +2,6 @@
 
 require 'rubygems'
 gem 'facets', '>=1.8.20'
-require 'facets/core/kernel/require_local'
+require 'facets/kernel/load'
 require_local '../lib/subwrap/svn_command.rb'
 Subversion::SvnCommand.execute

data/lib/subwrap.rb

@@ -1,6 +1,6 @@
 # This is the auto-require
 require 'rubygems'
 gem 'facets'
-require 'facets/core/kernel/require_local'
+require 'facets/kernel/load'
 require_local 'subwrap/subversion'
 Subversion

data/lib/subwrap/subversion.rb

@@ -1,4 +1,5 @@
 # Tested by: ../../test/subversion_test.rb
+#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..')
 $loaded ||= {}; if !$loaded[File.expand_path(__FILE__)]; $loaded[File.expand_path(__FILE__)] = true;
 
 require 'fileutils'
@@ -7,14 +8,16 @@ require 'rexml/xpath'
 require 'rubygems'
 
 gem 'facets'
-require 'facets/core/kernel/require_local'
-require 'facets/core/enumerable/uniq_by'
-require 'facets/core/kernel/silence_stream'
-require 'facets/core/module/initializer'
-require 'facets/core/fileutils/which'
-require 'facets/core/fileutils/whereis'
+silence_warnings do
+  require 'facets/kernel/silence'
+  require 'facets/kernel/load'
+  require 'facets/enumerable/uniq_by'
+  require 'facets/fileutils/which'
+  require 'facets/fileutils/whereis'
+end
 
 gem 'quality_extensions'
+require 'quality_extensions/module/initializer'
 require 'quality_extensions/kernel/windows_platform'
 
 
@@ -22,7 +25,7 @@ require 'quality_extensions/kernel/windows_platform'
 #gem 'activesupport'  # mattr_accessor
 #require 'active_support'
 #require 'active_support/core_ext/module/attribute_accessors'
-#require 'facets/core/class/cattr'
+#require 'facets/class/cattr'
 gem 'quality_extensions'
 require 'quality_extensions/module/attribute_accessors'
 require 'quality_extensions/module/guard_method'

data/lib/subwrap/subversion_extensions.rb

@@ -3,7 +3,10 @@
 gem 'colored'
 require 'colored'
 
-require 'facets/core/module/class_extension'
+require 'facets/class_extension'
+#require '/var/lib/gems/1.8/gems/xfacets-1.8.54/lib/facets/core/module/class_extension.rb'
+
+require 'subwrap/svn_command'
 
 class Array
   def to_regexp_char_class

data/lib/subwrap/svn_command.rb

@@ -2,19 +2,20 @@
 
 require 'rubygems'
 
-gem 'facets', '>=1.8.51'
+require 'facets'
+#gem 'facets', '>=1.8.51'
 #require 'facets/more/command'    # Not until they include my changes
-require 'facets/core/kernel/require_local'
-require 'facets/core/kernel/with'       # returning
-require 'facets/core/enumerable/every'
-require 'facets/core/array/select'      # select!
-require 'facets/core/string/margin'
-require 'facets/core/string/lines'
-require 'facets/core/string/index_all'
-require 'facets/core/string/to_re'
-require 'facets/core/string/to_rx'
-require 'facets/core/symbol/to_proc'
-require 'facets/core/kernel/in'
+#require 'facets/kernel/load'
+#require 'facets/kernel/with'       # returning
+#require 'facets/enumerable/every'
+#require 'facets/array/select'      # select!
+#require 'facets/string/margin'
+#require 'facets/string/lines'
+#require 'facets/string/index_all'
+#require 'facets/string/to_re'
+#require 'facets/string/to_rx'
+#require 'facets/ruby' # to_proc
+#require 'facets/kernel/in'
 
 gem 'quality_extensions', '>=0.0.3'
 require 'quality_extensions/enumerable/enum'
@@ -32,10 +33,11 @@ require 'stringio'
 gem 'colored'
 require 'colored'  # Lets us do "a".white.bold instead of "\033[1ma\033[0m"
 
-require_local '../../ProjectInfo'
-require_local 'subversion'
-require_local 'subversion_extensions'
-
+silence_warnings do
+  require_local '../../ProjectInfo'
+  require_local 'subversion'
+  require_local 'subversion_extensions'
+end
 
 begin
   gem 'termios'
@@ -134,6 +136,7 @@ def confirm(question, options = ['Yes', 'No'])
 end
 
 #Subversion.extend(Subversion::Extensions)
+require 'subwrap/subversion_extensions'
 module Subversion
   include(Subversion::Extensions)
 end
@@ -158,6 +161,7 @@ end
 module Subversion
   class SvnCommand
 
+    silence_warnings do
     # Constants
     C_standard_remote_command_options = {
       [:__username] => 1,
@@ -173,6 +177,7 @@ module Subversion
       [:__editor_cmd] => 1,
       [:__encoding] => 1,
     }
+    end
 
     # This shouldn't be necessary. Console::Command should allow introspection. But until such time...
     @@subcommand_list = [

data/test/subversion_extensions_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
-require 'subversion_extensions'
+require 'subwrap/subversion_extensions'
 
 Subversion.color = false    # Makes testing simpler. We can just test that the *colorization* features are working via *manual* tests.
 
@@ -33,7 +33,7 @@ ________________________________________ externals _____________________________
 M      applications/underlord/vendor/plugins/nifty/tasks/shared/base.rake
 End
     
-    assert_equal expected, out = Subversion::Extensions.status_lines_filter( input ), out.inspect
+    assert_equal expected, out = Subversion.status_lines_filter( input ), out.inspect
   end
 
   def test_update_lines_filter
@@ -53,7 +53,7 @@ U      gemables/calculator/lib/calculator_extensions.rb
 U      plugins/flubber/tasks/shared/blah.rb
 End
     
-    assert_equal expected, out = Subversion::Extensions.update_lines_filter( input ), out.inspect
+    assert_equal expected, out = Subversion.update_lines_filter( input ), out.inspect
   end
 
   def test_unadded_filter
@@ -66,7 +66,7 @@ End
 ?      gemables/calculator/lib/calculator_extensions.rb
 End
     
-    assert_equal expected, out = Subversion::Extensions.unadded_lines_filter( input ), out.inspect
-    assert_equal ['gemables/calculator/lib/calculator_extensions.rb'], out = Subversion::Extensions.unadded_filter( input ), out.inspect
+    assert_equal expected, out = Subversion.unadded_lines_filter( input ), out.inspect
+    assert_equal ['gemables/calculator/lib/calculator_extensions.rb'], out = Subversion.unadded_filter( input ), out.inspect
   end
 end

data/test/svn_command_test.rb

@@ -1,9 +1,9 @@
 $mock_subversion = true
 require File.dirname(__FILE__) + '/test_helper'
 require_local '../lib/subwrap/svn_command.rb'
-require 'facets/core/string/to_re'
+require 'facets/string/to_re'
 require 'yaml'
-require 'facets/core/module/alias_method_chain'
+require 'facets/module/alias'
 require 'quality_extensions/colored/toggleability'
 require 'quality_extensions/regexp/join'
 
@@ -523,8 +523,8 @@ class SvnViewCommitsTest < BaseSvnCommandTest
     |+++ lib/svn_command.rb  (revision 2342)
     |@@ -3,9 +3,11 @@
     | require 'facets/more/command'
-    | require 'facets/core/string/margin'
-    | require 'facets/core/kernel/require_local'
+    | require 'facets/string/margin'
+    | require 'facets/kernel/load'
     |+require 'extensions/symbol'
     | require 'pp'
     | require 'termios'

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'rubygems'
-require 'facets/core/kernel/require_local'
-require 'facets/core/kernel/load_local'
+require 'facets/kernel/load'
+gem 'mocha'
 require 'stubba'
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: subwrap
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
-date: 2007-08-08 00:00:00 -07:00
+  version: 0.3.12
+date: 2008-06-11 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -39,26 +39,26 @@ post_install_message: |
 authors: 
 - Tyler Rick
 files: 
-- lib/subwrap.rb
-- lib/subwrap/svn_command.rb
-- lib/subwrap/subversion.rb
 - lib/subwrap/subversion_extensions.rb
-- test/test_helper.rb
+- lib/subwrap/subversion.rb
+- lib/subwrap/svn_command.rb
+- lib/subwrap.rb
 - test/subversion_extensions_test.rb
-- test/subversion_test.rb
 - test/svn_command_test.rb
-- bin/rscm_test
+- test/subversion_test.rb
+- test/test_helper.rb
 - bin/subwrap
-- bin/_subwrap_post_install
+- bin/rscm_test
 - bin/command_completion_for_subwrap
 - bin/svn
+- bin/_subwrap_post_install
 - ProjectInfo.rb
 - Readme
 test_files: 
-- test/test_helper.rb
 - test/subversion_extensions_test.rb
-- test/subversion_test.rb
 - test/svn_command_test.rb
+- test/subversion_test.rb
+- test/test_helper.rb
 rdoc_options: 
 - --title
 - subwrap