ongaku_ryoho_server 0.2 → 0.3.0

data/.gitignore

@@ -1,18 +1,6 @@
-*.gem
-*.rbc
+.DS_Store
 .bundle
-.config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.pid
+pkg/
+tmp/
+log/

data/README.md

@@ -1,12 +1,12 @@
 # Ongaku Ryoho Server
 
-A little Sinatra web server wrapped in a gem specifically for the [Ongaku Ryoho client](https://github.com/icidasset/ongaku_ryoho).
+A little Sinatra web server (with Thin) wrapped in a gem specifically for the Ongaku Ryoho client.
 
 ## How to use
 
 ### Requirements
 
-`Ruby 1.9.2`
+`Ruby 1.9.2 (or higher)`
 
 ### Installation
 
@@ -20,15 +20,17 @@ Go to a music directory and run the web server.
 
 ```bash
 cd ~/Music
-(rvmsudo) ongaku_ryoho_server (-p 80)
+ongaku_ryoho_server start
+ongaku_ryoho_server stop (must be in the same directory)
 ```
 
 ### Options
 
-Some Sinatra options, that is.
+```
+-p           set the port (default: 3000)
+-d           daemonize
+
+--update     update the cached collection
 
++ all the other thin cli options
 ```
--p port    set the port (default is 4567)
--o addr    set the host (default is 0.0.0.0)
--x         turn on the mutex lock (default is off)
-```

data/bin/ongaku_ryoho_server

@@ -1,29 +1,45 @@
 #!/usr/bin/env ruby
-require_relative "../lib/ongaku_ryoho_server.rb"
+require "rubygems"
+require "thin"
+
 
 #
-# Look for some of the Sinatra options and pass them along
+# Thin CLI
 
-options = {}
+gem_dir = File.dirname(__FILE__)
+current_directory_name = File.basename(Dir.pwd)
 
-if ARGV.any?
-  require "optparse"
-  OptionParser.new { |op|
-    op.on("-p port",   "set the port (default is 4567)")            { |val| options[:port] = Integer(val) }
-    op.on("-o addr",   "set the host (default is 0.0.0.0)")         { |val| options[:bind] = val }
-    op.on("-x",        "turn on the mutex lock (default is off)")   {       options[:lock] = true }
-  }.parse!(ARGV.dup)
-end
+# require library
+require "#{gem_dir}/../lib/ongaku_ryoho_server.rb"
 
+# files
+rackup_file = "#{gem_dir}/../lib/ongaku_ryoho_server/config.ru"
+log_file = "#{gem_dir}/../log/#{current_directory_name}.log"
+pid_file = "#{gem_dir}/../tmp/#{current_directory_name}.pid"
 
-#
-# Build list
+# thin arguments
+argv = ARGV
+argv << ["--tag", "Ongaku Ryoho Server"]
+argv << ["-R", rackup_file] unless ARGV.include?("-R")
+argv << ["-P", pid_file] unless ARGV.include?("-P")
+argv << ["-l", log_file] unless ARGV.include?("-l")
+argv << ["-e", "production"] unless ARGV.include?("-e")
+argv << ["-p", "3000"] unless ARGV.include?("-p")
 
-OngakuRyohoServer::List.save
-puts "Collection saved at #{OngakuRyohoServer::List.config_file_path}\n\n"
+# special arguments
+update_collection = argv.include?("--update")
+argv.delete("--update") if update_collection
 
+# thin cli
+thin_runner = Thin::Runner.new(argv.flatten)
+
+# keep options
+OngakuRyohoServer::OPTIONS = {
+  update_collection: update_collection,
+  thin: thin_runner.options
+}
+
+# exec thin
+thin_runner.run!
 
-#
-# Run the server
 
-OngakuRyohoServer.run(options)

data/history.txt

@@ -0,0 +1,5 @@
+=== 0.3.0 / 2012-11-10
+
+* use thin cli (ability to daemonize)
+* added m4a to supported extensions
+* does not process the directory except when needed or requested (instead of always)

data/lib/ongaku_ryoho_server/application.rb

@@ -9,9 +9,9 @@ module OngakuRyohoServer
 
   class Application < Sinatra::Base
     set :environment, :production
-    set :server, :puma
+    set :server, :thin
 
-    FILE_FORMATS = %w{ mp3 mp4 ogg flac wav wma }
+    FILE_FORMATS = %w{ mp3 mp4 m4a ogg flac wav wma }
 
     # root
     get "/" do

data/lib/ongaku_ryoho_server/config.ru

@@ -0,0 +1,17 @@
+options = OngakuRyohoServer::OPTIONS
+
+
+#
+# Build file list (only if needed or request)
+
+config_file_path = OngakuRyohoServer::List.config_file_path
+if !File.file?(config_file_path) or options[:update_collection]
+  OngakuRyohoServer::List.save
+  puts "Collection saved at #{config_file_path}\n\n"
+end
+
+
+#
+# Run the application
+
+run OngakuRyohoServer::Application.new(options[:thin])

data/lib/ongaku_ryoho_server/version.rb

@@ -2,5 +2,5 @@ module OngakuRyohoServer
   #
   # { VERSION }
 
-  VERSION = "0.2"
+  VERSION = "0.3.0"
 end

data/lib/ongaku_ryoho_server.rb

@@ -1,17 +1,13 @@
+require "sinatra/base"
+require "taglib"
+
 require "json"
 require "uri"
 require "digest/sha1"
-require "puma"
-require "sinatra"
-require "taglib"
 
 require_relative "ongaku_ryoho_server/version"
 require_relative "ongaku_ryoho_server/process"
 require_relative "ongaku_ryoho_server/list"
 require_relative "ongaku_ryoho_server/application"
 
-module OngakuRyohoServer
-  def self.run(options)
-    OngakuRyohoServer::Application.run!(options)
-  end
-end
+module OngakuRyohoServer; end

data/ongaku_ryoho_server.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   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'
+  gem.add_dependency 'thin', '~> 1.5.0'
 
   gem.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.2'
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,8 +105,10 @@ files:
 - README.md
 - Rakefile
 - bin/ongaku_ryoho_server
+- history.txt
 - lib/ongaku_ryoho_server.rb
 - lib/ongaku_ryoho_server/application.rb
+- lib/ongaku_ryoho_server/config.ru
 - lib/ongaku_ryoho_server/list.rb
 - lib/ongaku_ryoho_server/process.rb
 - lib/ongaku_ryoho_server/version.rb
@@ -125,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 819011088545897320
+      hash: 3827745549629188482
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 819011088545897320
+      hash: 3827745549629188482
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24