jimmy_jukebox 0.3.7 → 0.4.1

data/spec/song_spec.rb

@@ -35,25 +35,25 @@ describe Song do
 
   end
 
-  describe "#paused" do
+  describe "#paused?" do
 
     before(:each) do
       @song = Song.new("~/Music/JAZZ/art_tatum.mp3")
     end
 
     it "is initially not paused" do
-      @song.paused.should be_false
+      @song.paused?.should be_false
     end
 
     it "is paused after calling #pause" do
       @song.pause
-      @song.paused.should be_true
+      @song.paused?.should be_true
     end
 
     it "is unpaused after calling #pause and #unpause" do
       @song.pause
       @song.unpause
-      @song.paused.should be_false
+      @song.paused?.should be_false
     end
 
   end

data/spec/spec_helper.rb

@@ -4,14 +4,38 @@ RSpec.configure do |config|
   end
 end
 
-# Override exec() to prevent songs from actually playing
-# Instead, start a brief sleep process
-module Kernel
-  alias :real_exec :exec
+require 'fakefs/spec_helpers'
+
+# Overriding FakeFS' File.expand_path
+# because it delegates to the same class
+# method in the REAL file system
+module FakeFS
+  class File
+    def self.expand_path(*args)
+      args[0].gsub(/~/,'/home/xavier')
+    end
+  end
+  # Started overriding FileUtils.ln because FakeFS doesn't know about it
+  # Instead switched to using File.link, which FakeFS knows about
+end
 
-  def exec(*cmd)
-    real_exec("sleep 0.2")  
+# Overriding File.expand_path
+# so it will provide the fake user's
+# home directory
+class File
+  def self.expand_path(*args)
+    args[0].gsub(/~/,'/home/xavier')
   end
 end
 
+# Override exec() to prevent songs from actually playing
+# Instead, start a brief sleep process
+#module Kernel
+#  alias :real_exec :exec
+#
+#  def exec(*cmd)
+#    real_exec("sleep 0.2")  
+#  end
+#end
+
 

data/spec/user_config_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
-require 'fakefs/safe'
 require File.dirname(__FILE__) + '/../lib/jimmy_jukebox/user_config'
 include JimmyJukebox
 
 describe UserConfig do
 
+  include FakeFS::SpecHelpers
+
   before(:all) do
-    #ARGV.delete_if { |val| true }
     ARGV.clear
-    #ARGV.pop
   end
 
   #describe "#configure_preferences" do
@@ -28,23 +27,23 @@ describe UserConfig do
   describe "#top_music_dir" do
 
     it "should parse '~/Music'" do
-      UserConfig.top_music_dir("~/Music").should == "/home/james/Music"
+      UserConfig.top_music_dir("~/Music").should == "/home/xavier/Music"
     end
 
-    it "should parse '/home/james/Music'" do
-      UserConfig.top_music_dir("/home/james/Music").should == "/home/james/Music"
+    it "should parse '/home/xavier/Music'" do
+      UserConfig.top_music_dir("/home/xavier/Music").should == "/home/xavier/Music"
     end
 
     it "should parse '~/Music/Rock/The_Eagles/hotel_california.mp3'" do
-      UserConfig.top_music_dir("~/Music/Rock/The_Eagles/hotel_california.mp3").should == "/home/james/Music"
+      UserConfig.top_music_dir("~/Music/Rock/The_Eagles/hotel_california.mp3").should == "/home/xavier/Music"
     end
 
     it "should parse '~/Music/Rock/The Eagles/Hotel California.mp3'" do
-      UserConfig.top_music_dir("~/Music/Rock/The Eagles/Hotel California.mp3").should == "/home/james/Music"
+      UserConfig.top_music_dir("~/Music/Rock/The Eagles/Hotel California.mp3").should == "/home/xavier/Music"
     end
 
     it "should parse '~/My Music'" do
-      UserConfig.top_music_dir("~/My Music").should == "/home/james/My Music"
+      UserConfig.top_music_dir("~/My Music").should == "/home/xavier/My Music"
     end
 
   end
@@ -55,8 +54,31 @@ describe UserConfig do
       ARGV.delete_if { |val| true }
     end
 
+    let(:uc) { UserConfig.new }
+
+    context "with no songs" do
+
+      it "finds no songs" do
+        uc.songs.length.should == 0
+      end
+
+    end
+
+    context "with songs" do
+
+      before do
+        FileUtils.mkdir_p "/home/xavier/Music"
+        FileUtils.touch "/home/xavier/Music/Yellow_Submarine.mp3"
+      end
+
+      it "finds songs" do
+        uc.songs.should_not be_empty
+        uc.songs.length.should == 1
+      end
+
+    end
+
     it "does not complain when ogg123 & mpg123 both installed" do
-      uc = UserConfig.new
       uc.should_receive(:`).with("which ogg123").and_return("/usr/bin/ogg123")
       uc.should_receive(:`).with("which mpg123").and_return("/usr/bin/mpg123")
       uc.should_not_receive(:puts)
@@ -66,7 +88,6 @@ describe UserConfig do
     end
 
     it "does not complain when ogg123 & mpg321 both installed but not mpg123" do
-      uc = UserConfig.new
       uc.should_receive(:`).with("which ogg123").and_return("/usr/bin/ogg123")
       uc.should_receive(:`).with("which mpg123").and_return("")
       uc.should_receive(:`).with("which mpg321").and_return("/usr/bin/mpg321")
@@ -77,7 +98,6 @@ describe UserConfig do
     end
 
     it "complains when ogg123 installed but mpg123, mpg321, music123, afplay & play not installed" do
-      uc = UserConfig.new
       uc.instance_variable_set(:@ogg_player, nil)
       uc.instance_variable_set(:@mp3_player, nil)
       uc.should_receive(:`).at_least(:once).with("which ogg123").and_return("/usr/bin/ogg123")
@@ -94,7 +114,6 @@ describe UserConfig do
     end
 
     it "complains when mpg123 installed but ogg123, mpg321, music123, afplay & play not installed" do
-      uc = UserConfig.new
       uc.instance_variable_set(:@ogg_player, nil)
       uc.instance_variable_set(:@mp3_player, nil)
       uc.should_receive(:`).at_least(:once).with("which ogg123").and_return("")
@@ -110,7 +129,6 @@ describe UserConfig do
     end
 
     it "complains when mpg321 installed but mpg123, music123, ogg123, afplay & play not installed" do
-      uc = UserConfig.new
       uc.instance_variable_set(:@ogg_player, nil)
       uc.instance_variable_set(:@mp3_player, nil)
       uc.should_receive(:`).at_least(:once).with("which ogg123").and_return("")
@@ -127,7 +145,6 @@ describe UserConfig do
     end
 
     it "prints message and exits when mpg123, mpg321, ogg123, music123, afplay & play all not installed" do
-      uc = UserConfig.new
       uc.instance_variable_set(:@ogg_player, nil)
       uc.instance_variable_set(:@mp3_player, nil)
       uc.should_receive(:`).at_least(:once).with("which ogg123").and_return("")

metadata

@@ -1,120 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.3.7
-  prerelease: 
+  prerelease:
+  version: 0.4.1
 platform: ruby
 authors:
 - James Lavin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: jimmy_jukebox plays random MP3 & OGG songs under a directory (or set
-  of directories) and can download music
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+description: jimmy_jukebox plays random MP3 & OGG songs under a directory (or set of directories) and can download music
 email: james@jameslavin.com
 executables:
 - play_jukebox
 - load_jukebox
-- jplay_jukebox
-- jload_jukebox
 extensions: []
 extra_rdoc_files: []
 files:
@@ -137,6 +146,7 @@ files:
 - lib/jimmy_jukebox/songs/ColemanHawkins.yml
 - lib/jimmy_jukebox/songs/KingOliver.yml
 - lib/jimmy_jukebox/songs/OriginalDixielandJazzBand.yml
+- lib/jimmy_jukebox/songs/Dixieland.yml
 - lib/jimmy_jukebox/songs/LouisArmstrong.yml
 - lib/jimmy_jukebox/songs/DjangoReinhardt.yml
 - lib/jimmy_jukebox/songs/RedNorvo.yml
@@ -145,13 +155,16 @@ files:
 - lib/jimmy_jukebox/songs/BixBeiderbecke.yml
 - lib/jimmy_jukebox/songs/ArtieShaw.yml
 - lib/jimmy_jukebox/songs/MilesDavis.yml
+- lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
 - lib/jimmy_jukebox/songs/DizzyGillespie.yml
 - lib/jimmy_jukebox/songs/DukeEllington.yml
 - lib/jimmy_jukebox/songs/BennyGoodman.yml
 - lib/jimmy_jukebox/songs/CountBasie.yml
+- lib/jimmy_jukebox/songs/ArchibaldCampBanjo.yml
 - lib/jimmy_jukebox/songs/SidneyBechet.yml
 - lib/jimmy_jukebox/songs/JamesPJohnson.yml
 - lib/jimmy_jukebox/songs/JellyRollMorton.yml
+- lib/jimmy_jukebox/songs/Ragtime.yml
 - lib/jimmy_jukebox/songs/EarlHines.yml
 - spec/jimmy_jukebox_spec.rb
 - spec/song_loader_spec.rb
@@ -160,31 +173,30 @@ files:
 - spec/spec_helper.rb
 - bin/play_jukebox
 - bin/load_jukebox
-- bin/jplay_jukebox
-- bin/jload_jukebox
 homepage: https://github.com/JamesLavin/jimmy_jukebox
 licenses: []
-post_install_message: I really hope you enjoy the great jazz downloadable using this
-  gem!
+post_install_message: I really hope you enjoy the great jazz downloadable using this gem!
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: jimmy_jukebox
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: plays your MP3 & OGG files and lets you easily download music
 test_files:

data/bin/jload_jukebox

@@ -1,3 +0,0 @@
-#!/usr/bin/env jruby
-
-require File.dirname(__FILE__) + '/../lib/jimmy_jukebox/load_jukebox_code.rb'

data/bin/jplay_jukebox

@@ -1,16 +0,0 @@
-#!/usr/bin/env jruby
-
-begin
-  require 'readline'
-  require 'spoon'
-rescue LoadError => e
-  raise unless e.message =~ /readline|spoon/
-  puts "*** You must install the 'spoon' gem to use JimmyJukebox on JRuby ***"
-  exit
-end
-
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-require 'jimmy_jukebox'
-include JimmyJukebox
-