emmy-engine 0.2.15 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb113b23785e4193d34f224c7506f6c782e9d0b
-  data.tar.gz: 3643fdd78e1c5474d01e2b90d9e82f45058c8a37
+  metadata.gz: 0f0affd3d94ec5901308857dd8ea928cdd072bad
+  data.tar.gz: b4eb84bfdfad8e35b435d38125c07ed540e70e98
 SHA512:
-  metadata.gz: 49f9e2f09c307d3005d79f5b268a661930ae3762297451477d34efb0844340361b4d13d44aab0b19e123d0298bd4eb057be4acfebfcf5fb2713460ec3e44296e
-  data.tar.gz: b55d702ad0623086699387c0cdf8a0942fb95293124374b0da2cb2fd75bccf4f2614ada024b20ce355763e5d30bbe1590799d3ff0dfe441237303eb815985918
+  metadata.gz: 22f10fd61797625d502339076cdec88bf35f19a47d61e042bd8b47f7ea13009f965745c03d8e3177b7c87e380fd47f50b266eba7622401ea0ee4dc57db30903b
+  data.tar.gz: 675c636ec3d8c0f50451223230cbfd5f863996078563539d0537bec1b20dc62c6f8796f30d370d25377d49a71e1a0334028d5fdbc52a70a0077d141a752511db

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in emmy-engine.gemspec
 gemspec
 
-gem 'eventmachine', '~> 1.0.7'
+gem 'eventmachine', '~> 1.2.0'

data/README.md

@@ -1,3 +1,3 @@
 # Emmy Engine
 
-Don't use directly use emmy gem instead
+This is a part of Emmy framework. A short description can be found in the root of this repository in README.md

data/emmy-engine.gemspec

@@ -5,32 +5,36 @@ require 'emmy/version'
 
 version = File.read(File.expand_path('../../EMMY_VERSION', __FILE__)).strip
 if version != Emmy::VERSION
-  puts "Different version numbers"
+  puts 'Emmy Engine gem has the different version than Emmy gem has. (expect #{Emmy::VERSION}, current #{version})'
   exit
 end
 
 Gem::Specification.new do |spec|
-  spec.name          = "emmy-engine"
+  spec.name          = 'emmy-engine'
   spec.version       = Emmy::VERSION
-  spec.authors       = ["inre"]
-  spec.email         = ["inre.storm@gmail.com"]
+  spec.summary       = %q{Console interface for Emmy}
+  spec.description   = %q{Support commands: start/stop server, display configuration, run console}
+  spec.license       = "MIT"
 
-  spec.summary       = %q{Emmy Engine}
-  #spec.description   = %q{TODO: Write a longer description or delete this line.}
-  #spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.authors       = ['Maksim V.']
+  spec.email         = ['inre.storm@gmail.com']
+  spec.homepage      = 'https://github.com/emmygems'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = "emmy"
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'bin'
+  spec.executables   = 'emmy'
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "emmy-machine",     "~> 0.1"
-  spec.add_dependency "emmy-http",        "~> 0.2"
-  spec.add_dependency "emmy-http-client", "~> 0.1"
-  spec.add_dependency "emmy-http-server", "~> 0.1"
+  spec.required_ruby_version     = '>= 2.2.2'
+  spec.required_rubygems_version = '>= 2.3.0'
 
-  spec.add_development_dependency "eventmachine", "~> 1.0"
-  spec.add_development_dependency "bundler",      "~> 1.9"
-  spec.add_development_dependency "rake",         "~> 10.0"
-  spec.add_development_dependency "rspec",        "~> 3"
+  spec.add_dependency 'emmy-machine', '~> 0.4'
+  spec.add_dependency 'emmy-http', '~> 0.4'
+  spec.add_dependency 'emmy-http-client', '~> 0.2'
+  spec.add_dependency 'emmy-http-server', '~> 0.2'
+
+  spec.add_development_dependency 'eventmachine', '~> 1'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'rspec', '~> 3'
 end

