play 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    play (0.0.4)
+    play (0.0.5)
       SystemTimer
       activerecord
+      fssm
       mustache
       mysql2
       oa-oauth
       rack (~> 1.2.2)
+      rb-fsevent
       ruby-audioinfo
       sinatra
       sqlite3
@@ -30,7 +32,7 @@ GEM
     addressable (2.2.5)
     apetag (1.1.2)
       cicphash (>= 1.0.0)
-    arel (2.0.9)
+    arel (2.0.10)
     builder (2.1.2)
     cicphash (1.0.0)
     faraday (0.6.1)
@@ -38,27 +40,29 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     flacinfo-rb (0.4)
+    fssm (0.2.7)
     i18n (0.5.0)
     mocha (0.9.12)
     mp4info (1.7.3)
     multi_json (1.0.1)
     multi_xml (0.2.2)
     multipart-post (1.1.0)
-    mustache (0.99.3)
+    mustache (0.99.4)
     mysql2 (0.2.7)
-    oa-core (0.2.5)
-    oa-oauth (0.2.5)
+    oa-core (0.2.6)
+    oa-oauth (0.2.6)
       faraday (~> 0.6.1)
       multi_json (~> 1.0.0)
       multi_xml (~> 0.2.2)
-      oa-core (= 0.2.5)
+      oa-core (= 0.2.6)
       oauth (~> 0.4.0)
       oauth2 (~> 0.4.1)
     oauth (0.4.4)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    rack (1.2.2)
+    rack (1.2.3)
+    rb-fsevent (0.4.0)
     ruby-audioinfo (0.1.7)
       apetag (= 1.1.2)
       flacinfo-rb (>= 0.4)
@@ -73,7 +77,7 @@ GEM
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     sqlite3 (1.3.3)
-    tilt (1.3)
+    tilt (1.3.2)
     tzinfo (0.3.27)
     wmainfo-rb (0.6)
     yajl-ruby (0.8.2)

data/README.md

@@ -63,6 +63,11 @@ recursively when you run:
 
     play -i
 
+Alternatively, you can just start up the web server (`play -w`) and it will
+listen for any changes you make to your music directory. In other words, once
+the web component has started, if you drop in a new directory of music, it'll
+realize that and go ahead and index it.
+
 ## Play
 
 Once you're all set up, you can spin up the web app with:
@@ -124,8 +129,8 @@ of do differently in Play is we disable the GitHub OAuth callback (since your
 development URL is different than it would be in production).
 
 To actually use it locally, we'll automatically create a user called `user` for
-you when you first access the app. That way you can actually mess around
-without having to hit GitHub or create a user manually.
+you when you first access the app. You can sign into this user by hitting
+`/devlogin` on your running instance.
 
 None of this happens if you launch Play with `bin/play -d`.
 

data/bin/play

@@ -27,6 +27,8 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-w", "--web", "Run the web instance") do
+    pid = fork { Play::Library.monitor }
+    Process.detach(pid)
     system("rackup -p 5050 #{File.dirname(__FILE__)}/../config.ru")
   end
 

data/lib/play.rb

@@ -9,6 +9,8 @@ require 'sinatra/base'
 require 'mustache/sinatra'
 require 'digest'
 require 'yajl'
+require 'rb-fsevent'
+require 'fssm'
 
 require 'play/core_ext/hash'
 
@@ -26,7 +28,7 @@ require 'play/vote'
 
 module Play
   
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   # The path to your music library. All of the music underneath this directory
   # will be added to the internal library.

data/lib/play/app.rb

@@ -38,10 +38,6 @@ module Play
           redirect '/login' unless request.path_info =~ /\/login/ ||
                                    request.path_info =~ /\/auth/  ||
                                    request.path_info =~ /\/api/
-        else
-          # This will create a test user for you locally in development.
-          session['user_id'] = User.create(:login => 'user',
-                                           :email => 'play@example.com').id
         end
       end
     end
@@ -51,6 +47,12 @@ module Play
       mustache :index
     end
 
+    get "/devlogin" do
+      session['user_id'] = User.create(:login => 'user',
+                                       :email => 'play@example.com').id
+      redirect '/'
+    end
+
     get "/login" do
       redirect '/auth/github'
     end

data/lib/play/library.rb

@@ -1,17 +1,33 @@
 module Play
   class Library
+
+    # Monitors the music directory for any new music added to it. Once
+    # changed, Play will run through and reindex those directories.
+    #
+    # Returns nothing.
+    def self.monitor
+      FSSM.monitor(Play.path, '**/**/**', :directories => true) do
+        update {|base, relative| Library.import_songs("#{base}/#{relative}") }
+        delete {|base, relative| nil }
+        create {|base, relative| Library.import_songs("#{base}/#{relative}") }
+      end
+    end
+
     # Search a directory and return all of the files in it, recursively.
     #
     # Returns an Array of String file paths.
-    def self.fs_songs
-      `find "#{Play.path}" -type f ! -name '.*'`.split("\n")
+    def self.fs_songs(path)
+      `find "#{path}" -type f ! -name '.*'`.split("\n")
     end
 
     # Imports an array of songs into the database.
     #
+    # path = the String path of the directory to search in. Will default to the
+    #        default Play path if not specified.
+    #
     # Returns nothing.
-    def self.import_songs
-      fs_songs.each do |path|
+    def self.import_songs(path=Play.path)
+      fs_songs(path).each do |path|
         import_song(path)
       end
     end

data/lib/play/views/layout.rb

@@ -1,6 +1,9 @@
 module Play
   module Views
     class Layout < Mustache
+      def login
+        @login
+      end
     end
   end
 end

data/play.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'play'
-  s.version           = '0.0.5'
-  s.date              = '2011-05-27'
+  s.version           = '0.0.6'
+  s.date              = '2011-06-23'
   s.rubyforge_project = 'play'
 
   ## Make sure your summary is short. The description may be as long
@@ -56,6 +56,8 @@ Gem::Specification.new do |s|
   s.add_dependency('oa-oauth')
   s.add_dependency('yajl-ruby')
   s.add_dependency('mysql2')
+  s.add_dependency('rb-fsevent')
+  s.add_dependency('fssm')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/test/test_library.rb

@@ -13,7 +13,6 @@ context "Library" do
     FileUtils.mkdir_p '/tmp/play'
     FileUtils.touch '/tmp/play/song_1'
     FileUtils.touch '/tmp/play/song_2'
-    Play.stubs(:path).returns('/tmp/play')
-    assert_equal 2, Library.fs_songs.size
+    assert_equal 2, Library.fs_songs('/tmp/play').size
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: play
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Zach Holman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-06-23 00:00:00 -07:00
 default_executable: play
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,7 +161,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: running_man
+  name: rb-fsevent
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -172,10 +172,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: fssm
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -186,8 +186,36 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: running_man
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
 description: |-
   We want to play music at our office. Everyone has their own
     library on their own machines, and everyone except for me plays shitty music.