playa 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88b2e0a2af60ed003e3ca5bc18d95d406be0533
-  data.tar.gz: 093d9cc23a42dd2cca5f70c2aa539f16780099e6
+  metadata.gz: f2598609b2bbafca074f45c864ceaaa6c5db48c3
+  data.tar.gz: 2ba8a4b27ff708b6e27c1fe98a50ad753ce05bd5
 SHA512:
-  metadata.gz: 0b4b7213271270d99c25141699aef79a0b4cd4bd9960827b3aaa60821f7faa83dc8a166649bfd4c417a185e409fede898d2a1785543db5672cece17e742fb9b8
-  data.tar.gz: 982b686d92fc31bfcb8457adbc49864573a5300ec399eaf6db6ba747197d043e0049832e323519f2a1b7915e540c607caed62e26ac4133c197462ea885fee883
+  metadata.gz: c4157bc6c7716a345e77839bb30740b5d474cb9e1154b4c11199a3f7062258dbeacfd3fb3b089a8b7c09b3fa0afdf644ab6cb350d345231918f12732bf5b6dea
+  data.tar.gz: 9f674d0a2c1673a63a306d2fbf25a0b54474500de26ed63904906d0b8d3935a6c9e4f6d4f8316d2edaf1cb5edf0eee636c87c92a31117664c98968b9d8e0ae28

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'vedeu', path: '~/source/vedeu'

data/lib/playa/controller.rb

@@ -11,7 +11,6 @@ module Playa
 
       event :update do
         PlaylistView.render(menu)
-        StatusView.render
       end
 
       event :progress_update, 0.5 do
@@ -25,7 +24,9 @@ module Playa
 
       event :complete do
         trigger(:menu_next)
+        trigger(:menu_select)
         trigger(:select, menu.current_item)
+        trigger(:update)
       end
 
       event :key do |key|

data/lib/playa/player.rb

@@ -65,6 +65,10 @@ module Playa
       player.events
     end
 
+    def track
+      @track
+    end
+
     private
 
     def open(track)

data/lib/playa/progress_view.rb

@@ -13,11 +13,37 @@ module Playa
     end
 
     def progress
-      '|' * (object.progress * view_width).ceil
+      if object.track
+        remaining = (object.track.duration - object.counter).floor
+        mm, ss    = remaining.divmod(60)
+        hh, mm    = mm.divmod(60)
+        mins      = mm.to_s.rjust(2, '0')
+        secs      = ss.to_s.rjust(2, '0')
+        time      = [mins, secs].join(":")
+        pwidth    = view_width - time.size - 1
+        pbar      = '|' * (object.progress * pwidth).ceil
+
+        {
+          streams: [
+            {
+              text:  pbar,
+              width: pwidth,
+              align: :left
+            }, {
+              text:  time,
+              width: time.size + 1,
+              align: :right
+            }
+          ]
+        }
+      else
+        { streams: [{ text: ' ', width: view_width }] }
+      end
     end
 
+    # TODO: playa knows too much here...
     def view_width
-      @_width ||= Vedeu.view('progress').width
+      @_width ||= Vedeu.view('progress').geometry.width
     end
   end
 end

data/lib/playa/status_view.rb

@@ -2,8 +2,20 @@ require 'playa/view'
 
 module Playa
   class StatusView < View
+    # def interface
+    #   'status'
+    # end
+
+    # def path
+    #   File.expand_path('../views/status.erb', __FILE__)
+    # end
+
     private
 
+    # def output
+    #   self
+    # end
+
     def output
       { 'status' => status }
     end
@@ -13,7 +25,7 @@ module Playa
     end
 
     def status
-      [ "\u{25B2} Previous   \u{25BC} Next   \u{21B2} Select   \u{2395} Pause   Q Quit" ]
+      [ "\u{25B2} Prev  \u{25BC} Next  \u{21B2} Select  \u{2395} Pause   Q Quit" ]
     end
   end
 end

data/lib/playa/view.rb

@@ -1,4 +1,6 @@
 module Playa
+  NotImplemented = Class.new(StandardError)
+
   class View
     def self.render(object = nil)
       new(object).render

data/lib/playa/views/status.erb

@@ -1,3 +1 @@
-<%- colour(foreground: '#a5f500', background: '#000000') do -%>
-  <%- menu.item -%>
-<%- end -%>
+<%= foreground('#ffff00') { "\u{25B2}" } -%> Prev   <%= foreground('#ffff00') { "\u{25BC}" } -%> Next  <%= foreground('#ffff00') { "\u{21B2}" } -%> Select  <%= foreground('#ffff00') { "\u{2395}" } -%> Pause  <%= foreground('#ffff00') { "Q" } -%> Quit

data/lib/playa/views/status_copy.erb

@@ -0,0 +1,7 @@
+<%- line do -%>
+  <%= foreground('#ffff00') { "\u{25B2}" } -%> Prev
+  <%= foreground('#ffff00') { "\u{25BC}" } -%> Next
+  <%= foreground('#ffff00') { "\u{21B2}" } -%> Select
+  <%= foreground('#ffff00') { "\u{2395}" } -%> Pause
+  <%= foreground('#ffff00') { "Q" } -%> Quit
+<%- end -%>

data/playa.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'playa'
-  spec.version       = '0.0.7'
+  spec.version       = '0.0.8'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'Plays mp3s from a directory.'
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'audite',             '0.3.0'
   spec.add_dependency 'ruby-mp3info',       '0.8.4'
-  spec.add_dependency 'vedeu',              '0.1.2'
+  spec.add_dependency 'vedeu',              '0.1.3'
 end

data/test/lib/playa/playlist_view.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+require 'playa/playlist_view'
+
+module Playa
+  describe PlaylistView do
+
+  end
+end

data/test/lib/playa/progress_view_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+require 'playa/progress_view'
+
+module Playa
+  describe ProgressView do
+
+  end
+end

data/test/lib/playa/status_view_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+require 'playa/status_view'
+
+module Playa
+  describe StatusView do
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playa
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 description: An example app using Vedeu.
 email:
 - gavinlaking@gmail.com
@@ -206,9 +206,13 @@ files:
 - lib/playa/view.rb
 - lib/playa/views/playlist.erb
 - lib/playa/views/status.erb
+- lib/playa/views/status_copy.erb
 - playa.gemspec
 - test/lib/playa/controller_test.rb
 - test/lib/playa/player_test.rb
+- test/lib/playa/playlist_view.rb
+- test/lib/playa/progress_view_test.rb
+- test/lib/playa/status_view_test.rb
 - test/lib/playa/track_collection_test.rb
 - test/lib/playa/track_test.rb
 - test/lib/playa/view_test.rb
@@ -242,6 +246,9 @@ summary: Plays mp3s from a directory.
 test_files:
 - test/lib/playa/controller_test.rb
 - test/lib/playa/player_test.rb
+- test/lib/playa/playlist_view.rb
+- test/lib/playa/progress_view_test.rb
+- test/lib/playa/status_view_test.rb
 - test/lib/playa/track_collection_test.rb
 - test/lib/playa/track_test.rb
 - test/lib/playa/view_test.rb