rb-skypemac 0.3.0 → 0.3.2

data/lib/rb-skypemac/call.rb

@@ -11,14 +11,16 @@ module SkypeMac
     
     attr :call_id
   
-    def Call.active_call_ids
-      r = Skype.send_ :command => "SEARCH ACTIVECALLS"
-      r.gsub(/CALLS /, "").split(", ")      
-    end
+    class << self
+      def Call.active_call_ids
+        r = Skype.send_ :command => "SEARCH ACTIVECALLS"
+        r.gsub(/CALLS /, "").split(", ")      
+      end
 
-    def Call.active_calls
-      calls = Call.active_call_ids.collect { |id| Call.new id unless id == "COMMAND_PENDING"}
-      calls
+      def Call.active_calls
+        calls = Call.active_call_ids.collect { |id| Call.new id unless id == "COMMAND_PENDING"}
+        calls
+      end
     end
 
     # Creates a Call object from a call_id.
@@ -28,9 +30,12 @@ module SkypeMac
     end
   
     # Attempts to hang up a call. <b>Note</b>: If Skype hangs while placing the call, this method could hang indefinitely.
-    # <u>Use Skype#Call instead of this method unless you like memory leaks</u>
+    # <u>Use Skype#Call instead of this method unless you like memory leaks</u>.  
+    # Raises SkypeError if an error is reported from the Skype API
     def hangup
-      Skype.send_ :command => "set call #{@call_id} status finished"
+      s = Skype.send_ :command => "set call #{@call_id} status finished"
+      raise SkypeError("Error occurred on hangup: #{s.message}") if s =~ /ERROR/
+      s
     end
   
     # Retrieves the status of the current call.<br>

data/lib/rb-skypemac/group.rb

@@ -8,17 +8,31 @@ module SkypeMac
   class Group
     attr_reader :gtype, :gid
     
-    # Gets the type of a group by id
-    def Group.get_type(id)
-      r = Skype.send_ :command => "get group #{id} type"
-      r.sub(/.*TYPE\b/, "").strip
-    end
+    class << self
+      # Gets the type of a group by id
+      def get_type(id)
+        r = Skype.send_ :command => "get group #{id} type"
+        r.sub(/.*TYPE\b/, "").strip
+      end
 
-    # Returns an array of your Skype instance's supported group types
-    def Group.types
-      groups = Group.groups
-      groups.map { |g| g.gtype }
-    end  
+      # Returns an array of your Skype instance's supported group types
+      def types
+        groups = Group.groups
+        groups.map { |g| g.gtype }
+      end  
+
+      # Returns hash of symols (group types) => Group objects
+      def groups
+        r = Skype.send_ :command => "search groups hardwired", :script_name => ""
+        r.gsub!(/^\D+/, "")
+        group_ids = r.split ", "
+        groups = []
+        group_ids.each do |id|
+          groups <<  Group.new(id, Group.get_type(id))
+        end
+        groups
+      end
+    end
   
     # Returns array of skype names of users in this group
     def member_user_names
@@ -31,17 +45,7 @@ module SkypeMac
       member_user_names.map { |h| User.new h }
     end
 
-    # Returns hash of symols (group types) => Group objects
-    def Group.groups
-      r = Skype.send_ :command => "search groups hardwired", :script_name => ""
-      r.gsub!(/^\D+/, "")
-      group_ids = r.split ", "
-      groups = []
-      group_ids.each do |id|
-        groups <<  Group.new(id, Group.get_type(id))
-      end
-      groups
-    end
+
     
     def <=>(grp)
       @gtype <=> grp.gtype

data/lib/rb-skypemac/skype.rb

@@ -5,93 +5,105 @@ include Appscript
 module SkypeMac  
 
   # Singleton for interfacing with Skype
-	class Skype
-	  @@groups = nil
+  class Skype     
+    @@groups = nil
     @@calls = []
 
-    # The Appscript interface to Skype.  Requires a Hash containing:
-    # (1) <i>:command</i> - the Skype API command to pass,
-    # (2) <i>:script_name</i> - unknown all though an empty String makes Skype happy.
-    # Impl adds <i>:script_name</i> to Hash and warns if it is not provided
-    def Skype.send_(params)
-      params[:script_name] = "" if not params.has_key? :script_name 
-      app('Skype').send_ params
-    end
+    class << self
+      # The Appscript interface to Skype.  Requires a Hash containing:
+      # (1) <i>:command</i> - the Skype API command to pass,
+      # (2) <i>:script_name</i> - unknown all though an empty String makes Skype happy.
+      # Impl adds <i>:script_name</i> to Hash and warns if it is not provided
+      def send_(params)
+        params[:script_name] = "" if not params.has_key? :script_name 
+        app('Skype').send_ params
+      end
 
-    # Initiates a Skype call
-	  def Skype.call(*person)
-      user_handles = person.collect { |u| user_str << ((u.is_a? User) ? u.handle : u) }
-      status = Skype.send_ :command => "call #{user_handles.join(', ')}"
-      if status =~ /CALL (\d+) STATUS/: @@calls << call = Call.new($1)
-      else raise RuntimeError.new("Call failed. Skype returned '#{status}'")
-      end        
-      call
-    end
+      # Initiates a Skype call
+  	  def call(*person)
+        user_handles = person.collect { |u| (u.is_a? User) ? u.handle : u }
+        status = Skype.send_ :command => "call #{user_handles.join(', ')}"
+        if status =~ /CALL (\d+) STATUS/: @@calls << call = Call.new($1)
+        else raise RuntimeError.new("Call failed. Skype returned '#{status}'")
+        end        
+        call
+      end
 
-    # Returns an Array of call IDs if there is an incoming Skype call otherwise nil
-    def Skype.incoming_calls
-      calls = Call.active_calls - @@calls
-      calls
-    end
+      # Returns an Array of Call IDs if there is an incoming Skype call otherwise nil
+      def incoming_calls
+        calls = Call.active_calls - @@calls
+        calls
+      end
     
-    # Answers a call given a skype call ID.  Returns an Array of Call objects.
-    def Skype.answer(call)
-      cmd = "ALTER CALL #{call.call_id} ANSWER"
-      r = Skype.send_ :command => cmd
-      raise RuntimeError("Failed to answer call.  Skype returned '#{r}'") unless r == cmd        
-      @@calls << call
-    end
+      # Answers a call given a skype Call ID.  Returns an Array of Call objects.
+      def answer(call)
+        cmd = "ALTER CALL #{call.call_id} ANSWER"
+        r = Skype.send_ :command => cmd
+        raise RuntimeError("Failed to answer call.  Skype returned '#{r}'") unless r == cmd        
+        @@calls << call
+      end
     
-    # Use this method to disconnect from a Call whether it was answered or iniiated locally.
-    def Skype.hangup(call)
-      call.hangup
-      @@calls.delete call
-    end
     
-    # Returns an Array of Group
-    def Skype.groups
-      @@groups = Group.groups if not @@groups
-      @@groups
-    end
+      # Use this method to disconnect from a Call whether it was answered or iniiated locally.
+      # Raises SkypeError if an error is reported from the Skype API
+      def hangup(call)
+        @@calls.delete call if call.hangup
+      end
     
-    # Returns Array of all users in Group.  Accepts types as defined by Group.types
-    def Skype.find_users_of_type(group_type)
-      Skype.groups.find { |g| g.gtype == group_type}.users
-    end
+      # Returns an Array of Group
+      def groups
+        @@groups = Group.groups if @@groups.nil? or @@groups.empty?
+        @@groups
+      end
+    
+      # Returns Array of all User in a particular Group type.  Accepts types as defined by Group.types
+      def find_users_of_type(group_type)
+        begin
+          Skype.groups.find { |g| g.gtype == group_type}.users
+        rescue Exception => e
+          puts e.message
+        end
+      end
 
-    # Returns an array of users online friends as User objects
-    def Skype.online_friends
-      Skype.find_users_of_type "ONLINE_FRIENDS"
-    end
+      # Returns an array of users online friends as User objects
+      def online_friends
+        Skype.find_users_of_type "ONLINE_FRIENDS"
+      end
     
-    # Array of all Users that are friends of the current user
-    def Skype.all_friends
-      Skype.find_users_of_type "ALL_FRIENDS"
-    end
+      # Array of all User that are friends of the current user
+      def all_friends
+        Skype.find_users_of_type "ALL_FRIENDS"
+      end
     
-    # Array of all Users defined as Skype Out users
-    def Skype.skypeout_friends
-      Skype.find_users_of_type "SKYPEOUT_FRIENDS"
-    end
+      # Array of all User defined as Skype Out users
+      def skypeout_friends
+        Skype.find_users_of_type "SKYPEOUT_FRIENDS"
+      end
     
-    # Array of all Users that the user knows
-    def Skype.all_users
-      Skype.find_users_of_type "ALL_USERS"
-    end
+      # Array of all User that the user knows
+      def all_users
+        Skype.find_users_of_type "ALL_USERS"
+      end
     
-    # Array of Users recently contacted by the user, friends or not
-    def Skype.recently_contacted_users
-      Skype.find_users_of_type "RECENTLY_CONTACTED_USERS"
-    end
+      # Array of User recently contacted by the user, friends or not
+      def recently_contacted_users
+        Skype.find_users_of_type "RECENTLY_CONTACTED_USERS"
+      end
     
-    # Array of Users waiting for authorization
-    def Skype.users_waiting_for_authorization
-      Skype.find_users_of_type "USERS_WAITING_MY_AUTHORIZATION"
-    end
+      # Array of User waiting for authorization
+      def users_waiting_for_authorization
+        Skype.find_users_of_type "USERS_WAITING_MY_AUTHORIZATION"
+      end
+    
+      # Array of User blocked
+      def blocked_users
+        Skype.find_users_of_type "USERS_BLOCKED_BY_ME"
+      end
     
-    # Array of Users blocked
-    def Skype.blocked_users
-      Skype.find_users_of_type "USERS_BLOCKED_BY_ME"
+      # Minimize the Skype window
+      def minimize
+        Skype.send_ :command => "MINIMIZE"
+      end
     end
   end
 end

data/lib/rb-skypemac/user.rb

@@ -6,36 +6,38 @@ module SkypeMac
 
   # Represents Skype internal grouping of contacts; https://developer.skype.com/Docs/ApiDoc/GROUP_object
   class User