data/lib/emmy.rb

@@ -13,6 +13,10 @@ module Emmy
   autoload :Backend, 'emmy/backend'
   autoload :Runner,  'emmy/runner'
 
+  module Rack
+    autoload :Async,  'emmy/rack/async'
+  end
+
   module_function
 
   def env

data/lib/emmy/http.rb

@@ -1,5 +1,3 @@
-require 'emmy_http/client'
-
 module Emmy
   class Http
     include EmmyHttp::Model

data/lib/emmy/rack/async.rb

@@ -0,0 +1,22 @@
+module Emmy
+  module Rack
+    class Async
+      def initialize(app, options={})
+        @app = app
+        @rescue_exception = options[:rescue_exception] || (->(env, ex) { [500, {}, ["Internal Server Error"]] })
+      end
+
+      def call(env)
+        call_app = lambda do
+          result = @app.call(env)
+          env['async.callback'].call result
+        end
+
+        Emmy.async(&call_app)
+        throw :async
+      rescue => ex
+        @rescue_exception[env, ex]
+      end
+    end
+  end
+end

data/lib/emmy/runner.rb

@@ -4,7 +4,7 @@ module Emmy
   class Runner
     include Singleton
     using EventObject
-    events :bootstrap, :instance
+    events :bootstrap, :instance, :parse_options
 
     RUBY     = Gem.ruby
     BIN_EMMY = "bin/emmy"
@@ -24,18 +24,20 @@ module Emmy
       on :bootstrap do
         parse_environment!
       end
-      on :bootstrap do
-        option_parser.parse!(argv)
-      end
       on :bootstrap do
         defaults!
       end
-      on :bootstrap do
-        update_rack_environment!
-      end
+
       on :instance do |id|
         instance_defaults!(id)
       end
+
+      on :parse_options do
+        option_parser.parse!(argv)
+      end
+      on :parse_options do
+        update_rack_environment!
+      end
     end
 
     def execute_bin_emmy
@@ -110,7 +112,8 @@ module Emmy
 
     def run_action
       # Bootstrap
-      bootstrap!
+      bootstrap! if @action != :display_help
+      parse_options!
       # start action
       send(action)
       self
@@ -133,9 +136,8 @@ module Emmy
             start_server
           end
         end
-        sleep(1)
       end
-      sleep(2)
+      sleep(1)
     end
 
     def start_server
@@ -158,7 +160,7 @@ module Emmy
     end
 
     def start_console
-      EmmyMachine.run_block do
+      EmmyMachine.run_once do
         if defined?(binding.pry)
           TOPLEVEL_BINDING.pry
         else
@@ -200,11 +202,11 @@ module Emmy
     end
 
     def bootstrap!
-      bootstrap.fire_for(self)
+      bootstrap.instance_fire(self)
     end
 
     def instance!
-      instance.fire_for(self, config.id)
+      instance.instance_fire(self, config.id)
     end
 
     private
@@ -251,13 +253,13 @@ module Emmy
       pid = File.read(pid_file).to_i
       unless pid.zero?
         Process.kill("TERM", pid)
-        puts "Stopping #{pid}..."
+        puts "Stopping..."
         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.15"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: '0.4'
 platform: ruby
 authors:
-- inre
+- Maksim V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: emmy-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: emmy-http-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: emmy-http-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+description: 'Support commands: start/stop server, display configuration, run console'
 email:
 - inre.storm@gmail.com
 executables:
@@ -140,10 +140,12 @@ files:
 - lib/emmy.rb
 - lib/emmy/backend.rb
 - lib/emmy/http.rb
+- lib/emmy/rack/async.rb
 - lib/emmy/runner.rb
 - lib/emmy/version.rb
-homepage: 
-licenses: []
+homepage: https://github.com/emmygems
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -153,16 +155,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: Emmy Engine
+summary: Console interface for Emmy
 test_files: []