aric 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83716dff105d773cb4fda838e9c412a5948750ad
-  data.tar.gz: a9bcf7b61e4d53ab16a374aae185c1f22c31775a
+  metadata.gz: 38efb585c476f6e9486d2c1f81f4a0fc05f96d33
+  data.tar.gz: 00542d977dd68357eb3e8e8288373d774821c022
 SHA512:
-  metadata.gz: 8926293e242e2efa94ac452e9fc6ca1cd74f703eacc74cfac566cec539840ebbda0ed6e19dc4f867676e11e9ec52639b68864a222d6e6a14cbd723ee1506f05a
-  data.tar.gz: de6c5e80d54124c0103fc57f35ca10e8838d30a4a0a80a1781887f9d8cc8105c8c1c3973d3b870a452d1a4c551e9c6265f59ea96000108e7d591769ab0801e06
+  metadata.gz: 6f96564319f5ddd6eefc31541a3d0f0139fc44534b24fffb47d15407b29380c858fc124dec26fb6a452c3b22a95351a4f78a0dc1ae25848ac5961252529c2ed7
+  data.tar.gz: e201d72434d0828eb1d7a43b65f29ecfbc021f40be6512a87b1726be21427a41fb787ffaf9e171c9e7e4643f2702cb23dbe6030f8679ee680d7b590e01851ac8

data/README.md

@@ -5,6 +5,11 @@
 
 Awesome Ruby Itunes Client
 
+## Requirements
+
+* OSX Yosemite or higher
+* Ruby 2.2 or higher
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,7 +28,49 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Command Line
+
+Show avalable jobs.
+
+```sh
+$ aric --list
+```
+
+Execute jobs as follow.
+
+```sh
+// play trakcs
+$ aric play
+
+// next tracks
+$ aric next
+
+// volume up by 10
+$ aric up 10
+
+// volume up by 10
+$ aric up 10
+
+// show tracks in current playlists
+$ aric current_playlist_tracks
+
+// set state to track love
+$ aric love
+
+// open iTunes
+$ aric activate
+```
+
+Play founded tracks with `-p` option.
+
+```sh
+// play loved tracks
+$ aric -p find_loved_tracks
+
+// play found tracks
+
+$ aric -p find_tracks <track_name>
+```
 
 ## Development
 

data/lib/aric/command.rb

@@ -13,29 +13,31 @@ module Aric
       case
       when list?
         puts JobHandler.jobs
+      when play?
+        JobHandler.play(*@args)
       else
-        puts handler.run(*values)
+        puts JobHandler.new(job).run(*values)
       end
     end
 
     private
 
     def values
-      @values ||= @args.drop(1)
+      @args.drop(1)
     end
 
     def job
-      @job ||= (@args.first or raise JobNameRequired)
-    end
-
-    def handler
-      @handler ||= JobHandler.new(job)
+      @args.first or raise JobNameRequired
     end
 
     def list?
       options['list']
     end
 
+    def play?
+      options['play']
+    end
+
     def options
       @options ||= option_parser.getopts(@argv)
     end
@@ -47,7 +49,8 @@ module Aric
 
         opt.separator 'Options:'
         opt.on('-l', '--list', 'show available methods')
-        opt.on('-d', 'demonize')
+        opt.on('-p', '--play', 'play found tracks')
+        # opt.on('-d', 'demonize')
       end
     end
   end

data/lib/aric/job/player.rb

@@ -3,10 +3,19 @@ require 'aric/job/base'
 module Aric
   module Job
     class Player < Base
-      def play(id = nil)
-        run(:play, id)
+      def play_music(*argv)
+        run(:play_music, argv)
+      end
+
+      def play_track(id = nil)
+        run(:play_track, id)
+      end
+      alias_method :play, :play_track
+      alias_method :start, :play_track
+
+      def play_playlist(id)
+        run(:play_playlist, id)
       end
-      alias_method :start, :play
 
       def pause
         run(:pause)

data/lib/aric/job_handler.rb

@@ -5,6 +5,14 @@ module Aric
     class JobNotFound < StandardError; end
 
     class << self
+      def play(*args)
+        if args.first && jobs.include?(args.first.to_sym)
+          new(:play_music).run(*args)
+        else
+          raise JobNotFound
+        end
+      end
+
       def jobs
         @jobs ||= job_class_hash.values.flat_map(&:itself)
       end
@@ -27,7 +35,7 @@ module Aric
     end
 
     def run(*args)
-      # check argument number
+      # Check argument number
       job_class.run(@job_name, *args)
     end
 

data/lib/aric/resource/playlist.rb

@@ -23,7 +23,7 @@ module Aric
       end
 
       def to_s
-        name
+        '%s / %s' % [name, persistentID]
       end
     end
   end

data/lib/aric/resource/track.rb

@@ -32,7 +32,7 @@ module Aric
       end
 
       def to_s
-        '%s / %s / %s' % [name, artist, album]
+        '%s / %s / %s / %s' % [name, artist, album, persistentID]
       end
 
       private

data/lib/aric/script_runner.rb

@@ -15,10 +15,7 @@ module Aric
     def run(args = [])
       args = Array(args).join(' ')
       stdout, stderr, status = Open3.capture3("osascript -l JavaScript #{script_file_path} #{args}")
-      puts nil, '<============================================================ DEBUG OUTPUT START HERE'
-      p stdout, stderr, status
-      puts '<============================================================ DEBUG OUTPUT CLOSE HERE', nil
-      raise stderr unless status.success?
+      raise "#{stderr} at osascript -l JavaScript #{script_file_path} #{args}" unless status.success?
       stdout.strip
     end
 

data/lib/aric/version.rb

@@ -1,3 +1,3 @@
 module Aric
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/scripts/create_playlist.js

@@ -0,0 +1,22 @@
+function run(argv) {
+  var app = Application("iTunes");
+  var plName = argv[0];
+  var pl = app.playlist[plName];
+
+  if (!pl) {
+    pl = new app.Playlist;
+    pl.make();
+    pl.name = plName;
+  }
+
+  argv.shift();
+  argv.forEach(function(id) {
+    var v = app.tracks().find(function(x){
+      return x.persistentID() == id;
+    });
+
+    if (v) {
+      v.duplicate({to: pl});
+    }
+  });
+}

data/scripts/finder/find_loved_tracks.js

@@ -1,16 +1,21 @@
-function run(argv) {
+function run(argv, playMode) {
   var app = Application("iTunes");
-  var tracks = app.tracks().filter(function(x){ return x.loved(); }).map(function(track){
-    return {
-      class: track.class(),
-      container: track.container(),
-      id: track.id(),
-      index: track.index(),
-      name: track.name(),
-      persistentID: track.persistentID(),
-      properties: track.properties()
-    };
-  });;
 
-  return JSON.stringify(tracks);
+  if (playMode === true) {
+    return app.tracks().filter(function(x){ return x.loved(); });
+  } else {
+    var tracks = app.tracks().filter(function(x){ return x.loved(); }).map(function(track){
+      return {
+        class: track.class(),
+        container: track.container(),
+        id: track.id(),
+        index: track.index(),
+        name: track.name(),
+        persistentID: track.persistentID(),
+        properties: track.properties()
+      };
+    });;
+
+    return JSON.stringify(tracks);
+  }
 }

data/scripts/finder/find_track_by_id.js

@@ -1,16 +1,21 @@
-function run(argv) {
+function run(argv, playMode) {
   var app = Application("iTunes");
+
   var track =  app.tracks().find(function(x){
     return x.persistentID() == argv[0];
   });
 
-  return JSON.stringify({
-    class: track.class(),
-    container: track.container(),
-    id: track.id(),
-    index: track.index(),
-    name: track.name(),
-    persistentID: track.persistentID(),
-    properties: track.properties()
-  });
+  if (playMode == true) {
+    return track;
+  } else {
+    return JSON.stringify({
+      class: track.class(),
+      container: track.container(),
+      id: track.id(),
+      index: track.index(),
+      name: track.name(),
+      persistentID: track.persistentID(),
+      properties: track.properties()
+    });
+  }
 }

data/scripts/finder/find_tracks.js

@@ -1,18 +1,24 @@
-function run(argv) {
+function run(argv, playMode) {
   var app = Application("iTunes");
   var pl = app.playlists().find(function(x){
     return x.name() == "ミュージック" || x.name() == "Music";
   });
-  var tracks = app.search(pl, {for: argv[0]}).map(function(track){
-    return {
-      class: track.class(),
-      container: track.container(),
-      id: track.id(),
-      index: track.index(),
-      name: track.name(),
-      persistentID: track.persistentID(),
-      properties: track.properties()
-    };
-  });
-  return JSON.stringify(tracks);
+  var tracks = app.search(pl, {for: argv[0]});
+
+  if (playMode === true) {
+    return tracks;
+  } else {
+    var t = tracks.map(function(track){
+      return {
+        class: track.class(),
+        container: track.container(),
+        id: track.id(),
+        index: track.index(),
+        name: track.name(),
+        persistentID: track.persistentID(),
+        properties: track.properties()
+      };
+    });
+    return JSON.stringify(t);
+  }
 }

data/scripts/play_music.js

@@ -0,0 +1,37 @@
+function run(argv) {
+  var app = Application("iTunes");
+  var ret = loadAndEval(argv);
+  var pl = createPlayList(app, "_aric_tmp");
+
+  ret.forEach(function (x) {
+    x.duplicate({to: pl});
+  });
+
+  app.play(pl);
+}
+
+function createPlayList(app, name) {
+  var pl = app.playlists().find(function (x) { return x.name() === name; });
+  console.log(pl);
+
+  if (pl) {
+    pl.delete();                // to overwrite
+  }
+
+  pl = new app.Playlist;
+  pl.make();
+  pl.name = name;
+  return pl;
+}
+
+function loadAndEval(argv) {
+  ObjC.import('Foundation');
+
+  var path = 'scripts/finder/' +  argv[0] + '.js';
+  var fm = $.NSFileManager.defaultManager;
+  var contents = fm.contentsAtPath(path.toString());
+  contents = $.NSString.alloc.initWithDataEncoding(contents, $.NSUTF8StringEncoding);
+
+  eval(ObjC.unwrap(contents));
+  return run([argv[1]], true);
+}

data/scripts/play_playlist.js

@@ -0,0 +1,7 @@
+function run(argv){
+  var app = Application("iTunes");
+  var t = app.playlists().find(function (x) {
+    return x.persistentID() == argv[0];
+  });
+  app.play(t);
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aric
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -103,6 +103,7 @@ files:
 - lib/aric/version.rb
 - scripts/activate.js
 - scripts/back_track.js
+- scripts/create_playlist.js
 - scripts/current_playlist.js
 - scripts/current_playlist_tracks.js
 - scripts/current_track.js
@@ -122,7 +123,9 @@ files:
 - scripts/mute.js
 - scripts/next_track.js
 - scripts/pause.js
-- scripts/play.js
+- scripts/play_music.js
+- scripts/play_playlist.js
+- scripts/play_track.js
 - scripts/player_position.js
 - scripts/player_state.js
 - scripts/previous_track.js
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Awesome Ruby Ituens Client