-    def User.skype_attr(attr_sym, accessor=false)
-      module_eval %{def #{attr_sym.to_s}
-        r = Skype.send_ :command => "get user \#{@handle} #{attr_sym.to_s}"
-        v = r.sub(/^.*#{attr_sym.to_s.upcase} /, "")
-        v = true if v == "TRUE"
-        v = false if v == "FALSE"
-        v
-      end}
-      if accessor
-        module_eval %{def #{attr_sym.to_s}=(value)
-          value = "true" if value == true
-          value = "False" if value == false
-          r = Skype.send_ :command => "set user \#{@handle} #{attr_sym.to_s} \#{value}"
+    class << self
+      def skype_attr(attr_sym, accessor=false)
+        module_eval %{def #{attr_sym.to_s}
+          r = Skype.send_ :command => "get user \#{@handle} #{attr_sym.to_s}"
           v = r.sub(/^.*#{attr_sym.to_s.upcase} /, "")
           v = true if v == "TRUE"
           v = false if v == "FALSE"
           v
         end}
+        if accessor
+          module_eval %{def #{attr_sym.to_s}=(value)
+            value = "true" if value == true
+            value = "False" if value == false
+            r = Skype.send_ :command => "set user \#{@handle} #{attr_sym.to_s} \#{value}"
+            v = r.sub(/^.*#{attr_sym.to_s.upcase} /, "")
+            v = true if v == "TRUE"
+            v = false if v == "FALSE"
+            v
+          end}
+        end
       end
-    end
 
-    def User.skype_attr_reader(*attr_sym)
-      attr_sym.each do |a|
-        User.skype_attr a, false
+      def skype_attr_reader(*attr_sym)
+        attr_sym.each do |a|
+          User.skype_attr a, false
+        end
       end
-    end
     
-    def User.skype_attr_accessor(*attr_sym)
-      attr_sym.each do |a|
-        User.skype_attr a, true
+      def User.skype_attr_accessor(*attr_sym)
+        attr_sym.each do |a|
+          User.skype_attr a, true
+        end
       end
     end
 
@@ -55,8 +57,15 @@ module SkypeMac
       @handle = handle
     end
     
+    def name
+      if displayname != "": displayname
+      elsif fullname != "": fullname
+      else handle
+      end
+    end
+    
     def <=>(user)
-      @handle <=> user.handle
+      name.upcase <=> user.name.upcase
     end
   end
 end

data/lib/rb-skypemac/version.rb

@@ -2,7 +2,7 @@ module SkypeMac #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_call.rb

@@ -4,7 +4,7 @@ include SkypeMac
 class TestCall< Test::Unit::TestCase
 
   def test_new
-    assert Call.new 42
+    assert Call.new(42)
   end
   
   def test_active_call_ids

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>rb skypemac</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rb-skypemac"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/rb-skypemac" class="numbers">0.2.1</a>
+      <a href="http://rubyforge.org/projects/rb-skypemac" class="numbers">0.3.2</a>
     </div>
     <h1>&#x2192; &#8216;rb-skypemac&#8217;</h1>
 
@@ -65,13 +65,29 @@ call.hangup
 
 sleight42 = Skype.online_friends.find { |u| u.handle == "sleight42" }
 call = Skype.call sleight42
-call.hangup # no one wants to talk to him anyway
+Skype.hangup call # no one wants to talk to him anyway
 
 # Set your user status to away
 Iam.away
 
 # Set your user status to back
 Iam.online
+
+# Attempt to detect and answer a call -- still experimental!  
+# Sporadically crashes Skype 2.6.0.17
+loop do
+  begin
+    if not (calls = Skype.incoming_calls).empty?
+      call = Skype.answer calls.first
+      sleep 10
+      Skype.hangup call
+    end
+  rescue RuntimeError =&gt; e
+    puts e.message
+  end
+  puts "sleeping..." 
+  sleep 1
+end
 </pre>
 
 	<h2>Licence</h2>
@@ -84,8 +100,11 @@ Iam.online
 
 
 	<p>Comments are welcome. Send an email to <a href="mailto:sleight42@gmail.com">Evan Light</a>.</p>
+
+
+	<p>Copyright 2007, Evan Light</p>
     <p class="coda">
-      <a href="mailto:sleight42@gmail.com.com">Evan Light</a>, 26th April 2007<br>
+      <a href="mailto:sleight42@gmail.com.com">Evan Light</a>, 2nd May 2007<br>
     </p>
 </div>
 

data/website/index.txt

@@ -40,7 +40,7 @@ loop do
     if not (calls = Skype.incoming_calls).empty?
       call = Skype.answer calls.first
       sleep 10
-      call.hangup
+      Skype.hangup call
     end
   rescue RuntimeError => e
     puts e.message

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rb-skypemac
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-05-02 00:00:00 -04:00
+  version: 0.3.2
+date: 2007-05-23 00:00:00 -04:00
 summary: Ruby interface to Skype on Mac OS X
 require_paths: 
 - lib