emmy-engine 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0214e3559c17d808c8b258a6275a0b379c03601a
-  data.tar.gz: e4ce42ae4fd039c7d63d69b66e7a5769575e895e
+  metadata.gz: 1784f12f765b7cb0f72b15759289c914078486cc
+  data.tar.gz: 37241e6d2c269a0f0dad6f803807d75f0ae9e25d
 SHA512:
-  metadata.gz: d782395dd4c7bd7435386c2f7362d345ffd7563c18764e7a836b0216d81fdd8191c3908061081a69b134366e773c168e278cee7b31e52c34d38c64e930a57ae0
-  data.tar.gz: c2a26cdef7e15ec34c15468d89b86b301f14b1f361b3f27480890426d71c0c665bed8e8db8c7ac6e3d7cdf9c1edcf38ca9587153a114717ce2e4b8195dd0bf3e
+  metadata.gz: 719208d6bb7dc964860640dcd7a7cdf3c516bb5d4fd25586936ff5fa21322d004b3194a8796c85bc020c1eee6c2946a9fd3830e87e2bae8570e870979dc30c8b
+  data.tar.gz: 73351b83e60afef077b2e549330532d87358d4a1dbc7398b293eb763569d30356eebf8cd948f835575042f4365952a1eefd3f878a3b9f1e17812496108cf30a4

data/Gemfile

@@ -4,3 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'eventmachine', '~> 1.0.7'
+
+gem 'emmy-http', path: '~/Dropbox/Projects/emmy/emmy-http'
+gem 'emmy-http-server', path: '~/Dropbox/Projects/emmy-http-server'

data/emmy-engine.gemspec

@@ -25,8 +25,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "emmy-machine",     "~> 0.1"
-  spec.add_dependency "emmy-http",        "~> 0.2"
+  #spec.add_dependency "emmy-http",        "~> 0.2"
   spec.add_dependency "emmy-http-client", "~> 0.1"
+  #spec.add_dependency "emmy-http-server", "~> 0.1"
 
   spec.add_development_dependency "eventmachine", "~> 1.0"
   spec.add_development_dependency "bundler",      "~> 1.9"

data/lib/emmy.rb

@@ -2,6 +2,7 @@ require 'singleton'
 require 'emmy_machine'
 require 'emmy_http'
 require 'emmy_http/client'
+require 'emmy_http/server'
 
 module Emmy
   extend EmmyMachine::ClassMethods

data/lib/emmy/backend.rb

@@ -5,21 +5,27 @@ module Emmy
 
     module_function
 
-    attr_reader :apps
-
-    def app(name: nil, &b)
-      @apps ||= {}
+    def app(name=nil, &b)
       name ||= Emmy::Runner.instance.config.backend
 
       if b
         app = EmmyHttp::Application.new
         app.instance_eval(&b)
-        @apps[name] = app
+        apps(name, app)
       else
-        @apps[name]
+        apps(name)
       end
     end
 
+    def apps(name, app=nil)
+      @apps ||= {}
+      app ? @apps[name || :default] = app : @apps[name || :default]
+    end
+
+    def to_a
+      apps.to_a
+    end
+
     #<<<
   end
 end

data/lib/emmy/runner.rb

@@ -60,37 +60,35 @@ module Emmy
         opts.on("-e", "--environment ENV", "Specifies the execution environment",
                                           "Default: #{config.environment}") { |env| config.environment = env }
         opts.on("-p", "--port PORT",      "Runs Emmy on the specified port",
-                                          "Default: #{config.url.port}")        { |port| config.url.port = port }
+                                          "Default: #{config.url.port}")    { |port| config.url.port = port }
         opts.on("-a", "--address HOST",   "Binds Emmy to the specified host",
-                                          "Default: #{config.url.host}")     { |address| config.url.host = address }
+                                          "Default: #{config.url.host}")    { |address| config.url.host = address }
         opts.on("-b", "--backend NAME",   "Backend name",
-                                          "Default: backend")         { |name| config.backend = name }
+                                          "Default: backend")           { |name| config.backend = name }
         opts.on("-d", "--daemonize",   "Runs server in the background") { @action = :daemonize_server }
         opts.on("-s", "--servers NUM", "Number of servers to start") do |num|
           @action = :daemonize_server if @action == :start_server
           config.servers = num.to_i
         end
-        opts.on('', '--id NUM',    "Server identifier")   { |id| config.id = id.to_i }
+        opts.on('', '--id NUM',    "Server identifier")         { |id| config.id = id.to_i }
+        opts.on('', '--pre',       "Prerelease server version") do |id|
+          config.adapter = EmmyHttp::Server::Server
+        end
         #opts.on('-l', '--log FILE',    "Log to file")   { |file| config.log    = file }
         #opts.on('-o', '--output FILE', "Logs stdout to file") { |file| config.stdout = config.stderr = file }
         #opts.on('-P', '--pid FILE',    "Pid file")      { |file| config.pid    = file }
 
         # actions
         opts.separator "Actions:"
-        opts.on("-i", "--info",      "Shows server configuration") { @action = :show_configuration }
-        opts.on("-c", "--console",   "Start a console")            { @action = :start_console }
+        opts.on("-i", "--info",      "Shows server configuration")  { @action = :show_configuration }
+        opts.on("-c", "--console",   "Start a console")             { @action = :start_console }
         opts.on('-t', '--stop',      "Terminate background server") { @action = :stop_server }
-        opts.on("-h", "--help",      "Display this help message")  { @action = :display_help }
-        opts.on("-v", "--version",   "Display Emmy version.")      { @action = :display_version }
+        opts.on("-h", "--help",      "Display this help message")   { @action = :display_help }
+        opts.on("-v", "--version",   "Display Emmy version.")       { @action = :display_version }
       end
     end
 
     def defaults!
-      if Process.uid == 0
-        config.user  = "worker"
-        config.group = "worker"
-      end
-
       if config.environment == "development"
         config.stdout = "#{config.backend}.stdout"
         config.stderr = config.stdout
@@ -98,6 +96,8 @@ module Emmy
 
       config.pid = "#{config.backend}.pid"
       config.log = "#{config.backend}.log"
+
+      config.adapter ||= EmmyExtends::Thin::Controller rescue nil
     end
 
     def instance_defaults!(id)
@@ -133,8 +133,9 @@ module Emmy
             start_server
           end
         end
+        sleep(1)
       end
-      sleep(1)
+      sleep(2)
     end
 
     def start_server
@@ -143,7 +144,8 @@ module Emmy
         trap("TERM") { Emmy.stop }
 
         Emmy.fiber_block do
-          Backend.module_eval(File.read(backend_file), backend_file)
+          file = backend_file
+          Backend.module_eval(File.read(file), file)
         end
       end
     end
@@ -249,13 +251,13 @@ module Emmy
       pid = File.read(pid_file).to_i
       unless pid.zero?
         Process.kill("TERM", pid)
-        puts "Stopping..."
+        puts "Stopping #{pid}..."
         while File.exists?(config.pid)
           sleep(0.1)
         end
-        #Process.wait(pid)
       end
     rescue Errno::ESRCH
+      puts "No such process"
     end
 
     def delete_pid

data/lib/emmy/version.rb

@@ -1,3 +1,3 @@
 module Emmy
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: emmy-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: emmy-http-client
   requirement: !ruby/object:Gem::Requirement