spty 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da1e8db64f316e104c98ae9254b694e2e983a4a
-  data.tar.gz: 5d9656b5fb1b560c96caf5a6e889f31262731b37
+  metadata.gz: 03f320416e178aac141deb66fcb50a15c0855920
+  data.tar.gz: 612e24b134d748dfe3b1a96068dc10bdefcea377
 SHA512:
-  metadata.gz: 6d729c7902bf5557b31deb17e3f0841ade66b69b35e955d6d937b91bb1077e170401bdf0ba704af8781597e0597aa20dbc0c95d0a5375fa4fc311e39effeb272
-  data.tar.gz: 30b5202ddbc8cc4e4c97eb3ea8573122f332a8167dac46efcba4f9dc7b7fa81dd1190ced548b801089e701a1d301756a4b217342a331c396f8f003253f8c0128
+  metadata.gz: 03da0ee0f8774e25bc36fb6fb8a37bbff58c7ffa3a9f7c5c089f1a509088e4c3c67aa4432b596f2a697dbaf70e930ae21aac8075b7582b2e33f65be228cfd11c
+  data.tar.gz: cd384ef7c3c4612f87fdd0fce4dd4f4c73e58814ed8a743f7344f3f19cd58eaccea0d63a87a60b53829c37cb65cc6445c14d63cd8f785f496df9e8ee315054ad

data/README.md

@@ -22,27 +22,27 @@ $ spty version
 
 Show current player state
 ```
-$ spty player state
+$ spty state
 ```
 
 Toggle player play / pause
 ```
-$ spty player toggle
+$ spty toggle
 ```
 
 Get track title and artist
 ```
-$ spty track info
+$ spty info
 ```
 
 Skip track and play the next track
 ```
-$ spty track skip
+$ spty skip
 ```
 
 Replay previous track
 ```
-$ spty track replay
+$ spty replay
 ```
 
 Show current volume level

data/lib/spty/commands/base_command.rb

@@ -1,13 +1,25 @@
 module Spty::Command
   class BaseCommand
-    def self.call(options, command)
-      action = options.shift
+    # Check if the application is running
+    ASCRIPT_PLAYER_DETECT = <<-EOL
+      if application "Spotify" is running then
+        return "Running"
+      else
+        return "Not running"
+      end if
+    EOL
+    def self.running?(show_mesg: true)
+      player_running = Spty::AppleScriptRunner.(ASCRIPT_PLAYER_DETECT)
+      return true if player_running.strip == 'Running'
 
-      begin
-        self.send(action.to_sym, options)
-      rescue NameError => _e
-        puts "Do not understand command: #{command} #{action}"
+      if show_mesg
+        output = "player not running\n"\
+                 "to launch Spotify player, use: spty launch"
+
+        puts output
       end
+
+      false
     end
   end
 end

data/lib/spty/commands/help_command.rb

@@ -1,6 +1,5 @@
 module Spty::Command
   class HelpCommand
-
     HELP_TEXT =
       "usage: spty <command> [<args>]\n"\
       "\n"\
@@ -9,10 +8,10 @@ module Spty::Command
       "  toggle            Toggle player play or pause\n"\
       "  skip              Skip the current track and play the next track\n"\
       "  replay            Replay the current track\n"\
-      "  volume            Shows the current volume level"\
-      "  volume up         Increase the volume level by 10"\
-      "  volume down       Decrease the volume level by 11"\
-      "  volume [number]   Set the volume level to number"\
+      "  volume            Shows the current volume level\n"\
+      "  volume up         Increase the volume level by 10\n"\
+      "  volume down       Decrease the volume level by 11\n"\
+      "  volume [number]   Set the volume level to number\n"\
       "\n"\
       "Track specific command\n"\
       "  info              Show information for the current track\n"\

data/lib/spty/commands/info_command.rb

@@ -1,5 +1,5 @@
 module Spty::Command
