ruby-proxy 0.2.1 → 0.2.2

data/bin/ruby_proxy_server

@@ -0,0 +1,9 @@
+require 'ruby_proxy/server'
+
+RubyProxy::DRbServer.ip = ARGV[0] unless ARGV[0].nil?
+RubyProxy::DRbServer.port = ARGV[1] unless ARGV[1].nil?
+
+puts "start server ip: #{RubyProxy::DRbServer.ip}"
+puts "start server port:#{RubyProxy::DRbServer.port}"
+#~ Dir.chdir ARGV[2] unless ARGV[2].nil?
+RubyProxy::DRbServer.start_service

data/lib/ruby_proxy/client.rb

@@ -6,7 +6,6 @@ require 'logger'
 
 module ATU
   
-  #require redefine
   class << self
     alias require_old require
     
@@ -24,6 +23,11 @@ module ATU
 		def []=(arg,var)
 			RubyProxy::DRbClient.proxy_global_set(arg,var)
 		end
+
+		#load path
+		def <<(path)
+			RubyProxy::DRbClient.add_load_path(path)
+		end
   end
 
   #entry
@@ -157,8 +161,8 @@ module RubyProxy
     class <<self
       def client
         begin
-          stop_service if @client.nil?
-          start_service if @client.nil?
+          stop_service if @client.nil? and Config.autostart
+          start_service if @client.nil? and Config.autostart
           connect_addr = "druby://#{Config.ip}:#{Config.port}"
           @client ||= DRbObject.new(nil,connect_addr)
         rescue DRb::DRbConnError
@@ -187,6 +191,11 @@ module RubyProxy
 				client.proxy_global_set(arg,var)
 			end
 
+      def add_load_path(path)
+        #path = File.expand_path(path)
+        client.add_load_path(path)
+      end
+
       # not use it later
       def start_service(t=10)
         message = nil
@@ -199,6 +208,7 @@ module RubyProxy
         #~ end
         #~ @server_thread.abort_on_exception = true
         wait_until_server_start_time(t)
+        do_at_exit if Config.autostart
       end
       
       def start_command
@@ -208,7 +218,7 @@ module RubyProxy
       end
       
       def stop_service(t=5)
-        TCPSocket.new(Config.ip,Config.port)
+        #TCPSocket.new(Config.ip,Config.port)
         @client ||= DRbObject.new(nil,"druby://#{Config.ip}:#{Config.port}")
         @client.stop_proxy
         sleep 1
@@ -225,7 +235,6 @@ module RubyProxy
             #~ raise CannotStartServer, "" unless @server_thread.alive?
             TCPSocket.new(Config.ip,Config.port)
             @@logger.info "server is starting"
-            #do_at_exit
             return true
           rescue Exception
             sleep 1

data/lib/ruby_proxy/config.rb

@@ -2,8 +2,9 @@ module RubyProxy
   class Config
 		@config = {
 			:ip => '127.0.0.1',
-			:port=> 8000,
-			:command => 'ruby'
+			:port=> 8889,
+			:command => 'ruby',
+      :autostart => true,
 		}
     class <<self
 			def ip
@@ -29,6 +30,13 @@ module RubyProxy
 			def command=(command)
 				@config[:command] = command
 			end
+
+      def autostart
+        @config[:autostart]
+      end
+      def autostart=(bool)
+        @config[:autostart] = bool
+      end
     end
   end
 end

data/lib/ruby_proxy/proxy.rb

@@ -28,6 +28,10 @@ module RubyProxy
     def self.proxy_global_get(arg)
       ProxyGlobalSet.get(arg)
     end
+
+    def self.add_load_path(path)
+      ProxyGlobalSet.add("$LOAD_PATH",path)
+    end
     
     def self.proxy_type(klass_name)
       return proxy_const_get(klass_name).class.to_s

data/lib/ruby_proxy/proxy_global_set.rb

@@ -10,6 +10,13 @@ module RubyProxy
 				eval("#{arg} = #{value}")
 			end
 
+      # add to $LOAD_PATH
+      def add(arg,value)
+        arg = convert_to_global(arg)
+				Logger.info "global add: #{arg} << #{value}"
+        eval("#{arg} << \"#{value}\"")
+      end
+
 			def get(arg)
 				arg = convert_to_global(arg)
 				Logger.info "global get: #{arg}"

data/lib/ruby_proxy/server.rb

