ruby-proxy 0.2.0 → 0.2.1

data/lib/ruby_proxy/client.rb

@@ -16,6 +16,14 @@ module ATU
       #~ path += '.rb'
       RubyProxy::DRbClient.proxy_load(arg)
     end
+
+		def [](arg)
+			RubyProxy::DRbClient.proxy_global_get(arg)
+		end
+
+		def []=(arg,var)
+			RubyProxy::DRbClient.proxy_global_set(arg,var)
+		end
   end
 
   #entry
@@ -167,10 +175,18 @@ module RubyProxy
 
       attr_accessor :ip,:port
       
-      def proxy_load(dir_or_file)
-        client.proxy_load(dir_or_file)
+      def proxy_load(file)
+        client.proxy_load(file)
       end
 
+			def proxy_global_get(arg)
+				client.proxy_global_get(arg)
+			end
+
+			def proxy_global_set(arg,var)
+				client.proxy_global_set(arg,var)
+			end
+
       # not use it later
       def start_service(t=10)
         message = nil
@@ -179,7 +195,7 @@ module RubyProxy
         @@logger.info start_command
         #~ @server_thread =  Thread.new do |t|
             #~ t.abort_on_exception = true
-            @service_log = IO.popen(start_command)
+				@service_log = IO.popen(start_command)
         #~ end
         #~ @server_thread.abort_on_exception = true
         wait_until_server_start_time(t)
@@ -209,7 +225,7 @@ module RubyProxy
             #~ raise CannotStartServer, "" unless @server_thread.alive?
             TCPSocket.new(Config.ip,Config.port)
             @@logger.info "server is starting"
-            do_at_exit
+            #do_at_exit
             return true
           rescue Exception
             sleep 1

data/lib/ruby_proxy/exceptions.rb

@@ -6,4 +6,6 @@ module RubyProxy
   class CommandNotFoundError < Error; end
   # start server fail error
   class CannotStartServer < Error; end
-end
+	# format wrong with global variable
+	class GlobalVarFormatError < Error; end
+end

data/lib/ruby_proxy/logger.rb

@@ -0,0 +1,35 @@
+require 'logger'
+
+module RubyProxy
+	class Logger
+		@@logger = ::Logger.new(STDOUT)
+		@@logger.level = ::Logger::INFO
+
+		def self.level=(level)
+			@@logger.level = level
+		end
+
+		def self.level
+			@@logger.level
+		end
+
+		def self.log(arg)
+			@@logger.info arg
+		end
+
+		def self.info(arg)
+			@@logger.info arg
+		end
+
+		def self.debug(arg)
+			@@logger.debug arg
+		end
+
+		def self.warn(arg)
+			@@logger.warn arg
+		end
+		def self.error(arg)
+			@@logger.error arh
+		end
+	end
+end

data/lib/ruby_proxy/proxy.rb

@@ -1,19 +1,15 @@
-require 'logger'
+require 'ruby_proxy/logger'
 require 'drb'
 require 'ruby_proxy/proxy_load'
+require 'ruby_proxy/proxy_global_set'
 
 module RubyProxy
   class Proxy
-    # loading proxy class, default folder: atu
-    # you can use Proxy.load_path << "" to add load path
-    #~ ProxyLoad.load
-    @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::INFO
-    
+
     def self.proxy(klass_name,method=nil,*arg)
-      @@logger.debug "klass_name= #{klass_name}"
-      @@logger.debug "method = #{method}"
-      @@logger.debug "arg = #{arg.join(',')}"
+      Logger.debug "klass_name= #{klass_name}"
+      Logger.debug "method = #{method}"
+      Logger.debug "arg = #{arg.join(',')}"
       if method.nil?
         return proxy_module(klass_name)
       else
@@ -22,12 +18,18 @@ module RubyProxy
     end
     
     def self.proxy_load(file_or_gem)
-      #~ ProxyLoad.load_path << dir_or_file
       ProxyLoad.load_file(file_or_gem)
     end
+
+    def self.proxy_global_set(arg,var)
+      ProxyGlobalSet.set(arg,var)
+    end
+
+    def self.proxy_global_get(arg)
+      ProxyGlobalSet.get(arg)
+    end
     
     def self.proxy_type(klass_name)
-      #@@logger.debug "proxy_type: #{proxy_const_get(klass_name).name} type is #{proxy_const_get(klass_name).class.to_s}"
       return proxy_const_get(klass_name).class.to_s
     end
     
@@ -38,7 +40,6 @@ module RubyProxy
     end
     
     def self.proxy_const_get(klass_name)
-      #@@logger.debug "const_get klass_name = #{klass_name}"
       atu = nil
       klass_name_array = klass_name.split('::')
       klass_name_array.shift if klass_name_array[0] == "ATU"

data/lib/ruby_proxy/proxy_global_set.rb

@@ -0,0 +1,37 @@
+require 'ruby_proxy/logger'
+require 'ruby_proxy/exceptions'
+module RubyProxy
+	class ProxyGlobalSet
+		MAGIC_GLOBAL = [ "$:", "$!", "$@", "$_", "$.", "$&", "$~", "$n", "$=", "$/", "$0", "$*", "$$", "$?" ]
+		class <<self
+			def set(arg,value)
+				arg = convert_to_global(arg)
+				Logger.info "global set: #{arg} = #{value}"
+				eval("#{arg} = #{value}")
+			end
+
+			def get(arg)
+				arg = convert_to_global(arg)
+				Logger.info "global get: #{arg}"
+				eval(arg)
+			end
+
+			private
+			def convert_to_global(arg)
+				check_format(arg)
+				add_dollar_if_noexist(arg)
+			end
+
+			def check_format(arg)
+				if !MAGIC_GLOBAL.include?(arg) and ! arg.match(/^\$?[a-zA-Z_]{1}[a-zA-Z_0-9]*$/)
+					raise GlobalVarFormatError,"global variable format wrong: #{arg}"
+				end
+			end
+
+			def add_dollar_if_noexist(arg)
+				arg = "$" + arg unless arg.match(/^\$/)
+				arg
+			end
+		end
+	end
+end

data/lib/ruby_proxy/proxy_load.rb

@@ -1,9 +1,6 @@
 require 'logger'
 module RubyProxy
   class ProxyLoad
-    @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::ERROR
-    #~ @@logger.info $:.join(':')
     @load_path = []
     class <<self
       attr_accessor :load_path
@@ -20,10 +17,10 @@ module RubyProxy
       end
       
       def load_file(file)
-        @@logger.debug "require file : #{file}"
+        Logger.debug "require file : #{file}"
         require file
       rescue LoadError=>e
-        @@logger.warn "require file : #{file} fail,exception:\n#{e}"
+        Logger.warn "require file : #{file} fail,exception:\n#{e}"
         raise 
       end
     end

data/lib/ruby_proxy/version.rb

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

data/unittests/test_atu_require.rb

@@ -0,0 +1,15 @@
+require 'setup'
+
+RubyProxy::Config.command = "/home/windy/.rvm/rubies/jruby-1.6.7/bin/ruby"
+
+class TestAtuLoad < Test::Unit::TestCase
+	def test_load_ok
+		assert_nothing_raised {
+			ATU.require 'support/atu/hello.rb'
+		}
+	end
+
+	def test_load_noexist
+		assert_raise(LoadError) { ATU.require 'noexist' }
+	end
+end

data/unittests/test_config.rb

@@ -9,7 +9,6 @@ class TestConfig < Test::Unit::TestCase
   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
@@ -17,8 +16,10 @@ class TestConfig < Test::Unit::TestCase
     assert_equal(1111, @config.port)
 		@config.ip = '1.1.1.1'
     assert_equal('1.1.1.1', @config.ip)
+		old_command = @config.command
 		@config.command = 'ruby'
     assert_equal('ruby', @config.command)
+		@config.command = old_command
   end
   
 end

data/unittests/test_drb_proxy.rb

