webcommand 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7af4f1c0a28aa9cc60b71f6d90d1c05c2e3bf4ea34c2a31fbac06ab26c73586
-  data.tar.gz: 57dbe78c08bea74f2644f1409bd83b5155ba46f46cc816df19dc9f5504a069d4
+  metadata.gz: 0ab170912e3f5f6894da78adc829a98a2af5a244cf254c1bbce200506fcceda1
+  data.tar.gz: d69a2d9ce59c2d13a46d388ce20a313d3b472cdc6b5007cfb56cb1960876a427
 SHA512:
-  metadata.gz: 378cdcb11d019bdc2b65360eae2390f37239cb23237c221cec97d939678aa06e919c581c54514e8e8a6fdd512487ee3f9f1807eda7c626854c1edde11032ec4c
-  data.tar.gz: eae1a6f679ba2eab644e9180e5fe3ff4c07a5ad04a8ef054e58eeb84ba2b055f85ee63fb8b935430acb637808e2e63de44c799f2c6d899715ab365ee26b1302b
+  metadata.gz: 1c5803beb7e93505a2941cb79b055b2bc8ec98e8893994ebf7dc5e492af284b1eb31fb625b4d951816a0a4b960d4508c1df71bc7eaf8c36e67e4eca247dea7a9
+  data.tar.gz: 8859ab578c0fbcf0f4e39c070f27ce8191797a478736ce671d52f61f4927f64295ad71faf9b3c7ccfa8a8b2b50aaaac9bce8a95769b806336ac2941641dad64b

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.5
   - 2.6
+  - 2.7
 before_script:
     - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
     - chmod +x ./cc-test-reporter

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    webcommand (0.1.3)
+    webcommand (0.1.4)
       mustache (~> 1.0)
-      puma (>= 4.2.1, < 4.4.0)
       rack-contrib (~> 2.1.0)
       sinatra (~> 2.0.7)
       thor (~> 0.20.3)
@@ -35,7 +34,6 @@ GEM
     mustache (1.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     pastel (0.7.3)
@@ -49,8 +47,6 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    puma (4.2.1)
-      nio4r (~> 2.0)
     rack (2.0.8)
     rack-contrib (2.1.0)
       rack (~> 2.0)
@@ -58,7 +54,7 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -112,7 +108,7 @@ DEPENDENCIES
   byebug
   pry
   rack-test
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rspec-parameterized
   simplecov

data/lib/webcommand.rb

@@ -10,6 +10,7 @@ require 'pathname'
 require_relative 'webcommand/extensions/hash_extension'
 require_relative 'webcommand/command'
 require_relative 'webcommand/server'
+require_relative 'webcommand/server/adapters/webrick'
 require_relative 'webcommand/config'
 require_relative 'webcommand/commands'
 require_relative 'webcommand/cli'

data/lib/webcommand/cli.rb

@@ -1,16 +1,19 @@
 module Webcommand
   class CLI < Thor
+    SERVER_ADAPTERS = {
+      'webrick' =>  Webcommand::Server::Adapters::Webrick
+    }.freeze
+
     desc "server", "Start the Webcommand server"
     option :port, aliases: :p, default: 9292
     option :bind, aliases: :b, default: '0.0.0.0'
-    option :threads, aliases: :t, default: 8
-    option :workers, aliases: :w, default: 1
+    option :adapter, type: :string, enum: SERVER_ADAPTERS.keys, default: 'webrick'
+
     def server
-      exec "puma " \
-       "-p #{options[:port]} " \
-       "-t #{options[:threads]}:#{options[:threads]} " \
-       "-w #{options[:workers]} " \
-       "#{Webcommand.root_path.join('config.ru')}"
+      server_adapter = SERVER_ADAPTERS[options[:adapter]]
+      server = server_adapter.new(Webcommand::Server, options)
+
+      server.start
     end
   end
 end

data/lib/webcommand/server/adapters/webrick.rb

@@ -0,0 +1,23 @@
+module Webcommand
+  class Server
+    module Adapters
+      class Webrick
+        def initialize(server, options)
+          require 'webrick'
+          @server = server
+          @options = options
+        end
+
+        def start
+          server = WEBrick::HTTPServer.new(
+            Port: @options[:port],
+            BindAddress: @options[:bind])
+          server.mount "/", Rack::Handler::WEBrick, server
+          Signal.trap(:INT) { server.shutdown }
+          server.start
+        end
+      end
+    end
+  end
+end
+ 

data/lib/webcommand/version.rb

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

data/webcommand.gemspec

@@ -29,10 +29,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mustache", "~> 1.0"
   spec.add_dependency "rack-contrib", "~> 2.1.0"
   spec.add_dependency "tty-command", "~> 0.9.0"
-  spec.add_dependency "puma", ">= 4.2.1", "< 4.4.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webcommand
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Carlos Atkinson Ferreira Filho
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,26 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +178,7 @@ files:
 - lib/webcommand/config.rb
 - lib/webcommand/extensions/hash_extension.rb
 - lib/webcommand/server.rb
+- lib/webcommand/server/adapters/webrick.rb
 - lib/webcommand/version.rb
 - webcommand.gemspec
 homepage: https://github.com/catks/webcommand