agoo 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e35f7871e0927d3f8f560b3d9b529507ae392867aca53a9665c275a627070d5
-  data.tar.gz: 79a0b47f55c6b823844cf4e1679a068b0329ac407f9495bb1b5e6c3ad1b4f8de
+  metadata.gz: 877d87f4ad733eff5852199868bf95e03280c295a5a0e5c02a8c45863a8f1725
+  data.tar.gz: 6c27c6124b1fb7b8a21c8abb821984c5525129d3ef22d8f61288d1a01fb8ff03
 SHA512:
-  metadata.gz: 1916a0a04b117d76f366d0f11cf105f5245e0e20b07cd1032a9dec29c03845e490a988405946397f229fd85aba9bf3720f68fc91f07ce21e1c8079991c0ffbaf
-  data.tar.gz: 87a2b7e8345f1e8a0876f076121ae92a8659c8a8360d55a259edf037dc0e626b978567f167ba5d3702bfe426e60a6ebeb5560a6809a1253069f0d55ec851b481
+  metadata.gz: f4219cd58299df917205fcc340b4ce8f5b2dd0874b75c17006955a4bc87e1d4642903d98683f5cf8ffc302941a24b24c4c2933d862f1dd6449399d1120de4c03
+  data.tar.gz: a4221a53bf7ca5fa5f3364ba5cf2f72343153e1b1247220a4cc6de4aef735b6f6b30dd5a3f29e79a79103db719e1e505fd7e7a537ad9ee49dccb6608a3be24eb

data/bin/agoo

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+while (index = ARGV.index('-I'))
+  _, path = ARGV.slice!(index, 2)
+  $LOAD_PATH << path
+end
+
+# Always add ./lib to the load path as that is the default location for Ruby
+# files in a project.
+$LOAD_PATH << File.expand_path('./lib')
+
+require 'optparse'
+require 'fileutils'
+require 'logger'
+
+require 'agoo'
+
+# Prepare the +usage+ string.
+# Basically a banner text and description passed on +OptionParser+.
+usage = %{
+Usage: agoo [options] [<handler_class>@<path>]...
+
+version #{Agoo::VERSION}
+
+Agoo is a Ruby web server. It can be run as a standalone application using this
+application. The handler/class arguments must have the form of <class>@<path>
+where the class is the Ruby class where the new method takes not arguments and
+has either a call() method or a on_request() method.
+
+}
+
+@verbose = 1
+@port = 6464
+@root = '.'
+@log_dir = nil
+@classic = true
+@console = true
+@colorize = true
+
+@opts = OptionParser.new(usage)
+@opts.on('-h', '--help', 'Show this display.')                                 { puts @opts.help; Process.exit!(0) }
+@opts.on('-s', '--silent', 'Silent.')                                          { @verbose = 0 }
+@opts.on('-v', '--verbose', 'Increase verbosity.')                             { @verbose += 1 }
+@opts.on('-p', '--port PORT', Integer, 'Port to listen on.')                   { |p| @port = p }
+@opts.on('-d', '--dir DIR', String, 'Directory to serve static assets from.')  { |d| @root = d }
+@opts.on('-r', '--require FILE', String, 'Ruby require.')                      { |r| require r }
+@opts.on('--log.dir DIR', String, 'Log file directory.')                       { |d| @log_dir = d }
+@opts.on('--[no-]log.classic', 'Classic log entries instead of JSON.')         { |b| @classic = b }
+@opts.on('--[no-]log.console', 'Display log entries on the console.')          { |b| @console = b }
+@opts.on('--[no-]log.colorize', 'Display log entries in color.')               { |b| @colorize = b }
+
+handler_paths = @opts.parse(ARGV)
+
+server = Agoo::Server.new(@port, @root,
+			  log_dir: @log_dir,
+			  thread_count: 0,
+			  log_console: @console,
+			  log_classic: @classic,
+			  log_colorize: @colorize,
+			  log_states: {
+			    INFO: 1 <= @verbose,
+			    DEBUG: 3 <= @verbose,
+			    connect: 2 <= @verbose,
+			    request: 2 <= @verbose,
+			    response: 2 <= @verbose,
+			    eval: 2 <= @verbose,
+			  })
+puts "Agoo #{Agoo::VERSION} is listening on port #{@port}. Path mappings are:" if 1 <= @verbose
+
+handler_paths.each { |hp|
+  classname, path = hp.split('@')
+  if classname.nil? || path.nil? || classname.empty? || path.empty?
+    raise "Invalid handler/path specification. Both a class and path must be present."
+  end
+  c = Object.const_get(classname)
+  server.handle(nil, path, c.new)
+  if 1 <= @verbose
+    puts "  #{path} => #{classname}"
+  end
+}
+
+server.start()

