Author: kclark
Date: Tue Jun 17 17:56:48 2008
New Revision: 668912
URL: http://svn.apache.org/viewvc?rev=668912&view=rev
Log:
Fix up thrift/thrift to only require the the files that define the classes it
used to hold. This fixes the existing tests
Modified:
incubator/thrift/trunk/lib/rb/lib/thrift/deprecation.rb
incubator/thrift/trunk/lib/rb/lib/thrift/thrift.rb
incubator/thrift/trunk/test/rb/test_helper.rb
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/deprecation.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/deprecation.rb?rev=668912&r1=668911&r2=668912&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/deprecation.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/deprecation.rb Tue Jun 17 17:56:48
2008
@@ -1,7 +1,9 @@
# provide a backwards-compatible wrapper API and deprecate it
-unless Thrift.const_defined?(:DEPRECATION)
- Thrift::DEPRECATION = true
+module Thrift
+ unless const_defined?(:DEPRECATION)
+ DEPRECATION = true
+ end
end
class Module
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/thrift.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/thrift.rb?rev=668912&r1=668911&r2=668912&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/thrift.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/thrift.rb Tue Jun 17 17:56:48 2008
@@ -1,2 +1,8 @@
# This file kept for backwards compatability
-require File.join(File.dirname(__FILE__), '../thrift')
+# require File.join(File.dirname(__FILE__), '../thrift')
+require File.join(File.dirname(__FILE__), 'deprecation')
+require File.join(File.dirname(__FILE__), 'types')
+require File.join(File.dirname(__FILE__), 'processor')
+require File.join(File.dirname(__FILE__), 'exceptions')
+require File.join(File.dirname(__FILE__), 'client')
+require File.join(File.dirname(__FILE__), 'struct')
Modified: incubator/thrift/trunk/test/rb/test_helper.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/test_helper.rb?rev=668912&r1=668911&r2=668912&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/test_helper.rb (original)
+++ incubator/thrift/trunk/test/rb/test_helper.rb Tue Jun 17 17:56:48 2008
@@ -1,4 +1,4 @@
-$:.push File.dirname(__FILE__) + '/gen-rb'
-$:.push File.join(File.dirname(__FILE__), '../../lib/rb/lib')
+$:.unshift File.dirname(__FILE__) + '/gen-rb'
+$:.unshift File.join(File.dirname(__FILE__), '../../lib/rb/lib')
require 'test/unit'
