nephos-server 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874850432c525c3a1578fe7718c1e1152fbad5c1
-  data.tar.gz: 0b3648125fcb43419799d9316eb1f61e12799e59
+  metadata.gz: 0198ab59046527552ad7b7f66c25dcd04ca3727f
+  data.tar.gz: aeb7527f299c85860b4941a528c15635ed6024a8
 SHA512:
-  metadata.gz: eb03c24fd8928f00977dfebe013a7ca0e798f4c282d6729d9db6834a31946e5391b1aa291bee39069656003a742588980e7a07e22c64c1b51b581b5b9a12614a
-  data.tar.gz: 1706413aa6c577391eb60a7a634a97c0255fbd6ed5fd6f7967f9bd62c7bdfd3d9fc1772767c8e51f3dae62c2b74ffefb39bb3fcb71011bd8e3183474c1c5a630
+  metadata.gz: b6aee265e6d6fb09239476dcb545c6ea282fea41ef548432cd28134d94bff3fdf6698399a933a8eca2411f30b08ae0452c9ec00301e8be989682d4feaa61b118
+  data.tar.gz: 66fc08b9fe7a964d87e34eb8e4113f0aa2d68eedc3127ef4f0374ff8a24fa6e5b96be526bd7ab78448fe87b39489e13bf68300b1c7818a1d4f38dd801b798ef6

data/bin/nephos-generator

@@ -45,19 +45,28 @@ def initialize_application
   exec("bundle install")
 end
 
-case ARGV[0]
-when "c", "controller"
-  if not ARGV[1].to_s.empty?
-    generate_controller("#{ARGV[1]}Controller", "src/#{ARGV[1]}.rb")
-  end
-when "a", "appli", "application"
-  if not ARGV[1].to_s.empty?
-    create_application_dir(ARGV[1])
-    puts "Application #{ARGV[1]} created"
-    move_to_application_dir(ARGV[1])
+require 'optparse'
+
+begin
+  OptionParser.new do |opts|
+    opts.banner = "Usage: nephos-generator [controller name] [appli [name]]"
+  end.parse!
+
+  case ARGV[0]
+  when "c", "controller"
+    if not ARGV[1].to_s.match(/[\w_\-\.]+/)
+      generate_controller("#{ARGV[1]}Controller", "src/#{ARGV[1]}.rb")
+    end
+  when "a", "appli", "application"
+    if not ARGV[1].to_s.empty?
+      create_application_dir(ARGV[1])
+      puts "Application #{ARGV[1]} created"
+      move_to_application_dir(ARGV[1])
+    end
+    initialize_application
+    puts "Application initialized"
   end
-  initialize_application
-  puts "Application initialized"
-else
-  puts "help: generate c[ontroller] name"
+
+rescue => err
+  puts "Error: #{err.message}"
 end

data/bin/nephos-server

@@ -1,17 +1,36 @@
 #!/usr/bin/env ruby
 
-# require_relative "../lib/nephos-server"
-require 'nephos-server'
-
 require 'optparse'
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: main.rb [update] [-t n] [-s n] [-i id]"
+begin
+  OptionParser.new do |opts|
+    opts.banner = "Usage: nephos-server [-p=port] [--debug]"
+
+    $server_port = ENV["SERVER_PORT"] || 8080
+    opts.on("-p=nb", "--port=nb", "Port") do |port|
+      $server_port = Integer(port)
+    end
+
+    opts.on("--debug") do
+      $debug = true
+    end
+
+  end.parse!
 
-  $server_port = ENV["SERVER_PORT"] || 8080
-  opts.on("-p=nb", "--port=nb", "Port") do |port|
-    $server_port = Integer(port)
+  if $debug
+    require_relative "../lib/nephos-server"
+  else
+    require 'nephos-server'
   end
-end.parse!
 
-Nephos::Server.start($server_port)
+  if not $debug and
+    (not File.exists? "Gemfile.lock" or
+     not File.read("Gemfile.lock").split.index("nephos-server"))
+    raise InvalidApplicationError
+  end
+
+  Nephos::Server.start($server_port)
+
+rescue => err
+  puts "Error: #{err.message}"
+end

data/lib/nephos-server.rb

@@ -1 +1,8 @@
+# coding: utf-8
+
+# require 'yaml'
+require 'json'
+require 'open-uri'
+require 'rack'
+
 require_relative 'nephos-server/server/main'

data/lib/nephos-server/server/main.rb

@@ -1,10 +1,4 @@
-#coding: utf-8
-
-# require 'json'
-# require 'yaml'
-require 'open-uri'
-require 'rack'
-
+require_relative 'basic_errors'
 require_relative 'responder'
 require_relative '../routing/execute'
 

data/lib/nephos-server/server/responder.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module Nephos
   module Responder
 

data/version

@@ -1 +1 @@
-0.1.2
+0.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - poulet_a