itunes-observer 0.0.3 → 0.1.1

data/Rakefile

@@ -4,9 +4,6 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/sshpublisher'
 require 'spec/rake/spectask'
 require 'fileutils'
 include FileUtils
@@ -40,7 +37,6 @@ task :package => [:clean]
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
   t.spec_files = FileList['spec/*_spec.rb']
-  t.rcov = true
 end
 
 spec = Gem::Specification.new do |s|
@@ -63,6 +59,7 @@ spec = Gem::Specification.new do |s|
   s.test_files        = Dir["test/test_*.rb"]
 
   #s.add_dependency('')
+  s.add_development_dependency('eventmachine')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +
@@ -89,21 +86,6 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.options += RDOC_OPTS
-  rdoc.template = "resh"
-  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  if ENV['DOC_FILES']
-    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-  else
-    rdoc.rdoc_files.include('README.rdoc', 'ChangeLog')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include('ext/**/*.c')
-  end
-end
-
 desc "Show information about the gem"
 task :debug_gem do
   puts spec.to_ruby

data/examples/love.rb

@@ -23,14 +23,14 @@ def main
   unless session = config['session']
     token = lastfm.auth.get_token
     auth(config['api_key'], token)
-    session = lastfm.auth.get_session(token)
+    session = lastfm.auth.get_session(token)['key']
     Pit.set('last.fm', :data => {
         "session" => session
       }.merge(config))
 
     puts "Session key was generated."
 
-    return
+    exit
   end
 
   lastfm.session = session

data/lib/itunes_observer.rb

@@ -1,11 +1,30 @@
 require 'osx/cocoa'
 
 class ITunesObserver
-  VERSION = '0.0.3'
+  VERSION = '0.1.1'
+
+  STATES = {
+    :playing => 'Playing',
+    :paused  => 'Paused',
+    :stopped => 'Stopped'
+  }
 
   def initialize(&callback)
-    observer = Observer.alloc.init
-    observer.observe(&callback)
+    @observer = Observer.alloc.init
+
+    add_callback(STATES[:playing], &callback)
+  end
+
+  def on_play(&callback)
+    add_callback(STATES[:playing], &callback)
+  end
+
+  def on_pause(&callback)
+    add_callback(STATES[:paused], &callback)
+  end
+
+  def on_stop(&callback)
+    add_callback(STATES[:stopped], &callback)
   end
 
   def run(stop_after = nil)
@@ -16,23 +35,55 @@ class ITunesObserver
     end
   end
 
+  def finish
+    @observer.finish
+  end
+
+  private
+
+  def add_callback(state, &callback)
+    if callback
+      @observer.add_callback(state, &callback)
+    end
+  end
+
   # based on http://blog.8-p.info/articles/2006/12/24/rubycocoa-skype-itunes
   class Observer < OSX::NSObject
+    def initialize
+      @callbacks = {}
+
+      notification_centor.addObserver_selector_name_object_(self,
+        'onPlayerInfo:',
+        'com.apple.iTunes.playerInfo',
+        'com.apple.iTunes.player')
+    end
+
     def onPlayerInfo(info)
-      if info.userInfo['Player State'] == 'Playing'
-        result = Result.new(info.userInfo)
-        @callback.call(result)
+      result = Result.new(info.userInfo)
+
+      STATES.each do |k, state|
+        if info.userInfo['Player State'] == state
+          (@callbacks[state] || []).each do |callback|
+            callback.call(result)
+          end
+        end
       end
     end
 