@@ -80,11 +80,6 @@ class TestDrbProxy < Test::Unit::TestCase
 		end
 	end
 	
-	#~ 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"))
@@ -106,10 +101,10 @@ class TestDrbProxy < Test::Unit::TestCase
   # 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.b() {|i| i})
-  end
+  #def test_block_ok
+  #  a = ATU::M1::Hello6.new
+  #  assert_equal(1,a.b() {|i| i})
+  #end
 
 	def test_file_path
 		assert_equal([__FILE__],ATU::M1::Hello6.a(__FILE__))
@@ -128,4 +123,4 @@ class TestDrbProxy < Test::Unit::TestCase
 		assert_equal("normal",hello7.normal)
 	end
 	
-end
+end

data/unittests/test_gloabal_var.rb

@@ -0,0 +1,20 @@
+require 'setup'
+
+class TestGlobalVar < Test::Unit::TestCase
+	def test_global_get_ok
+		assert_equal(ATU["$LOAD_PATH"], ATU["LOAD_PATH"])
+	end
+
+	def test_global_get_noexist
+		assert_equal(nil, ATU["NO"])
+	end
+
+	def test_global_get_format_error
+		assert_raise(RubyProxy::GlobalVarFormatError) { ATU["12345"] }
+	end
+
+	def test_global_set_ok
+		ATU["HELLO"] = 10
+		assert_equal(10, ATU["HELLO"])
+	end
+end

metadata

@@ -1,77 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruby-proxy
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - yafei Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+
+date: 2012-04-21 00:00:00 Z
 dependencies: []
+
 description: Ruby Proxy for two or more ruby processes.
 email: lyfi2003@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/ruby_proxy/config.rb
 - lib/ruby_proxy/client.rb
 - lib/ruby_proxy/exceptions.rb
 - lib/ruby_proxy/proxy_load.rb
+- lib/ruby_proxy/proxy_global_set.rb
 - lib/ruby_proxy/server.rb
 - lib/ruby_proxy/version.rb
 - lib/ruby_proxy/proxy.rb
+- lib/ruby_proxy/logger.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/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_sikuli_api.rb
+- unittests/test_atu_require.rb
 - 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Proxy for two or more ruby processes.
-test_files:
+test_files: 
 - unittests/test_drb_proxy.rb
-- unittests/your_jruby_sikuli_config_ok.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_sikuli_api.rb
+- unittests/test_atu_require.rb
 - unittests/setup.rb

data/lib/atu/key.rb

@@ -1,218 +0,0 @@
-require 'java'
-require 'iconv'
-#require 'drb'
-java_import 'java.awt.event.InputEvent'
-class String
-  def to_unicode
-    begin
-      Iconv.iconv("UNICODEBIG//", "utf-8", self)[0]
-    rescue Exception
-      puts $!.class
-      puts $!.message
-      self
-    end
-  end
-end
-
-module ATU
-##
-# The Shift key modifier constant.
-# This equals to java.awt.event.InputEvent.SHIFT_MASK.
-  KEY_SHIFT = InputEvent::SHIFT_MASK
-##
-# The Ctrl key modifier constant.
-# This equals to java.awt.event.InputEvent.CTRL_MASK.
-  KEY_CTRL = InputEvent::CTRL_MASK
-##
-# The Meta/Windows/Apple key modifier constant.
-# This equals to java.awt.event.InputEvent.META_MASK.
-  KEY_META = InputEvent::META_MASK
-##
-# The Apple(Command) key modifier constant.
-# This equals to java.awt.event.InputEvent.META_MASK.
-  KEY_CMD = InputEvent::META_MASK
-##
-# The Windows key modifier constant.
-# This equals to java.awt.event.InputEvent.META_MASK.
-  KEY_WIN = InputEvent::META_MASK
-##
-# The Alt key modifier constant.
-# This equals to java.awt.event.InputEvent.ALT_MASK.
-  KEY_ALT = InputEvent::ALT_MASK
-
-##
-# class Key contains the constants of all special keys.
-  class Key
-    include DRb::DRbUndumped
-    ##
-    # ENTER
-    ENTER = "\n"
-    ##
-    # BACKSPACE
-    BACKSPACE = "\b"
-    ##
-    # TAB
-    TAB = "\t"
-    ##
-    # ESC
-    ESC = "\u001b".to_unicode
-    ##
-    # UP
-    UP = "\ue000".to_unicode
-    ##
-    # RIGHT
-    RIGHT = "\ue001".to_unicode
-    ##
-    # DOWN
-    DOWN = "\ue002".to_unicode
-    ##
-    # LEFT
-    LEFT = "\ue003".to_unicode
-    ##
-    # PAGE_UP
-    PAGE_UP = "\ue004".to_unicode
-    ##
-    # PAGE_DOWN
-    PAGE_DOWN = "\ue005".to_unicode
-    ##
-    # DELETE
-    DELETE = "\ue006".to_unicode
-    ##
-    # END
-    KEY_END = "\ue007".to_unicode
-    ##
-    # HOME
-    HOME = "\ue008".to_unicode
-    ##
-    # INSERT
-    INSERT = "\ue009".to_unicode
-    ##
-    # F1
-    F1 = "\ue011".to_unicode
-    ##
-    # F2
-    F2 = "\ue012".to_unicode
-    ##
-    # F3
-    F3 = "\ue013".to_unicode
-    ##
-    # F4
-    F4 = "\ue014".to_unicode
-    ##
-    # F5
-    F5 = "\ue015".to_unicode
-    ##
-    # F6
-    F6 = "\ue016".to_unicode
-    ##
-    # F7
-    F7 = "\ue017".to_unicode
-    ##
-    # F8
-    F8 = "\ue018".to_unicode
-    ##
-    # F9
-    F9 = "\ue019".to_unicode
-    ##
-    # F10
-    F10 = "\ue01A".to_unicode
-    ##
-    # F11
-    F11 = "\ue01B".to_unicode
-    ##
-    # F12
-    F12 = "\ue01C".to_unicode
-    ##
-    # F13
-    F13 = "\ue01D".to_unicode
-    ##
-    # F14
-    F14 = "\ue01E".to_unicode
-    ##
-    # F15
-    F15 = "\ue01F".to_unicode
-    ##
-    # SHIFT
-    SHIFT = "\ue020".to_unicode
-    ##
-    # CTRL
-    CTRL = "\ue021".to_unicode
-    ##
-    # ALT
-    ALT = "\ue022".to_unicode
-    ##
-    # META
-    META = "\ue023".to_unicode
-    ##
-    # META
-    CMD = "\ue023".to_unicode
-    ##
-    # META
-    WIN = "\ue023".to_unicode
-
-    ##
-    # PRINTSCREEN
-    PRINTSCREEN = "\ue024".to_unicode
-    ##
-    # SCROLL_LOCK
-    SCROLL_LOCK = "\ue025".to_unicode
-    ##
-    # PAUSE
-    PAUSE = "\ue026".to_unicode
-    ##
-    # CAPS_LOCK
-    CAPS_LOCK = "\ue027".to_unicode
-
-    ##
-    # NUM0
-    NUM0 = "\ue030".to_unicode
-    ##
-    # NUM1
-    NUM1 = "\ue031".to_unicode
-    ##
-    # NUM2
-    NUM2 = "\ue032".to_unicode
-    ##
-    # NUM3
-    NUM3 = "\ue033".to_unicode
-    ##
-    # NUM4
-    NUM4 = "\ue034".to_unicode
-    ##
-    # NUM5
-    NUM5 = "\ue035".to_unicode
-    ##
-    # NUM6
-    NUM6 = "\ue036".to_unicode
-    ##
-    # NUM7
-    NUM7 = "\ue037".to_unicode
-    ##
-    # NUM8
-    NUM8 = "\ue038".to_unicode
-    ##
-    # NUM9
-    NUM9 = "\ue039".to_unicode
-    ##
-    # SEPARATOR (numpad)
-    SEPARATOR = "\ue03A".to_unicode
-    ##
-    # NUM_LOCK
-    NUM_LOCK = "\ue03B".to_unicode
-    ##
-    # ADD (numpad)
-    ADD = "\ue03C".to_unicode
-    ##
-    # MINUS (numpad)
-    MINUS = "\ue03D".to_unicode
-    ##
-    # MULTIPLY (numpad)
-    MULTIPLY = "\ue03E".to_unicode
-    ##
-    # DIVIDE (numpad)
-    DIVIDE = "\ue03F".to_unicode
-  end
-end
-
-if __FILE__ == $0
-end

data/lib/atu/sikuli.rb

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'java'
-#$CLASSPATH << "/Applications/Sikuli-IDE.app/Contents/Resources/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 "atu/sikuli-script.jar"
-
-
-
-#~ include Java
-module ATU
-  module Sikuli
-    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
-  end
-  class Java::OrgSikuliScript::Region
-    alias old_paste paste
-    def paste(*args)
-	  len = args.length
-	  if len == 1
-	    old_paste(nil,java.lang.String.new(args[0].to_java_bytes,"utf-8"))
-	  elsif  len== 2
-	    old_paste(args[0],java.lang.String.new(args[1].to_java_bytes,"utf-8"))
-	  end
-	end
-  end
-  #Sikuli = Java::OrgSikuliScript
-end
-if __FILE__ == $0
-  puts ATU::Sikuli
-  @region = ATU::Sikuli::Region.new(0, 0, 1440, 900)
-  puts @region.class
-  puts ATU::Sikuli::C.new.class
-end

data/unittests/test_sikuli_api.rb

@@ -1,33 +0,0 @@
-require 'setup'
-
-class TestSikuliApi < Test::Unit::TestCase
-	@@image_path = nil
-	def setup
-		@@image_path ||= File.join(__FILE__,'..','support','image')
-	end
-	def test_sikuli_module
-		screen = ATU::Sikuli::Screen.new
-		assert_equal(0,screen.x)
-		assert_equal(0,screen.y)
-		assert_equal(true,screen.w > 0)
-		assert_equal(true,screen.h > 0)
-	end
-	
-	def test_screen_click
-		#region = ATU::Sikuli::Region.new(0,0,1440,900)
-		region = ATU::Sikuli::Screen.new
-		assert_equal(0,region.x)
-		assert_equal(0,region.y)
-		assert_equal(true,File.exist?(File.join(@@image_path,"start.png")))
-		region.click(File.expand_path(File.join(@@image_path, "start.png")),0)
-		assert_nothing_raised do 
-			region.wait(File.expand_path(File.join(@@image_path,"search.png")),10)
-		end
-		#~ region.type(ATU::Key.ESC)
-		#~ assert_nothing_raised do
-			#~ region.waitVanish(File.expand_path(File.join(@@image_path,"search.png")),10)
-		#~ end
-	end
-	
-	
-end

data/unittests/your_jruby_sikuli_config_ok.rb

@@ -1,26 +0,0 @@
-require 'setup'
-require 'atu/sikuli'
-class TestSikuliApi < Test::Unit::TestCase
-	@@image_path = nil
-	def setup
-		@@image_path ||= File.join(__FILE__,'..','support','image')
-	end
-	def test_sikuli_module
-		screen = ATU::Sikuli::Screen.new
-		assert_equal(0,screen.x)
-		assert_equal(0,screen.y)
-		assert_equal(true,screen.w > 0)
-		assert_equal(true,screen.h > 0)
-	end
-	
-	def test_region_offen_used
-		region = ATU::Sikuli::Region.new(0,0,1440,900)
-		assert_equal(0,region.x)
-		assert_equal(0,region.y)
-		assert_equal(true,File.exist?(File.join(@@image_path,"start.png")))
-		region.click(File.join(@@image_path, "start.png"),0)
-		puts region.wait(File.join(@@image_path,"search.png"),10)
-	end
-	
-	
-end