ongaku_ryoho_server 0.3.0 → 0.3.1

data/README.md

@@ -1,6 +1,6 @@
 # Ongaku Ryoho Server
 
-A little Sinatra web server (with Thin) wrapped in a gem specifically for the Ongaku Ryoho client.
+A little Sinatra web server (with Puma) wrapped in a gem specifically for the Ongaku Ryoho client.
 
 ## How to use
 
@@ -27,10 +27,10 @@ ongaku_ryoho_server stop (must be in the same directory)
 ### Options
 
 ```
--p           set the port (default: 3000)
+-p           set the port (default: 7000)
 -d           daemonize
 
 --update     update the cached collection
 
-+ all the other thin cli options
++ all the other puma cli options
 ```

data/bin/ongaku_ryoho_server

@@ -1,45 +1,38 @@
 #!/usr/bin/env ruby
 require "rubygems"
-require "thin"
+require "puma/cli"
 
 
-#
-# Thin CLI
-
 gem_dir = File.dirname(__FILE__)
-current_directory_name = File.basename(Dir.pwd)
 
 # 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"
+pid_file = "#{gem_dir}/../tmp/#{OngakuRyohoServer::List.get_digest}.pid"
 
-# thin arguments
+# puma 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 << ["--pidfile", pid_file] unless ARGV.include?("--pidfile")
 argv << ["-e", "production"] unless ARGV.include?("-e")
-argv << ["-p", "3000"] unless ARGV.include?("-p")
+argv << ["-p", "7000"] unless ARGV.include?("-p")
+
+# rackup file
+argv << rackup_file
 
 # special arguments
 update_collection = argv.include?("--update")
 argv.delete("--update") if update_collection
 
-# thin cli
-thin_runner = Thin::Runner.new(argv.flatten)
+# puma cli
+puma_cli = Puma::CLI.new(argv.flatten)
 
 # keep options
 OngakuRyohoServer::OPTIONS = {
   update_collection: update_collection,
-  thin: thin_runner.options
+  puma: puma_cli.instance_variable_get("@options")
 }
 
-# exec thin
-thin_runner.run!
-
-
+# exec puma
+puma_cli.run

data/history.txt

@@ -1,3 +1,9 @@
+=== 0.3.1 / 2012-11-16
+
+* use puma instead of thin (better streaming support, daemonizing coming soon)
+* removed the unnecessary "/available" route
+
+
 === 0.3.0 / 2012-11-10
 
 * use thin cli (ability to daemonize)

data/lib/ongaku_ryoho_server/application.rb

@@ -9,7 +9,6 @@ module OngakuRyohoServer
 
   class Application < Sinatra::Base
     set :environment, :production
-    set :server, :thin
 
     FILE_FORMATS = %w{ mp3 mp4 m4a ogg flac wav wma }
 
@@ -21,12 +20,6 @@ module OngakuRyohoServer
     end
 
 
-    # availability
-    get "/available?" do
-      "As it happens, I am."
-    end
-
-
     # compare filelists
     post "/check" do
       content_type :json

data/lib/ongaku_ryoho_server/config.ru

@@ -14,4 +14,4 @@ end
 #
 # Run the application
 
-run OngakuRyohoServer::Application.new(options[:thin])
+run OngakuRyohoServer::Application.new(options[:puma])

data/lib/ongaku_ryoho_server/version.rb

@@ -2,5 +2,5 @@ module OngakuRyohoServer
   #
   # { VERSION }
 
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 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 'thin', '~> 1.5.0'
+  gem.add_dependency 'puma', '~> 1.6.3'
 
   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.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3827745549629188482
+      hash: -3003266274688567412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3827745549629188482
+      hash: -3003266274688567412
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24