reifier 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa60f4a229669e2c71cccd301f93309a67fa48d6
-  data.tar.gz: 731f667e0829f067924abbf80ed8d4f5e88f559c
+  metadata.gz: f44cae18b405a8793f34980692b85438987551d7
+  data.tar.gz: 8dad6a8d76982c62fe8ef97bff274c130c7fd310
 SHA512:
-  metadata.gz: 167c3dff17ad61c8fa5a5be610939603df0516d61eedf96e1d3545ae3bf13701c60ba8a554f4eaf34a9685d37550707e76c649eb859e6d7ec9e6eed4495143d2
-  data.tar.gz: b04ce039f7d7a1a86589f3fecc8514d28a09a4ebbab06ddab4a3b3956ea9c292a21bbb17d2e387e29c1bd740e03b57cbdb266ad1927b5db452976980bd55e8c5
+  metadata.gz: e7c3111aef5ed045e12b832778d60eadbff4783dd99f6e00f1ac98f060d71f6e35e6e32f4f35cbb8e3abc1443203e2b033039119b0cea4a2151456af30d19575
+  data.tar.gz: 24be8d505dc28cc4c594f4d40c90a6aae43b2da86c5545d842240074662f374a40a186f13c819994129eadd9b00a5a264fa94072c3142575088fe7a1794239eb

data/.travis.yml

@@ -1,4 +1,33 @@
-language: ruby
+cache: bundler
+sudo: false
+
+before_install:
+  - gem install bundler
+
 rvm:
   - 2.2.4
-before_install: gem install bundler -v 1.11.2
+  - 2.3.0
+  - ruby-head
+  - jruby-9000
+  - rbx-3
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-3
+    - rvm: jruby-9000
+
+script:
+  - CODECLIMATE_REPO_TOKEN=b84ce34b20f2a809814493585d027aa71ab07e13116bf68430511548815d9411 bundle exec rake
+
+addons:
+  code_climate:
+    repo_token: b84ce34b20f2a809814493585d027aa71ab07e13116bf68430511548815d9411
+
+notifications:
+  email:
+    recipients:
+      - benny.klotz92@gmail.com
+    email:
+      on_failure: change
+      on_success: change

data/README.md

@@ -8,6 +8,13 @@ reify
 
 Reifier is a threaded and pre forked rack app server written in pure ruby.
 
+[![Gem Version](https://badge.fury.io/rb/reifier.svg)](https://badge.fury.io/rb/reifier)
+[![Build Status](https://travis-ci.org/tak1n/reifier.svg?branch=master)](https://travis-ci.org/tak1n/reifier)
+[![Code Climate](https://codeclimate.com/github/tak1n/reifier/badges/gpa.svg)](https://codeclimate.com/github/tak1n/reifier)
+[![Test Coverage](https://codeclimate.com/github/tak1n/reifier/badges/coverage.svg)](https://codeclimate.com/github/tak1n/reifier/coverage)
+[![Inline docs](http://inch-ci.org/github/tak1n/reifier.svg?branch=master)](http://inch-ci.org/github/tak1n/reifier)
+[![Dependency Status](https://gemnasium.com/tak1n/reifier.svg)](https://gemnasium.com/tak1n/reifier)
+
 ## Is it any good?
 
 [Yes](http://news.ycombinator.com/item?id=3067434), no really just a fun project use it in production if you want :P
@@ -41,9 +48,9 @@ Use it through rackup:
 
 ## Available Options
 
-You can adapt the ThreadPool size with following option:
+You can adapt the ThreadPool size with following options:
 
-    $ rackup -s reifier -O Threads=8
+    $ rackup -s reifier -O MinThreads=8 -O MaxThreads=16
 
 Also the amount of workers is adaptable:
 

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :spec
+task :default => :test

data/examples/reifier.rb

@@ -1,2 +1,2 @@
-threads 8 # Using a thread pool size of 8
+threads 8, 16 # Using a thread pool size of 8
 workers 9 # Using 9 worker processes

data/lib/rack/handler/reifier.rb

@@ -6,7 +6,8 @@ module Rack
     module Reifier
       DEFAULT_OPTIONS = {
         Workers: 1,
-        Threads: 16
+        MinThreads: 0,
+        MaxThreads: 16
       }.freeze
 
       def self.run(app, options = {})
@@ -19,7 +20,8 @@ module Rack
 
       def self.valid_options
         {
-          'Threads=THREADS' => 'Number of threads (default: 16)',
+          'MinThreads=MINTHREADS' => 'Number of minimal threads (default: 0)',
+          'MaxThreads=MAXTHREADS' => 'Number of minimal threads (default: 16)',
           'Workers=WORKERS' => 'Number of workers (default: 1)'
         }
       end

data/lib/reifier/server.rb

@@ -5,6 +5,26 @@ module Reifier
       @options = options
     end
 
+    def load_configuration
+      if defined?(Rails)
+        path = Rails.root.join('config/reifier.rb')
+      else
+        path = Dir.pwd + '/reifier.rb'
+      end
+
+      return unless File.exist?(path)
+
+      lines = File.read(path).split("\n")
+
+      lines.each do |line|
+        eval(line)
+      end
+
+      puts "======= Loaded settings from #{path} =======\n"
+    rescue NoMethodError => e
+      raise UnsupportedOptionError, "Option #{e.name} is not supported from config file"
+    end
+
     def start
       server = TCPServer.new(@options[:Host], @options[:Port])
 
@@ -25,11 +45,12 @@ module Reifier
         exit
       end
 
+      puts "# Ruby version: #{RUBY_VERSION}"
+      puts "# Min threads: #{@options[:MinThreads]}, max threads: #{@options[:MaxThreads]}"
       puts "# Environment: #{@options[:environment]}"
-      puts "# Listening on tcp://#{@options[:Host]}:#{@options[:Port]}"
-      puts "# Master PID: #{Process.pid}"
-      puts "# Number of Threads used: #{@options[:Threads]}"
       puts "# Number of Workers used: #{@options[:Workers]}"
+      puts "# Master PID: #{Process.pid}"
+      puts "# Listening on tcp://#{server.addr.last}:#{@options[:Port]}"
 
       loop do
         pid = Process.wait
@@ -40,38 +61,39 @@ module Reifier
       end
     end
 
-    def load_configuration
-      if defined?(Rails)
-        path = Rails.root.join('config/reifier.rb')
-      else
-        path = Dir.pwd + '/reifier.rb'
-      end
-
-      return unless File.exist?(path)
-
-      lines = File.read(path).split("\n")
-
-      lines.each do |line|
-        option = line.split.first.capitalize
-        value  = line.split.last
-
-        @options[option.to_sym] = value
-      end
+    private
 
-      puts "======= Loaded settings from #{path} =======\n"
+    def threads(min, max)
+      @options[:MinThreads] = min
+      @options[:MaxThreads] = max
     end
 
-    private
+    def workers(count)
+      @options[:Workers] = count
+    end
 
     def spawn_worker(server)
       fork do
-        pool  = Concurrent::FixedThreadPool.new(@options[:Threads])
+        pool = Concurrent::ThreadPoolExecutor.new(
+          min_threads:     @options[:MinThreads],
+          max_threads:     @options[:MaxThreads],
+          max_queue:       0,
+          fallback_policy: :caller_runs,
+        )
+
+        # Signal.trap 'SIGINT' do
+        #   puts "Shutting down thread pool in Worker: #{Process.pid}"
+        #   pool.shutdown
+        #   pool.wait_for_termination
+
+        #   exit
+        # end
 
         loop do
           socket = server.accept
           socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
-          pool.post do
+          Concurrent::Future.new(executor: pool) do
             begin
               request  = Request.new(socket, @options)
               response = Response.new(socket)
@@ -82,6 +104,8 @@ module Reifier
               response << @app.call(request.rack_env)
 
               response.handle
+            rescue EOFError
+              # nothing, shit happens
             rescue Exception => e
               socket.close
 
@@ -90,7 +114,7 @@ module Reifier
               STDERR.puts e.backtrace
               STDERR.puts ERROR_FOOTER
             end
-          end
+          end.execute
         end
       end
     end

data/lib/reifier/version.rb

@@ -1,3 +1,3 @@
 module Reifier
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/lib/reifier.rb

@@ -79,7 +79,8 @@ module Reifier
   POST = 'POST'.freeze
   PUT  = 'PUT'.freeze
 
-  HTTPParseError = Class.new(StandardError)
+  HTTPParseError         = Class.new(StandardError)
+  UnsupportedOptionError = Class.new(StandardError)
   ERROR_HEADER = '=============================== FATAL SERVER ERROR =============================='.freeze
   ERROR_FOOTER = "=================================================================================\n\n\n".freeze
 end

data/reifier.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rubocop', '~> 0.37'
   spec.add_development_dependency 'rack', '~> 2.0.0.alpha'
+  spec.add_development_dependency 'codeclimate-test-reporter'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reifier
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Benny Klotz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0.alpha
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A threaded and preforked rack app server written in pure ruby
 email:
 - benny.klotz92@gmail.com