spider-gazelle 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf67f2f83bb093e412603cfaccbdff9465fd492
-  data.tar.gz: 418b883c22f28aec01358f7e1583b5102eed3452
+  metadata.gz: a635e54f6ee2156e7a387e7e84c9934b28591b2d
+  data.tar.gz: c93b073acb5665495ccede21a2a817e87fc57328
 SHA512:
-  metadata.gz: 8e6bf5475f273760fb5bcbcd0e73988a292d3f473d95e96a6b043168b303b46403fac5e4c2b1201693ef2b51cdd3b250b1ef593c43ba2407e2e006443101556c
-  data.tar.gz: 5c62a4b4dd5a142b2a0f8090cac2ff67a2004305bf9c0ca78d2c4c8cb4e7043115d8b9b338180d76ab249af439838fce58ea093bac83dbc26d3936fec5c77659
+  metadata.gz: 54f76fcb8ec1e75541371a4e373031f5d0a127048581e0cecf74c22205c31e562a9865278369a122f017e9a692ee58913f322b9bb27c20947cf2b4c5a62ab916
+  data.tar.gz: 39999c854db582de74be926631a5bff1ad2e6cda7354425622bdba6eef3cddd47eb8cd1bcb6d74b415b87a90b248d8a42425be5ed68a9f6bbc9e908c585a48e8

data/bin/sg

@@ -6,25 +6,24 @@ require 'optparse'
 
 
 options = {
-    host: "0.0.0.0",
-    port: 3000,
-    tls: false,
+    Host: "0.0.0.0",
+    Port: 3000,
     environment: ENV['RACK_ENV'] || 'development',
     rackup: "#{Dir.pwd}/config.ru",
-    quiet: false
+    Verbose: false
 }
 
 parser = OptionParser.new do |opts|
     opts.on "-p", "--port PORT", Integer, "Define what port TCP port to bind to (default: 3000)" do |arg|
-        options[:port] = arg
+        options[:Port] = arg
     end
 
     opts.on "-a", "--address HOST", "bind to HOST address (default: 0.0.0.0)" do |arg|
-        options[:host] = arg
+        options[:Host] = arg
     end
 
-    opts.on "-q", "--quiet", "quiet down the output" do
-        options[:quiet] = true
+    opts.on "-v", "--verbose", "loud output" do
+        options[:Verbose] = true
     end
 
     opts.on "-e", "--environment ENVIRONMENT", "The environment to run the Rack app on (default: development)" do |arg|
@@ -36,7 +35,7 @@ parser = OptionParser.new do |opts|
     end
 
     opts.on "-l", "--logfile FILE", "Location of the servers log file (default: logs/server.log)" do |arg|
-        options[:rackup] = arg
+        ENV['SG_LOG'] = arg
     end
 
     opts.on "-m", "--mode MODE", "Either thread, process or no_ipc (default: thread)" do |arg|
@@ -60,7 +59,6 @@ unless File.exists?(options[:rackup])
     abort "No rackup found at #{options[:rackup]}"
 end
 
-ENV['RACK_ENV'] = options[:environment].to_s
 # Force process mode on Windows (pipes + sockets not working at the moment)
 ENV['SG_MODE'] = 'no_ipc' if ::FFI::Platform.windows?
 

data/lib/spider-gazelle/binding.rb

@@ -4,13 +4,6 @@ require 'set'
 
 module SpiderGazelle
     class Binding
-        DEFAULT_OPTIONS = {
-            :Host => '0.0.0.0',
-            :Port => 3000,
-            :tls => false,
-            :optimize_for_latency => true,
-            :backlog => 1024
-        }
 
 
         attr_reader :app_id
@@ -18,7 +11,7 @@ module SpiderGazelle
 
         def initialize(loop, delegate, app_id, options = {})
             @app_id = app_id
-            @options = DEFAULT_OPTIONS.merge(options)
+            @options = options
             @loop = loop
             @delegate = delegate
             @port = @options[:Port]

data/lib/spider-gazelle/spider.rb

@@ -2,7 +2,8 @@ require 'set'
 require 'thread'
 require 'logger'
 require 'singleton'
-require 'fileutils'
+require 'fileutils'   # mkdir_p
+require 'forwardable' # run method
 
 
 module SpiderGazelle
@@ -20,11 +21,47 @@ module SpiderGazelle
         DEFAULT_OPTIONS = {
             :Host => '0.0.0.0',
             :Port => 8080,
-            :Verbose => false
+            :Verbose => false,
+            :tls => false,
+            :optimize_for_latency => true,
+            :backlog => 1024
         }
 
+        def self.run(app, options = {})
+            options = DEFAULT_OPTIONS.merge(options)
+
+            ENV['RACK_ENV'] = options[:environment].to_s if options[:environment]
+
+            puts "Look out! Here comes Spider-Gazelle #{::SpiderGazelle::VERSION}!"
+            puts "* Environment: #{ENV['RACK_ENV']} on #{RUBY_ENGINE || 'ruby'} #{RUBY_VERSION}"
+
+            server = instance
+            server.run do |logger|
+                logger.progress server.method(:log)
+                server.loaded.then do
+                    puts "* Loading: #{app}"
+
+                    # yield server if block_given?
+
+                    server.load(app, options).catch(proc {|e|
+                        puts "#{e.message}\n#{e.backtrace.join("\n") unless e.backtrace.nil?}\n"
+                    }).finally do
+                        # This will execute if the TCP binding is lost
+                        # Terminating the application
+                        Process.kill 'INT', 0
+                    end
+
+                    puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
+                end
+            end
+        end
+
+
         attr_reader :state, :mode, :threads, :logger
 
+        extend Forwardable
+        def_delegators :@web, :run
+
 
         def initialize
             # Threaded mode by default
@@ -71,42 +108,6 @@ module SpiderGazelle
             end
         end
 
-        def run(&block)
-            @web.run &block
-        end
-
-        def self.run(app, options = {})
-            options = DEFAULT_OPTIONS.merge(options)
-
-            instance.run do |logger|
-                logger.progress do |level, errorid, error|
-                    begin
-                        puts "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-                    rescue Exception
-                        p 'error in gazelle logger'
-                    end
-                end
-
-                puts "Look out! Here comes Spider-Gazelle #{::SpiderGazelle::VERSION}!"
-                puts "* Environment: #{ENV['RACK_ENV']} on #{RUBY_ENGINE || 'ruby'} #{RUBY_VERSION}"
-                server = ::SpiderGazelle::Spider.instance
-                server.loaded.then do
-                    puts "* Loading: #{app}"
-
-                    # yield server if block_given?
-
-                    server.load(app, options).catch(proc {|e|
-                        puts "#{e.message}\n#{e.backtrace.join("\n") unless e.backtrace.nil?}\n"
-                    }).finally do
-                        # This will execute if the TCP binding is lost
-                        server.shutdown
-                    end
-
-                    puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
-                end
-            end
-        end
-
         # Provides a promise that resolves when we are read to start binding applications
         #
         # @return [::Libuv::Q::Promise] that indicates when the gazelles are loaded

data/lib/spider-gazelle/version.rb

@@ -1,3 +1,3 @@
 module SpiderGazelle
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stephen von Takach