controlio 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c75b8046bd0d3bd8682d38f809df03e5f05b37
-  data.tar.gz: f6bbb79fe9d682cb69019497e3ac1b7234f90718
+  metadata.gz: 2decd01fc4b6db84d0855e447638883230f76888
+  data.tar.gz: 912360f620adc5af2c511ef0d7caa802659c375d
 SHA512:
-  metadata.gz: e9d59c8303f87c6ec097db331e119d672329ff413ab1f40ef33b666390354d7484e1fb16af411850919c9ce5ca21150030719bf2437c6121b7a5468edb5c1315
-  data.tar.gz: 505ba665c8bff794b7735ef77d9b9a08974ad0b4f2b9b3a5a4950e9be5124f6b36cf572fe86ec7c902288b74ea3b910db3ed01c915ee3e5217eaae98a1bee5bb
+  metadata.gz: e04a064a71468730f2a6a87289a222f62426cba1c34f8122f7d60a90951dc1e70959ed293822ea87f47bdd45680b4157ece2e8e4ce4e70770a5231b977c8ac7d
+  data.tar.gz: c7adb4ef75f1a0642260dde20a380153ac6cc9d1616d72f049d4ee3bfba23f87c81577c1cdde5260ced0a325d2abd50c1592d141abace4142a410e6eb66bda69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    controlio (0.0.6)
+    controlio (0.0.7)
       activesupport (~> 4.1.6)
       rest_client (~> 1.7.3)
 

data/controlio.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         << 'sbin/controlio-imagesnap'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/commands/pause.rb

@@ -1,7 +1,9 @@
+require "helpers/player"
+
 module Commands
   class Pause
     def initialize(args, settings)
-      @app = args.first || settings.get('default_player')
+      @app = args.first || Helpers::Player.to_s || settings.get('default_player')
     end
 
     def go

data/lib/commands/picture.rb

@@ -9,7 +9,7 @@ module Commands
     end
 
     def go
-      `imagesnap -q #{FILE_LOCATION}`
+      `#{File.expand_path("#{File.dirname(__FILE__)}/../../sbin/controlio-imagesnap")} -q #{FILE_LOCATION}`
       response = RestClient.post "#{@api_root}/upload", file: File.new(FILE_LOCATION, 'rb')
       @url = JSON.load(response)['url']
     end

data/lib/commands/play.rb

@@ -1,7 +1,9 @@
+require "helpers/player"
+
 module Commands
   class Play
     def initialize(args, settings)
-      @app = args.first || settings.get('default_player')
+      @app = args.first || Helpers::Player.to_s || settings.get('default_player')
     end
 
     def go
@@ -11,6 +13,7 @@ module Commands
     end
 
     def respond
+      puts @app
       "Now playing: #{`osascript -e 'tell application "#{@app}" to get the name of the current track'`}".chomp rescue ""
     end
 

data/lib/commands/skip.rb

@@ -1,7 +1,9 @@
+require "helpers/player"
+
 module Commands
   class Skip
     def initialize(args, settings)
-      @app = args.first || settings.get('default_player')
+      @app = args.first || Helpers::Player.to_s || settings.get('default_player')
     end
 
     def go

data/lib/controlio/client.rb

@@ -20,7 +20,7 @@ module Controlio
           if klass.present?
             puts "Running #{klass} (#{args})"
             instance = klass.new(args, @settings)
-            instance.go
+            spawn_and_timeout instance
             send instance.respond, instance.media?
           else
             send "Command '#{c['message']}' was not found!"
@@ -33,6 +33,22 @@ module Controlio
 
     private
 
+    def spawn_and_timeout(instance)
+      pid = fork do
+        instance.go
+      end
+      Process.detach pid
+      pid2 = fork do
+        sleep 10
+        begin
+          Process.kill "TERM", pid
+        rescue
+        end
+      end
+      Process.detach pid2
+      pid
+    end
+
     def authorize
       @settings = Settings.new
       @api_key = @settings.get('api_key')

data/lib/controlio/settings.rb

@@ -23,7 +23,7 @@ module Controlio
     private
 
     def create_new_settings
-      settings = {api_root: API_ROOT}
+      settings = {api_root: API_ROOT, default_player: 'iTunes'}
       puts "Enter your phone number"
       number = gets.chomp
       if JSON.load(RestClient.get("#{API_ROOT}/check/#{number}"))['registered']

data/lib/controlio/version.rb

@@ -1,3 +1,3 @@
 module Controlio
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/helpers/player.rb

@@ -0,0 +1,15 @@
+module Helpers
+  class Player
+
+    def self.app_names
+      ["Spotify", "Rdio", "iTunes"]
+    end
+
+    def self.to_s
+      app_names.each do |app|
+        return "#{app}.app" if `ps aux | grep "#{app}"`.include? "#{app}.app"
+      end
+      nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controlio
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yasyf Mohamedali
@@ -101,6 +101,8 @@ files:
 - lib/controlio/client.rb
 - lib/controlio/settings.rb
 - lib/controlio/version.rb
+- lib/helpers/player.rb
+- sbin/controlio-imagesnap
 homepage: https://github.com/yasyf/controlio
 licenses: []
 metadata: {}