Ruby4Skype 0.2.2 → 0.2.3

data/lib/skypeapi/user.rb

@@ -10,10 +10,10 @@ module SkypeAPI
       end
       getter :Sex, 'SEX'
       getter :Language, 'LANGUAGE' do |str|
-        str.empty? ? ['',''] : str.split(' ',2)
+        str.empty? ? str : str.split(' ',2)[0]
       end
       getter :Country, 'COUNTRY' do |str|
-        str.empty? ? ['',''] : str.split(' ',2)
+        str.empty? ? str : str.split(' ',2)[0]
       end
       getter :Province, 'PROVINCE'
       getter :City, 'CITY'
@@ -32,7 +32,7 @@ module SkypeAPI
         str._flag
       end
       getter :BuddyStatus, 'BUDDYSTATUS' do |str|
-        str._int
+        str.to_i
       end
       getter :IsAuthorized, 'ISAUTHORIZED' do |str|
         str._flag
@@ -50,7 +50,7 @@ module SkypeAPI
         str._flag
       end
       getter :SpeedDial, 'SPEEDDIAL' do |str|
-        str._int
+        str#._int
       end
       getter :ReceivedAuthRequest, 'RECEIVEDAUTHREQUEST'
       getter :MoodText, 'MOOD_TEXT'
@@ -68,31 +68,31 @@ module SkypeAPI
       getter :DisplayName, 'DISPLAYNAME'
       
       def getAvatar(filePath)
-        sendCMD("GET USER #{@id} AVATAR 1 #{filePath}") =~ /^USER #{@id} AVATAR \d+ (.+)$/
-        if $1
-          return $1
-        else
+        invoke("GET USER #{@id} AVATAR 1 #{filePath}") =~ /^USER #{@id} AVATAR \d+ (.+)$/
+        #if $1
+        #  return $1
+        #else
           return nil
-        end
+        #end
       end
       notice :Avatar, 'AVATAR 1'
       
       def setBuddyStatus(statusCode, msg="")
         raise ArgumentErorr unless statusCode.to_i == 1 or statusCode.to_i == 2
-        sendSet('BUDDYSTATUS',"#{statusCode} #{msg}")
+        invoke_set('BUDDYSTATUS',"#{statusCode} #{msg}")
       end
       
-      def setIsBlocked(flag) sendSet('ISBLOCKED', flag._str); end
-      
-      def setIsAuthorized(flag) sendSet('ISAUTHORIZED', flag._str); end
+      def setIsBlocked(flag) invoke_set('ISBLOCKED', flag._str); end
       
-      def setSpeedDial(numbers) sendSet('SPEEDDIAL', numbers); end
+      def setIsAuthorized(flag) invoke_set('ISAUTHORIZED', flag._str); end
       
-      def setDisplayName(name) sendSet('DISPLAYNAME', name);end
+      def setSpeedDial(numbers) invoke_set('SPEEDDIAL', numbers); end
       
-=begin
+      def setDisplayName(name) invoke_set('DISPLAYNAME', name);end
+
+
       def addContactList msg=""
-        val = sendSet("BUDDYSTATUS","2 #{msg}")
+        val = invoke_set("BUDDYSTATUS","2 #{msg}")
         val == 2 or val == 3
       end
             
@@ -102,9 +102,8 @@ module SkypeAPI
       end
       
       def delContactList
-        sendSet("BUDDYSTATUS","1") == 1
+        invoke_set("BUDDYSTATUS","1") == 1
       end
-=end
     end
   end
 end

data/lib/skypeapi/version.rb

@@ -2,8 +2,12 @@ module SkypeAPI
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
+    
+    def self.to_s
+      STRING
+    end
   end
-end
+end

data/lib/skypeapi/voicemail.rb

@@ -4,11 +4,11 @@ module SkypeAPI
       OBJECT_NAME = "VOICEMAIL"
       
       def self.create target
-        @@skypeApi.sendCMD "CALLVOICEMAIL #{target}"
+        @@skypeApi.invoke "CALLVOICEMAIL #{target}"
       end
       
       def self.open id
-        @@skypeApi.sendCMD "OPEN VOICEMAIL #{id}"
+        @@skypeApi.invoke "OPEN VOICEMAIL #{id}"
       end
       
       getter :Type, 'TYPE'
