itunes-client 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c223fb2667334432e8c1abae7ba824866af422
-  data.tar.gz: 5f0696afab2934878524b5d3bcf4a302f72cb968
+  metadata.gz: 2f636c50e60a1601b8d1666384714bd4d2501e18
+  data.tar.gz: 680822064d023dca16d84a7a44563e15c8bebb24
 SHA512:
-  metadata.gz: 2195776658c61f904b1bc40e3b545b6d9e4d294917d7d44b77f81712d9c720d687dbb9ae14cf36b0bb2ea57aa41b70f87686ba9d83e5ede4654356e4215f035b
-  data.tar.gz: c928d7021796713d796dfc27198a3922a1c9cdca85408f2c6394cef723560e8130b66cf0e3e08b68bb4f98f200ebc5052c4d27a925650e52fb3c54fc25601198
+  metadata.gz: 8f73dd601b66ad9ca14ab81f0c3a6cbf319f255b7765b98a020f1f21c116933caa08ba4a19e2fb761eecbe6aed7997d6920b0c7c8f0c8da9b97e348c76adb98e
+  data.tar.gz: f776209c942f08ee85ad7bf919dbf9767147c418a4c9e3d8853226d3c26b388574cd94a86cd7dffb8f2462c1ecca62cb6434ab0b3979590ffa3df6d4d33e9560

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.DS_Store
 .bundle
 .config
 .yardoc

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+before_install:
+  - gem update bundler
 rvm:
   - 2.2
   - 2.1
   - 2.0
-  - 1.9

data/README.md

@@ -29,10 +29,10 @@ $ gem install itunes-client
 
 
 ## Supported Ruby
-- 2.2.0-preview1
-- 2.1.3
-- 2.0.0
-- 1.9.3
+- 2.2
+- 2.1
+- 2.0
+
 
 ## Usage
 
@@ -57,6 +57,22 @@ track.play
 
 # Stop track
 track.stop