-  class InfoCommand
+  class InfoCommand < BaseCommand
     ASCRIPT_TRACK_INFO = <<-EOL
       tell application "Spotify"
         set currentTrack to name of current track as string
@@ -9,13 +9,13 @@ module Spty::Command
       end tell
     EOL
     def self.call(_, _command = 'info')
-      if Spty::Command::PlayerCommand.running?
-        track_info = Spty::AppleScriptRunner.(ASCRIPT_TRACK_INFO)
-        player_state_script = Spty::Command::StateCommand::ASCRIPT_PLAYER_STATE
-        player_state = Spty::AppleScriptRunner.(player_state_script)
+      return unless running?
 
-        puts "=> #{track_info.strip} [#{player_state.strip}]"
-      end
+      track_info = Spty::AppleScriptRunner.(ASCRIPT_TRACK_INFO)
+      player_state_script = Spty::Command::StateCommand::ASCRIPT_PLAYER_STATE
+      player_state = Spty::AppleScriptRunner.(player_state_script)
+
+      puts "=> #{track_info.strip} [#{player_state.strip}]"
     end
   end
 end

data/lib/spty/commands/launch_command.rb

@@ -1,11 +1,11 @@
 module Spty::Command
-  class LaunchCommand
+  class LaunchCommand < BaseCommand
     ASCRIPT_PLAYER_LAUNCH = <<-EOL
       tell application "Spotify" to activate
     EOL
 
     def self.call(_, _command = 'launch')
-      if Spty::Command::PlayerCommand.running?(show_mesg: false)
+      if running?(show_mesg: false)
         puts 'Spotify player is running'
         return
       end

data/lib/spty/commands/replay_command.rb

@@ -7,10 +7,10 @@ module Spty::Command
       end tell
     EOL
     def self.call(_, command = 'replay')
-      if Spty::Command::PlayerCommand.running?
-        Spty::AppleScriptRunner.(ASCRIPT_TRACK_REPLAY)
-        Spty::Command::InfoCommand.(nil, command)
-      end
+      return unless running?
+
+      Spty::AppleScriptRunner.(ASCRIPT_TRACK_REPLAY)
+      Spty::Command::InfoCommand.(nil, command)
     end
 
   end

data/lib/spty/commands/skip_command.rb

@@ -1,16 +1,15 @@
 module Spty::Command
-  class SkipCommand
-
+  class SkipCommand < BaseCommand
     ASCRIPT_TRACK_SKIP = <<-EOL
       tell application "Spotify"
         next track
       end tell
     EOL
     def self.call(_, command = 'skip')
-      if Spty::Command::PlayerCommand.running?
-        Spty::AppleScriptRunner.(ASCRIPT_TRACK_SKIP)
-        Spty::Command::InfoCommand.(nil, command)
-      end
+      return unless running?
+
+      Spty::AppleScriptRunner.(ASCRIPT_TRACK_SKIP)
+      Spty::Command::InfoCommand.(nil, command)
     end
 
   end

data/lib/spty/commands/state_command.rb

@@ -1,14 +1,14 @@
 module Spty::Command
-  class StateCommand
+  class StateCommand < BaseCommand
     # Display the current state of the player.
     ASCRIPT_PLAYER_STATE = <<-EOL
       tell application "Spotify" to return player state
     EOL
     def self.call(_, _command = nil)
-      if Spty::Command::PlayerCommand.running?
-        player_state = Spty::AppleScriptRunner.(ASCRIPT_PLAYER_STATE)
-        puts "=> player #{player_state}"
-      end
+      return unless running?
+
+      player_state = Spty::AppleScriptRunner.(ASCRIPT_PLAYER_STATE)
+      puts "=> player #{player_state}"
     end
   end
 end

data/lib/spty/commands/toggle_command.rb

@@ -1,14 +1,14 @@
 module Spty::Command