@@ -30,29 +30,29 @@ module SkypeAPI
       end
       
       #def alter action
-      #  @@skypeApi.sendCMD "ALTER VOICEMAIL #{id} #{action}"
+      #  @@skypeApi.invoke "ALTER VOICEMAIL #{id} #{action}"
       #end
       
       def startPlayback
-        sendAlter "STARTPLAYBACK"
+        invoke_alter "STARTPLAYBACK"
       end
       def stopPlayback
-        sendAlter "STOPPLAYBACK"
+        invoke_alter "STOPPLAYBACK"
       end
       def upload
-        sendAlter "UPLOAD"
+        invoke_alter "UPLOAD"
       end
       def download
-        sendAlter "DOWNLOAD"
+        invoke_alter "DOWNLOAD"
       end
       def startRecording
-        sendAlter "STARTRECORDING"
+        invoke_alter "STARTRECORDING"
       end
       def stopRecording
-        sendAlter "STOPRECORDING"
+        invoke_alter "STOPRECORDING"
       end
       def delete
-        sendAlter "DELETE"
+        invoke_alter "DELETE"
       end
 
     end

data/lib/skypeapi.rb

@@ -1,6 +1,5 @@
 require "forwardable.rb"
-require "skypeApi/os.rb"
-require "skypeapi/shareFunctions.rb"
+require "skypeapi/sharefunctions.rb"
 require "skypeapi/object.rb"
 require "skypeapi/version.rb"
 require "skypeapi/user.rb"
@@ -17,12 +16,10 @@ require "skypeapi/group.rb"
 require "skypeapi/filetransfer.rb"
 require "skypeapi/event.rb"
 require "skypeapi/menuitem.rb"
+require "skypeapi/os/etc.rb"
 
 class SkypeAPIError < StandardError
   class Attach < SkypeAPIError; end
-  class Connct < SkypeAPIError; end
-  class Reconnect < SkypeAPIError; end
-  class TimeOut < SkypeAPIError; end
   class API < SkypeAPIError; end
   class NotImprement < SkypeAPIError; end
 end
@@ -39,44 +36,53 @@ module SkypeAPI
   def self.init os=RUBY_PLATFORM.downcase
     unless @inited
       case os
-      when /mswin(?!ce)|mingw|cygwin|bccwin/
+      when /(mswin(?!ce))|(mingw)|(cygwin)|(bccwin)/
+        require 'skypeapi/os/windows.rb'
         @os = SkypeAPI::OS::Windows.new
-      when /(mac)/
+      when /(mac)|(darwin)/
+        require 'skypeapi/os/mac.rb'
         @os = SkypeAPI::OS::Mac.new
       when /(linux)/
+        require 'skypeapi/os/linux.rb'
         @os = SkypeAPI::OS::Linux.new
       else
         raise SkypeAPIError::NotImplementError,"#{os} is unknown or not support OS"
       end
       
-      #SkypeAPI�̓��W���[���̂��߂ɁA�f���Q�[�^�[�ŃN���X���\�b�h�Ƃ��Ē�`�B
-      #SkypeAPI�����̃��\�b�h�͑S�ăN���X���\�b�h�Ȃ̂ŃA�N�Z�X�”\.
+      #SkypeAPI縺ｯ繝｢繧ｸ繝･繝ｼ繝ｫ縺ｮ縺溘ａ縺ｫ縲√ョ繝ｪ繧ｲ繝ｼ繧ｿ繝ｼ縺ｧ繧ｯ繝ｩ繧ｹ繝｡繧ｽ繝・ラ縺ｨ縺励※螳夂ｾｩ縲・
+      #SkypeAPI逶ｴ荳九・繝｡繧ｽ繝・ラ縺ｯ蜈ｨ縺ｦ繧ｯ繝ｩ繧ｹ繝｡繧ｽ繝・ラ縺ｪ縺ｮ縺ｧ繧｢繧ｯ繧ｻ繧ｹ蜿ｯ閭ｽ.
       self.class.extend Forwardable
       self.class.def_delegators(:@os,
-        :sendCMD,
-        :setEvent,
-        :addEvent,
-        :delEvent,
-        :replaceEvent,
-        :getEventm,
-        :existEvent?,
+        :invoke,
+        :add_event,
+        :del_event,
+        :get_event,
+        :exist_event?,
         :attach,
-        :attachWait,
+        :attach_wait,
         :polling,
         :wait,
         :close
       )
+      class << self
+        alias addEvent add_event
+        alias setEvent add_event
+        alias delEvent del_event
+        alias getEvent get_event
+        alias existEvent? exist_event?
+        alias attachWait attach_wait
+      end
       
-      #�O���p�B
+      #螟門・逕ｨ縲・
       #self.class.__send__(:define_method, :os, Proc.new{@os})
       
       @notify = Hash.new
-      @os.addNotify nil, method(:notified)
+      @os.add_notify nil, method(:notified)
       objectsInit
       
       @inited = true
     else
-      raise SkypeAPIErrorm,'init at onece'
+      #raise SkypeAPIError,'init at onece'
     end
   end
   
@@ -116,7 +122,7 @@ module SkypeAPI
   
   def self.objectsInit
     [User,Profile,Call,Message,Chat,ChatMessage,ChatMember,VoiceMail,SMS,Application,Group,FileTransfer,Event,MenuItem].each do |klass|
-      @os.addNotify /^#{klass::OBJECT_NAME} (.+)$/m, klass.method(:notified)
+      @os.add_notify /^#{klass::OBJECT_NAME} (.+)$/m, klass.method(:notified)
     end
   end
   
@@ -184,9 +190,9 @@ module SkypeAPI
   
   getter :UserStatus, 'USERSTATUS'
   
-  def self.setUserStatus(status) sendSet "USERSTATUS", status ; end
+  def self.setUserStatus(status) invoke_set "USERSTATUS", status ; end
   
-  def self.getPrivilege(privilege) sendGet("PRIVILEGE #{privilege}")._flag ; end
+  def self.getPrivilege(privilege) invoke_get("PRIVILEGE #{privilege}")._flag ; end
   notice :Privilege, 'PRIVILEGE'
   # privilege SkypeOut | SkypeIn | VoiceMail
   
@@ -196,33 +202,33 @@ module SkypeAPI
   
   getter :AudioIn, 'AUDIO_IN'
   
-  def self.setAudioIn(device) sendSet "AUDIO_IN", device ; end  
+  def self.setAudioIn(device) invoke_set "AUDIO_IN", device ; end  
   
   getter :AudioOut, 'AUDIO_OUT'
   
-  def self.setAudioOut(device) sendSet "AUDIO_OUT", device ; end
+  def self.setAudioOut(device) invoke_set "AUDIO_OUT", device ; end
   
   getter :Ringer, 'RINGER'
   
-  def self.setRinger(device) sendSet("RINGER", device) ; end
+  def self.setRinger(device) invoke_set("RINGER", device) ; end
   
   getter :Mute, 'MUTE' do |str|
     str._flag
   end
   
-  def self.setMute(flag) sendSet("MUTE", flag._swi) ; end
+  def self.setMute(flag) invoke_set("MUTE", flag._swi) ;end
   
-  def self.getAvatar(filePath, num=1) sendGet("AVATAR #{num} #{filePath}") ; end
+  def self.getAvatar(filePath, num=1) invoke_get("AVATAR #{num} #{filePath}") ; end
   notice :Avator, 'AVATOR'
   #?
   
   def self.setAvatar(filePath, idx="", num=1)
-    sendSet("AVATAR", "#{num} #{filePath}#{idx.empty? ? '' : ':'+idx.to_s}").split(' ')[1]
+    invoke_set("AVATAR", "#{num} #{filePath}#{idx.empty? ? '' : ':'+idx.to_s}").split(' ')[1]
   end
   
-  def self.getRingtone(id=1) sendGet("RINGTONE #{id}") ; end
+  def self.getRingtone(id=1) invoke_get("RINGTONE #{id}") ; end
   
-  def self.setRingtone(filePath, idx="", id=1) sendSet("RINGTONE","#{id} #{filePath}:#{idx}") ; end
+  def self.setRingtone(filePath, idx="", id=1) invoke_set("RINGTONE","#{id} #{filePath}:#{idx}") ; end
   
   notice :Ringtone, "RINGTONE 1" do |str|
     num, file = str.split(' ',2)
