From 511f689414b24be29377508003cc1703b96acc19 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Thu, 13 Aug 2015 17:43:08 +0300
Subject: [PATCH] routes list

---
 devops-service/app/devops-api2.rb              |  1 +
 devops-service/core/devops-service.rb          | 12 ++++--------
 devops-service/db/mongo/models/mongo_model.rb  |  1 -
 devops-service/sinatra/methods_with_headers.rb | 13 +++++++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/devops-service/app/devops-api2.rb b/devops-service/app/devops-api2.rb
index 32ef054..7a42782 100644
--- a/devops-service/app/devops-api2.rb
+++ b/devops-service/app/devops-api2.rb
@@ -79,6 +79,7 @@ module Devops
         Devops::Api2.register r
       end
       Routes.route "/v2.0", Devops::Api2
+      Devops::Api2.routes_list
     end
 
     private
diff --git a/devops-service/core/devops-service.rb b/devops-service/core/devops-service.rb
index 776be2f..405fc27 100644
--- a/devops-service/core/devops-service.rb
+++ b/devops-service/core/devops-service.rb
@@ -33,12 +33,6 @@ class DevopsService
 
   class << self
 
-    def routes
-      config = DevopsConfig.config
-      Devops::Routes.preffix = config[:url_prefix]
-      #require_relative "routes/routes.rb"
-    end
-
     # steps:
     # 1. init db
     # 2. load application handlers
@@ -48,12 +42,13 @@ class DevopsService
     # 6. init all routes classes
     # 7. register routes for all classes
     def init
-      KnifeFactory.init
       # init database
       Devops::Db.init
       DevopsLogger.logger = DevopsLogger.create(STDOUT)
 
-      routes
+      config = DevopsConfig.config
+      Devops::Routes.preffix = config[:url_prefix]
+
       apps = Devops::Application.applications
       apps.each do |a|
         a.prepare
@@ -81,6 +76,7 @@ class DevopsService
       # add plugins routes
       Devops::Loader.routes
 =end
+      KnifeFactory.init
     end
 
     def debug?
diff --git a/devops-service/db/mongo/models/mongo_model.rb b/devops-service/db/mongo/models/mongo_model.rb
index 8b86ae5..de2d063 100644
--- a/devops-service/db/mongo/models/mongo_model.rb
+++ b/devops-service/db/mongo/models/mongo_model.rb
@@ -132,7 +132,6 @@ module Devops
         # all exceptions are handled in @validate! method
         def validate_model(model)
           DevopsLogger.logger.debug validators.inspect
-          puts validators.inspect
           validators.each do |validator|
             validator.new(model).validate!
           end
diff --git a/devops-service/sinatra/methods_with_headers.rb b/devops-service/sinatra/methods_with_headers.rb
index 2bce5f1..eca0711 100644
--- a/devops-service/sinatra/methods_with_headers.rb
+++ b/devops-service/sinatra/methods_with_headers.rb
@@ -94,6 +94,19 @@ module Sinatra
           statistic
         end
       end
+
+      def routes
+        @routes
+      end
+
+      def routes_list
+        routes.each do |verb, signature|
+          signature.each do |s|
+            puts "#{verb}\t#{s[0]}"
+          end
+        end
+      end
+
     end
 
     # Check request headers