rack-handlers 0.5.5 → 0.5.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 97fb1f3567cdeaa4b70c22b96cfc47f859b97d53
+  data.tar.gz: b65abcf06838ad66c1a398ed1a609379240061c8
+!binary "U0hBNTEy":
+  metadata.gz: 0f867ed4d07d1b4a9fae63475b83e76680227e9204a507f6a64da8a83fc4243c0c814dbedf65316ff69d7236b518bcb67c5c02548ae8a41a28ed6479d8309bd2
+  data.tar.gz: 3bff97ba81c9d1a88c4dde2c25a8f60df0981227051a718025fdd865a31f62ba15f892f929fcb9c1b3cebd607cf8a6b57b6f430c8c6d283a7dcb3f0492cfddbd

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## rack-handlers 0.5.6 -- 2013-04-01
+
+* [rails server] Don't hack Rack. Instead, always try to look up
+  default config path. If there's nothing, then don't load the config.
+
 ## rack-handlers 0.5.5 -- 2012-08-23
 
 * Fix an error from running simply `rails`.

data/Rakefile

@@ -8,7 +8,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'rack-handlers'
-    s.version = '0.5.5'
+    s.version = '0.5.6'
 
     %w[rack].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/rack/handler/rails-server.rb

@@ -3,21 +3,9 @@ if ARGV[0] && ARGV[0] == 'server'[0, ARGV[0].size] && ARGV[1] !~ /^\w+/
   server = %w[zbatery rainbows unicorn puma thin].find do |s|
     begin
       require s
-
-      require 'rack/server'
-      class ::Rack::Server
-        alias_method :old_default_options, :default_options
-      end
-
-      ::Rack::Server.module_eval <<-RUBY
-        def default_options
-          old_default_options.merge(:config_file => "config/#{s}.rb")
-        end
-      RUBY
-
       true
-
     rescue LoadError
+      false
     end
   end
 

data/lib/rack/handler/unicorn.rb

@@ -8,9 +8,12 @@ class Rack::Handler::Unicorn
   end
 
   def self.run app, options
+    config_path = "config/#{name.downcase}.rb"
+    config_file = config_path if File.exist?(config_path)
+
     server = server_class.new(app,
       :listeners   => "#{options[:Host]}:#{options[:Port]}",
-      :config_file => options[:config_file])
+      :config_file => config_file)
 
     yield(server) if block_given?
 

data/rack-handlers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-handlers"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-08-23"
+  s.date = "2013-04-01"
   s.description = "Some Rack handlers which are not included in Rack distribution."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -20,16 +20,15 @@ Gem::Specification.new do |s|
   "lib/rack/handler/unicorn.rb",
   "lib/rack/handler/zbatery.rb",
   "rack-handlers.gemspec",
-  "task/.git",
   "task/.gitignore",
   "task/gemgem.rb"]
   s.homepage = "https://github.com/godfat/rack-handlers"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.0"
   s.summary = "Some Rack handlers which are not included in Rack distribution."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])

data/task/gemgem.rb

@@ -32,7 +32,8 @@ module Gemgem
     }
     @readme ||=
       if path
-        ps = File.read(path).scan(/#+[^\n]+\n\n.+?(?=\n\n#+[^\n]+\n)/m)
+        ps = "##{File.read(path)}".
+             scan(/((#+)[^\n]+\n\n.+?(?=\n\n\2[^#\n]+\n))/m).map(&:first)
         ps.inject({'HEADER' => ps.first}){ |r, s, i|
           r[s[/\w+/]] = s
           r
@@ -61,12 +62,13 @@ module Gemgem
   end
 
   def ann_md
-    "##{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
+     "#{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
     "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
     "### CHANGES:\n\n"                                                     \
     "###{changes}\n\n"                                                     \
     "##{readme['INSTALLATION']}\n\n"                                       +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}" else '' end
+    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS'][/[^\n]+\n\n[^\n]+/]}"
+    else '' end
   end
 
   def ann_html
@@ -113,7 +115,7 @@ module Gemgem
 
   def all_files
     @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/}
+      if file.to_s =~ %r{\.git/|\.git$}
         nil
       else
         file.to_s
@@ -177,7 +179,7 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}")
+  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
 end
 
 desc 'Build gem'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rack-handlers
 version: !ruby/object:Gem::Version
-  version: 0.5.5
-  prerelease: 
+  version: 0.5.6
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,32 +41,29 @@ files:
 - lib/rack/handler/unicorn.rb
 - lib/rack/handler/zbatery.rb
 - rack-handlers.gemspec
-- task/.git
 - task/.gitignore
 - task/gemgem.rb
 homepage: https://github.com/godfat/rack-handlers
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Some Rack handlers which are not included in Rack distribution.
 test_files: []
-has_rdoc: 

data/task/.git

@@ -1 +0,0 @@
-gitdir: /Users/godfat/project/godfat/rack-handlers/.git/modules/task