ongaku_ryoho_server 0.3.1 → 0.3.2

data/bin/ongaku_ryoho_server

@@ -14,7 +14,6 @@ pid_file = "#{gem_dir}/../tmp/#{OngakuRyohoServer::List.get_digest}.pid"
 
 # puma arguments
 argv = ARGV
-argv << ["--pidfile", pid_file] unless ARGV.include?("--pidfile")
 argv << ["-e", "production"] unless ARGV.include?("-e")
 argv << ["-p", "7000"] unless ARGV.include?("-p")
 
@@ -30,8 +29,8 @@ puma_cli = Puma::CLI.new(argv.flatten)
 
 # keep options
 OngakuRyohoServer::OPTIONS = {
-  update_collection: update_collection,
-  puma: puma_cli.instance_variable_get("@options")
+  :update_collection => update_collection,
+  :puma => puma_cli.instance_variable_get("@options")
 }
 
 # exec puma

data/history.txt

@@ -1,3 +1,9 @@
+=== 0.3.2 / 2012-11-17
+
+* ruby 1.8.7 support
+* remove pid file thing
+
+
 === 0.3.1 / 2012-11-16
 
 * use puma instead of thin (better streaming support, daemonizing coming soon)

data/lib/ongaku_ryoho_server/application.rb

@@ -1,3 +1,5 @@
+require "sinatra/base"
+
 module OngakuRyohoServer
   #
   # { Application }
@@ -31,6 +33,7 @@ module OngakuRyohoServer
 
     # music file
     get %r{.(#{FILE_FORMATS.join("|")})$}i do
+      require "uri"
       requested_item = URI.unescape(request.path_info[1..-1])
       File.exists?(requested_item) ? send_file(requested_item) : 404
     end

data/lib/ongaku_ryoho_server/list.rb

@@ -17,6 +17,7 @@ module OngakuRyohoServer
     # => Creates a digest from the path of the current directory
     #
     def self.get_digest
+      require "digest/sha1"
       digested_path = Digest::SHA1.hexdigest(Dir.pwd)
     end
 

data/lib/ongaku_ryoho_server/process.rb

@@ -43,12 +43,12 @@ module OngakuRyohoServer
       new_files = file_list_from_current_directory - file_list
 
       new_tracks = OngakuRyohoServer::Process.files(
-        new_files, { last_modified: Time.now }
+        new_files, { :last_modified => Time.now }
       )
 
       return {
-        missing_files: missing_files,
-        new_tracks: new_tracks
+        :missing_files => missing_files,
+        :new_tracks => new_tracks
       }
     end
 
@@ -72,7 +72,7 @@ module OngakuRyohoServer
       # loop over every track
       file_list.each do |location|
         rpartition = location.rpartition("/")
-        filename   = rpartition[2]
+        filename = rpartition[2]
 
         track = {}
 
@@ -80,19 +80,19 @@ module OngakuRyohoServer
           tag = fileref.tag
 
           tags = {
-            title:   tag.title,
-            artist:  tag.artist,
-            album:   tag.album,
-            year:    tag.year,
-            track:   tag.track,
-            genre:   tag.genre
+            :title => tag.title,
+            :artist => tag.artist,
+            :album => tag.album,
+            :year => tag.year,
+            :track => tag.track,
+            :genre => tag.genre
           }
 
           tags.each do |key, value|
             tags[key] = "Unknown" if value.nil? or (value.respond_to?(:empty) and value.empty?)
           end
 
-          tags.merge!({ filename: filename, location: location })
+          tags.merge!({ :filename => filename, :location => location })
 
           track = tags.clone
         end

data/lib/ongaku_ryoho_server.rb

@@ -1,13 +1,5 @@
-require "sinatra/base"
-require "taglib"
-
-require "json"
-require "uri"
-require "digest/sha1"
-
-require_relative "ongaku_ryoho_server/version"
-require_relative "ongaku_ryoho_server/process"
-require_relative "ongaku_ryoho_server/list"
-require_relative "ongaku_ryoho_server/application"
+require "ongaku_ryoho_server/process"
+require "ongaku_ryoho_server/list"
+require "ongaku_ryoho_server/application"
 
 module OngakuRyohoServer; end

data/ongaku_ryoho_server.gemspec

@@ -1,24 +1,26 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/ongaku_ryoho_server/version', __FILE__)
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Steven Vandevelde"]
-  gem.email         = ["icid.asset@gmail.com"]
-  gem.description   = %q{Serves music to Ongaku Ryoho clients}
-  gem.summary       = %q{Serves music to Ongaku Ryoho clients}
-  gem.homepage      = "https://github.com/icidasset/ongaku_ryoho_server"
+Gem::Specification.new do |s|
+  s.name = "ongaku_ryoho_server"
+  s.version = "0.3.2"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "ongaku_ryoho_server"
-  gem.require_paths = ["lib"]
-  gem.version       = OngakuRyohoServer::VERSION
+  s.authors = ["Steven Vandevelde"]
+  s.email = ["icid.asset@gmail.com"]
+  s.description = "Serves music to Ongaku Ryoho clients"
+  s.summary = "Serves music to Ongaku Ryoho clients"
+  s.homepage = "https://github.com/icidasset/ongaku_ryoho_server"
 
-  gem.add_dependency 'json', '~> 1.7.5'
-  gem.add_dependency 'taglib-ruby', '~> 0.5.2'
-  gem.add_dependency 'sinatra', '~> 1.3.3'
-  gem.add_dependency 'puma', '~> 1.6.3'
+  s.files = `git ls-files`.split($\)
+  s.executables = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
-  gem.add_development_dependency 'rake'
+  s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+
+  s.add_dependency "json", "~> 1.7.5"
+  s.add_dependency "taglib-ruby", "~> 0.5.2"
+  s.add_dependency "sinatra", "~> 1.3.3"
+  s.add_dependency "puma", "~> 1.6.3"
+
+  s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -111,7 +111,6 @@ files:
 - lib/ongaku_ryoho_server/config.ru
 - lib/ongaku_ryoho_server/list.rb
 - lib/ongaku_ryoho_server/process.rb
-- lib/ongaku_ryoho_server/version.rb
 - ongaku_ryoho_server.gemspec
 homepage: https://github.com/icidasset/ongaku_ryoho_server
 licenses: []
@@ -124,10 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3003266274688567412
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3003266274688567412
+      hash: -71336546807028651
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/ongaku_ryoho_server/version.rb

@@ -1,6 +0,0 @@
-module OngakuRyohoServer
-  #
-  # { VERSION }
-
-  VERSION = "0.3.1"
-end