playa 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4878ba1ffdd6bac5e65efca51700fb2c4eb04c78
-  data.tar.gz: 857acc9d3e9d1b0d9467626887a1ce6925628ddc
+  metadata.gz: a82f51bf8b609feea4159e92b17c023125c5d8c2
+  data.tar.gz: 5694dd5c5e3286ada63ad34db283dec1f00dab81
 SHA512:
-  metadata.gz: 4a38780c433bb4ab05fa20b7abd5439876ba05d953b6f2f6c3e5ea2a7b4370d7001649bb20cf81f7c2e12ed39ad24ceb0e5fd40424835a59e2b380481e6dc8d4
-  data.tar.gz: 6a0dda0911e38eaec891fc39582d869705408cf5b6ff7437b740741e1b09f4810a2078100751fb338af3255f4214d8f88f3d13818b14bb3cc4bece1919f1d928
+  metadata.gz: 0b71f4158b50a56b9d8caed65954e54c63ab701ae2a740785df6f71c3fef34357015b777426ea5fee7912e8eec20b410335c755c190cae3c3ae842a4f0e75f8b
+  data.tar.gz: f1fb8b7b45a8d2b0104ee09284217bf8e64ccf9c49676d1e6dc9d76c9c0a7b04766f80f155baacf51b45c7b8d247ceb1abdcf8d254251431b88cf83b3336bafb

data/README.md