@@ -231,7 +237,7 @@ module SkypeAPI
   #?
   
   def self.getRingtoneStatus(id=1)
-    sendCMD("GET RINGTONE #{id} STATUS") =~ /RINGTONE #{id} ((ON)|(OFF))/
+    invoke("GET RINGTONE #{id} STATUS") =~ /RINGTONE #{id} ((ON)|(OFF))/
     $2._flag
   end
   
@@ -241,7 +247,7 @@ module SkypeAPI
   #?
   
   def self.setRingtoneStatus(flag, id=1)
-    sendCMD("SET RINGTONE #{id} STATUS #{flag._swi}") =~ /RINGTONE #{id} ((ON)|(OFF))/
+    invoke("SET RINGTONE #{id} STATUS #{flag._swi}") =~ /RINGTONE #{id} ((ON)|(OFF))/
     $2._flag
   end
     
@@ -249,52 +255,52 @@ module SkypeAPI
     str._flag
   end
   
-  def self.setPCSpeaker(flag) sendSet("PCSPEAKER", flag._swi) ; end
+  def self.setPCSpeaker(flag) invoke_set("PCSPEAKER", flag._swi) ; end
   
   getter :AGC, 'AGC' do |str|
     str._flag
   end
   
-  def self.setAGC(flag) sendSet("AGC", flag._swi) ; end
+  def self.setAGC(flag) invoke_set("AGC", flag._swi) ; end
   
   getter :AEC, 'AEC' do |str|
     str._flag
   end
   
-  def self.setAEC(flag) sendSet("AEC", flag._swi) ; end
+  def self.setAEC(flag) invoke_set("AEC", flag._swi) ; end
   
-  def self.resetIdleTimer() sendCMD("RESETIDLETIMER") == "RESETIDLETIMER" ; end
+  def self.resetIdleTimer() invoke("RESETIDLETIMER") == "RESETIDLETIMER" ; end
   notice :ResetIdleTimer, 'RESETIDLETIMER' #?
   
   getter :AutoAway ,'AUTOAWAY' do |str|
       str._flag
   end
   
-  def self.setAutoAway(flag) sendSet('AUTOAWAY', flag._swi) ; end
+  def self.setAutoAway(flag) invoke_set('AUTOAWAY', flag._swi) ; end
   
   getter :VideoIn, 'VIDEO_IN'
   
-  def self.setVideoIn(device) sendSet("VIDEO_IN", device) ; end
+  def self.setVideoIn(device) invoke_set("VIDEO_IN", device) ; end
   
   def self.ping waitLimit=nil
     if waitLimit
-      sendBlock "PING", waitLimit
+      invoke_block "PING", waitLimit
     else
-      sendCMD("PING") == "PONG"
+      invoke("PING") == "PONG"
     end
   end
   
   #UserInterFace
-  def self.focus() sendCMD('FOCUS') == 'FOCUS' ; end
+  def self.focus() invoke('FOCUS') == 'FOCUS' ; end
   
-  def self.minimize() sendCMD('MINIMIZE') == 'MINIMIZE' ; end
+  def self.minimize() invoke('MINIMIZE') == 'MINIMIZE' ; end
   
   getter :WindowState, 'WINDOWSTATE'
   
-  def self.setWindowState(state) sendSet("WINDOWSTATE", state); end
+  def self.setWindowState(state) invoke_set("WINDOWSTATE", state); end
   
   def self.open prop, *value
-    "OPEN #{prop} #{value.join(' ')}".rstrip == sendCMD("OPEN #{prop} #{value.join(' ')}")
+    "OPEN #{prop} #{value.join(' ')}".rstrip == invoke("OPEN #{prop} #{value.join(' ')}".rstrip)
   end
   
   def self.openVideoTest id=''
@@ -317,7 +323,7 @@ module SkypeAPI
     open 'CHAT', chat
   end
   
-  def self.openFileTransfer users, path=nil
+  def self.openFileTransfer path=nil, *users
     open 'FILETRANSFER', "#{users.join(', ')}",path ? "IN #{path}" : ''
   end
   
@@ -378,32 +384,36 @@ module SkypeAPI
   end
   
   def self.BTNPressed key
-    sendEcho "BTN_PRESSED #{key}"
+    invoke_echo "BTN_PRESSED #{key}"
   end
   
   def self.BTNReleased key
