jimmy_jukebox 0.3.6 → 0.3.7

data/bin/jplay_jukebox

@@ -1,15 +1,10 @@
 #!/usr/bin/env jruby
 
-require 'readline'
-
 begin
-  #Gem::Specification.find_by_name('spoon') # Gem.available?('spoon')
-  #gem 'spoon'
-  if (defined?(JRUBY_VERSION) || RUBY_PLATFORM == 'java')
-    require 'rubygems'
-    require 'spoon'
-  end
-rescue LoadError
+  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

data/bin/play_jukebox

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
-require 'readline'
+
+begin
+  require 'readline'
+  require 'posix/spawn'
+rescue LoadError => e
+  raise unless e.message =~ /readline|posix|spawn/
+  puts "*** You must install the 'rb-readline' and 'posix_spawn' gems to use JimmyJukebox in Ruby ***"
+  exit
+end
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)

data/lib/jimmy_jukebox/load_jukebox_code.rb

@@ -1,7 +1,7 @@
 lib = File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 require 'jimmy_jukebox/song_loader'
-include JimmyJukebox
+include SongLoader
 
 require 'jimmy_jukebox/artists'
 include Artists

data/lib/jimmy_jukebox/song.rb

@@ -35,14 +35,6 @@ module JimmyJukebox
       `kill -s CONT #{@playing_pid}` if @playing_pid
     end
 
-    def delete
-      # without temp var, next song could start playing
-      # in another thread and wrong file could be deleted
-      file_to_delete = @music_file
-      terminate
-      File.delete(file_to_delete)
-    end
-
     def terminate
       @paused = false
       #`killall #{@player}`
@@ -73,8 +65,9 @@ module JimmyJukebox
     def play_with_player
       puts "Press Ctrl-C to stop the music and exit this program"
       puts "Now playing '#{@music_file}'"
-      puts "#{@player} \"#{File.expand_path(@music_file)}\""
-      system_yield_pid(@player, File.expand_path(@music_file)) do |pid|
+      command = @player
+      arg = File.expand_path(@music_file)
+      system_yield_pid(command,arg) do |pid|
         @playing_pid = pid 
       end
     end
@@ -82,16 +75,19 @@ module JimmyJukebox
   end
 
   # make system call and get pid so you can terminate process
-  def system_yield_pid(player, filename)
+  def system_yield_pid(command,arg)
     # would like to use Process.respond_to?(:fork) but JRuby mistakenly returns true
     if (defined?(JRUBY_VERSION) || RUBY_PLATFORM == 'java')
-      pid = Spoon.spawnp("#{player}", "#{filename}")
+      pid = Spoon.spawnp(command,arg)
+      Process.waitpid(pid)      # Waits for a child process to exit, returns its process id, and sets $? to a Process::Status object
     else
       begin
-        pid = fork do             # creates and runs block in subprocess (which will terminate with status 0), capture subprocess pid
-          exec(player,filename)   # replaces current process with system call
-          exit! 127               # exit process and return exit status 127; should never be reached
-        end
+        pid = POSIX::Spawn::spawn(command + ' ' + arg)
+        stat = Process::waitpid(pid)
+        #pid = fork do             # creates and runs block in subprocess (which will terminate with status 0), capture subprocess pid
+        #  exec(command)           # replaces current process with system call
+        #  exit! 127               # exit process and return exit status 127; should never be reached
+        #end
       rescue NotImplementedError
         raise "*** fork()...exec() not supported ***"
       end
@@ -104,7 +100,6 @@ module JimmyJukebox
     #  puts "No process id (pid)!"
     #  raise "@current_song: #{Jukebox.current_song.inspect}"
     #end
-    Process.waitpid(pid)      # Waits for a child process to exit, returns its process id, and sets $? to a Process::Status object
     $?                        # return Process::Status object with instance methods .stopped?, .exited?, .exitstatus; see: http://www.ruby-doc.org/core/classes/Process/Status.html
   end
 

data/lib/jimmy_jukebox/song_loader.rb

@@ -18,23 +18,23 @@ module JimmyJukebox
 
   module SongLoader
 
-    @user_config = UserConfig.new
     SUPPORTED_MUSIC_TYPES = /\.mp3$|\.ogg$/i
 
     @last_top_dir = nil            # enables returning previous result if @last_top_dir == top_dir
+
     @user_config = UserConfig.new
 
-    def self.define_artist(name)
+    def self.define_artist(name,user_config)
       metaclass.instance_eval do
         define_method(name) do
-          save_dir = @user_config.default_music_dir + value_to_subdir_name(name)
+          save_dir = user_config.default_music_dir + value_to_subdir_name(name)
           songs = YAML::load_file(File.dirname(__FILE__) + "/songs/#{value_to_yaml_file(name)}")
           download_songs(songs, save_dir)
         end
       end
     end
 
-    JAZZ_ARTISTS.values.each { |v| define_artist v.to_sym }
+    JAZZ_ARTISTS.values.each { |v| define_artist v.to_sym, @user_config }
 
     def self.sample(num_songs)
       # create array of all possible songs

data/lib/jimmy_jukebox/user_config.rb

@@ -2,6 +2,8 @@ module JimmyJukebox
 
   class UserConfig
 
+    require 'fileutils'
+
     require 'jimmy_jukebox/artists'
     include Artists
 
@@ -17,15 +19,10 @@ module JimmyJukebox
     end
 
     def initialize
-      #configure_preferences
       set_music_players
       generate_directories_list
       generate_song_list
-     end
-
-    #def configure_preferences
-    #  File.exists?(File.join("~",".jimmy_jukebox","configuration"))
-    #end
+    end
 
     def default_music_dir
       File.expand_path(File.join("~","Music"))
@@ -150,9 +147,16 @@ module JimmyJukebox
       else
         @music_directories << default_music_dir
       end
+      create_nonexistent_music_directories
       add_all_subdirectories
     end
 
+    def create_nonexistent_music_directories
+      @music_directories.each do |md|
+        FileUtils.mkdir_p(md) unless Dir.exists?(md)
+      end
+    end
+
     def is_a_txt_file?(whatever)
       return false unless whatever
       whatever.match(/.*\.txt/) ? true : false
@@ -192,11 +196,11 @@ module JimmyJukebox
         files.map! { |f| File.expand_path(music_dir) + '/' + f }
         @songs = @songs + files
       end
-      raise "JimmyJukebox could not find any songs" unless @songs.length > 0
+      puts "WARNING: JimmyJukebox could not find any songs" unless @songs.length > 0
       #songs = ["~/Music/Artie_Shaw/Georgia On My Mind 1941.mp3",
       #         "~/Music/Jelly_Roll_Morton/High Society 1939.mp3"]
     end
 
   end
 
- end 
+end 

data/lib/jimmy_jukebox/user_interface.rb

@@ -1,3 +1,5 @@
+require 'readline'
+
 jj = Jukebox
 
 play_loop_thread = Thread.new do

data/lib/jimmy_jukebox/version.rb

@@ -1,3 +1,3 @@
 module JimmyJukebox
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,198 +1,195 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jimmy_jukebox
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.3.7
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 6
-  version: 0.3.6
 platform: ruby
-authors: 
+authors:
 - James Lavin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: jimmy_jukebox plays random MP3 & OGG songs under a directory (or set of directories) and can download music
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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
 email: james@jameslavin.com
-executables: 
+executables:
 - play_jukebox
 - load_jukebox
 - jplay_jukebox
 - jload_jukebox
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - roadmap.txt
 - LICENSE.txt
-- lib/jimmy_jukebox/load_jukebox_code.rb
-- lib/jimmy_jukebox/jukebox.rb
-- lib/jimmy_jukebox/song_loader.rb
-- lib/jimmy_jukebox/user_config.rb
+- lib/jimmy_jukebox.rb
 - lib/jimmy_jukebox/version.rb
-- lib/jimmy_jukebox/song.rb
 - lib/jimmy_jukebox/artists.rb
+- lib/jimmy_jukebox/song.rb
+- lib/jimmy_jukebox/jukebox.rb
+- lib/jimmy_jukebox/user_config.rb
 - lib/jimmy_jukebox/user_interface.rb