-    def observe(&callback)
-      @callback = callback
-      center = OSX::NSDistributedNotificationCenter.defaultCenter
-      center.addObserver_selector_name_object_(self,
-        'onPlayerInfo:',
+    def add_callback(state, &callback)
+      @callbacks[state] ||= []
+      @callbacks[state] << callback
+    end
+
+    def finish
+      notification_centor.removeObserver_name_object_(self,
         'com.apple.iTunes.playerInfo',
         'com.apple.iTunes.player')
     end
+
+    def notification_centor
+      OSX::NSDistributedNotificationCenter.defaultCenter
+    end
   end
 
   class Result
@@ -46,6 +97,8 @@ class ITunesObserver
         value.to_s
       when OSX::NSCFString
         value.to_s
+      when OSX::NSNumber
+        value.to_i
       else
         value
       end

data/spec/itunes_observer_spec.rb

@@ -1,7 +1,9 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'rubygems'
 require 'spec_helper'
 require 'osx/cocoa'
+require 'eventmachine'
 
 include OSX
 OSX.require_framework 'ScriptingBridge'
@@ -10,11 +12,6 @@ describe ITunesObserver do
   before do
     @itunes = SBApplication.applicationWithBundleIdentifier_("com.apple.iTunes")
     raise 'iTunes must be running' unless @itunes.isRunning
-    @result = nil
-    @observer = ITunesObserver.new do |result|
-      @result = result
-    end
-
     @itunes.stop
   end
 
@@ -22,11 +19,108 @@ describe ITunesObserver do
     @itunes.stop
   end
 
-  it "should observe playing" do
-    @itunes.playpause
-    @observer.run(1)
-    @result.should_not be_nil
-    @result['Name'].should_not be_nil
-    @result['Player State'].should eql('Playing')
+  describe ".new" do
+    it "should observe playing" do
+      result = nil
+
+      observer = ITunesObserver.new do |result|
+        result = result
+      end
+
+      run_loop(observer) do
+        @itunes.playpause
+      end
+
+      result.should_not be_nil
+      result['Name'].should_not be_nil
+      result['Player State'].should eql('Playing')
+      result['Total Time'].should be_kind_of(Fixnum)
+    end
+  end
+
+  describe "#on_stop" do
+    it "should observe stopping" do
+      observer = ITunesObserver.new
+      result = nil
+
+      observer.on_stop do |result|
+        result = result
+      end
+
+      run_loop(observer) do
+        @itunes.playpause
+        @itunes.stop
+      end
+
+      observer.finish
+
+      result.should_not be_nil
+      result['Name'].should_not be_nil
+      result['Player State'].should eql('Stopped')
+      result['Total Time'].should be_kind_of(Fixnum)
+    end
+  end
+
+  describe "#on_play" do
+    it "should observe playing" do
+      observer = ITunesObserver.new
+      result = nil
+
+      observer.on_play do |result|
+        result = result
+      end
+
+      run_loop(observer) do
+        @itunes.playpause
+      end
+
+      result.should_not be_nil
+      result['Name'].should_not be_nil
+      result['Player State'].should eql('Playing')
+      result['Total Time'].should be_kind_of(Fixnum)
+    end
+  end
+
+  describe "#on_pause" do
+    it "should observe pausing" do
+      observer = ITunesObserver.new
+      result = nil
+
+      observer.on_pause do |result|
+        result = result
+      end
+
+      run_loop(observer) do
+        @itunes.playpause
+
+        EM::Timer.new(1) do
+          @itunes.pause
+        end
+      end
+
+      observer.run(0)
+      observer.finish
+
+      result.should_not be_nil
+      result['Name'].should_not be_nil
+      result['Player State'].should eql('Paused')
+      result['Total Time'].should be_kind_of(Fixnum)
+    end
+  end
+
+  def run_loop(observer)
+    EM.run do
+      yield
+
+      EM::Timer.new(3) do
+        EM.stop
+      end
+
+      EM::add_periodic_timer(1) do
+        observer.run(0)
+      end
+    end
+  ensure
+    observer.finish
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itunes-observer
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
-  - 0
-  - 3
-  version: 0.0.3
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - youpy
@@ -14,10 +15,22 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
+date: 2012-03-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: ""
 email: youpy@buycheapviagraonlinenow.com
 executables: []
@@ -36,7 +49,6 @@ files:
 - spec/spec_helper.rb
 - lib/itunes_observer.rb
 - examples/love.rb
-has_rdoc: true
 homepage: http://itunes-observer.rubyforge.org
 licenses: []
 
@@ -57,23 +69,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: itunes-observer
-rubygems_version: 1.3.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ""