playa 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fc80a18e93a859e9f9221df9a3a9f65d6b5cda
-  data.tar.gz: 042ef6c6eb0883feb60ee44d84e23231151fb6d3
+  metadata.gz: 61b17361d49a438953990aef19248ce27bdeda1c
+  data.tar.gz: 4bd50d9e494bfa86021b47b24a955bcba9e5b9ed
 SHA512:
-  metadata.gz: 293c17584453ed20368f5aa828913843182564d0202c064d1a60b5e899b46c4581e79abc074543513433a9f3eb13e41c8f6a2aa453202bdf5212c9fae8941f56
-  data.tar.gz: 0054741fc230d61cd994c81c3d4303d999493f8dedc9390981982c6a2edb03f14d23ba797457a628c2542512bd1808341fc04c900fa7a62eb85455ebadb2f1f4
+  metadata.gz: 51ea45f264d1273c7368f6c53144ab0adc7911017fdccbf26ae4c81ad62bd7071d82c544f86f75278446dca66c7a0e6edbfca5a86370ab65894b816ed1f90817
+  data.tar.gz: 6484d655d7d6eeac01ab527205e8eca41192f25ae13b739c16cb335f4a3f7adb90c6f649b01f0ad017910ffd03d3662092a96b03aa146755ce308de968c8dcc7

data/Gemfile

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

data/README.md

@@ -40,7 +40,7 @@ or, specify a directory to play from:
 
 ## Contributing
 
-1. Fork it ( https://github.com/gavinlaking/playa/fork )
+1. Fork it ( http://github.com/gavinlaking/playa/fork )
 2. Clone it
 3. `bundle`
 4. `rake` or `bundle exec guard`
@@ -48,4 +48,4 @@ or, specify a directory to play from:
 6. Write some tests, write some code, have some fun
 7. Commit your changes (`git commit -am 'Add some feature'`)
 8. Push to the branch (`git push origin my-new-feature`)
-9. Create a new Pull Request
+9. Create a new pull request

data/lib/playa.rb

@@ -10,12 +10,22 @@ module Playa
   class Application
     include Vedeu
 
-    playlist = interface 'playlist' do
+    interface 'help' do
+      centred true
+      colour  foreground: '#ffffff', background: '#000000'
+      cursor  false
+      group   'help'
+      height  9
+      width   60
+    end
+
+    interface 'playlist' do
       colour  foreground: '#afd700', background: '#000000'
       cursor  false
       width   60
       height  5
       centred true
+      group   'player'
     end
 
     interface 'progress' do
@@ -23,10 +33,11 @@ module Playa
       cursor  false
       width   60
       height  1
-      y       playlist.north(2)
-      x       playlist.left
+      y       use('playlist').north(2)
+      x       use('playlist').left
       centred false
       delay   1.0
+      group   'player'
     end
 
     interface 'status' do
@@ -34,15 +45,19 @@ module Playa
       cursor  false
       width   60
       height  1
-      y       playlist.south(1)
-      x       playlist.left
+      y       use('playlist').south(1)
+      x       use('playlist').left
       centred false
+      group   'player'
     end
 
     def self.start(args = [])
       Controller.new(args)
 
       Vedeu::Launcher.new(args).execute!
+    rescue Errno::EMFILE
+      puts "Playa does not support this number of files."
+      puts "Please see https://github.com/gavinlaking/playa/issues/11"
     end
   end
 end

data/lib/playa/controller.rb

@@ -1,6 +1,8 @@
+require 'playa/views/help_view'
 require 'playa/views/playlist_view'
 require 'playa/views/progress_view'
 require 'playa/views/status_view'
+require 'playa/views/startup_view'
 
 module Playa
   class Controller
@@ -9,6 +11,36 @@ module Playa
     def initialize(args = [])
       @player = Player.new
 
+      event :_initialize_ do
+        trigger(:show_startup)
+      end
+
+      event :show_startup do
+        trigger(:_clear_)
+
+        StartupView.render
+
+        trigger(:_refresh_group_player_)
+      end
+
+      event :show_help do
+        trigger(:_clear_)
+
+        HelpView.render
+
+        trigger(:_refresh_help_)
+      end
+
+      event :show_player do
+        trigger(:_clear_)
+
+        PlaylistView.render(menu)
+        StatusView.render
+        ProgressView.render(@player)
+
+        trigger(:_refresh_group_player_)
+      end
+
       event :update do
         PlaylistView.render(menu)
         trigger(:_refresh_playlist_)
@@ -32,26 +64,30 @@ module Playa
 
       event :key do |key|
         case key
-        when :left  then trigger(:rewind)
-        when :right then trigger(:forward)
+        when :left, 'h'  then trigger(:rewind)
+        when :right, 'l' then trigger(:forward)
         when ' '    then trigger(:toggle)
-        when :up    then trigger(:menu_prev)
-        when :down  then trigger(:menu_next)
-        when 'q'    then trigger(:_exit_)
+        when :up, 'k' then
+          trigger(:menu_prev)
+          trigger(:update)
+        when :down, 'j' then
+          trigger(:menu_next)
+          trigger(:update)
+        when '?' then trigger(:show_help)
+        when 'p', 's' then trigger(:show_player)
+        when 'q' then trigger(:_exit_)
         when :enter
           trigger(:menu_select)
           trigger(:select, menu.current_item)
+          trigger(:update)
         end
-        trigger(:update)
       end
 
       @player.events.on(:position_change) { trigger(:progress_update) }
       @player.events.on(:complete)        { trigger(:complete) }
 
-      @args          = args
-      @playlist_view = PlaylistView.render(menu)
-      @status_view   = StatusView.render
-      @progress_view = ProgressView.render(@player)
+      @args = args
+      trigger(:show_startup)
     end
 
     private

data/lib/playa/helpers.rb

@@ -0,0 +1,22 @@
+module Playa
+  module Helpers
+    def duration(track)
+      human(track.duration.ceil)
+    end
+
+    def remaining(track, player)
+      human((track.duration - player.counter).floor)
+    end
+
+    private
+
+    def human(seconds)
+      mm, ss    = seconds.divmod(60)
+      hh, mm    = mm.divmod(60)
+      mins      = mm.to_s.rjust(2, '0')
+      secs      = ss.to_s.rjust(2, '0')
+
+      [mins, secs].join(":")
+    end
+  end
+end

data/lib/playa/views/help_view.rb

@@ -0,0 +1,11 @@
+module Playa
+  class HelpView < Vedeu::View
+    def output
+      view 'help' do
+        line do
+          text 'Help!'
+        end
+      end
+    end
+  end
+end

data/lib/playa/views/playlist_view.rb

@@ -1,23 +1,90 @@
+require 'playa/helpers'
+
 module Playa
   class PlaylistView < Vedeu::View
+    include Playa::Helpers
+
     def output
       view 'playlist' do
         self.object.view.each do |sel, cur, item|
           if sel && cur
-            line { text "\u{25B6}> #{item.title}" }
+            line do
+              stream do
+                width title_width(item)
+                text "\u{25B6}> #{item.title}"
+              end
+
+              stream do
+                width timer_width(item)
+                text  "#{timer(item)}"
+                align :right
+              end
+            end
 
           elsif cur
-            line { text " > #{item.title}" }
+            line do
+              stream do
+                width title_width(item)
+                text " > #{item.title}"
+              end
+
+              stream do
+                width timer_width(item)
+                text  "#{timer(item)}"
+                align :right
+              end
+            end
 
           elsif sel
-            line { text "\u{25B6}  #{item.title}" }
+            line do
+              stream do
+                width title_width(item)
+                text "\u{25B6}  #{item.title}"
+              end
+
+              stream do
+                width timer_width(item)
+                text  "#{timer(item)}"
+                align :right
+              end
+            end
 
           else
-            line { text "   #{item.title}" }
+            line do
+              stream do
+                width title_width(item)
+                text "   #{item.title}"
+              end
+
+              stream do
+                width timer_width(item)
+                text  "#{timer(item)}"
+                align :right
+              end
+            end
 
           end
         end
       end
     end
+
+    private
+
+    def title_width(item)
+      view_width - timer_width(item) - 1
+    end
+
+    def timer_width(item)
+      timer(item).size + 1
+    end
+
+    def timer(item)
+      duration(item)
+    end
+
+    def view_width
+      @_width ||= Vedeu.use('playlist').width
+    end
+
   end
 end

data/lib/playa/views/progress_view.rb

@@ -1,5 +1,9 @@
+require 'playa/helpers'
+
 module Playa
   class ProgressView < Vedeu::View
+    include Playa::Helpers
+
     def output
       if object.track
         track_loaded
@@ -53,18 +57,11 @@ module Playa
     end
 
     def timer
-      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')
-
-      [mins, secs].join(":")
+      remaining(object.track, object)
     end
 
-    # TODO: playa knows too much here...
     def view_width
-      @_width ||= Vedeu.with('progress').geometry.width
+      @_width ||= Vedeu.use('progress').width
     end
   end
 end

data/lib/playa/views/startup_view.rb

@@ -0,0 +1,23 @@
+module Playa
+  class StartupView < Vedeu::View
+    def output
+      views do
+        view 'progress' do
+          line do
+            text 'Welcome to Playa.'
+          end
+        end
+        view 'playlist' do
+          line do
+            text 'An mp3 player in your console.'
+          end
+        end
+        view 'status' do
+          line do
+            text 'Press `s` to begin.'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/playa/views/status_view.rb

@@ -5,7 +5,7 @@ module Playa
         line do
           stream do
             colour foreground: '#ff0000'
-            text   "\u{25B2}"
+            text   " \u{25B2}"
           end
           stream do
             colour foreground: '#ffffff'

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.11'
+  spec.version       = '0.0.12'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'Plays mp3s from a directory.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playa
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,11 +196,14 @@ files:
 - bin/playa
 - lib/playa.rb
 - lib/playa/controller.rb
+- lib/playa/helpers.rb
 - lib/playa/player.rb
 - lib/playa/track.rb
 - lib/playa/track_collection.rb
+- lib/playa/views/help_view.rb
 - lib/playa/views/playlist_view.rb
 - lib/playa/views/progress_view.rb
+- lib/playa/views/startup_view.rb
 - lib/playa/views/status_view.rb
 - playa.gemspec
 - screenshot.png