skype 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede6c4cab33484aaf2f5f269c346e5ac7c4bb069
-  data.tar.gz: 649f35174cfeaa41a7702b4b663b5f21370433fb
+  metadata.gz: e1715eeb6270ab42387b2f16b396ff8d3216d690
+  data.tar.gz: 56e7b9d58ba245b15729de2cd2b22af2c929c0a4
 SHA512:
-  metadata.gz: c382139f8baeb26b1e7e41948c5a74bdf551a04f335349ac7a3471b8aa720bc72d147b4b7f5fee14748650fd00a17c0f460a804e7eccdf12bb5d1d04a6ec73a8
-  data.tar.gz: b0fe574de19ead18aa875759fe31f0dcd4486ac428d52139c3d31c8ee5a9864cc9426785ae9650c7e9c7d2e6cd7d8ae99e4b25992fab1ea3cf49b9d2b2525984
+  metadata.gz: db905f810d96b25eb01234c732ebcfe1e93e8bef311e0528690fedd7c372da17038d44ee7e1d2904b194d1bedc98926a36bdc2a00c9b500a1606b95f86b6b5c1
+  data.tar.gz: ba1ac32a63d698a197586f71d96768c1245ee0d7b053e43a77f6f4f6ad876bd6f98f4f1191dd96fa0d62f4cee48b80caa0d58c12f7e486e92ffd9a184db9fb1c

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.0 2013-06-27
+
+* add Chat API
+
 === 0.0.3 2013-06-20
 
 * give up choose dbus/applescript in gemspec

data/README.md

@@ -23,6 +23,13 @@ for Linux
 
     % gem install skype ruby-dbus
 
+Gemfile
+```ruby
+gem "skype"
+gem "rb-appscript" if RUBY_PLATFORM =~ /darwin/i
+gem "ruby-dbus"    if RUBY_PLATFORM =~ /linux/i
+```
+
 Usage
 -----
 please read [API Reference](http://dev.skype.com/desktop-api-reference) before use.
@@ -35,24 +42,37 @@ require 'skype'
 Skype.config :app_name => "my_skype_app"
 ```
 
-### send message
+### Skype API
+
+send message
 ```ruby
 Skype.message "USER_NAME", "hello!!"
+Skype.exec "MESSAGE USER_NAME hello!!"
 ```
 
-### call
+call
 ```ruby
 Skype.call "USER_NAME"
+Skype.exec "CALL USER_NAME"
+```
+
+### Chat API
+
+find a chat
+```ruby
+chat = Skype.chats.find{|c| c.members.include? "shokaishokai" and c.topic =~ /testchat/ }
 ```
 
-### get recent chat list
+post message to the chat
 ```ruby
-puts Skype.search("recentchats")
+chat.post "hello chat!!"
 ```
 
-### send message to group chat
+show chat messages
 ```ruby
-Skype.chatmessage "#name1/name2;$a1b2cdef3456", "hello chat!!"
+chat.messages.each do |m|
+  puts m
+end
 ```
 
 Samples

data/lib/skype.rb

@@ -1,7 +1,18 @@
 require "rubygems"
+require "kconv"
+require "tmp_cache"
 
 require "skype/version"
-require "skype/skype"
+require case RUBY_PLATFORM
+        when /darwin/
+          "skype/platforms/mac"
+        when /linux/
+          "skype/platforms/linux"
+        else
+          STDERR.puts %Q{!!Skype gem cannot support your platform "#{RUBY_PLATFORM}" not support.}
+        end
+require "skype/main"
+require "skype/wrappers/chat"
 
 module Skype
 end

data/lib/skype/{skype.rb → main.rb}

@@ -1,10 +1,3 @@
-require case RUBY_PLATFORM
-        when /darwin/
-          "skype/platforms/mac"
-        when /linux/
-          "skype/platforms/linux"
-        end
-
 module Skype
   @@config = {:app_name => "ruby-skype"}
   def self.config(conf=nil)

data/lib/skype/version.rb

@@ -1,3 +1,3 @@
 module Skype
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/skype/wrappers/chat.rb

@@ -0,0 +1,52 @@
+module Skype
+
+  def self.chats
+    search("recentchats").
+      scan(/(#[^\s,]+)[\s,]/).
+      map{|i| Chat.new i[0] }
+  end
+
+  class Chat
+    @@message_cache = TmpCache::Cache.new
+
+    attr_reader :id, :topic, :members
+
+    def initialize(id)
+      @id = id
+      @topic = ::Skype::exec("GET CHAT #{@id} TOPIC").scan(/TOPIC (.*)$/)[0][0].toutf8
+      @members = ::Skype::exec("GET CHAT #{@id} MEMBERS").scan(/MEMBERS (.+)$/)[0][0].split(/\s/)
+    end
+
+    def messages
+      ::Skype.exec("GET CHAT #{@id} RECENTCHATMESSAGES").
+        split(/,? /).
+        select{|i| i =~ /^\d+$/ }.
+        map{|i| i.to_i }.
+        map{|i| @@message_cache.get(i) || @@message_cache.set(i, Skype::Chat::Message.new(i), 3600*72) }.
+        sort{|a,b| b.time <=> a.time }
+    end
+
+    def post(message)
+      ::Skype.exec "CHATMESSAGE #{@id} #{message}"
+    end
+
+    class Message
+
+      attr_reader :id, :user, :body, :time
+
+      def initialize(id)
+        @id = id
+        @user = ::Skype.exec("GET CHATMESSAGE #{@id} from_handle").split(/\s/).last
+        @body = ::Skype.exec("GET CHATMESSAGE #{@id} body").scan(/^MESSAGE #{@id} BODY (.+)$/)[0][0]
+        @time = Time.at ::Skype.exec("GET CHATMESSAGE #{@id} timestamp").split(/\s/).last.to_i
+      end
+
+      def to_s
+        "[#{@time}] <#{@user}> #{@body} "
+      end
+
+    end
+
+  end
+
+end

data/samples/chat.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'rubygems'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'skype'
+
+chats = Skype.chats
+puts "#{chats.length} chats found"
+chat = chats.find{|c| c.members.include? "shokaishokai" and c.topic =~ /test/}
+
+p chat
+chat.post "test"
+
+chat.messages.each do |m|
+  puts m
+end

data/samples/send_message.rb

@@ -3,4 +3,6 @@ require 'rubygems'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'skype'
 
-p Skype.message "shokaishokai", "hello"
+user = ARGV.shift || "shokaishokai"
+msg  = ARGV.shift || "hello"
+p Skype.message user, msg

data/skype.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "tmp_cache"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: skype
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tmp_cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -51,13 +65,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- chat.rb
 - lib/skype.rb
+- lib/skype/main.rb
 - lib/skype/platforms/linux.rb
 - lib/skype/platforms/mac.rb
-- lib/skype/skype.rb
 - lib/skype/version.rb
+- lib/skype/wrappers/chat.rb
 - samples/call.rb
-- samples/send_groupchat.rb
+- samples/chat.rb
 - samples/send_message.rb
 - skype.gemspec
 homepage: https://github.com/shokai/skype-ruby