skype 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7abc203b8c8e00b1338cb47e58297b1382e560fe
-  data.tar.gz: 523913048ed2032061443f685ce0d8e340173f62
+  metadata.gz: e68ed01cb9d2602a623e54a3b5e8aa2c76f87221
+  data.tar.gz: 1e09a51e82d16821366472e523e52d99769121c7
 SHA512:
-  metadata.gz: 6a0d3056586e3409170cd6b5cc2185db45090ff4a88708b856a74c4613ad1d6e0cf506aec97a37e1a75af1603b52deddce7e9190fe884bdf2061492daa5225ca
-  data.tar.gz: 7b291a9d5cca6a21285f1db28a7414d0ebd97139df4408f554f5ebc83bf3f41857bb6db37ed8d3351c434e3392c842d35f24f5905de14033ff96545a0c0e25a4
+  metadata.gz: d928b372617006a58bd30a512ea1a72925c4f0cf865a9ca71961370d2da93d3ce513cc97823fdefe64e648963f2f30d5f9fbfe236ba913eb16823298c38b5e5b
+  data.tar.gz: 5208227f716a88cfee3487968a510e72fed98db77d28867b5293bb9f528d783fa74f49f66944363f51f556838243b87c81d55c2e6bf569e909aaa60aeb1bb17b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skype (0.1.5)
+    skype (0.2.0)
       tmp_cache
 
 GEM

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.0 2013-06-30
+
+* add Call API wrapper and tests
+
 === 0.1.5 2013-06-30
 
 * add skype-chat command
@@ -24,7 +28,7 @@
 
 === 0.1.0 2013-06-27
 
-* add Chat API
+* add Chat API wrapper
 
 === 0.0.3 2013-06-20
 

data/README.md

@@ -76,6 +76,23 @@ chat.messages.each do |m|
 end
 ```
 
+### Call API
+
+call
+```ruby
+c = Skype.call "shokaishokai"
+```
+
+check status
+```ruby
+puts c.status # => :routing, :ringing, :inprogress, :finished, :missed, :cancelled
+```
+
+hangup
+```ruby
+c.hangup
+```
+
 Samples
 -------
 https://github.com/shokai/skype-ruby/tree/master/samples

data/bin/skype-chat

@@ -3,6 +3,8 @@ require 'rubygems'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'skype'
 
+puts "skype rubygem v#{Skype::VERSION}"
+
 chats = Skype.chats
 puts "#{chats.length} chats found"
 chats.each_with_index do |c, index|

data/lib/skype.rb

@@ -14,6 +14,7 @@ require case RUBY_PLATFORM
         end
 require "skype/main"
 require "skype/wrappers/chat"
+require "skype/wrappers/call"
 
 module Skype
 end

data/lib/skype/platforms/linux.rb

@@ -17,7 +17,9 @@ module Skype
     end
   end
 
-  def self.exec(command)
-    filter_response (@@connection||=Connection.new).invoke command
+  def self.exec(command, opts={:response_filter => true})
+    res = (@@connection||=Connection.new).invoke command
+    res = filter_response res if opts[:response_filter]
+    res
   end
 end

data/lib/skype/platforms/mac.rb

@@ -1,9 +1,11 @@
 module Skype
-  def self.exec(command)
+  def self.exec(command, opts={:response_filter => true})
     script = %Q{tell application "Skype"
   send command "#{Utils.escape command}" script name "#{self.config[:app_name]}"
 end tell}
-    filter_response `unset LD_LIBRARY_PATH; unset DYLD_LIBRARY_PATH; /usr/bin/osascript -e '#{script}'`.strip
+    res = `unset LD_LIBRARY_PATH; unset DYLD_LIBRARY_PATH; /usr/bin/osascript -e '#{script}'`.strip
+    res = filter_response res if opts[:response_filter]
+    res
   end
 
   module Utils

data/lib/skype/version.rb

@@ -1,3 +1,3 @@
 module Skype
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/skype/wrappers/call.rb

@@ -0,0 +1,30 @@
+module Skype
+
+  response_filter /^CALL \d+ STATUS [A-Z]+$/ do |res|
+    Skype::Call.new res.scan(/CALL (\d+)/)[0][0]
+  end
+
+  class Call
+
+    attr_reader :id, :time, :to
+
+    def initialize(id)
+      @id = id.to_i
+      @time = Time.at ::Skype.exec("GET CALL #{id} TIMESTAMP").split(/\s/).last.to_i
+      @to = ::Skype.exec("GET CALL #{id} PARTNER_HANDLE").scan(/PARTNER_HANDLE (.+)$/)[0][0] rescue @to = ""
+    end
+
+    def status
+      begin
+        return ::Skype.exec("GET CALL #{@id} STATUS", :response_filter => false).scan(/([A-Z]+)$/)[0][0].downcase.to_sym
+      rescue
+        return :api_error
+      end
+    end
+
+    def hangup
+      ::Skype.exec "ALTER CALL #{@id} HANGUP"
+    end
+  end
+
+end

data/samples/call.rb

@@ -6,4 +6,19 @@ require 'skype'
 puts "please put the username to call"
 print "> "
 to = STDIN.gets.strip
-p Skype.call to
+call = Skype.call to
+
+loop do
+  puts s = call.status
+  break if s == :inprogress
+  sleep 1
+end
+
+5.downto(0) do |i|
+  puts "#{i} - #{call.status}"
+  sleep 1
+end
+
+call.hangup
+
+puts call.status

data/test/test_call.rb

@@ -0,0 +1,18 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestSkypeCall < MiniTest::Test
+
+  SKYPE_FROM = ENV["SKYPE_FROM"]
+  SKYPE_TO   = ENV["SKYPE_TO"] || "echo123"
+
+  def test_call
+    call = Skype.call SKYPE_TO
+    STDERR.puts call if call.kind_of? String
+    assert_equal call.class, Skype::Call
+    assert_equal call.to, SKYPE_TO
+    sleep 1
+    call.hangup
+    assert [:finished, :missed, :cancelled].include? call.status
+  end
+
+end

data/test/test_chat.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestSkype < MiniTest::Test
+class TestSkypeChat < MiniTest::Test
 
   SKYPE_FROM = ENV["SKYPE_FROM"]
   SKYPE_TO   = ENV["SKYPE_TO"] || "echo123"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skype
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmp_cache
@@ -88,10 +88,12 @@ files:
 - lib/skype/platforms/linux.rb
 - lib/skype/platforms/mac.rb
 - lib/skype/version.rb
+- lib/skype/wrappers/call.rb
 - lib/skype/wrappers/chat.rb
 - samples/call.rb
 - samples/send_message.rb
 - skype.gemspec
+- test/test_call.rb
 - test/test_chat.rb
 - test/test_helper.rb
 - test/test_skype.rb
@@ -120,6 +122,7 @@ signing_key:
 specification_version: 4
 summary: Skype Desktop API Ruby wrapper for Mac/Linux.
 test_files:
+- test/test_call.rb
 - test/test_chat.rb
 - test/test_helper.rb
 - test/test_skype.rb