ruby-proxy 0.0.5 → 0.2.0

data/lib/ruby_proxy.rb

@@ -1,2 +1,4 @@
+require 'ruby_proxy/exceptions'
+require 'ruby_proxy/config'
 require 'ruby_proxy/client'
-require 'ruby_proxy/version'
+require 'ruby_proxy/version'

data/lib/ruby_proxy/client.rb

@@ -5,10 +5,23 @@ require 'socket'
 require 'logger'
 
 module ATU
+  
+  #require redefine
+  class << self
+    alias require_old require
+    
+    def require(arg)
+      #TODO: path maybe confict
+      #~ path= File.expand_path File.join(Dir.pwd,arg)
+      #~ path += '.rb'
+      RubyProxy::DRbClient.proxy_load(arg)
+    end
+  end
+
   #entry
   def self.const_missing(name)
     name = self.name.to_s + "::" + name.to_s
-    type = RubyProxy::DRbClient.client.proxy_type(name.to_s)
+    type = RubyProxy::DRbClient.client.proxy_type(name)
     make_kclass(name,type)
   end
 
@@ -19,14 +32,9 @@ module ATU
       RubyProxy::KlassFactory.make_class(name) do |klass|
         klass.class_eval do
           def initialize(*arg)
-            #puts self.class.to_s
             @proxy = RubyProxy::DRbClient.client.proxy(self.class.to_s,"new",*arg)
-            # undef type method 
-            # I think all methods should be proxyed by remote
-            #~ class << @proxy
-              #~ undef :type
-            #~ end
           end
+           # I think all methods should be proxyed by remote
           undef :type rescue nil
           undef :to_s
           undef :to_a if respond_to?(:to_a)
@@ -36,11 +44,11 @@ module ATU
             @proxy
           end
           
-          def method_missing(name,*arg)
+          def method_missing(name,*arg,&block)
             #return if @proxy.nil?
             #puts "#{@proxy.methods(false)}"
             #puts "proxy = #{@proxy} method=#{name} arg=#{arg.join(',')}"
-            @proxy.__send__(name.to_s,*arg)
+            @proxy.__send__(name,*arg,&block)
           end
           def self.const_missing(name)
             name = self.name.to_s + "::" + name.to_s
@@ -53,9 +61,9 @@ module ATU
             RubyProxy::DRbClient.client.proxy(name.to_s)
           end
           
-          # block not support now
-          def self.method_missing(name,*arg)
-            RubyProxy::DRbClient.client.proxy(self.name.to_s,name.to_s,*arg)
+          # TODO: block not support now
+          def self.method_missing(name,*arg,&block)
+            RubyProxy::DRbClient.client.proxy(self.name.to_s,name.to_s,*arg,&block)
           end
 
         end
@@ -103,7 +111,7 @@ module RubyProxy
       end
     end
   
-  #生成类,返回类常量
+  # generate proxy class
     def self.make_class(klass_name)
       klass_name = klass_name.to_s
       name_ok?(klass_name)
@@ -132,31 +140,29 @@ module RubyProxy
       raise TypeError," name #{name} can't be class or module name." unless name =~ /^[A-Z][a-zA-Z_0-9]*/
     end
   end
+  
+  # Get DRbClient
   class DRbClient
     @client = nil
-    @port = 9000
-    @ip = "127.0.0.1"
     @@logger =  Logger.new(STDOUT)
-    @@logger.level= Logger::DEBUG
+    @@logger.level= Logger::INFO
     class <<self
       def client
         begin
           stop_service if @client.nil?
-          @client ||= DRbObject.new(nil,"druby://#{@ip}:#{@port}")
-          alive?
-          @client
-        rescue Exception
-          start_service
-          @client ||= DRbObject.new(nil,"druby://#{@ip}:#{@port}")
-          @client
+          start_service if @client.nil?
+          connect_addr = "druby://#{Config.ip}:#{Config.port}"
+          @client ||= DRbObject.new(nil,connect_addr)
+        rescue DRb::DRbConnError
+          raise RubyProxy::NotConnError, "can connect to druby server: #{connect_addr}"
         end
       end
 
       def alive?
         @client.respond_to?("any_thing")
-        @client
+        true
       rescue DRb::DRbConnError
-        raise
+        false
       end
 
       attr_accessor :ip,:port