-- lib/jimmy_jukebox.rb
-- lib/jimmy_jukebox/songs/BennieMoten.yml
-- lib/jimmy_jukebox/songs/MilesDavis.yml
-- lib/jimmy_jukebox/songs/BixBeiderbecke.yml
-- lib/jimmy_jukebox/songs/LionelHampton.yml
-- lib/jimmy_jukebox/songs/CountBasie.yml
-- lib/jimmy_jukebox/songs/DizzyGillespie.yml
-- lib/jimmy_jukebox/songs/DjangoReinhardt.yml
-- lib/jimmy_jukebox/songs/LouisArmstrong.yml
-- lib/jimmy_jukebox/songs/JellyRollMorton.yml
-- lib/jimmy_jukebox/songs/CharlieChristian.yml
+- lib/jimmy_jukebox/song_loader.rb
+- lib/jimmy_jukebox/load_jukebox_code.rb
 - lib/jimmy_jukebox/songs/BillieHoliday.yml
-- lib/jimmy_jukebox/songs/ArtTatum.yml
 - lib/jimmy_jukebox/songs/CharlieParker.yml
+- lib/jimmy_jukebox/songs/CharlieChristian.yml
+- lib/jimmy_jukebox/songs/BennieMoten.yml
+- lib/jimmy_jukebox/songs/FletcherHenderson.yml
+- lib/jimmy_jukebox/songs/ColemanHawkins.yml
 - lib/jimmy_jukebox/songs/KingOliver.yml
 - lib/jimmy_jukebox/songs/OriginalDixielandJazzBand.yml
-- lib/jimmy_jukebox/songs/EarlHines.yml
-- lib/jimmy_jukebox/songs/BennyGoodman.yml
-- lib/jimmy_jukebox/songs/ArtieShaw.yml
-- lib/jimmy_jukebox/songs/ColemanHawkins.yml
-- lib/jimmy_jukebox/songs/JamesPJohnson.yml
+- lib/jimmy_jukebox/songs/LouisArmstrong.yml
+- lib/jimmy_jukebox/songs/DjangoReinhardt.yml
 - lib/jimmy_jukebox/songs/RedNorvo.yml
+- lib/jimmy_jukebox/songs/LionelHampton.yml
+- lib/jimmy_jukebox/songs/ArtTatum.yml
+- lib/jimmy_jukebox/songs/BixBeiderbecke.yml
+- lib/jimmy_jukebox/songs/ArtieShaw.yml
+- lib/jimmy_jukebox/songs/MilesDavis.yml
+- lib/jimmy_jukebox/songs/DizzyGillespie.yml
 - lib/jimmy_jukebox/songs/DukeEllington.yml
-- lib/jimmy_jukebox/songs/FletcherHenderson.yml
+- lib/jimmy_jukebox/songs/BennyGoodman.yml
+- lib/jimmy_jukebox/songs/CountBasie.yml
 - lib/jimmy_jukebox/songs/SidneyBechet.yml
-- spec/spec_helper.rb
-- spec/user_config_spec.rb
+- lib/jimmy_jukebox/songs/JamesPJohnson.yml
+- lib/jimmy_jukebox/songs/JellyRollMorton.yml
+- lib/jimmy_jukebox/songs/EarlHines.yml
 - spec/jimmy_jukebox_spec.rb
 - spec/song_loader_spec.rb
+- spec/user_config_spec.rb
 - spec/song_spec.rb
+- 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: 
+post_install_message: I really hope you enjoy the great jazz downloadable using this
+  gem!
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- spoon gem (JRuby only)
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
 rubyforge_project: jimmy_jukebox
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: plays your MP3 & OGG files and lets you easily download music
-test_files: 
-- spec/spec_helper.rb
-- spec/user_config_spec.rb
+test_files:
 - spec/jimmy_jukebox_spec.rb
 - spec/song_loader_spec.rb
+- spec/user_config_spec.rb
 - spec/song_spec.rb
+- spec/spec_helper.rb