nephos-server 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597ef096f14958c9c1139eb49d340783a4903bba
-  data.tar.gz: 91f587c2e6a54091835bfa374f031a4f19a3baef
+  metadata.gz: e144905879152af79fc251c1b0b2d3a178dfa066
+  data.tar.gz: d31444aa6d75c9dec7fe795bef0204067e257d86
 SHA512:
-  metadata.gz: 4e0e0860affde008dfdd112563fb7d5eb0e8eb2420c92f891503e3d64345d3d3cffaf96e4065b1e8a742fdea7057b07d57e5d88e4b2c6e3351eca897552bbf0c
-  data.tar.gz: 05396e4d53d8c8d0ce6c17c939246db518162344641af4a60da66755317b322be243fa7f7e9606e727486e01b95834ae9eeed472635a38233530b31b41380da9
+  metadata.gz: 25a38d64cd6e7258a5dd2a136bf1024e5521cca2a68ab12c0450737c415fca756f26adf8f2cd905465f4544c5adbb7a3a46cb395e0b1dc70061636c345fb101b
+  data.tar.gz: 1b061583e821e28d60521770a119b0a0e8cbb4a42fa304fd3d11f362a530b5ecd413db9ad0ae5f1d1d6c16758bbc60379e82c1239c33a4ef321c64696e91266b

data/bin/nephos-generator

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'colorize'
 require 'optparse'
 require 'nephos-server/bin-helpers'
 
@@ -15,8 +16,25 @@ ROUTE_RB = <<EOF
 #get url: "/rm", controller: "MainController", method: "rm_url"
 EOF
 
+def raise_invalid_appli
+  if not Nephos::Bin.is_a_valid_application? and not $debug
+    raise "You are not in a valid application directory"
+  end
+end
+
+def route_exists? line
+  File.read("routes.rb").split("\n").include? line
+end
+
+def write_route! line
+  File.open("routes.rb", "a") do |f|
+    f.puts line
+  end
+  puts("Route created: ".green + line)
+end
+
 def generate_route(verb, url, dest_c, dest_m=nil)
-  raise "You are not in a valid application directory" if not Nephos::Bin.is_a_valid_application?
+  raise_invalid_appli
   raise InvalidVerb, "\"#{verb}\" doesn't match with /\w+/" if not verb.to_s.match(/^\w+$/)
   raise InvalidUrl if not url.match(/^\/?(:?\w+)(\/:?\w+)*\/?$/)
   raise "Option dest_m is not avaiable for now" if not dest_m.nil?
@@ -24,13 +42,15 @@ def generate_route(verb, url, dest_c, dest_m=nil)
   controller = dest_c.split("#")[0]
   method = dest_c.split("#")[1]
   line = "add_route \"#{verb}\", url: \"#{url}\", controller: \"#{controller}\", method: \"#{method}\""
-  File.open("routes.rb", "a") do |f|
-    f.puts line
+  if route_exists? line
+    puts("Route already exists: ".yellow + line)
+  else
+    write_route!(line)
   end
 end
 
 def generate_controller(name, file)
-  raise "You are not in a valid application directory" if not Nephos::Bin.is_a_valid_application?
+  raise_invalid_appli
   if File.exists? file
     print "The file #{file} already exists. Are you sure to erase it ? (y/N)"
     r = STDIN.gets.to_s.chomp
@@ -73,29 +93,34 @@ def initialize_application
 end
 
 begin
-  OptionParser.new do |opts|
+  opt = OptionParser.new do |opts|
     opts.banner = "Usage: nephos-generator [controller name] [appli [name]]"
+
+    opts.on("--debug") do
+      $debug = true
+    end
+
   end.parse!
 
-  case ARGV[0]
+  case opt[0]
   when "c", "controller"
-    if ARGV[1].to_s.match(/[\w\-\.]+/)
-      generate_controller("#{ARGV[1].capitalize}Controller", "app/#{ARGV[1].downcase}.rb")
+    if opt[1].to_s.match(/[\w\-\.]+/)
+      generate_controller("#{opt[1].capitalize}Controller", "app/#{opt[1].downcase}.rb")
     else
       puts "error"
     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])
+    if not opt[1].to_s.empty?
+      create_application_dir(opt[1])
+      puts "Application #{opt[1]} created"
+      move_to_application_dir(opt[1])
     end
     initialize_application
     puts "Application initialized"
   when "r", "route"
-    generate_route(*(ARGV[1..4]))
+    generate_route(*(opt[1..4]))
   else
-    puts "\"#{ARGV[0]}\" not recognized has a command"
+    puts "\"#{opt[0]}\" not recognized has a command"
   end
 
 rescue => err

data/version

@@ -1 +1 @@
-0.4.0
+0.4.1

metadata

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