@@ -1,6 +1,9 @@
+[![Code Climate](https://codeclimate.com/github/gavinlaking/playa.png)](https://codeclimate.com/github/gavinlaking/playa)
+[![Build Status](https://travis-ci.org/gavinlaking/playa.svg?branch=master)](https://travis-ci.org/gavinlaking/playa)
+
 # Playa
 
-Plays mp3s from a directory. An example app using Vedeu.
+Plays mp3s from a directory using Ruby. An example app using Vedeu.
 
 
 ## Requirements
@@ -24,8 +27,14 @@ Plays mp3s from a directory. An example app using Vedeu.
 
 ## Usage
 
+Play all .mp3 files in the current working directory:
+
     playa
 
+or, specify a directory to play from:
+
+    playa /path/to/mp3s
+
 
 ## Contributing
 

data/bin/playa

@@ -10,6 +10,6 @@ require 'playa'
 
 args = ARGV.dup
 
-play_directory = args.empty? || args.nil? ? Dir.pwd : args
+play_directory = args.empty? || args.nil? ? [Dir.pwd] : args
 
 Playa::Application.start(play_directory)

data/lib/playa/controller.rb

@@ -3,14 +3,14 @@ module Playa
     include Vedeu
 
     def initialize(args = [])
+      @player = Player.new
+
       event :update do
         @view = View.render(menu.items)
       end
 
       event :select do |track|
-        player.stop
-
-        @_player = Player.play(track)
+        trigger(:play, track)
       end
 
       event :complete do
@@ -20,9 +20,9 @@ module Playa
 
       event :key do |key|
         case key
-        when :left  then player.rewind
-        when :right then player.forward
-        when :space then player.toggle
+        when :left  then trigger(:rewind)
+        when :right then trigger(:forward)
+        when ' '    then trigger(:toggle)
         when :up    then trigger(:menu_prev)
         when :down  then trigger(:menu_next)
         when 'q'    then trigger(:_exit_)
@@ -48,9 +48,5 @@ module Playa
     def tracks
       @_tracks ||= TrackCollection.new(args).tracks
     end
-
-    def player
-      @_player ||= Player.new
-    end
   end
 end

data/lib/playa/player.rb

@@ -2,20 +2,19 @@ require 'audite'
 
 module Playa
   class Player
-    attr_reader :track
+    include Vedeu
 
-    def self.play(track)
-      new(track).start
-    end
-
-    def initialize(track = nil)
-      @track = track
-    end
+    def initialize
+      event(:forward) { forward if playing? }
+      event(:rewind)  { rewind if playing? }
+      event(:toggle)  { toggle }
+      event(:play) do |track|
+        stop if playing?
 
-    def start
-      open
+        open(track)
 
-      play
+        play
+      end
     end
 
     def play
@@ -35,7 +34,11 @@ module Playa
     end
 
     def toggle
-      player.toggle
+      if playing?
+        stop
+      else
+        play
+      end
     end
 
     def playing?
@@ -52,7 +55,7 @@ module Playa
 
     private
 
-    def open
+    def open(track)
       player.load(track.filename)
     end
 

data/lib/playa/view.rb

@@ -9,7 +9,7 @@ module Playa
     end
 
     def render
-      Vedeu::Parser.parse(['playlist', playlist])
+      Vedeu::Parser.parse([ interface, playlist ])
     end
 
     private
@@ -17,7 +17,11 @@ module Playa
     attr_reader :menu
 
     def playlist
-      menu.map { |sel, cur, item| [sel, cur, item.title] }
+      menu.map { |sel, cur, item| [ sel, cur, item.title ] }
+    end
+
+    def interface
+      'playlist'
     end
   end
 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.4'
+  spec.version       = '0.0.5'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'Plays mp3s from a directory.'
@@ -28,5 +28,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.0.41'
+  spec.add_dependency 'vedeu',              '0.0.42'
 end

data/test/lib/playa/controller_test.rb

@@ -3,6 +3,10 @@ require 'playa/controller'
 
 module Playa
   describe Controller do
-
+    describe '#initialize' do
+      it 'returns an instance of itself' do
+        Controller.new.must_be_instance_of(Controller)
+      end
+    end
   end
 end

data/test/lib/playa/player_test.rb

@@ -3,5 +3,10 @@ require 'playa/player'
 
 module Playa
   describe Player do
+    describe '#initialize' do
+      it 'returns an instance of itself' do
+        Player.new.must_be_instance_of(Player)
+      end
+    end
   end
 end

data/test/lib/playa/track_collection_test.rb

@@ -3,6 +3,12 @@ require 'playa/track_collection'
 
 module Playa
   describe TrackCollection do
+    describe '#initialize' do
+      it 'returns an instance of itself' do
+        TrackCollection.new.must_be_instance_of(TrackCollection)
+      end
+    end
+
     describe '#tracks' do
       it 'returns a collection of Track objects' do
         collection = TrackCollection.new
@@ -12,6 +18,32 @@ module Playa
     end
 
     describe '#files' do
+      it 'returns an empty list of files when the directory ' \
+         'contains no mp3s' do
+        collection = TrackCollection.new(['/some/path'])
+        Dir.stub(:glob, []) do
+          collection.files.must_be_empty
+        end
+      end
+
+      it 'returns only the mp3s when the directory contains ' \
+         'multiple file types' do
+        files = [
+          '/some/path/dance.mp3',
+          '/some/path/README.txt',
+          '/some/path/dubstep.mp3'
+        ]
+        collection = TrackCollection.new(['/some/path'])
+        Dir.stub(:glob, files) do
+          File.stub(:file?, true) do
+            collection.files.must_equal([
+              '/some/path/dance.mp3',
+              '/some/path/dubstep.mp3'
+            ])
+          end
+        end
+      end
+
       it 'returns a list of files for the specified directory' do
         files = [
           '/some/path/dance.mp3',
@@ -19,7 +51,6 @@ module Playa
           '/some/path/dubstep.mp3'
         ]
         collection = TrackCollection.new
-
         Dir.stub(:glob, files) do
           File.stub(:file?, true) do
             collection.files.must_equal(files)

data/test/lib/playa/track_test.rb

@@ -22,6 +22,12 @@ module Playa
     end
     let(:track) { Track.new(file) }
 
+    describe '#initialize' do
+      it 'returns an instance of itself' do
+        Track.new(file).must_be_instance_of(Track)
+      end
+    end
+
     describe '#attributes' do
       it 'returns a collection of attributes' do
         Mp3Info.stub(:open, mp3info) do

data/test/lib/playa/view_test.rb

@@ -3,6 +3,11 @@ require 'playa/view'
 
 module Playa
   describe View do
-
+    describe '#initialize' do
+      it 'returns an instance of itself' do
+        menu = []
+        View.new(menu).must_be_instance_of(View)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playa
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.41
+        version: 0.0.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.41
+        version: 0.0.42
 description: An example app using Vedeu.
 email:
 - gavinlaking@gmail.com