@@ -7,12 +7,16 @@ require 'ruby_proxy/proxy'
 require 'drb/timeridconv'
 module RubyProxy
   class DRbServer
+    @ip = Config.ip
+    @port = Config.port
+
     class << self
       attr_accessor :ip,:port
     end
+
     def self.start_service
       DRb.install_id_conv(DRb::TimerIdConv.new)
-      DRb.start_service("druby://#{Config.ip}:#{Config.port}",Proxy)
+      DRb.start_service("druby://#{ip}:#{port}",Proxy)
       #~ trap("INT") { DRb.stop_service }
       # for ruby1.9
       begin

data/lib/ruby_proxy/version.rb

@@ -1,3 +1,3 @@
 module RubyProxy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/unittests/all_tests.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
 require 'setup'
 
-$all_tests.each { |f| require f }
+$all_tests.each { |f| require f }

data/unittests/setup.rb

@@ -6,4 +6,6 @@ require 'test/unit'
 
 require 'ruby_proxy'
 
+#RubyProxy::Config.autostart = false
+
 $all_tests = Dir['test_*.rb']

data/unittests/test_config.rb

@@ -7,7 +7,7 @@ class TestConfig < Test::Unit::TestCase
   end
   
   def test_config_default
-    assert_equal(8000, @config.port)
+    assert_equal(8889, @config.port)
     assert_equal('127.0.0.1', @config.ip)
   end
   

data/unittests/test_drb_proxy.rb

@@ -12,6 +12,7 @@ end
 class TestDrbProxy < Test::Unit::TestCase
   
 	def setup
+    ATU << File.dirname(__FILE__)
     ATU::require 'support/atu/hello'
   end
 

data/unittests/{test_gloabal_var.rb → test_global_var.rb}

@@ -17,4 +17,11 @@ class TestGlobalVar < Test::Unit::TestCase
 		ATU["HELLO"] = 10
 		assert_equal(10, ATU["HELLO"])
 	end
+
+  def test_global_add_ok
+    load_path = ATU["$LOAD_PATH"]
+    load_path << File.dirname(__FILE__)
+    ATU << File.dirname(__FILE__)
+    assert_equal(load_path, ATU["$LOAD_PATH"])
+  end
 end

data/unittests/{test_atu_require.rb → test_require.rb}

@@ -1,8 +1,11 @@
 require 'setup'
 
-RubyProxy::Config.command = "/home/windy/.rvm/rubies/jruby-1.6.7/bin/ruby"
+#RubyProxy::Config.command = "/home/windy/.rvm/rubies/jruby-1.6.7/bin/ruby"
 
 class TestAtuLoad < Test::Unit::TestCase
+  def setup
+    ATU << File.dirname(__FILE__)
+  end
 	def test_load_ok
 		assert_nothing_raised {
 			ATU.require 'support/atu/hello.rb'

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-proxy
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - yafei Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby Proxy for two or more ruby processes.
 email: lyfi2003@gmail.com
-executables: []
-
+executables:
+- ruby_proxy_server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ruby_proxy/config.rb
 - lib/ruby_proxy/client.rb
 - lib/ruby_proxy/exceptions.rb
@@ -41,55 +32,48 @@ files:
 - lib/ext/drb_ext.rb
 - unittests/test_drb_proxy.rb
 - unittests/test_config.rb
-- unittests/test_gloabal_var.rb
 - unittests/all_tests.rb
 - unittests/support/config.yml
 - unittests/support/image/search.png
 - unittests/support/image/start.png
 - unittests/support/atu/hello.rb
-- unittests/test_atu_require.rb
+- unittests/test_global_var.rb
+- unittests/test_require.rb
 - unittests/setup.rb
+- !binary |-
+  YmluL3J1YnlfcHJveHlfc2VydmVy
 homepage: https://github.com/windy/ruby_proxy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Ruby Proxy for two or more ruby processes.
-test_files: 
+test_files:
 - unittests/test_drb_proxy.rb
 - unittests/test_config.rb
-- unittests/test_gloabal_var.rb
 - unittests/all_tests.rb
 - unittests/support/config.yml
 - unittests/support/image/search.png
 - unittests/support/image/start.png
 - unittests/support/atu/hello.rb
-- unittests/test_atu_require.rb
+- unittests/test_global_var.rb
+- unittests/test_require.rb
 - unittests/setup.rb