@@ -165,30 +171,29 @@ module RubyProxy
         client.proxy_load(dir_or_file)
       end
 
-      def start_service(t=5)
+      # not use it later
+      def start_service(t=10)
         message = nil
-        @start_service_log_path = File.join(File.dirname(__FILE__),'start_service.log')
         @service_log = nil
-        server_thread =  Thread.new do
-            @@logger.info "start jruby proxy server..."
-            org_path = Dir.pwd
-            Dir.chdir(File.join(File.dirname(__FILE__),'..')) do
-            # we can start jruby proxy or ruby
-            # just change here command
-			temp = ENV["RUBYOPT"]
-            ENV["RUBYOPT"] = "-rubygems"
-            #system("start /I /B jruby -J-Dfile.encoding=UTF-8 ruby_proxy/server.rb #{@ip} #{@port} \"#{org_path}\"  ") #> #{@start_service_log_path} 2>&1")
-            @service_log = IO.popen("jruby -J-Dfile.encoding=UTF-8 ruby_proxy/server.rb #{@ip} #{@port} \"#{org_path}\" 2>&1")
-            ENV["RUBYOPT"] = temp
-			end
-        end
+        @@logger.info "start ruby proxy server..."
+        @@logger.info start_command
+        #~ @server_thread =  Thread.new do |t|
+            #~ t.abort_on_exception = true
+            @service_log = IO.popen(start_command)
+        #~ end
+        #~ @server_thread.abort_on_exception = true
         wait_until_server_start_time(t)
-        #@service_log.close
+      end
+      
+      def start_command
+        #raise RubyProxy::CommandNotFoundError, "ruby command can not be found: #{Config.command}" unless File.file?(Config.command)
+        server_file = File.expand_path File.join( File.dirname(__FILE__), 'server.rb' )
+        Config.command + " " + server_file
       end
       
       def stop_service(t=5)
-        TCPSocket.new(@ip,@port)
-        @client ||= DRbObject.new(nil,"druby://#{@ip}:#{@port}")
+        TCPSocket.new(Config.ip,Config.port)
+        @client ||= DRbObject.new(nil,"druby://#{Config.ip}:#{Config.port}")
         @client.stop_proxy
         sleep 1
       rescue
@@ -201,14 +206,23 @@ module RubyProxy
       def wait_until_server_start_time(t)
         t.times do |tt|
           begin
-            TCPSocket.new(@ip,@port)
+            #~ 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
           end
         end
-        raise RuntimeError,"start drbserver fail, reason: \n#{@service_log.read rescue nil}"
+        raise RuntimeError,"start drbserver fail"
+      end
+
+      def do_at_exit
+        at_exit do
+          @@logger.info "try to stop service"
+          stop_service
+        end
       end
 
     end
@@ -218,4 +232,4 @@ end
 if $0 == __FILE__
   a = ATU::Hello.new
   puts a.return_1
-end
+end

data/lib/ruby_proxy/config.rb

@@ -0,0 +1,34 @@
+module RubyProxy
+  class Config
+		@config = {
+			:ip => '127.0.0.1',
+			:port=> 8000,
+			:command => 'ruby'
+		}
+    class <<self
+			def ip
+				@config[:ip]
+			end
+
+			def ip=(ip)
+				@config[:ip] = ip
+			end
+			
+			def port=(port)
+				@config[:port] = port
+			end
+
+			def port
+				@config[:port]
+			end
+
+			def command
+				@config[:command]
+			end
+			
+			def command=(command)
+				@config[:command] = command
+			end
+    end
+  end
+end

data/lib/ruby_proxy/exceptions.rb

@@ -0,0 +1,9 @@
+module RubyProxy
+  class Error < RuntimeError; end
+  # can not connect to proxy server
+  class NotConError < Error; end
+  #config command config error
+  class CommandNotFoundError < Error; end
+  # start server fail error
+  class CannotStartServer < Error; end
+end

data/lib/ruby_proxy/proxy.rb

@@ -6,7 +6,7 @@ module RubyProxy
   class Proxy
     # loading proxy class, default folder: atu
     # you can use Proxy.load_path << "" to add load path
-    ProxyLoad.load
+    #~ ProxyLoad.load
     @@logger = Logger.new(STDOUT)
     @@logger.level = Logger::INFO
     
@@ -21,9 +21,9 @@ module RubyProxy
       end
     end
     
-    def self.proxy_load(dir_or_file)
-      ProxyLoad.load_path << dir_or_file
-      ProxyLoad.load
+    def self.proxy_load(file_or_gem)
+      #~ ProxyLoad.load_path << dir_or_file
+      ProxyLoad.load_file(file_or_gem)
     end
     
     def self.proxy_type(klass_name)
@@ -44,7 +44,7 @@ module RubyProxy
       klass_name_array.shift if klass_name_array[0] == "ATU"
       klass_name_array.each do |m|
         if atu.nil?
-          atu = ATU.const_get(m)
+          atu = Kernel.const_get(m)
         else
           atu = atu.const_get(m)
         end

data/lib/ruby_proxy/proxy_load.rb

@@ -2,8 +2,9 @@ require 'logger'
 module RubyProxy
   class ProxyLoad
     @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::INFO
-    @load_path = ['atu']
+    @@logger.level = Logger::ERROR
+    #~ @@logger.info $:.join(':')
+    @load_path = []
     class <<self
       attr_accessor :load_path
       def load
@@ -12,21 +13,18 @@ module RubyProxy
             Dir[p.chomp("/") + "/*.rb"].each do |file|
               load_file(file)
             end
-          elsif File.file?(p)
-            load_file(p)
           else
-            @@logger.warn("path: #{p} not exist ,ignore")
+            load_file(p)
           end
-        
         end
       end
       
       def load_file(file)
         @@logger.debug "require file : #{file}"
-        Kernel.require file
-      rescue LoadError
-        @@logger.warn "require file : #{file} fail,exception:"
-        @@logger.warn "#{$!}"
+        require file
+      rescue LoadError=>e
+        @@logger.warn "require file : #{file} fail,exception:\n#{e}"
+        raise 
       end
     end
   end

data/lib/ruby_proxy/server.rb

@@ -1,18 +1,28 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__),'..')
+
+require 'rubygems'
 require 'drb'
+require 'ruby_proxy/config'
 require 'ruby_proxy/proxy'
 require 'drb/timeridconv'
 module RubyProxy
   class DRbServer
-    @ip = "127.0.0.1"
-    @port = 9000
     class << self
-      attr_writer :ip,:port
+      attr_accessor :ip,:port
     end
     def self.start_service
       DRb.install_id_conv(DRb::TimerIdConv.new)
-      DRb.start_service("druby://#{@ip}:#{@port}",Proxy)
-      DRb.thread.join
+      DRb.start_service("druby://#{Config.ip}:#{Config.port}",Proxy)
+      #~ trap("INT") { DRb.stop_service }
+      # for ruby1.9
+      begin
+        DRb.thread.join
+      rescue Interrupt
+      ensure
+        DRb.stop_service
+      end
     end
+    
     def self.stop_service
       DRb.stop_service
     end
@@ -20,15 +30,18 @@ module RubyProxy
 end
 
 if $0 == __FILE__
-  ['INT'].each do |signal|
-    trap(signal) {
-      RubyProxy::DRbServer.stop_service
-    }
-  end
-  puts "start server ip:#{ARGV[0]}"
-  puts "start server port:#{ARGV[1]}"
+  #~ ['INT'].each do |signal|
+    #~ trap(signal) {
+      #~ puts 'exit...'
+      #~ RubyProxy::DRbServer.stop_service
+    #~ }
+  #~ end
+  #~ puts "start server ip:#{ARGV[0] || "127.0.0.1"}"
+  #~ puts "start server port:#{ARGV[1] || 9000}"
   RubyProxy::DRbServer.ip = ARGV[0] unless ARGV[0].nil?
   RubyProxy::DRbServer.port = ARGV[1] unless ARGV[1].nil?
-  Dir.chdir ARGV[2] unless ARGV[2].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
 end

data/lib/ruby_proxy/version.rb

@@ -1,3 +1,3 @@
 module RubyProxy
-  VERSION = "0.0.5"
+  VERSION = "0.2.0"
 end

data/lib/test.rb

@@ -0,0 +1,15 @@
+$LOAD_PATH << File.dirname(__FILE__)
+#~ $LOAD_PATH << 'C:\jruby-1.5.6\lib\ruby\gems\1.8\gems\sikuli-0.2.3\lib'
+require 'rubygems'
+require 'ruby_proxy'
+
+ATU::require 'rubygems'
+ATU::require 'java'
+ 
+ATU::require 'sikuli'
+
+screen = ATU::Sikuli::Screen.new
+screen.click(10,10)
+#~ browser = ATU::Watir::Browser.new(:ff)
+
+#~ browser.goto("http://google.hk")

data/unittests/setup.rb

@@ -1,9 +1,9 @@
 
-$LOAD_PATH.unshift File.join(__FILE__,'..','..','lib') unless $LOADED
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__),'..','lib') unless $LOADED
 $LOADED = true
 
 require 'test/unit'
 
 require 'ruby_proxy'
 
-$all_tests = Dir['test_*.rb']
+$all_tests = Dir['test_*.rb']

data/unittests/support/atu/hello.rb

@@ -7,7 +7,7 @@ module B
 end
 
 
-module ATU
+#~ module ATU
   class Hello
     def initialize
     end
@@ -77,6 +77,7 @@ module ATU
         var = 1
         yield var
       end
+      
       def b(*arg)
         var = 1
         yield var if block_given?
@@ -90,15 +91,15 @@ module ATU
     
     class Hello7
       def to_a
-        puts "call to_a"
+        #~ puts "call to_a"
         [1,2,3]
       end
       def type(a)
-        puts "call type"
+        #~ puts "call type"
         "a"
       end
       def to_s
-        puts "call to_s"
+        #~ puts "call to_s"
         return "b"
       end
       def normal
@@ -108,5 +109,5 @@ module ATU
     
   end
   
-end
+#~ end
 

data/unittests/support/config.yml

@@ -0,0 +1,3 @@
+ip: 1.1.1.1
+port: 1111
+#~ command: jruby

data/unittests/test_config.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'setup'
+
+class TestConfig < Test::Unit::TestCase
+  def setup
+    @config = RubyProxy::Config
+  end
+  
+  def test_config_default
+    assert_equal(8000, @config.port)
+    assert_equal('127.0.0.1', @config.ip)
+    assert_equal('ruby', @config.command)
+  end
+  
+  def test_config_personal
+		@config.port = 1111
+    assert_equal(1111, @config.port)
+		@config.ip = '1.1.1.1'
+    assert_equal('1.1.1.1', @config.ip)
+		@config.command = 'ruby'
+    assert_equal('ruby', @config.command)
+  end
+  
+end

data/unittests/test_drb_proxy.rb

@@ -6,24 +6,20 @@ class Me
 	def a
 		"a"
 	end
-	
 end
 
 
 class TestDrbProxy < Test::Unit::TestCase
-	@@atu = nil
+  
 	def setup
-		return unless @@atu.nil?
-		@@atu = File.expand_path(File.join(__FILE__,'..','support','atu'))
-		RubyProxy::DRbClient.proxy_load(@@atu)
+    ATU::require 'support/atu/hello'
   end
 
-  def test_server_start_auto
+  def test_server_start_ok
     assert_kind_of(DRbObject,RubyProxy::DRbClient.client)
   end
 	def test_atu_ok
 		a = ATU::Hello.new
-		#~ puts "aaa= #{a}"
 	  assert_equal(1,a.return_1)
 		assert_equal("1",a.return_str_1)
 	end
@@ -47,38 +43,30 @@ class TestDrbProxy < Test::Unit::TestCase
 		a = Me.new
 		assert_equal("a",a.a)
 		a = ATU::Hello.new
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
-		assert_equal([1,"1"],a.return_vars(1,"1",3,4))
+    assert_equal([1,"1"],a.return_vars(1,"1",3,4))
 	end
 	
 	def test_support_thread
 		a = Me.new
 		assert_equal("a",a.a)
+    
 		t = Thread.new do
 			a = ATU::Hello.new
 			for i in 1..100 do
 				assert_equal(1,a.return_1)
 				assert_equal(1,a.return_1)
-				
-				#sleep 1
 			end
 		end
+    
 		b = ATU::Hello.new
 		assert_equal(1,b.return_1)
     assert_equal("1",b.return_str_1)
-		#sleep 20
-
-		assert_equal("1",b.return_str_1)
 	  t.join
     c = ATU::Hello.new
     assert_equal(1,c.return_1)
   end
 	