+
+# Control volume
+volume = Itunes::Volume
+
+# Decrease and increase the volume
+volume.down(20)
+volume.down      # default 10
+volume.up(20)
+volume.up       # default 10
+
+# Mute and unmute the volume
+volume.mute
+volume.unmute
+
+# Return volume value
+volume.value
 ```
 
 ## License

data/lib/itunes/player.rb

@@ -3,6 +3,7 @@ require 'singleton'
 
 require 'itunes/track'
 require 'itunes/util'
+require 'itunes/volume'
 
 module Itunes
   class Player

data/lib/itunes/track.rb

@@ -14,7 +14,11 @@ module Itunes
       :artist,
       :track_count,
       :track_number,
-      :year
+      :year,
+      :season_number,
+      :episode_number,
+      :show,
+      :video_kind
     ].freeze
 
     FINDER_ATTRIBUTES = [
@@ -120,7 +124,11 @@ module Itunes
       records = []
       args.each do |key, val|
         if ATTRIBUTES.include?(key)
-          records << "set #{key.to_s.gsub('_', ' ')} of specified_track to \"#{val}\""
+          if key == :video_kind
+            records << "set video kind of specified_track to #{val}"
+          else
+            records << "set #{key.to_s.gsub('_', ' ')} of specified_track to \"#{val}\""
+          end
         end
       end
       records.join("\n")

data/lib/itunes/version.rb

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

data/lib/itunes/volume.rb

@@ -0,0 +1,38 @@
+require 'itunes/util'
+
+module Itunes
+  class Volume
+    extend Itunes::Util::Executor
+
+    class << self
+      def up(level = 10)
+        execute_script("#{script_dir}/up.scpt", level)
+        self
+      end
+
+      def down(level = 10)
+        execute_script("#{script_dir}/down.scpt", level)
+        self
+      end
+
+      def mute
+        execute_script("#{script_dir}/mute.scpt")
+        self
+      end
+
+      def unmute
+        execute_script("#{script_dir}/unmute.scpt")
+        self
+      end
+
+      def value
+        execute_script("#{script_dir}/value.scpt").to_i
+      end
+
+      private
+      def script_dir
+        'volume'
+      end
+    end
+  end
+end

data/scripts/track/finder.tmpl.scpt

@@ -12,7 +12,11 @@ tell application "iTunes"
     set end of props to ("\"artist\":\"" & my escape_quote(artist of specified_track) & "\",")
     set end of props to ("\"track_count\":\"" & track count of specified_track & "\",")
     set end of props to ("\"track_number\":\"" & track number of specified_track & "\",")
-    set end of props to ("\"year\":\"" & year of specified_track & "\"")
+    set end of props to ("\"year\":\"" & year of specified_track & "\",")
+    set end of props to ("\"video_kind\":\"" & video kind of specified_track & "\",")
+    set end of props to ("\"show\":\"" & show of specified_track & "\",")
+    set end of props to ("\"season_number\":\"" & season number of specified_track & "\",")
+    set end of props to ("\"episode_number\":\"" & episode number of specified_track & "\"")
     set end of props to "}"
 
     set json to json & props as string & ","

data/scripts/volume/down.scpt

@@ -0,0 +1,5 @@
+on run argv
+  tell application "iTunes"
+    set sound volume to (sound volume - (item 1 of argv))
+  end tell
+end run

data/scripts/volume/mute.scpt

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  set mute to true
+end tell

data/scripts/volume/unmute.scpt

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  set mute to false
+end tell

data/scripts/volume/up.scpt

@@ -0,0 +1,5 @@
+on run argv
+  tell application "iTunes"
+    set sound volume to (sound volume + (item 1 of argv))
+  end tell
+end run

data/scripts/volume/value.scpt

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  return sound volume
+end tell

data/spec/itunes/volume_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'itunes-client'
+
+include Itunes
+
+describe Volume do
+  let(:level) { an_instance_of(Fixnum) }
+
+  describe '.up' do
+    it 'calls up.scpt' do
+      expect(Volume).to receive(:execute_script).with('volume/up.scpt', level)
+      Volume.up
+    end
+  end
+
+  describe '.down' do
+    it 'calls down.scpt' do
+      expect(Volume).to receive(:execute_script).with('volume/down.scpt', level)
+      Volume.down
+    end
+  end
+
+  describe '.mute' do
+    it 'calls mute.scpt' do
+      expect(Volume).to receive(:execute_script).with('volume/mute.scpt')
+      Volume.mute
+    end
+  end
+
+  describe '.unmute' do
+    it 'calls unmute.scpt' do
+      expect(Volume).to receive(:execute_script).with('volume/unmute.scpt')
+      Volume.unmute
+    end
+  end
+
+  describe '.value' do
+    context 'when iTunes returns volume level' do
+      it 'returns current value' do
+        allow(Volume).to receive(:execute_script).with('volume/value.scpt').and_return("30")
+        expect(Volume.value).to eq(30)
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes-client
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - ryo katsuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,6 +174,7 @@ files:
 - lib/itunes/util.rb
 - lib/itunes/util/executor.rb
 - lib/itunes/version.rb
+- lib/itunes/volume.rb
 - scripts/player/add.scpt
 - scripts/player/current_track.scpt
 - scripts/player/next_track.scpt
@@ -189,9 +190,15 @@ files:
 - scripts/track/finder.tmpl.scpt
 - scripts/track/play.scpt
 - scripts/track/updater.tmpl.scpt
+- scripts/volume/down.scpt
+- scripts/volume/mute.scpt
+- scripts/volume/unmute.scpt
+- scripts/volume/up.scpt
+- scripts/volume/value.scpt
 - spec/itunes/player_spec.rb
 - spec/itunes/track_spec.rb
 - spec/itunes/util/executor_spec.rb
+- spec/itunes/volume_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/katsuma/itunes-client
 licenses:
@@ -222,4 +229,5 @@ test_files:
 - spec/itunes/player_spec.rb
 - spec/itunes/track_spec.rb
 - spec/itunes/util/executor_spec.rb
+- spec/itunes/volume_spec.rb
 - spec/spec_helper.rb