nephos-server 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3ad4cb71c886a6242547faa12b28596219c6fdb
-  data.tar.gz: b20d7a5730beaa95a57c2cd152a5c17ba667287d
+  metadata.gz: c19caddb625aa364f4db457946e82f11c9677cad
+  data.tar.gz: cfbda59dc9b76f3127738802b8fa5e32c7195daa
 SHA512:
-  metadata.gz: 5b7a8b0309d2349f78cfe8c5dcf6c69dc6bd5b283454d2158e8f84eeaa41c4e9833c581444a2804ed44ad27e3c31c6782602b0abff8c30eff5952b3b2d438d7b
-  data.tar.gz: f655da539e649b07af61e63bfdeed956406fc1ed7ac88ade4db9ecac1866d0d5c9931b50dbba8bfa93f3a865f6173a0c8a534c9dded48746eda319d851192252
+  metadata.gz: 976ab4a4c50704d349a41c47bc2d62f8d2ce8c358ad27ad6812dc122d3cbe09cbd375d22725a6002f524f616a9557e3484b54a69655ec747df4fd57858a9972c
+  data.tar.gz: 976677fcea7eee326490ef4811b6087e8d7403fed10952566370c29703dc8fc616c4abf0d73f65cd84151845e79efe4d12e68f15c3eda3bc4152120e3a4839b3

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.4.7
+	* improve controller generator (names)
+	* add puma to change the default web server
+	* add environments
+
 v0.4.6
 	* improve router errors
 	* improve documentation (production mode)

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 # web server
 gem 'rack'
+gem 'puma'
 
 # colorize messages
 gem 'colorize'

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     colorize (0.7.7)
     nomorebeer (1.1)
+    puma (2.13.4)
     rack (1.6.4)
 
 PLATFORMS
@@ -11,6 +12,7 @@ PLATFORMS
 DEPENDENCIES
   colorize
   nomorebeer
+  puma
   rack
 
 BUNDLED WITH

data/README.md

@@ -109,12 +109,9 @@ end
 # Developers: Roadmap
 
 ## TODO v0.4
-- improve generator with application status, tests, more generation (routing, ...)
-- improved render status
+- improve generator with application tests
 - improve executables (tests, arguments)
 - improve documentation (bin)
-- improve controller generator (names's case)
-- environnementable
 
 ## TODO v0.5
 - executables with version

data/bin/nephos-generator

@@ -70,7 +70,10 @@ module Nephos
     end
 
     module Controller
-      def self.generate!(name, file)
+      def self.generate!(ctr)
+        uname = "#{ctr[0].upcase}#{ctr[1..-1]}Controller".gsub(/ControllerController$/, "Controller")
+        lname = uname.gsub(/([A-Z])/, '_\1')[1..-1].downcase
+        file = "app/#{lname}.rb"
         raise_invalid_appli
         if File.exists? file
           print "The file #{file} already exists. Are you sure to erase it ? (y/N)"
@@ -79,7 +82,7 @@ module Nephos
         end
         f = File.open(file, 'w')
         f << <<EOF
-class #{name} < Nephos::Controller
+class #{uname} < Nephos::Controller
   def root
     return {plain: "index"}
   end
@@ -120,7 +123,7 @@ EOF
       case opt[0]
       when "c", "controller"
         if opt[1].to_s.match(/[\w\-\.]+/)
-          Controller.generate!("#{opt[1].capitalize}Controller", "app/#{opt[1].downcase}_controller.rb")
+          Controller.generate!(opt[1])
         else
           puts "error"
         end

data/bin/nephos-server

@@ -19,6 +19,11 @@ begin
       $server_host = host
     end
 
+    $server_env = ENV["ENVIRONMENT"] || "development"
+    opts.on("-e=env", "--env=env", "Environment") do |env|
+      $server_env = env
+    end
+
     opts.on("--debug") do
       $debug = true
     end
@@ -36,7 +41,7 @@ begin
     raise InvalidApplication
   end
 
-  puts "Running Nephos::Server version #{Nephos::VERSION}"
+  puts "Running Nephos::Server version #{Nephos::VERSION} (#{Nephos.env})"
   Nephos::Server.start($server_port, $server_host)
 
 rescue RoutingError => err

data/lib/nephos-server.rb

@@ -17,4 +17,9 @@ require_relative 'nephos-server/server/main'
 module Nephos
   VERSION_FILE = __FILE__.split("/")[0..-3].join("/") + "/version"
   VERSION = File.read(VERSION_FILE).strip
+
+  @@env = $server_env
+  def self.env
+    @@env
+  end
 end

data/nephos-server.gemspec

@@ -54,5 +54,6 @@ nephos-status
   s.add_dependency 'nomorebeer', '~> 1.1'
   s.add_dependency 'rack', '~> 1.6'
   s.add_dependency 'colorize', '~> 0.7'
+  s.add_dependency 'puma', '~> 2.13'
 
 end

data/test/generator.rb

@@ -17,6 +17,11 @@ class TestNephosServerGenerator < Test::Unit::TestCase
     `nephos-generator c test --debug`
     assert File.exists? "app/test_controller.rb"
     assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
+    `rm -f app/test_controller.rb`
+
+      `nephos-generator c testController --debug`
+    assert File.exists? "app/test_controller.rb"
+    assert_equal "class TestController < Nephos::Controller", File.read("app/test_controller.rb").split("\n").first
     `rm -f app/test_controller.rb`
   end
 

data/version

@@ -1 +1 @@
-0.4.6
+0.4.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - poulet_a
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
 description: " a minimalist server, based on rack/puma, with routing, rendering, and
   controllers. Designed for quick api."
 email:
@@ -148,6 +162,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "* improve router errors * improve documentation (production mode) * add
-  listen network parameter to run the server"
+summary: "* improve controller generator (names) * add puma to change the default
+  web server * add environments"
 test_files: []