itunes-client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c189fff206a4195c462ee164b839c8650f2fc7
-  data.tar.gz: 70e5a4475b5ff5748d093b78516b952bbc3bea19
+  metadata.gz: 65c223fb2667334432e8c1abae7ba824866af422
+  data.tar.gz: 5f0696afab2934878524b5d3bcf4a302f72cb968
 SHA512:
-  metadata.gz: 3b2e8948ff6cf54e8b6c4165ed9292293be30133c32ce3dc8f33fefc0f5c82141b914a5faae9461a4845936f281e8aadc1e9c4d8a2eaa2037c816b3354f1a5fe
-  data.tar.gz: c55a3960ba159490b62fca65c482cee299b1f7cd2125ad31c06604cec368cbf880b6861815de61f34208629d9b484b030fc02778a921cb09facbe838e1d77e2d
+  metadata.gz: 2195776658c61f904b1bc40e3b545b6d9e4d294917d7d44b77f81712d9c720d687dbb9ae14cf36b0bb2ea57aa41b70f87686ba9d83e5ede4654356e4215f035b
+  data.tar.gz: c928d7021796713d796dfc27198a3922a1c9cdca85408f2c6394cef723560e8130b66cf0e3e08b68bb4f98f200ebc5052c4d27a925650e52fb3c54fc25601198

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.2.0

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.2
+  - 2.1
+  - 2.0
+  - 1.9

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/README.md

@@ -24,12 +24,13 @@ $ gem install itunes-client
 ```
 
 ## Supported OS
-- OSX 10.9 (Mavericks)
-- OSX 10.8 (Mountain Lion)
+- OSX Yosemite
+- OSX Mavericks
 
 
 ## Supported Ruby
-- 2.1.0
+- 2.2.0-preview1
+- 2.1.3
 - 2.0.0
 - 1.9.3
 

data/itunes-client.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0.3"
-  spec.add_development_dependency "rspec", "~> 2.13.0"
-  spec.add_development_dependency "rb-fsevent", "~> 0.9.3"
-  spec.add_development_dependency "guard", "~> 1.8.1"
-  spec.add_development_dependency "guard-rspec", "~> 3.0.2"
+  spec.add_development_dependency "rake", "~> 10.3.2"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "rb-fsevent", "~> 0.9.4"
+  spec.add_development_dependency "guard", "~> 2.6.1"
+  spec.add_development_dependency "guard-rspec", "~> 4.3.1"
   spec.add_development_dependency "growl", "~> 1.0.3"
-  spec.add_development_dependency "fakefs", "~> 0.4.2"
-  spec.add_development_dependency "simplecov", "~> 0.7.1"
-  spec.add_development_dependency "coveralls", "~> 0.6.6"
-  spec.add_development_dependency "pry", "~> 0.9.12.2"
+  spec.add_development_dependency "fakefs", "~> 0.6.0"
+  spec.add_development_dependency "simplecov", "~> 0.9.0"
+  spec.add_development_dependency "coveralls", "~> 0.7.1"
+  spec.add_development_dependency "pry", "~> 0.10.1"
 end

data/lib/itunes/player.rb

@@ -47,6 +47,14 @@ module Itunes
         execute_script("#{script_dir}/player_state.scpt") == 'stopped'
       end
 
+      def position
+        execute_script("#{script_dir}/position.scpt").to_f
+      end
+
+      def position=(position)
+        execute_script("#{script_dir}/set_position.scpt", position).to_f
+      end
+
       def next_track
         persistent_id = execute_script("#{script_dir}/next_track.scpt")
         Track.find_by(persistent_id: persistent_id).first

data/lib/itunes/version.rb

@@ -1,3 +1,3 @@
 module Itunes
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/scripts/player/position.scpt

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  player position
+end tell

data/scripts/player/set_position.scpt

@@ -0,0 +1,6 @@
+on run argv
+  tell application "iTunes"
+    set player position to (item 1 of argv)
+    return player position
+  end tell
+end run

data/spec/itunes/player_spec.rb

@@ -21,9 +21,9 @@ describe Player do
       end
 
       before do
-        Player.should_receive(:execute_script).
+        expect(Player).to receive(:execute_script).
           with('player/add.scpt', file_name).and_return(new_persistent_id)
-        Track.should_receive(:find_by).
+        expect(Track).to receive(:find_by).
           with(persistent_id: new_persistent_id).
           and_return([Track.new(persistent_id: new_persistent_id)])
       end
@@ -53,21 +53,21 @@ describe Player do
 
   describe '.pause' do
     it 'calls pause.scpt' do
-      Player.should_receive(:execute_script).with('player/pause.scpt')
+      expect(Player).to receive(:execute_script).with('player/pause.scpt')
       Player.pause
     end
   end
 
   describe '.stop' do
     it 'calls stop.scpt' do
-      Player.should_receive(:execute_script).with('player/stop.scpt')
+      expect(Player).to receive(:execute_script).with('player/stop.scpt')
       Player.stop
     end
   end
 
   describe '.play' do
     it 'calls play.scpt' do
-      Player.should_receive(:execute_script).with('player/play.scpt')
+      expect(Player).to receive(:execute_script).with('player/play.scpt')
       Player.play
     end
   end
@@ -75,47 +75,63 @@ describe Player do
   describe '.playing?' do
     subject { Player.playing? }
     context 'when iTunes plays a track' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
-      it { expect(subject).to be_true }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_truthy }
     end
 
     context 'when iTunes stops a track' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
-      it { expect(subject).to be_false }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
+      it { expect(subject).to be_falsey }
     end
   end
 
   describe '.paused?' do
     subject { Player.paused? }
     context 'when iTunes plays a track' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
-      it { expect(subject).to be_false }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_falsey }
     end
 
     context 'when iTunes pauses' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('paused') }
-      it { expect(subject).to be_true }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('paused') }
+      it { expect(subject).to be_truthy }
     end
   end
 
   describe '.stopped?' do
     subject { Player.stopped? }
     context 'when iTunes plays a track' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
-      it { expect(subject).to be_false }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_falsey }
     end
 
     context 'when iTunes stops a track' do
-      before { Player.should_receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
-      it { expect(subject).to be_true }
+      before { expect(Player).to receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
+      it { expect(subject).to be_truthy }
+    end
+  end
+
+  describe '.position' do
+    it 'calls position.scpt' do
+      expect(Player).to receive(:execute_script).with('player/position.scpt')
+      Player.position
+    end
+  end
+
+  describe '.position=' do
+    let(:position) { 10 }
+
+    it 'sets player position by argument' do
+      expect(Player).to receive(:execute_script).with('player/set_position.scpt', position)
+      Player.position = position
     end
   end
 
   describe '.next_track' do
     before do
-      Player.should_receive(:execute_script).
+      expect(Player).to receive(:execute_script).
         with('player/next_track.scpt').and_return(new_persistent_id)
-      Track.should_receive(:find_by).
+      expect(Track).to receive(:find_by).
         with(persistent_id: new_persistent_id).
         and_return([Track.new(persistent_id: new_persistent_id)])
     end
@@ -129,9 +145,9 @@ describe Player do
 
   describe '.prev_track' do
     before do
-      Player.should_receive(:execute_script).
+      expect(Player).to receive(:execute_script).
         with('player/prev_track.scpt').and_return(new_persistent_id)
-      Track.should_receive(:find_by).
+      expect(Track).to receive(:find_by).
         with(persistent_id: new_persistent_id).
         and_return([Track.new(persistent_id: new_persistent_id)])
     end
@@ -145,10 +161,10 @@ describe Player do
 
   describe '.current_track' do
     before do
-      Player.should_receive(:execute_script).
+      expect(Player).to receive(:execute_script).
         with('player/current_track.scpt').
         and_return(new_persistent_id)
-      Track.should_receive(:find_by).
+      expect(Track).to receive(:find_by).
         with({ persistent_id: new_persistent_id }).
         and_return([Track.new(persistent_id: new_persistent_id)])
     end

data/spec/itunes/track_spec.rb

@@ -32,10 +32,10 @@ describe Track do
     let(:new_persistent_id) { 'bar' }
 
     before do
-      track.should_receive(:execute_script).
+      expect(track).to receive(:execute_script).
         with('track/convert.scpt', base_persistent_id).
         and_return(new_persistent_id)
-      Track.should_receive(:find_by).
+      expect(Track).to receive(:find_by).
         with(persistent_id: new_persistent_id).
         and_return([Track.new(persistent_id: new_persistent_id)])
     end
@@ -51,7 +51,7 @@ describe Track do
     subject { track.delete! }
 
     before do
-      track.should_receive(:execute_script).
+      expect(track).to receive(:execute_script).
         with('track/delete.scpt', track.persistent_id)
     end
 
@@ -62,7 +62,7 @@ describe Track do
     subject { track.play }
 
     before do
-      track.should_receive(:execute_script).
+      expect(track).to receive(:execute_script).
         with('track/play.scpt', track.persistent_id)
     end
 
@@ -73,7 +73,7 @@ describe Track do
     subject(:pause) { track.pause }
 
     it 'calls player#pause' do
-      player.should_receive(:pause)
+      expect(player).to receive(:pause)
       pause
     end
   end
@@ -82,7 +82,7 @@ describe Track do
     subject(:stop) { track.stop }
 
     it 'calls player#stop' do
-      player.should_receive(:stop)
+      expect(player).to receive(:stop)
       stop
     end
    end
@@ -104,10 +104,10 @@ describe Track do
       let(:attributes) { { name: new_name, album: new_album } }
 
       before do
-        track.stub(:generate_script_from_template).
+        allow(track).to receive(:generate_script_from_template).
           with('track/updater.tmpl.scpt', persistent_id: track.persistent_id, update_records: "set name of specified_track to \"#{new_name}\"\nset album of specified_track to \"#{new_album}\"").
           and_return(new_scpt)
-        track.stub(:execute_template_based_script).
+        allow(track).to receive(:execute_template_based_script).
           with(new_scpt)
       end
 
@@ -148,10 +148,10 @@ describe Track do
       let(:name) { 'Hey Jude' }
 
       before do
-        Track.stub(:generate_script_from_template).
+        allow(Track).to receive(:generate_script_from_template).
           and_return(new_scpt)
 
-        Track.stub(:execute_template_based_script).
+        allow(Track).to receive(:execute_template_based_script).
           and_return([{ persistent_id: new_persistent_id, name: name }].to_json)
       end
 
@@ -167,10 +167,10 @@ describe Track do
     subject(:all) { Track.all }
 
     it 'calls find_by(:all)' do
-      Track.stub(:generate_script_from_template).
+      allow(Track).to receive(:generate_script_from_template).
         and_return('new.scpt')
 
-      Track.stub(:execute_template_based_script).
+      allow(Track).to receive(:execute_template_based_script).
         with('new.scpt').
         and_return([].to_json)
 

data/spec/itunes/util/executor_spec.rb

@@ -16,7 +16,7 @@ describe Itunes::Util::Executor do
     let(:result) { { status: 'ok' }.to_json }
 
     it 'returns a script result' do
-      Open3.should_receive(:capture2).with("osascript #{klass.script_base_dir}/#{path} #{args}").and_return(result)
+      expect(Open3).to receive(:capture2).with("osascript #{klass.script_base_dir}/#{path} #{args}").and_return(result)
       expect(execute_script).to eq(result)
     end
   end
@@ -29,7 +29,7 @@ describe Itunes::Util::Executor do
     let(:result) { { status: 'ok' }.to_json }
 
     before do
-      Open3.should_receive(:capture2).with("osascript #{script_full_path}").and_return(result)
+      expect(Open3).to receive(:capture2).with("osascript #{script_full_path}").and_return(result)
       FileUtils.touch(script_full_path)
     end
 

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'coveralls'
 Bundler.setup(:default, :development)
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.tty = true
   #config.formatter = :documentation
   config.include FakeFS::SpecHelpers, fakefs: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes-client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ryo katsuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: 0.10.1
 description: iTunes client with high level API
 email:
 - katsuma@gmail.com
@@ -180,7 +180,9 @@ files:
 - scripts/player/pause.scpt
 - scripts/player/play.scpt
 - scripts/player/player_state.scpt
+- scripts/player/position.scpt
 - scripts/player/prev_track.scpt
+- scripts/player/set_position.scpt
 - scripts/player/stop.scpt
 - scripts/track/convert.scpt
 - scripts/track/delete.scpt
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: itunes-client provides a high level API like ActiveRecord style to control