-	def test_method_missing1
+	def test_method_missing_and_more_time
 		a = ATU::Hello3.new(1,"2")
 		i=1
 		1.upto(100) do |i|
@@ -86,21 +74,18 @@ class TestDrbProxy < Test::Unit::TestCase
 		end
 	end
 	
-	
-	
-	
 	def test_atu_gue
 		assert_raise(NameError) do
 			ATU::ExistNo.new
 		end
 	end
 	
-	def test_atu_sikuli
-		screen = ATU::Sikuli::Region.new(0,0,1440,900)
-		assert_not_nil(screen)
-	end
-	#多个模块内的调用
-	def test_multi_m
+	#~ def test_atu_sikuli
+		#~ screen = ATU::Sikuli::Region.new(0,0,1440,900)
+		#~ assert_not_nil(screen)
+	#~ end
+	
+	def test_multi_modules
 		a = ATU::M1::Hello4.new
     assert_equal("one",a.one("test"))
 	end
@@ -123,13 +108,13 @@ class TestDrbProxy < Test::Unit::TestCase
 	# I will do fixing it later.
   def test_block_ok
     a = ATU::M1::Hello6.new
-    assert_equal(1,a.a() {|i| i})
+    assert_equal(1,a.b() {|i| i})
   end
 
 	def test_file_path
 		assert_equal([__FILE__],ATU::M1::Hello6.a(__FILE__))
-		path = File.join(__FILE__,'..','support','atu','hello.rb')
-		assert_equal(true,ATU::M1::Hello6.file_exist?(path))
+		path = File.expand_path File.join(File.dirname(__FILE__),'support','atu','hello.rb')
+		assert_equal(File.exist?(path),ATU::M1::Hello6.file_exist?(path))
 	end
 	
 	#now pass it 

metadata

@@ -1,88 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-proxy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
-- yafei Li
+authors:
+- yafei Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-25 00:00:00 +08:00
-default_executable: 
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies: []
-
-description: Ruby Proxy for Jruby.
-email: lyfi2003@sina.com
+description: Ruby Proxy for two or more ruby processes.
+email: lyfi2003@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/atu/key.rb
-- lib/atu/sikuli-script.jar
-- lib/atu/sikuli.rb
-- lib/ext/drb_ext.rb
+files:
+- lib/ruby_proxy/config.rb
 - lib/ruby_proxy/client.rb
-- lib/ruby_proxy/proxy.rb
+- lib/ruby_proxy/exceptions.rb
 - lib/ruby_proxy/proxy_load.rb
 - lib/ruby_proxy/server.rb
 - lib/ruby_proxy/version.rb
+- lib/ruby_proxy/proxy.rb
 - lib/ruby_proxy.rb
+- lib/atu/sikuli.rb
+- lib/atu/sikuli-script.jar
+- lib/atu/key.rb
+- lib/test.rb
+- lib/ext/drb_ext.rb
+- unittests/test_drb_proxy.rb
+- unittests/your_jruby_sikuli_config_ok.rb
+- unittests/test_config.rb
 - unittests/all_tests.rb
-- unittests/setup.rb
-- unittests/support/atu/hello.rb
+- unittests/support/config.yml
 - unittests/support/image/search.png
 - unittests/support/image/start.png
-- unittests/test_drb_proxy.rb
+- unittests/support/atu/hello.rb
 - unittests/test_sikuli_api.rb
-- unittests/your_jruby_sikuli_config_ok.rb
-has_rdoc: true
+- unittests/setup.rb
 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 
-      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 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ruby-proxy
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: Ruby Proxy for Jruby.
-test_files: 
+summary: Ruby Proxy for two or more ruby processes.
+test_files:
+- unittests/test_drb_proxy.rb
+- unittests/your_jruby_sikuli_config_ok.rb
+- unittests/test_config.rb
 - unittests/all_tests.rb
-- unittests/setup.rb
-- unittests/support/atu/hello.rb
+- unittests/support/config.yml
 - unittests/support/image/search.png
 - unittests/support/image/start.png
-- unittests/test_drb_proxy.rb
+- unittests/support/atu/hello.rb
 - unittests/test_sikuli_api.rb
-- unittests/your_jruby_sikuli_config_ok.rb
+- unittests/setup.rb