rack-handlers 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c0040d685a42ff72fe775bba5f121adebb24aed
-  data.tar.gz: 84be49d1dfd0fabcfa4ea3c513090f7dc52e5158
+  metadata.gz: e816e057dcaad84c8d013e3240650e941eb3075e
+  data.tar.gz: 0a870189ac4682e159c2925d00876282fcd598f7
 SHA512:
-  metadata.gz: deb4dab07de2c809a14b984197a5c3a4eec2b264b2d770b42d2f98353153c703df859611107fbf6c99be044a3fb5901d0d257183a1d6bd939354fd756fcf2530
-  data.tar.gz: 278429ba6adef5565c49062ad9d6708408121e63dd913eb5e9a44db31a44fb501402f92fbae44154e0dc6083841865f40d68134f0a55991f23fb890585d4bc9c
+  metadata.gz: 36bdd8a177ce91cc97b929651c5fa3f1a6a1ce356c04ed6d2047b23bafafb8a1969751f9acf14fbb2c78a468e0fe9eb497de4b53a58bb3c32814d6b8bc536310
+  data.tar.gz: fee8bbd4f495b838b9375f8091d230befeb653677ccfb29064fc8c0bc5f25534e3672117b4cb243a8a3af8c9ed19bb09b3cfcb504b89e527a49bc92cfe0222f4

data/.travis.yml

@@ -0,0 +1,18 @@
+sudo: true
+language: ruby
+rvm:
+  - 2.1
+  - 2.2
+  - 2.3.0
+  - rbx
+  - jruby-9
+
+before_install:
+  - rvm get head
+  - rvm reload
+  - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
+install:
+  - gem install bundler
+  - bundle install --retry=3
+  - gem install yahns zbatery rainbows unicorn puma thin torquebox trinidad || true
+script: 'rake test'

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## rack-handlers 0.7.3 -- 2016-04-27
+
+* config directory is now optional and default to '.' Thanks @jgoulah
+
 ## rack-handlers 0.7.2 -- 2016-01-14
 
 * Added torquebox and trinidad to the default list for JRuby.

data/Gemfile

@@ -0,0 +1,15 @@
+
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+gem 'pork'
+
+gem 'simplecov', :require => false if ENV['COV']
+gem 'coveralls', :require => false if ENV['CI']
+
+platforms :rbx do
+  gem 'rubysl-singleton' # used in rake
+  gem 'rubysl-readline'  # we need readline extension
+end

data/README.md

@@ -1,4 +1,4 @@
-# rack-handlers
+# rack-handlers [![Build Status](https://secure.travis-ci.org/godfat/rack-handlers.png?branch=master)](http://travis-ci.org/godfat/rack-handlers) [![Coverage Status](https://coveralls.io/repos/godfat/rack-handlers/badge.png)](https://coveralls.io/r/godfat/rack-handlers)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -54,6 +54,7 @@ For people who likes to run `rails s`!
 
 ## CONTRIBUTORS:
 
+* John Goulah (@jgoulah)
 * Lin Jen-Shin (@godfat)
 
 ## LICENSE:

data/Rakefile

@@ -8,7 +8,6 @@ end
 
 Gemgem.init(dir) do |s|
   s.name    = 'rack-handlers'
-  s.version = '0.7.2'
+  s.version = '0.7.3'
   %w[rack].each{ |g| s.add_runtime_dependency(g) }
-  %w[unicorn yahns rainbows zbatery]
 end

data/config.ru

@@ -0,0 +1,4 @@
+
+run lambda{ |_|
+  [200, {}, ["OK\n"]]
+}

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

@@ -1,6 +1,6 @@
 
 if ARGV[0] && ARGV[0] == 'server'[0, ARGV[0].size] && ARGV[1] !~ /^\w+/
-  server = %w[yahns zbatery rainbows unicorn puma thin webrick].find do |s|
+  server = Rack::Handler::DEFAULT.find do |s|
     begin
       require s
       true

data/lib/rack/handler/unicorn.rb

@@ -9,7 +9,7 @@ class Rack::Handler::Unicorn
 
   def self.run app, opts
     server_name = name[/::(\w+)$/, 1].downcase
-    config_path = "#{File.dirname(opts[:config])}/config/#{server_name}.rb"
+    config_path = "#{config_dir(opts)}/config/#{server_name}.rb"
     config_file = config_path if File.exist?(config_path)
 
     server = initialize_server(app, opts, config_file)
@@ -19,6 +19,14 @@ class Rack::Handler::Unicorn
     server.start.join
   end
 
+  def self.config_dir opts
+    if opts[:config]
+      File.dirname(opts[:config])
+    else
+      '.'
+    end
+  end
+
   def self.initialize_server app, opts, config_file
     server_class.new(app, :listeners   => "#{opts[:Host]}:#{opts[:Port]}",
                           :config_file => config_file)

data/rack-handlers.gemspec

@@ -1,45 +1,57 @@
 # -*- encoding: utf-8 -*-
-# stub: rack-handlers 0.7.2 ruby lib
+# stub: rack-handlers 0.7.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rack-handlers"
-  s.version = "0.7.2"
+  s.name = "rack-handlers".freeze
+  s.version = "0.7.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2016-01-14"
-  s.description = "Unicorn family Rack handlers for you. Mostly for `rails s`."
-  s.email = ["godfat (XD) godfat.org"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lin Jen-Shin (godfat)".freeze]
+  s.date = "2016-04-27"
+  s.description = "Unicorn family Rack handlers for you. Mostly for `rails s`.".freeze
+  s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  "CHANGES.md",
-  "README.md",
-  "Rakefile",
-  "lib/rack-handlers.rb",
-  "lib/rack/handler/rails-server.rb",
-  "lib/rack/handler/rainbows.rb",
-  "lib/rack/handler/unicorn.rb",
-  "lib/rack/handler/yahns.rb",
-  "lib/rack/handler/zbatery.rb",
-  "rack-handlers.gemspec",
-  "task/.gitignore",
-  "task/gemgem.rb"]
-  s.homepage = "https://github.com/godfat/rack-handlers"
-  s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Unicorn family Rack handlers for you. Mostly for `rails s`."
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "Gemfile".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "config.ru".freeze,
+  "config/environment.rb".freeze,
+  "lib/rack-handlers.rb".freeze,
+  "lib/rack/handler/rails-server.rb".freeze,
+  "lib/rack/handler/rainbows.rb".freeze,
+  "lib/rack/handler/unicorn.rb".freeze,
+  "lib/rack/handler/yahns.rb".freeze,
+  "lib/rack/handler/zbatery.rb".freeze,
+  "rack-handlers.gemspec".freeze,
+  "script/config.ru".freeze,
+  "script/rails".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/shared.rb".freeze,
+  "test/test_basic.rb".freeze,
+  "test/test_rails.rb".freeze]
+  s.homepage = "https://github.com/godfat/rack-handlers".freeze
+  s.licenses = ["Apache License 2.0".freeze]
+  s.rubygems_version = "2.6.3".freeze
+  s.summary = "Unicorn family Rack handlers for you. Mostly for `rails s`.".freeze
+  s.test_files = [
+  "test/test_basic.rb".freeze,
+  "test/test_rails.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<rack>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<rack>.freeze, [">= 0"])
   end
 end

data/script/rails

@@ -0,0 +1,17 @@
+
+require 'rails'
+require 'logger'
+
+APP_PATH = 'rails'
+root = File.expand_path("#{__dir__}/..")
+config = Rails::Application::Configuration.new
+config.root = root
+app = Class.new(Struct.new(:root, :config)) do
+  def call _
+    [200, {}, ["OK\n"]]
+  end
+end.new(root, config)
+Rails.application = app
+Rails.logger = Logger.new(File.open(IO::NULL))
+
+require 'rails/commands'

data/task/README.md

@@ -0,0 +1,54 @@
+# Gemgem
+
+## DESCRIPTION:
+
+Provided tasks:
+
+    rake clean        # Remove ignored files
+    rake gem:build    # Build gem
+    rake gem:install  # Install gem
+    rake gem:release  # Release gem
+    rake gem:spec     # Generate gemspec
+    rake test         # Run tests in memory
+
+## REQUIREMENTS:
+
+* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+
+## INSTALLATION:
+
+    git submodule add git://github.com/godfat/gemgem.git task
+
+And in Rakefile:
+
+``` ruby
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
+end
+
+Gemgem.init(dir) do |s|
+  s.name    = 'your-gem'
+  s.version = '0.1.0'
+end
+```
+
+## LICENSE:
+
+Apache License 2.0
+
+Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/task/gemgem.rb

@@ -34,10 +34,112 @@ module Gemgem
       s.executables = bin_files
     end
     spec_create.call(spec)
-    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     self.spec = spec
   end
 
+  def gem_install
+    require 'rubygems/commands/install_command'
+    # read ~/.gemrc
+    Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
+    Gem::Command.extra_args = Gem.configuration[:gem]
+
+    # setup install options
+    cmd = Gem::Commands::InstallCommand.new
+    cmd.handle_options([])
+
+    # install
+    install = Gem::Installer.new(gem_path, cmd.options)
+    install.install
+    puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
+  end
+
+  def gem_spec
+    create
+    write
+  end
+
+  def gem_build
+    require 'fileutils'
+    require 'rubygems/package'
+    gem = nil
+    Dir.chdir(dir) do
+      gem = Gem::Package.build(Gem::Specification.load(spec_path))
+      FileUtils.mkdir_p(pkg_dir)
+      FileUtils.mv(gem, pkg_dir) # gem is relative path, but might be ok
+    end
+    puts "\e[35mGem built: \e[33m#{strip_path("#{pkg_dir}/#{gem}")}\e[0m"
+  end
+
+  def gem_release
+    sh_git('tag', gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', gem_path)
+  end
+
+  def gem_check
+    unless git('status', '--porcelain').empty?
+      puts("\e[35mWorking copy is not clean.\e[0m")
+      exit(3)
+    end
+
+    ver = spec.version.to_s
+
+    if ENV['VERSION'].nil?
+      puts("\e[35mExpected "                                  \
+           "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+      exit(1)
+
+    elsif ENV['VERSION'] != ver
+      puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+           "\e[35mbut got\n         "                         \
+           "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+      exit(2)
+    end
+  end
+
+  def test
+    return if test_files.empty?
+
+    if ENV['COV'] || ENV['CI']
+      require 'simplecov'
+      if ENV['CI']
+        begin
+          require 'coveralls'
+          SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+        rescue LoadError => e
+          puts "Cannot load coveralls, skip: #{e}"
+        end
+      end
+      SimpleCov.start do
+        add_filter('test/')
+        add_filter('test.rb')
+      end
+    end
+
+    test_files.each{ |file| require "#{dir}/#{file[0..-4]}" }
+  end
+
+  def clean
+    return if ignored_files.empty?
+
+    require 'fileutils'
+    trash = File.expand_path("~/.Trash/#{spec.name}")
+    puts "Move the following files into: \e[35m#{strip_path(trash)}\e[33m"
+
+    ignored_files.each do |file|
+      from = "#{dir}/#{file}"
+      to   = "#{trash}/#{File.dirname(file)}"
+      puts strip_path(from)
+
+      FileUtils.mkdir_p(to)
+      FileUtils.mv(from, to)
+    end
+
+    print "\e[0m"
+  end
+
   def write
     File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
@@ -144,20 +246,18 @@ module Gemgem
   end
 
   def ignored_pattern
-    @ignored_pattern ||= Regexp.new(expand_patterns(gitignore).join('|'))
+    @ignored_pattern ||= if gitignore.empty?
+                           /^$/
+                         else
+                           Regexp.new(expand_patterns(gitignore).join('|'))
+                         end
   end
 
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|
-      case path
-      when %r{\*}
-        Regexp.escape(path).gsub(/\\\*/, '[^/]*')
-      when %r{^/}
-        "^#{Regexp.escape(path[1..-1])}"
-      else # we didn't implement negative pattern for now
-        Regexp.escape(path)
-      end
+      # we didn't implement negative pattern for now
+      Regexp.escape(path).sub(%r{^/}, '^').gsub(/\\\*/, '[^/]*')
     }
   end
 
@@ -175,86 +275,38 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  Gemgem.sh_gem('install', Gemgem.gem_path)
+  Gemgem.gem_install
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  require 'fileutils'
-  require 'rubygems/package'
-  gem = nil
-  Dir.chdir(Gemgem.dir) do
-    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
-    FileUtils.mkdir_p(Gemgem.pkg_dir)
-    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
-  end
-  puts "\e[35mGem built: \e[33m" \
-       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+  Gemgem.gem_build
 end
 
 desc 'Generate gemspec'
 task :spec do
-  Gemgem.create
-  Gemgem.write
+  Gemgem.gem_spec
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  Gemgem.module_eval do
-    sh_git('tag', Gemgem.gem_tag)
-    sh_git('push')
-    sh_git('push', '--tags')
-    sh_gem('push', Gemgem.gem_path)
-  end
+  Gemgem.gem_release
 end
 
 task :check do
-  ver = Gemgem.spec.version.to_s
-
-  if ENV['VERSION'].nil?
-    puts("\e[35mExpected "                                  \
-         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
-    exit(1)
-
-  elsif ENV['VERSION'] != ver
-    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
-         "\e[35mbut got\n         "                         \
-         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
-    exit(2)
-  end
+  Gemgem.gem_check
 end
 
 end # of gem namespace
 
-desc 'Run tests in memory'
+desc 'Run tests'
 task :test do
-  next if Gemgem.test_files.empty?
-
-  require 'bacon'
-  Bacon.extend(Bacon::TestUnitOutput)
-  Bacon.summary_on_exit
-  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
+  Gemgem.test
 end
 
-desc 'Remove ignored files'
+desc 'Trash ignored files'
 task :clean => ['gem:spec'] do
-  next if Gemgem.ignored_files.empty?
-
-  require 'fileutils'
-  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
-  puts "Move the following files into:" \
-       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
-
-  Gemgem.ignored_files.each do |file|
-    from = "#{Gemgem.dir}/#{file}"
-    to   = "#{trash}/#{File.dirname(file)}"
-    puts Gemgem.strip_path(from)
-
-    FileUtils.mkdir_p(to)
-    FileUtils.mv(from, to)
-  end
-
-  print "\e[0m"
+  Gemgem.clean
 end
 
 task :default do

data/test/shared.rb

@@ -0,0 +1,36 @@
+
+require 'socket'
+
+require 'rack'
+require 'rack-handlers'
+
+require 'pork'
+require 'pork/more/bottomup_backtrace'
+require 'pork/more/color'
+
+Pork::API.copy :shared do
+  def get name
+    Rack::Handler.get(name)
+  rescue LoadError
+  end
+
+  Rack::Handler::DEFAULT.each do |name|
+    would "launch #{name}" do
+      rd, wr = IO.pipe
+      child = run(name, &wr.method(:puts))
+      msg = rd.gets
+      rd.close
+      skip if msg == "\n"
+      sleep(0.1) if name == 'puma' # slow puma
+      sock = TCPSocket.new('localhost', 8080)
+      sock.binmode
+      sock.print("GET / HTTP/1.1\r\nHost: localhost\r\n\r\n")
+      sock.readline("\r\n\r\n")
+      expect(sock.read(3)).eq "OK\n"
+      sock.close
+      Process.kill('TERM', child)
+      TCPSocket.new('localhost', 8080).close if name == 'yahns' # wake up!
+      Process.waitpid(child)
+    end
+  end
+end

data/test/test_basic.rb

@@ -0,0 +1,29 @@
+
+require_relative 'shared'
+
+Pork::API.describe Rack::Handler do
+  def app
+    lambda do |_|
+      [200, {}, ["OK\n"]]
+    end
+  end
+
+  def run name, &block
+    fork do
+      if server = get(name)
+        trap 'TERM' do
+          server.shutdown
+        end if name == 'webrick' # the way to stop webrick
+
+        server.run(app, :Port => 8080){ block.call(name) }
+      else
+        block.call
+      end
+    end
+  end
+
+  paste :shared
+end unless RUBY_ENGINE == 'jruby'
+
+Pork.execute
+Pork.stat.report

data/test/test_rails.rb

@@ -0,0 +1,20 @@
+
+require_relative 'shared'
+
+Pork::API.describe 'rails-server' do
+  def run name, &block
+    if get(name)
+      pid = Process.spawn('rails', 's', name, '-p', '8080')
+      sleep(1) # slow rails
+      block.call(name)
+      pid
+    else
+      block.call
+    end
+  end
+
+  paste :shared
+end
+
+Pork.execute
+Pork.stat.report

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-handlers
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -33,9 +33,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
+- Gemfile
 - README.md
 - Rakefile
+- config.ru
+- config/environment.rb
 - lib/rack-handlers.rb
 - lib/rack/handler/rails-server.rb
 - lib/rack/handler/rainbows.rb
@@ -43,8 +47,13 @@ files:
 - lib/rack/handler/yahns.rb
 - lib/rack/handler/zbatery.rb
 - rack-handlers.gemspec
-- task/.gitignore
+- script/config.ru
+- script/rails
+- task/README.md
 - task/gemgem.rb
+- test/shared.rb
+- test/test_basic.rb
+- test/test_rails.rb
 homepage: https://github.com/godfat/rack-handlers
 licenses:
 - Apache License 2.0
@@ -65,8 +74,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Unicorn family Rack handlers for you. Mostly for `rails s`.
-test_files: []
+test_files:
+- test/test_basic.rb
+- test/test_rails.rb

data/task/.gitignore

@@ -1 +0,0 @@
-*.rbc