nephos-server 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e144905879152af79fc251c1b0b2d3a178dfa066
-  data.tar.gz: d31444aa6d75c9dec7fe795bef0204067e257d86
+  metadata.gz: 9fdc970288b999aeab76422947f72cfbfcba0710
+  data.tar.gz: 38042ea637910e98ca204e6119d457b51417c3a0
 SHA512:
-  metadata.gz: 25a38d64cd6e7258a5dd2a136bf1024e5521cca2a68ab12c0450737c415fca756f26adf8f2cd905465f4544c5adbb7a3a46cb395e0b1dc70061636c345fb101b
-  data.tar.gz: 1b061583e821e28d60521770a119b0a0e8cbb4a42fa304fd3d11f362a530b5ecd413db9ad0ae5f1d1d6c16758bbc60379e82c1239c33a4ef321c64696e91266b
+  metadata.gz: e95c52c9519e04511f62db2d89197923ebf5bc485bad8997c0facf3142cf423953b010e997345df57ff1db1ff03e73f275fc747ef36a2fd1e2057b4ba48dc858
+  data.tar.gz: a8e1e84c5d8f58b0598b5987759ea1e545258977f96a0745f81fdbf1394f23055daa2485cf29501cd7c41ead58f2e19cf62ad0b8fb9df491121984013361ee1c

data/bin/nephos-generator

@@ -22,107 +22,141 @@ def raise_invalid_appli
   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_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?