-    sendEcho "BTN_RELEASED #{key}"
+    invoke_echo "BTN_RELEASED #{key}"
   end
   
-  getter :ContactsFocused, 'CONTACTS FOCUSED' do |str|
+  getter :ContactsFocused, 'CONTACTS_FOCUSED' do |str|
     user str
   end
   #nitify?
   
   getter :UILanguage, 'UI_LANGUAGE'
   
-  def self.setUILanguage(lang) sendSet("UI_LANGUAGE", lang); end
+  def self.setUILanguage(lang) invoke_set("UI_LANGUAGE", lang); end
   
   getter :WallPaper, 'WALLPAPER'
   
-  def self.setWallPaper(filePath) sendSet('WALLPAPER', filePath) ; end
+  def self.setWallPaper(filePath) invoke_set('WALLPAPER', filePath) ; end
   
-  def self.setSilentMode(flag) sendSet('SILENT_MODE', flag._swi)._flag ; end
+  getter :SilentMode, 'SILENT_MODE' do |str|
+    str._flag
+  end
+  
+  def self.setSilentMode(flag) invoke_set('SILENT_MODE', flag._swi) ; end
   
   #Search
   
   def self.search prop, preffix=prop, val=''
-    ret = sendCMD "SEARCH #{prop} #{val}"
+    ret = invoke "SEARCH #{prop} #{val}"
     ret =~ /^#{preffix} (.+)$/
     if $1
       $1.split(', ')
@@ -546,12 +556,12 @@ module SkypeAPI
   
   #History
   
-  def self.clearChatHistory() sendCMD('CLEAR CHATHISTORY') == 'CLEAR CHATHISTORY' ; end 
+  def self.clearChatHistory() invoke('CLEAR CHATHISTORY') == 'CLEAR CHATHISTORY' ; end 
   
-  def self.clearVoicemailHistory() sendCMD('CLEAR VOICEMAILHISTORY') == 'CLEAR VOICEMAILHISTORY' ; end
+  def self.clearVoiceMailHistory() invoke('CLEAR VOICEMAILHISTORY') == 'CLEAR VOICEMAILHISTORY' ; end
   
   def self.clearCallHistory(type, handle='')
-    sendCMD("CLEAR CALLHISTORY #{type} #{handle}") == "CLEAR CALLHISTORY #{type} #{handle}".rstrip
+    invoke("CLEAR CALLHISTORY #{type} #{handle}") == "CLEAR CALLHISTORY #{type} #{handle}".rstrip
   end
   
   notice :CallHistoryChanged, 'CALLHISTORYCHANGED'
@@ -568,4 +578,3 @@ module SkypeAPI
   #  return A2AEx.new(appName,self)
   #end
 end
-

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: Ruby4Skype
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2008-02-07 00:00:00 +09:00
-summary: SkypeAPI wrapper
-require_paths: 
-- lib
-email: bopper@kf7.so-net.ne.jp
-homepage: http://rubyforge.org/projects/skyperapper/
-rubyforge_project: Ruby4Skype
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - bopper
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-01-08 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: 
+email: bopper@kf7.so-net.ne.jp
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - lib/skypeapi
 - lib/skypeapi/application.rb
@@ -41,7 +34,12 @@ files:
 - lib/skypeapi/menuitem.rb
 - lib/skypeapi/message.rb
 - lib/skypeapi/object.rb
-- lib/skypeapi/os.rb
+- lib/skypeapi/os
+- lib/skypeapi/os/etc.rb
+- lib/skypeapi/os/linux.rb
+- lib/skypeapi/os/mac.rb
+- lib/skypeapi/os/timer.rb
+- lib/skypeapi/os/windows.rb
 - lib/skypeapi/profile.rb
 - lib/skypeapi/sharefunctions.rb
 - lib/skypeapi/sms.rb
@@ -49,17 +47,31 @@ files:
 - lib/skypeapi/version.rb
 - lib/skypeapi/voicemail.rb
 - lib/skypeapi.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://rubyforge.org/projects/skyperapper/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
 
-requirements: 
-- swin
-dependencies: []
+rubyforge_project: Ruby4Skype
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: SkypeAPI wrapper
+test_files: []