-  class ToggleCommand
+  class ToggleCommand < BaseCommand
     # Toggle player play / pause
     ASCRIPT_PLAYER_TOGGLE = <<-EOL
       tell application "Spotify" to playpause
     EOL
     def self.call(_, command = 'toggle')
-      if Spty::Command::PlayerCommand.running?
-        Spty::AppleScriptRunner.(ASCRIPT_PLAYER_TOGGLE)
-        Spty::Command::StateCommand.(nil, command)
-      end
+      return unless running?
+
+      Spty::AppleScriptRunner.(ASCRIPT_PLAYER_TOGGLE)
+      Spty::Command::StateCommand.(nil, command)
     end
   end
 end

data/lib/spty/commands/volume_command.rb

@@ -1,7 +1,7 @@
 module Spty::Command
-  class VolumeCommand
+  class VolumeCommand < BaseCommand
     def self.call(options, _)
-      return unless Spty::Command::PlayerCommand.running?
+      return unless running?
 
       action = options.shift
 

data/lib/spty/version.rb

@@ -1,3 +1,3 @@
 module Spty
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - J Shamsul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,12 +107,10 @@ files:
 - lib/spty/commands/help_command.rb
 - lib/spty/commands/info_command.rb
 - lib/spty/commands/launch_command.rb
-- lib/spty/commands/player_command.rb
 - lib/spty/commands/replay_command.rb
 - lib/spty/commands/skip_command.rb
 - lib/spty/commands/state_command.rb
 - lib/spty/commands/toggle_command.rb
-- lib/spty/commands/track_command.rb
 - lib/spty/commands/version_command.rb
 - lib/spty/commands/volume_command.rb
 - lib/spty/version.rb

data/lib/spty/commands/player_command.rb

@@ -1,43 +0,0 @@
-module Spty::Command
-  class PlayerCommand < BaseCommand
-    # Check if the application is running
-    ASCRIPT_PLAYER_DETECT = <<-EOL
-      if application "Spotify" is running then
-        return "Running"
-      else
-        return "Not running"
-      end if
-    EOL
-    def self.running?(show_mesg: true)
-      player_running = Spty::AppleScriptRunner.(ASCRIPT_PLAYER_DETECT)
-      return true if player_running.strip == 'Running'
-
-      if show_mesg
-        output = "player not running\n"\
-                 "to launch Spotify player, use: spty launch"
-
-        puts output
-      end
-
-      false
-    end
-
-    # Method is depreciated. It calls the actuall method
-    # This method should be removed on next release
-    def self.state(_, command = 'state')
-      if running?
-        Spty::Command::StateCommand.('state')
-        puts "Command is deprecated. Use \"spty #{command}\"."
-      end
-    end
-
-    # Method is depreciated. It calls the actuall method
-    # This method should be removed on next release
-    def self.toggle(_, command = 'toggle')
-      if running?
-        Spty::Command::ToggleCommand.(nil, 'toggle')
-        puts "Command is deprecated. Use \"spty #{command}\"."
-      end
-    end
-  end
-end

data/lib/spty/commands/track_command.rb

@@ -1,26 +0,0 @@
-module Spty::Command
-  class TrackCommand < BaseCommand
-
-    # This command is deprecated.
-    def self.info(_, command = 'info')
-      if Spty::Command::PlayerCommand.running?
-        Spty::Command::InfoCommand.(nil, 'info')
-        puts "Command is deprecated. Use \"spty #{command}\"."
-      end
-    end
-
-    # This command is deprecated.
-    def self.skip(_)
-      Spty::Command::SkipCommand.call(nil)
-      puts 'Command is deprecated. Use "spty skip".'
-    end
-
-    # This command is deprecared.
-    def self.replay(_)
-      #move_track(ASCRIPT_TRACK_REPLAY, 'replay')
-      Spty::Command::ReplayCommand.call(nil)
-      puts 'Command is deprecated. Use "spty replay".'
-    end
-
-  end
-end