skype 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1715eeb6270ab42387b2f16b396ff8d3216d690
-  data.tar.gz: 56e7b9d58ba245b15729de2cd2b22af2c929c0a4
+  metadata.gz: 9a374dd4707ba6ebcd367220c2acb71eeb1fbe56
+  data.tar.gz: c2a6cd4dc9e31794a60ce5b1cc0fa33dedfba53f
 SHA512:
-  metadata.gz: db905f810d96b25eb01234c732ebcfe1e93e8bef311e0528690fedd7c372da17038d44ee7e1d2904b194d1bedc98926a36bdc2a00c9b500a1606b95f86b6b5c1
-  data.tar.gz: ba1ac32a63d698a197586f71d96768c1245ee0d7b053e43a77f6f4f6ad876bd6f98f4f1191dd96fa0d62f4cee48b80caa0d58c12f7e486e92ffd9a184db9fb1c
+  metadata.gz: 70bcedf70842e5f9cb7fa127febfa815bf563e7914bcda542d7615ac4d3b96db793f7d9358d912f517ec95f752ae71115e7764a1ca9b9773b5250748ab02a58d
+  data.tar.gz: c0a1fb7f01c9bb8dda17151749601ca6a378a0cb2a66133e61c4e11f09437f4396b8828409b09073b9e2190cc084ef79e11dc35aa491856f861ae1c0f59072c9

data/.gitignore

@@ -7,7 +7,6 @@
 .config
 .yardoc
 .ruby-version
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    skype (0.1.1)
+      tmp_cache
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    minitest (5.0.6)
+    rake (10.1.0)
+    tmp_cache (0.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  minitest (~> 5.0)
+  rake
+  skype!

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.1 2013-06-29
+
+* add tests
+* use /usr/bin/osascript instead of rb-appscript
+
 === 0.1.0 2013-06-27
 
 * add Chat API

data/README.md

@@ -17,7 +17,7 @@ Installation
 
 for Mac
 
-    % gem install skype rb-appscript
+    % gem install skype
 
 for Linux
 
@@ -26,7 +26,6 @@ for Linux
 Gemfile
 ```ruby
 gem "skype"
-gem "rb-appscript" if RUBY_PLATFORM =~ /darwin/i
 gem "ruby-dbus"    if RUBY_PLATFORM =~ /linux/i
 ```
 
@@ -80,6 +79,17 @@ Samples
 https://github.com/shokai/skype-ruby/tree/master/samples
 
 
+Test
+----
+test requires 2 skype accounts.
+
+    % gem install bundler
+    % bundle install
+    % export SKYPE_FROM=your_skype_name1
+    % export SKYPE_TO=your_skype_name2
+    % rake test
+
+
 Contributing
 ------------
 1. Fork it

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
+end
+
+task :default => :test

data/lib/skype/platforms/mac.rb

@@ -1,7 +1,17 @@
-require "appscript"
-
 module Skype
   def self.exec(command)
-    Appscript.app("skype").send_ :script_name => self.config[:app_name], :command => command
+    script = %Q{tell application "Skype"
+  send command "#{Utils.escape command}" script name "#{self.config[:app_name]}"
+end tell}
+    res = `unset LD_LIBRARY_PATH; unset DYLD_LIBRARY_PATH; /usr/bin/osascript -e '#{script}'`.split(/[\n\r]+/)
+    res.shift if res.size > 1 and res[0] =~ /^dyld: /
+    res[0]
+  end
+
+  module Utils
+    def self.escape(str)
+      str.gsub(/(["\\])/){ "\\#{$1}" }.
+        gsub("'"){ "'\\''" }
+    end
   end
 end

data/lib/skype/version.rb

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

data/lib/skype/wrappers/chat.rb

@@ -36,8 +36,8 @@ module Skype
 
       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]
+        @user = ::Skype.exec("GET CHATMESSAGE #{@id} from_handle").split(/\s/).last rescue @user = ""
+        @body = ::Skype.exec("GET CHATMESSAGE #{@id} body").scan(/^MESSAGE #{@id} BODY (.+)$/)[0][0] rescue @body = ""
         @time = Time.at ::Skype.exec("GET CHATMESSAGE #{@id} timestamp").split(/\s/).last.to_i
       end
 

data/skype.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", "~> 5.0"
 end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'minitest/autorun'
+
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'skype'

data/test/test_skype.rb

@@ -0,0 +1,43 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestSkype < MiniTest::Test
+
+  SKYPE_FROM = ENV["SKYPE_FROM"]
+  SKYPE_TO   = ENV["SKYPE_TO"]
+
+  def test_exec
+    body = "hello exec"
+    res = Skype.exec "MESSAGE #{SKYPE_TO} #{body}"
+    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
+    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
+    msg = Skype::Chat::Message.new res_id
+    assert_equal msg.id, res_id
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+
+  def test_message
+    body = "hello hello"
+    res = Skype.message SKYPE_TO, body
+    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
+    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
+    msg = Skype::Chat::Message.new res_id
+    assert_equal msg.id, res_id
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+
+  def test_message_escape
+    body = "hello \"'$@&()^![]{};*?<>`\\ world"
+    res = Skype.message SKYPE_TO, body
+    assert res =~ /^(CHAT)?MESSAGE \d+ STATUS (SENT|SENDING)$/, "Skype API response error"
+    res_id = res.scan(/(CHAT)?MESSAGE (\d+) STATUS (SENT|SENDING)$/)[0][1].to_i
+    msg = Skype::Chat::Message.new res_id
+    assert_equal msg.id, res_id
+    assert_equal msg.body, body
+    assert_equal msg.time.class, Time
+    assert_equal msg.user, SKYPE_FROM
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skype
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmp_cache
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Skype Desktop API wrapper for Ruby
 email:
 - hashimoto@shokai.org
@@ -61,11 +75,11 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
-- chat.rb
 - lib/skype.rb
 - lib/skype/main.rb
 - lib/skype/platforms/linux.rb
@@ -76,6 +90,8 @@ files:
 - samples/chat.rb
 - samples/send_message.rb
 - skype.gemspec
+- test/test_helper.rb
+- test/test_skype.rb
 homepage: https://github.com/shokai/skype-ruby
 licenses:
 - MIT
@@ -100,5 +116,6 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Skype Desktop API wrapper for Ruby
-test_files: []
-has_rdoc: 
+test_files:
+- test/test_helper.rb
+- test/test_skype.rb

data/chat.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
-require 'skype'
-
-chats = Skype.search "recentchats"
-chats = chats.scan(/(#[^\s,]+)[\s,]/).map{|i| i[0] }
-
-chats.each_with_index do |chat, index|
-  puts "[#{index}] #{chat}"
-end
-
-puts %Q{select chat number 0~#{chats.size-1} ?}
-exit 1 unless (n = STDIN.gets.strip) =~ /^\d$/
-
-chat = chats[n.to_i]
-puts %Q{#{chat} was selected}
-
-while line = STDIN.gets.strip
-  Skype.chatmessage chat, line
-end