httpthumbnailer 0.0.7 → 0.0.8

data/Gemfile

@@ -4,6 +4,8 @@ gem "sinatra", ">= 1.2.6"
 gem "mongrel", ">= 1.1.5"
 gem "rmagick", "~> 2"
 gem "haml", "~> 3"
+gem "fcgi", "~> 0.8"
+gem "cli", "~> 0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
+    cli (0.0.2)
     cucumber (1.1.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -13,6 +14,7 @@ GEM
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.7)
+    fcgi (0.8.8)
     gem_plugin (0.2.3)
     gherkin (2.6.5)
       json (>= 1.4.6)
@@ -56,8 +58,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  cli (~> 0.0)
   cucumber
   daemon (~> 1)
+  fcgi (~> 0.8)
   haml (~> 3)
   httpclient (~> 2.2)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/httpthumbnailer

@@ -1,5 +1,16 @@
 #!/usr/bin/ruby
 
+require 'cli'
+options = CLI.new do
+	description 'HTTP thumbnailing server'
+	option :bind, :short => :b, :default => 'localhost', :description => "HTTP server bind address"
+	option :port, :short => :p, :default => 3100, :cast => Integer, :description => "HTTP server TCP port"
+	option :server, :short => :s, :default => 'mongrel', :description => "Rack server handler like thin, mongrel, webrick, fastcgi etc."
+	option :limit_memory, :default => 128*1024**2, :cast => Integer, :description => "Image cache heap memory size limit in bytes"
+	option :limit_map, :default => 256*1024**2, :cast => Integer, :description => "Image cache memory mapped file size limit in bytes - used when heap memory limit is used up"
+	option :limit_disk, :default => 0, :cast => Integer, :description => "Image cache temporary file size limit in bytes - used when memory mapped file limit is used up"
+end.parse!
+
 require 'sinatra/base'
 require 'haml'
 require 'RMagick'
@@ -10,17 +21,17 @@ require 'httpthumbnailer/thumbnail_specs'
 
 sinatra = Sinatra.new
 
-sinatra.set :port, 3100
-sinatra.set :bind, 'localhost'
+sinatra.set :port, options.port
+sinatra.set :bind, options.bind
 sinatra.set :environment, 'production'
-sinatra.set :server, ['mongrel']
+sinatra.set :server, options.server
 sinatra.set :lock, true
 sinatra.set :boundary, "thumnail image data"
 sinatra.set :logging, true
 sinatra.set :debug, true
-sinatra.set :limit_memory, 128*10**6 # B (keep in mem)
-sinatra.set :limit_map, 256*10**6 # B (if not fit in mem, map to disk)
-sinatra.set :limit_disk, 0 # B (if not fit in map use standard IO)
+sinatra.set :limit_memory, options.limit_memory
+sinatra.set :limit_map, options.limit_map
+sinatra.set :limit_disk, options.limit_disk
 
 sinatra.before do
 	logger.level = Logger::DEBUG if settings.debug == true
@@ -116,10 +127,5 @@ sinatra.error do
 	plain_exception(env['sinatra.error'])
 end
 
-begin
-	sinatra.run!
-rescue Errno::EACCES, Errno::EADDRNOTAVAIL, SocketError => e
-	puts "Error: failed to bind HTTP server socket (#{options[:bind]}): #{e}"
-	exit 5
-end
+sinatra.run!
 

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-30"
+  s.date = "2011-12-01"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -57,6 +57,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_runtime_dependency(%q<rmagick>, ["~> 2"])
       s.add_runtime_dependency(%q<haml>, ["~> 3"])
+      s.add_runtime_dependency(%q<fcgi>, ["~> 0.8"])
+      s.add_runtime_dependency(%q<cli>, ["~> 0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -70,6 +72,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<rmagick>, ["~> 2"])
       s.add_dependency(%q<haml>, ["~> 3"])
+      s.add_dependency(%q<fcgi>, ["~> 0.8"])
+      s.add_dependency(%q<cli>, ["~> 0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -84,6 +88,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<rmagick>, ["~> 2"])
     s.add_dependency(%q<haml>, ["~> 3"])
+    s.add_dependency(%q<fcgi>, ["~> 0.8"])
+    s.add_dependency(%q<cli>, ["~> 0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpthumbnailer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -78,8 +78,38 @@ dependencies:
   name: haml
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  prerelease: false
+  name: fcgi
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 0
+        version: "0.0"
+  prerelease: false
+  name: cli
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,10 +122,10 @@ dependencies:
         version: 2.3.0
   prerelease: false
   name: rspec
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,10 +136,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: cucumber
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +152,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   name: bundler
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,10 +168,10 @@ dependencies:
         version: 1.6.4
   prerelease: false
   name: jeweler
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,10 +182,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: rcov
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -166,10 +196,10 @@ dependencies:
         version: "1"
   prerelease: false
   name: daemon
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -181,10 +211,10 @@ dependencies:
         version: "2.2"
   prerelease: false
   name: httpclient
-  version_requirements: *id011
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -196,7 +226,7 @@ dependencies:
         version: "3.9"
   prerelease: false
   name: rdoc
-  version_requirements: *id012
+  version_requirements: *id014
 description: Provides HTTP API for thumbnailing images
 email: jpastuszek@gmail.com
 executables: