ruby-proxy 0.0.1 → 0.0.3

data/lib/atu/sikuli.rb

@@ -4,12 +4,8 @@ require 'java'
 #This is key to making it work under ruby. The path above is the default
 #installation location on the Mac which contains all of the
 #relevant sikuli jar files.
-require "sikuli-script.jar"
+require "atu/sikuli-script.jar"
 
-module B
-class C
-end
-end
 
 
 #~ include Java
@@ -18,10 +14,10 @@ module ATU
     java_import 'org.sikuli.script.Region'
     java_import 'org.sikuli.script.Screen'
     java_import 'org.sikuli.script.Settings'
+    java_import 'org.sikuli.script.Pattern'
     java_import 'org.sikuli.script.SikuliEvent'
     java_import 'org.sikuli.script.SikuliScript'
     include Java::OrgSikuliScript
-    include B
   end
   #Sikuli = Java::OrgSikuliScript
 end

data/lib/ext/drb_ext.rb

@@ -0,0 +1,6 @@
+require 'drb'
+module DRb
+  class DRbObject
+    undef :type
+  end
+end

data/lib/ruby_proxy/client.rb

@@ -1,4 +1,5 @@
 require 'drb'
+require 'ext/drb_ext'
 require 'timeout'
 require 'socket'
 require 'logger'
@@ -12,7 +13,7 @@ module ATU
   end
 
   def self.make_kclass(name,type)
-    puts "make_kclass: #{name}, #{type}"
+    #puts "make_kclass: #{name}, #{type}"
     case type
     when "Class"
       RubyProxy::KlassFactory.make_class(name) do |klass|
@@ -20,7 +21,21 @@ module ATU
           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
+          undef :type
+          undef :to_s
+          undef :to_a if respond_to?(:to_a)
+          undef :methods
+          
+          def __proxy
+            @proxy
+          end
+          
           def method_missing(name,*arg)
             #return if @proxy.nil?
             #puts "#{@proxy.methods(false)}"
@@ -158,8 +173,13 @@ module RubyProxy
             @@logger.info "start jruby proxy server..."
             org_path = Dir.pwd
             Dir.chdir(File.join(File.dirname(__FILE__),'..')) do
-            system("start /I /B jruby ruby_proxy/server.rb #{@ip} #{@port} #{org_path} ")#> #{@start_service_log_path} 2>&1")
-            end
+            # we can start jruby proxy or ruby
+            # just change here command
+			temp = ENV["RUBYOPT"]
+            ENV["RUBYOPT"] = "-rubygems"
+            system("start /I /B jruby ruby_proxy/server.rb #{@ip} #{@port} \"#{org_path}\" ")#> #{@start_service_log_path} 2>&1")
+            ENV["RUBYOPT"] = temp
+			end
         end
         wait_until_server_start_time(t)
       end

data/lib/ruby_proxy/proxy.rb

@@ -8,7 +8,7 @@ module RubyProxy
     # you can use Proxy.load_path << "" to add load path
     ProxyLoad.load
     @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::DEBUG
+    @@logger.level = Logger::INFO
     
     def self.proxy(klass_name,method=nil,*arg)
       @@logger.debug "klass_name= #{klass_name}"

data/lib/ruby_proxy/proxy_load.rb

@@ -2,7 +2,7 @@ require 'logger'
 module RubyProxy
   class ProxyLoad
     @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::DEBUG
+    @@logger.level = Logger::INFO
     @load_path = ['atu']
     class <<self
       attr_accessor :load_path

data/lib/ruby_proxy/server.rb

@@ -1,5 +1,6 @@
 require 'drb'
 require 'ruby_proxy/proxy'
+require 'drb/timeridconv'
 module RubyProxy
   class DRbServer
     @ip = "127.0.0.1"
@@ -8,6 +9,7 @@ module RubyProxy
       attr_writer :ip,:port
     end
     def self.start_service
+      DRb.install_id_conv(DRb::TimerIdConv.new)
       DRb.start_service("druby://#{@ip}:#{@port}",Proxy)
       DRb.thread.join
     end

data/lib/ruby_proxy/version.rb

@@ -1,3 +1,3 @@
 module RubyProxy
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/unittests/support/atu/hello.rb

@@ -88,6 +88,24 @@ module ATU
       end
     end
     
+    class Hello7
+      def to_a
+        puts "call to_a"
+        [1,2,3]
+      end
+      def type(a)
+        puts "call type"
+        "a"
+      end
+      def to_s
+        puts "call to_s"
+        return "b"
+      end
+      def normal
+        "normal"
+      end
+    end
+    
   end
   
 end

data/unittests/test_drb_proxy.rb

@@ -21,7 +21,7 @@ class TestDrbProxy < Test::Unit::TestCase
   end
 	def test_atu_ok
 		a = ATU::Hello.new
-		puts "aaa= #{a}"
+		#~ puts "aaa= #{a}"
 	  assert_equal(1,a.return_1)
 		assert_equal("1",a.return_str_1)
 	end
@@ -115,7 +115,10 @@ class TestDrbProxy < Test::Unit::TestCase
     assert([1,"1"],ATU::M1::Hello6.a(1,"1"))
     assert("m",ATU::M1::m)
   end
+	
   # failed, fix me
+	# I have not seen druby's block call. That not be supported to call block.
+	# I will do fixing it later.
   def test_block_ok
     a = ATU::M1::Hello6.new
     assert_equal(1,a.a() {|i| i})
@@ -127,4 +130,15 @@ class TestDrbProxy < Test::Unit::TestCase
 		assert_equal(true,ATU::M1::Hello6.file_exist?(path))
 	end
 	
+	#now pass it 
+	# it seems sometimes druby in jruby has some bugs like concurrent problem.
+	# other time, I will fix it.  
+	def test_specify_method_support
+		hello7 = ATU::M1::Hello7.new
+		assert_equal([1,2,3],hello7.to_a)
+		assert_equal("a",hello7.type("b"))
+		assert_equal("b",hello7.to_s)
+		assert_equal("normal",hello7.normal)
+	end
+	
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-proxy
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - yafei Li
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +08:00
+date: 2011-08-26 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -22,50 +27,60 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/atu
 - lib/atu/key.rb
 - lib/atu/sikuli-script.jar
 - lib/atu/sikuli.rb
-- lib/ruby_proxy
+- lib/ext/drb_ext.rb
 - lib/ruby_proxy/client.rb
 - lib/ruby_proxy/proxy.rb
 - lib/ruby_proxy/proxy_load.rb
 - lib/ruby_proxy/server.rb
 - lib/ruby_proxy/version.rb
 - lib/ruby_proxy.rb
-has_rdoc: false
+- unittests/all_tests.rb
+- unittests/setup.rb
+- unittests/support/atu/hello.rb
+- unittests/support/image/search.png
+- unittests/support/image/start.png
+- unittests/test_drb_proxy.rb
+- unittests/test_sikuli_api.rb
+- unittests/your_jruby_sikuli_config_ok.rb
+has_rdoc: true
 homepage: https://github.com/windy/ruby_proxy
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-proxy
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby Proxy for Jruby.
 test_files: 
 - unittests/all_tests.rb
 - unittests/setup.rb
-- unittests/support
-- unittests/support/atu
 - unittests/support/atu/hello.rb
-- unittests/support/image
 - unittests/support/image/search.png
 - unittests/support/image/start.png
 - unittests/test_drb_proxy.rb