listlace 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dd49a642dc3679a690ddc7b4107d614d2356c6
-  data.tar.gz: 49cfdc7c09b8e1835346c3d334796e2a25a81287
+  metadata.gz: 73a561a8f588866994d8cbe4718ebdfecc177e0c
+  data.tar.gz: b6e132d833d80fa70db4bd45797a14f215a886ed
 SHA512:
-  metadata.gz: 1894c03f8bcc99d20c212bbc8c2b80ae37cf4ebe67bd44e6053cd64eb22a19223a7f2fbbf44fd22a40bebdf2a82cbe51e985d629c2811401dd277ad1fabbc2a9
-  data.tar.gz: fe454c5393bdedf4acbc145393ea94c83726670eeaf7b243e6b7df7f62fdf856ccec7a377427082117bc22d15eebde2de6f80559df5900b8924ad1d0964fbd68
+  metadata.gz: 71fbeea2dffa8205f5ad4ffa0320b5c53ad8e8f8cbf8d3c22f83b3a396330bd9aba86b70ccb9f224aabe66607a15bc7068ba2fa6ac85cd0d2167aa74b2d27bd1
+  data.tar.gz: 453a19318a387a0016cebbd839a1bdf22caa2f350ae108e06b4f25d75f9e229b3611fc3561ba3a4e502fc2dd9ac705d500f60ea1bcf3ff53ebdcaf83e97a8f9b

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    listlace (0.2.0)
-      bundler
-      pry
-      ruby-mpd
+    listlace (0.2.2)
+      bundler (~> 1.5)
+      pry (~> 0.9)
+      ruby-mpd (~> 0.3, >= 0.3.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
     method_source (0.8.2)
@@ -15,7 +15,6 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (0.9.2.2)
     ruby-mpd (0.3.1)
     slop (3.5.0)
 
@@ -24,4 +23,3 @@ PLATFORMS
 
 DEPENDENCIES
   listlace!
-  rake

data/README.md

@@ -96,14 +96,14 @@ It's basically a numeric selector, but you can pass a String containing a format
 
 ### Special selectors
 
-### all
+#### all
 
 `all` returns all the songs in your library.
 
     ♫> all
     => [3560 songs]
 
-### none
+#### none
 
 `none` returns an empty playlist.
 
@@ -134,6 +134,54 @@ It's basically a numeric selector, but you can pass a String containing a format
 
     ♫> stop
 
+### skip
+
+`skip` goes to the next song. If you give it a number, it will go that many songs ahead.
+
+    ♫> skip
+    ♫> skip 3
+
+### back
+
+`back` goes back a song. If you give it a number, it will go that many songs back.
+
+    ♫> back
+    ♫> back 3
+
+### restart
+
+`restart` goes back to the beginning of the current song.
+
+    ♫> restart
+
+### pause
+
+`pause` pauses the current song.
+
+    ♫> pause
+
+### resume
+
+`resume` resumes the current song after being paused.
+
+    ♫> resume
+
+### seek
+
+`seek` seeks forward or backward the specified number of seconds. You can also pass a String containing a formatted time, like "1:23", to skip ahead that many minutes and seconds, or "-1:23" to skip backward.
+
+    ♫> seek 10
+    ♫> seek -10
+    ♫> seek "1:23"
+    ♫> seek "-0:10"
+
+### seek_to
+
+`seek_to` seeks to an exact position of the current playing song. You can give it a number of seconds, or a formatted string containing a time.
+
+    ♫> seek_to 0
+    ♫> seek_to "5:00"
+
 ### list
 
 `list` with no arguments lists all the songs in your music library. If you pass it a playlist, it will list all the songs in that playlist.

data/lib/listlace.rb

@@ -9,7 +9,9 @@ require "listlace/core_ext/array"
 class Listlace
   attr_reader :mpd
 
-  include Commands
+  include Commands::InfoCommands
+  include Commands::PlaybackCommands
+  include Commands::QueueCommands
   include Selectors
 
   def initialize(host, port)

data/lib/listlace/commands.rb

@@ -1,81 +1,9 @@
+require "listlace/commands/info_commands"
+require "listlace/commands/playback_commands"
+require "listlace/commands/queue_commands"
+
 class Listlace
   module Commands
-    def p(*playlist)
-      if playlist.empty?
-        case mpd.status[:state]
-        when :play
-          mpd.pause = true
-        when :pause
-          mpd.pause = false
-        when :stop
-          mpd.play
-        end
-      else
-        mpd.clear
-        playlist.flatten.each do |song|
-          mpd.add song.file
-        end
-        mpd.play
-      end
-      nil
-    end
-
-    def stop
-      mpd.stop
-      nil
-    end
-
-    def q(*playlist)
-      if playlist.empty?
-        mpd.queue
-      else
-        mpd.clear
-        playlist.flatten.each do |song|
-          mpd.add song.file
-        end
-        nil
-      end
-    end
-
-    def list(playlist = nil)
-      (playlist || all).each do |song|
-        time = TimeHelpers.format_time(song.time)
-        puts "#{song.artist} - #{song.album} - #{song.title} (#{time})"
-      end
-      nil
-    end
-
-    def artists(playlist = nil)
-      (playlist || all).group_by(&:artist).each do |artist, songs|
-        plural = (songs.length == 1) ? "" : "s"
-        puts "#{artist} (#{songs.length} song#{plural})"
-      end
-      nil
-    end
-
-    def albums(playlist = nil)
-      (playlist || all).group_by(&:album).each do |album, songs|
-        plural = (songs.length == 1) ? "" : "s"
-        puts "#{songs.first.artist} - #{album} (#{songs.length} song#{plural})"
-      end
-      nil
-    end
-
-    def genres(playlist = nil)
-      (playlist || all).group_by(&:genre).each do |genre, songs|
-        plural = (songs.length == 1) ? "" : "s"
-        puts "#{genre} (#{songs.length} song#{plural})"
-      end
-      nil
-    end
-
-    def years(playlist = nil)
-      (playlist || all).group_by(&:date).each do |year, songs|
-        plural = (songs.length == 1) ? "" : "s"
-        puts "#{year} (#{songs.length} song#{plural})"
-      end
-      nil
-    end
   end
 end
 

data/lib/listlace/commands/info_commands.rb

@@ -0,0 +1,46 @@
+class Listlace
+  module Commands
+    module InfoCommands
+      def list(playlist = nil)
+        (playlist || all).each do |song|
+          time = TimeHelpers.format_time(song.time)
+          puts "#{song.artist} - #{song.album} - #{song.title} (#{time})"
+        end
+        nil
+      end
+
+      def artists(playlist = nil)
+        (playlist || all).group_by(&:artist).each do |artist, songs|
+          plural = (songs.length == 1) ? "" : "s"
+          puts "#{artist} (#{songs.length} song#{plural})"
+        end
+        nil
+      end
+
+      def albums(playlist = nil)
+        (playlist || all).group_by(&:album).each do |album, songs|
+          plural = (songs.length == 1) ? "" : "s"
+          puts "#{songs.first.artist} - #{album} (#{songs.length} song#{plural})"
+        end
+        nil
+      end
+
+      def genres(playlist = nil)
+        (playlist || all).group_by(&:genre).each do |genre, songs|
+          plural = (songs.length == 1) ? "" : "s"
+          puts "#{genre} (#{songs.length} song#{plural})"
+        end
+        nil
+      end
+
+      def years(playlist = nil)
+        (playlist || all).group_by(&:date).each do |year, songs|
+          plural = (songs.length == 1) ? "" : "s"
+          puts "#{year} (#{songs.length} song#{plural})"
+        end
+        nil
+      end
+    end
+  end
+end
+

data/lib/listlace/commands/playback_commands.rb

@@ -0,0 +1,73 @@
+class Listlace
+  module Commands
+    module PlaybackCommands
+      def p(*playlist)
+        if playlist.empty?
+          case mpd.status[:state]
+          when :play
+            mpd.pause = true
+          when :pause
+            mpd.pause = false
+          when :stop
+            mpd.play
+          end
+        else
+          mpd.clear
+          playlist.flatten.each do |song|
+            mpd.add song.file
+          end
+          mpd.play
+        end
+        nil
+      end
+
+      def stop
+        mpd.stop
+        nil
+      end
+
+      def skip(n = 1)
+        n.times { mpd.next }
+        nil
+      end
+
+      def back(n = 1)
+        n.times { mpd.previous }
+        nil
+      end
+
+      def restart
+        seek_to 0
+        nil
+      end
+
+      def pause
+        mpd.pause = true
+        nil
+      end
+
+      def resume
+        mpd.pause = false
+        nil
+      end
+
+      def seek(time)
+        if time.is_a? String
+          time = TimeHelpers.parse_time(time)
+        end
+        stat = mpd.status
+        mpd.seek(stat[:time].first + time, pos: stat[:song])
+        nil
+      end
+
+      def seek_to(time)
+        if time.is_a? String
+          time = TimeHelpers.parse_time(time)
+        end
+        mpd.seek(time, pos: mpd.status[:song])
+        nil
+      end
+    end
+  end
+end
+

data/lib/listlace/commands/queue_commands.rb

@@ -0,0 +1,18 @@
+class Listlace
+  module Commands
+    module QueueCommands
+      def q(*playlist)
+        if playlist.empty?
+          mpd.queue
+        else
+          mpd.clear
+          playlist.flatten.each do |song|
+            mpd.add song.file
+          end
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/listlace/time_helpers.rb

@@ -4,22 +4,33 @@ class Listlace
 
     # Helper method to format a number of seconds as a string like "1:03:56".
     def format_time(seconds, options = {})
-      raise ArgumentError, "can't format negative time" if seconds < 0
+      negative = false
+      if seconds < 0
+        negative = true
+        seconds = -seconds
+      end
 
       hours = seconds / 3600
       minutes = (seconds / 60) % 60
       seconds = seconds % 60
+      sign = negative ? "-" : ""
 
       if hours > 0
-        "%d:%02d:%02d" % [hours, minutes, seconds]
+        "%s%d:%02d:%02d" % [sign, hours, minutes, seconds]
       else
-        "%d:%02d" % [minutes, seconds]
+        "%s%d:%02d" % [sign, minutes, seconds]
       end
     end
 
     # Helper method to parse a string like "1:03:56" and return the number of
     # seconds that time length represents.
     def parse_time(string)
+      negative = false
+      if string[0] == "-"
+        negative = true
+        string = string[1..-1]
+      end
+
       parts = string.split(":", -1).map(&:to_i)
 
       raise ArgumentError, "too many parts" if parts.length > 3
@@ -27,7 +38,9 @@ class Listlace
 
       parts.unshift(0) until parts.length == 3
       hours, minutes, seconds = parts
-      hours * 3600 + minutes * 60 + seconds
+      total_seconds = hours * 3600 + minutes * 60 + seconds
+
+      total_seconds * (negative ? -1 : 1)
     end
   end
 end

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.2.1"
-  s.date = "2014-03-24"
+  s.version = "0.2.2"
+  s.date = "2014-03-25"
   s.summary = "An mpd (music player daemon) client with a Ruby shell as the interface."
   s.description = "Listlace is an mpd (music player daemon) client with a Ruby shell as the interface."
   s.author = "Jeremy Ruten"
@@ -15,12 +15,8 @@ Gem::Specification.new do |s|
   s.files += ["bin/listlace"]
   s.files += Dir["lib/**/*.rb"]
 
-  %w(bundler pry ruby-mpd).each do |gem_name|
-    s.add_runtime_dependency gem_name
-  end
-
-  %w(rake).each do |gem_name|
-    s.add_development_dependency gem_name
-  end
+  s.add_runtime_dependency "bundler", "~> 1.5"
+  s.add_runtime_dependency "pry", "~> 0.9"
+  s.add_runtime_dependency "ruby-mpd", "~> 0.3", ">= 0.3.1"
 end
 

metadata

@@ -1,71 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 description: Listlace is an mpd (music player daemon) client with a Ruby shell as
   the interface.
 email: jeremy.ruten@gmail.com
@@ -81,6 +73,9 @@ files:
 - bin/listlace
 - lib/listlace.rb
 - lib/listlace/commands.rb
+- lib/listlace/commands/info_commands.rb
+- lib/listlace/commands/playback_commands.rb
+- lib/listlace/commands/queue_commands.rb
 - lib/listlace/core_ext/array.rb
 - lib/listlace/selectors.rb
 - lib/listlace/time_helpers.rb