spty 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522850d6e6a9a6eb5f13810aa5d6fd1a7b5b2c5e
-  data.tar.gz: a60e505c3c678e4192c59d5eb92ac31e55f1295d
+  metadata.gz: 36a4a7466d3e6d655f2738738476d2411d604e12
+  data.tar.gz: f16da74414643bf5380ddd217e81975878cebbd5
 SHA512:
-  metadata.gz: 71ce6cce28e3d61f19cf9eb95f9cc6e6b2103f2bf414536df847ab49d467959a983765f050fffb2ef8b117916cc3a66cf8ae4bb2185424ae2f903b978ebe28ef
-  data.tar.gz: 15f6143a5197f7f1f7c677518ac3c30bb5f9d9be62779508e0f1f2031a1e8a9ed2fd50e7949a7716709838812d6c57d305c8315ff8e1c8afc4f433ac257779bb
+  metadata.gz: 833a1aac1594c88ff35ea7ae3c7e08bf93244537975a1686f1b5473efc89f92cb8c642b7a654ce1b7281cebc017fccdbf1109d60b32bf18357792b04f4e60226
+  data.tar.gz: 9410b8bcb475f9904c712e506df2bb39bd334d8c68ea2c37cf15b127dbbefd4b16b152ef3312d1d263ca98574b96ddc0fb5a3e96c7ce1163f081264332a60f03

data/lib/spty/commands/info_command.rb

@@ -0,0 +1,21 @@
+module Spty::Command
+  class InfoCommand
+    ASCRIPT_TRACK_INFO = <<-EOL
+      tell application "Spotify"
+        set currentTrack to name of current track as string
+        set currentArtist to artist of current track as string
+
+        return currentTrack & " - " & currentArtist
+      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)
+
+        puts "=> #{track_info.strip} [#{player_state.strip}]"
+      end
+    end
+  end
+end

data/lib/spty/commands/player_command.rb

@@ -15,25 +15,21 @@ module Spty::Command
       puts "=> player not running" and return false
     end
 
-    # Display the current state of the player.
-    ASCRIPT_PLAYER_STATE = <<-EOL
-      tell application "Spotify" to return player state
-    EOL
-    def self.state(_)
+    # Method is depreciated. It calls the actuall method
+    # This method should be removed on next release
+    def self.state(_, command = 'state')
       if running?
-        player_state = Spty::AppleScriptRunner.(ASCRIPT_PLAYER_STATE)
-        puts "=> player #{player_state}"
+        Spty::Command::StateCommand.('state')
+        puts "Command is deprecated. Use \"spty #{command}\"."
       end
     end
 
-    # Toggle player play / pause
-    ASCRIPT_PLAYER_TOGGLE = <<-EOL
-      tell application "Spotify" to playpause
-    EOL
-    def self.toggle(_)
+    # Method is depreciated. It calls the actuall method
+    # This method should be removed on next release
+    def self.toggle(_, command = 'toggle')
       if running?
-        Spty::AppleScriptRunner.(ASCRIPT_PLAYER_TOGGLE)
-        state(nil)
+        Spty::Command::ToggleCommand.(nil, 'toggle')
+        puts "Command is deprecated. Use \"spty #{command}\"."
       end
     end
   end

data/lib/spty/commands/replay_command.rb

@@ -0,0 +1,17 @@
+module Spty::Command
+  class ReplayCommand < BaseCommand
+
+    ASCRIPT_TRACK_REPLAY = <<-EOL
+      tell application "Spotify"
+        previous track
+      end tell
+    EOL
+    def self.call(_, command = 'replay')
+      if Spty::Command::PlayerCommand.running?
+        Spty::AppleScriptRunner.(ASCRIPT_TRACK_REPLAY)
+        Spty::Command::InfoCommand.(nil, command)
+      end
+    end
+
+  end
+end

data/lib/spty/commands/skip_command.rb

@@ -0,0 +1,17 @@
+module Spty::Command
+  class SkipCommand
+
+    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
+    end
+
+  end
+end

data/lib/spty/commands/state_command.rb

@@ -0,0 +1,14 @@
+module Spty::Command
+  class StateCommand
+    # 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
+    end
+  end
+end

data/lib/spty/commands/toggle_command.rb

@@ -0,0 +1,14 @@
+module Spty::Command
+  class ToggleCommand
+    # 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
+    end
+  end
+end

data/lib/spty/commands/track_command.rb

@@ -1,48 +1,26 @@
 module Spty::Command
   class TrackCommand < BaseCommand
-    ASCRIPT_TRACK_INFO = <<-EOL
-      tell application "Spotify"
-        set currentTrack to name of current track as string
-        set currentArtist to artist of current track as string
 
-        return currentTrack & " - " & currentArtist
-      end tell
-    EOL
-    def self.info(_)
+    # This command is deprecated.
+    def self.info(_, command = 'info')
       if Spty::Command::PlayerCommand.running?
-        track_info = Spty::AppleScriptRunner.(ASCRIPT_TRACK_INFO)
-        player_state_script = Spty::Command::PlayerCommand::ASCRIPT_PLAYER_STATE
-        player_state = Spty::AppleScriptRunner.(player_state_script)
-
-        puts "=> #{track_info.strip} [#{player_state.strip}]"
+        Spty::Command::InfoCommand.(nil, 'info')
+        puts "Command is deprecated. Use \"spty #{command}\"."
       end
     end
 
-    ASCRIPT_TRACK_SKIP = <<-EOL
-      tell application "Spotify"
-        next track
-      end tell
-    EOL
+    # This command is deprecated.
     def self.skip(_)
-      move_track(ASCRIPT_TRACK_SKIP)
+      Spty::Command::SkipCommand.call(nil)
+      puts 'Command is deprecated. Use "spty skip".'
     end
 
-    ASCRIPT_TRACK_REPLAY = <<-EOL
-      tell application "Spotify"
-        previous track
-      end tell
-    EOL
+    # This command is deprecared.
     def self.replay(_)
-      move_track(ASCRIPT_TRACK_REPLAY)
-    end
-
-    def self.move_track(ascript)
-      if Spty::Command::PlayerCommand.running?
-        Spty::AppleScriptRunner.(ascript)
-        Spty::Command::TrackCommand.info(nil)
-      end
+      #move_track(ASCRIPT_TRACK_REPLAY, 'replay')
+      Spty::Command::ReplayCommand.call(nil)
+      puts 'Command is deprecated. Use "spty replay".'
     end
 
-    private_class_method :move_track
   end
 end

data/lib/spty/version.rb

@@ -1,3 +1,3 @@
 module Spty
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spty.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.email         = ["jibone@gmail.com"]
 
   spec.summary       = %q{Spotify Player Terminal Utility}
-  spec.description   = %q{Lets you control your Spotify player from the terminal
-                          Currently only works for Mac OSX.}
+  spec.description   = "Control your Spotify player from the terminal. "\
+                       "Currently only works for Mac OSX."
   spec.homepage      = "https://github.com/jibone/spty-rb"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spty
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - J Shamsul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,9 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-description: |-
-  Lets you control your Spotify player from the terminal
-                            Currently only works for Mac OSX.
+description: Control your Spotify player from the terminal. Currently only works for
+  Mac OSX.
 email:
 - jibone@gmail.com
 executables:
@@ -91,7 +90,12 @@ files:
 - lib/spty/apple_script_runner.rb
 - lib/spty/cli.rb
 - lib/spty/commands/base_command.rb
+- lib/spty/commands/info_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/version.rb