-  raise "Option dest_c must match with \"controller#method\"" if not dest_c.match(/^\w+\#\w+$/)
-  controller = dest_c.split("#")[0]
-  method = dest_c.split("#")[1]
-  line = "add_route \"#{verb}\", url: \"#{url}\", controller: \"#{controller}\", method: \"#{method}\""
-  if route_exists? line
-    puts("Route already exists: ".yellow + line)
-  else
-    write_route!(line)
-  end
-end
+module Nephos
+  module Generator
+
+    module Route
+      def self.exists? line
+        File.read("routes.rb").split("\n").include? line
+      end
+
+      def self.write! line
+        File.open("routes.rb", "a") do |f|
+          f.puts line
+        end
+        puts("Route created: ".green + line)
+      end
+
+      def self.generate!(verb, url, dest_c, dest_m=nil)
+        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_c must match with \"controller#method\"" if not dest_c.match(/^\w+\#\w+$/) and dest_m.nil?
+        raise "Option dest_c must match with \"controllerName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
+        raise "Option dest_m must match with \"methodName\"" if not dest_m.nil? and not dest_c.match(/^\w+$/)
+        controller, method = dest_c, dest_m
+        if dest_m.nil?
+          controller = dest_c.split("#")[0]
+          method = dest_c.split("#")[1]
+        end
+        line = "add_route \"#{verb}\", url: \"#{url}\", controller: \"#{controller}\", method: \"#{method}\""
+        if exists? line
+          if $remove
+            routes = File.read("routes.rb").split("\n")
+            puts "Route deleted: ".green + routes.delete(line).to_s
+            File.write("routes.rb", routes.join("\n") + "\n")
+          else
+            puts("Route already exists: ".yellow + line)
+          end
+        else
+          if $remove
+            puts("Route doesn't exists: ".yellow + line)
+          else
+            write!(line)
+          end
+        end
+      end
+    end
 
-def generate_controller(name, file)
-  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
-    raise "File #{file} already exists" unless r.match(/y(es)?/)
-  end
-  f = File.open(file, 'w')
-  f << <<EOF
+    module Controller
+      def self.generate!(name, file)
+        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
+          raise "File #{file} already exists" unless r.match(/y(es)?/)
+        end
+        f = File.open(file, 'w')
+        f << <<EOF
 class #{name} < Nephos::Controller
   def root
     return {plain: "index"}
   end
 end
 EOF
-  puts "Controller \"#{name}\" created at location \"#{file}\""
-end
+        puts "Controller \"#{name}\" created at location \"#{file}\""
+      end
+    end
 
-def create_application_dir dir
-  raise "Directory #{dir} already exists" if Dir.exists? dir
-  Dir.mkdir dir
-end
+    module Application
+      def self.create_application_dir dir
+        raise "Directory #{dir} already exists" if Dir.exists? dir
+        Dir.mkdir dir
+      end
+
+      def self.move_to_application_dir dir
+        Dir.chdir dir
+      end
+
+      def self.initialize!
+        raise "Not an empty dir" unless Dir[File.expand_path "*"].empty?
+        File.write "routes.rb", ROUTE_RB
+        File.write "Gemfile", GEMFILE
+        Dir.mkdir "app"
+        begin
+          `git init .`
+          puts "Git repository initialized"
+        rescue Errno::ENOENT => err
+          puts "Warning: git repository not initialized"
+        rescue => err
+          puts "Error: #{err.message}"
+        end
+        exec("bundle install")
+      end
+    end
 
-def move_to_application_dir dir
-  Dir.chdir dir
-end
+    def self.main opt
+      case opt[0]
+      when "c", "controller"
+        if opt[1].to_s.match(/[\w\-\.]+/)
+          Controller.generate!("#{opt[1].capitalize}Controller", "app/#{opt[1].downcase}.rb")
+        else
+          puts "error"
+        end
+      when "a", "appli", "application"
+        if not opt[1].to_s.empty?
+          Application.create_application_dir(opt[1])
+          puts "Application #{opt[1]} created"
+          Application.move_to_application_dir(opt[1])
+        end
+        Application.initialize!
+        puts "Application initialized"
+      when "r", "route"
+        Route.generate!(*(opt[1..4]))
+      else
+        puts "\"#{opt[0]}\" not recognized has a command"
+      end
+    end
 
-def initialize_application
-  raise "Not an empty dir" unless Dir[File.expand_path "*"].empty?
-  File.write "routes.rb", ROUTE_RB
-  File.write "Gemfile", GEMFILE
-  Dir.mkdir "app"
-  begin
-    `git init .`
-    puts "Git repository initialized"
-  rescue Errno::ENOENT => err
-    puts "Warning: git repository not initialized"
-  rescue => err
-    puts "Error: #{err.message}"
   end
-  exec("bundle install")
 end
 
 begin
   opt = OptionParser.new do |opts|
     opts.banner = "Usage: nephos-generator [controller name] [appli [name]]"
 
+    opts.on("--rm") do
+      $remove = true
+    end
+
     opts.on("--debug") do
       $debug = true
     end
-
   end.parse!
 
-  case opt[0]
-  when "c", "controller"
-    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 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(*(opt[1..4]))
-  else
-    puts "\"#{opt[0]}\" not recognized has a command"
-  end
+  Nephos::Generator.main(opt)
 
 rescue => err
-  puts "Error: #{err.message}"
+  puts "Error:".red + " #{err.message}"
+  puts err.backtrace
 end

data/bin/nephos-server

@@ -29,6 +29,7 @@ begin
     raise InvalidApplication
   end
 
+  puts "Running Nephos::Server version #{Nephos::VERSION}"
   Nephos::Server.start($server_port)
 
 rescue RoutingError => err

data/bin/nephos-status

@@ -3,11 +3,20 @@
 require 'optparse'
 require 'nephos-server/bin-helpers'
 
-OptionParser.new do |opts|
+opt = OptionParser.new do |opts|
   opts.banner = "Usage: nephos-status [appli directory]"
+
+  opts.on("--rm") do
+    $remove = true
+  end
+
+  opts.on("--debug") do
+    $debug = true
+  end
+
 end.parse!
 
-$dir = ARGV[0] || "."
+$dir = opt[0] || "."
 
 begin
   if Dir.exists? $dir
@@ -19,8 +28,13 @@ begin
       i = File.read($gfl).split.index("nephos-server") + 1
       version = File.read($gfl).split[i]
       path = $gfl.gsub(/Gemfile\.lock$/, "")
+      n_controllers = 0
+      Dir[File.expand_path 'app/*.rb'].each do |f|
+        n_controllers += 1 if File.read(f).include? "< Nephos::Controller"
+      end
       puts "Full path: #{path}"
       puts "Installed nephos-version: #{version}"
+      puts "Controllers (#{n_controllers})"
     end
   else
     raise "\"#{$dir}\" is not a valid directory"

data/lib/nephos-server.rb

@@ -13,3 +13,8 @@ require_relative 'nephos-server/controller'
 require_relative 'nephos-server/router/main'
 # server
 require_relative 'nephos-server/server/main'
+
+module Nephos
+  VERSION_FILE = __FILE__.split("/")[0..-3].join("/") + "/version"
+  VERSION = File.read(VERSION_FILE).strip
+end

data/nephos-server.gemspec

@@ -31,6 +31,7 @@ test/responder.rb
 test/router.rb
 test/params.rb
 test/controller.rb
+test/generator.rb
 routes.rb
 app/dataset.rb
 app/image.jpg

data/test/generator.rb

@@ -0,0 +1,47 @@
+class TestNephosServerGenerator < Test::Unit::TestCase
+
+  def test_generator_application
+    # Dir.chdir("/tmp")
+    # name = Time.now.to_i.to_s
+    # `nephos-server a #{name}`
+  end
+
+  def test_generator_controller
+    `rm -f app/test.rb`
+
+    `nephos-generator --debug c test`
+    assert File.exists? "app/test.rb"
+    assert_equal "class TestController < Nephos::Controller", File.read("app/test.rb").split("\n").first
+    `rm -f app/test.rb`
+
+    `nephos-generator c test --debug`
+    assert File.exists? "app/test.rb"
+    assert_equal "class TestController < Nephos::Controller", File.read("app/test.rb").split("\n").first
+    `rm -f app/test.rb`
+  end
+
+  # test simple and rm
+  def test_generator_route1
+    s1 = File.read("routes.rb")
+    `./bin/nephos-generator --debug r get test ctr#mth`
+    s2 = File.read("routes.rb")
+    `./bin/nephos-generator --debug r get test ctr#mth --rm`
+    s3 = File.read("routes.rb")
+    assert_equal s1, s3
+    assert_not_equal s1, s2
+  end
+
+  # test if ctr#mth == ctr mth
+  def test_generator_route2
+    s1 = File.read("routes.rb")
+    `./bin/nephos-generator --debug r get test ctr#mth`
+    s2 = File.read("routes.rb")
+    `./bin/nephos-generator --debug r get test ctr mth`
+    s3 = File.read("routes.rb")
+    `./bin/nephos-generator --debug r get test ctr mth --rm`
+    s4 = File.read("routes.rb")
+    assert_equal s2, s3
+    assert_equal s1, s4
+  end
+
+end

data/version

@@ -1 +1 @@
-0.4.1
+0.4.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nephos-server
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - poulet_a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer
@@ -78,6 +78,7 @@ email:
   - test/router.rb
   - test/params.rb
   - test/controller.rb
+  - test/generator.rb
   - routes.rb
   - app/dataset.rb
   - app/image.jpg
@@ -116,6 +117,7 @@ files:
 - nephos-server.gemspec
 - routes.rb
 - test/controller.rb
+- test/generator.rb
 - test/params.rb
 - test/responder.rb
 - test/router.rb