data/ext/agoo/server.c

@@ -50,6 +50,7 @@ shutdown_server(Server server) {
     if (NULL != server && server->active) {
 	the_server = NULL;
 
+	log_cat(&server->info_cat, "Agoo shutting down.");
 	server->active = false;
 	if (0 != server->listen_thread) {
 	    pthread_join(server->listen_thread, NULL);
@@ -404,7 +405,12 @@ handle_rack_inner(void *x) {
     if (3 != RARRAY_LEN(res)) {
 	rb_raise(rb_eArgError, "a rack call() response must be an array of 3 members.");
     }
-    code = NUM2INT(rb_funcall(rb_ary_entry(res, 0), to_i_id, 0));
+    hv = rb_ary_entry(res, 0);
+    if (RUBY_T_FIXNUM == rb_type(hv)) {
+	code = NUM2INT(hv);
+    } else {
+	code = NUM2INT(rb_funcall(hv, to_i_id, 0));
+    }
     status_msg = http_code_message(code);
     if ('\0' == *status_msg) {
 	rb_raise(rb_eArgError, "invalid rack call() response status code (%d).", code);
@@ -428,7 +434,7 @@ handle_rack_inner(void *x) {
 	    bsize += (int)RSTRING_LEN(rb_ary_entry(bv, i));
 	}
     } else {
-	rb_iterate (rb_each, bv, body_len_cb, (VALUE)&bsize);
+	rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
     }
     switch (code) {
     case 100:
@@ -462,7 +468,7 @@ handle_rack_inner(void *x) {
 		t = text_append(t, StringValuePtr(v), (int)RSTRING_LEN(v));
 	    }
 	} else {
-	    rb_iterate (rb_each, bv, body_append_cb, (VALUE)&t);
+	    rb_iterate(rb_each, bv, body_append_cb, (VALUE)&t);
 	}
     }
     res_set_message(req->res, t);
@@ -582,9 +588,15 @@ start(VALUE self) {
     signal(SIGTERM, sig_handler);
     signal(SIGPIPE, SIG_IGN);
 
+    if (server->info_cat.on) {
+	VALUE	agoo = rb_const_get_at(rb_cObject, rb_intern("Agoo"));
+	VALUE	v = rb_const_get_at(agoo, rb_intern("VERSION"));
+					       
+	log_cat(&server->info_cat, "Agoo %s listening on port %d.", StringValuePtr(v), server->port);
+    }
     if (0 >= server->thread_cnt) {
 	Req		req;
-    
+
 	while (server->active) {
 	    if (NULL != (req = (Req)queue_pop(&server->eval_queue, 0.1))) {
 		switch (req->handler_type) {

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,80 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  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'
+date: 2018-02-23 00:00:00.000000000 Z
+dependencies: []
 description: A fast HTTP server supporting rack.
 email: peter@ohler.com
-executables: []
+executables:
+- agoo
 extensions:
 - ext/agoo/extconf.rb
 extra_rdoc_files:
@@ -82,6 +21,7 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
+- bin/agoo
 - ext/agoo/agoo.c
 - ext/agoo/con.c
 - ext/agoo/con.h
@@ -123,7 +63,7 @@ files:
 - test/rack_handler_test.rb
 - test/static_test.rb
 - test/tests.rb
-homepage: http://www.ohler.com/agoo
+homepage: https://github.com/ohler55/agoo
 licenses:
 - MIT
 metadata: {}
@@ -143,13 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- Linux or macOS
 rubyforge_project: agoo
 rubygems_version: 2.7.3
 signing_key: