tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

some small changes

Browse Source
This commit is contained in:
Anton Martynov 2015-01-27 13:18:26 +03:00
parent d7292d9ace
commit d2a36bca9f
3 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devops-service/devops-service.rb
View File

@ -1,6 +1,5 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
require "fileutils"
require "wisper" require "wisper"
$:.push File.dirname(__FILE__) $:.push File.dirname(__FILE__)
@ -27,8 +26,6 @@ class DevopsService
include Wisper::Publisher include Wisper::Publisher
# include Devops::Loader
class << self class << self
def routes config def routes config
@ -42,9 +39,10 @@ class DevopsService
def init config def init config
routes config routes config
Devops::Version2_0::Application.init config Devops::Version2_0::Application.init config
DevopsLoader.load DevopsLoader.load
DevopsLoader.routes DevopsLoader.routes
Devops::Loader.plugins config
end end
end end

46
devops-service/loader.rb
View File

@ -1,51 +1,19 @@
require "json"
require "routes/v2.0/flavor"
require "routes/v2.0/image"
require "routes/v2.0/filter"
require "routes/v2.0/network"
require "routes/v2.0/group"
require "routes/v2.0/deploy"
require "routes/v2.0/project"
require "routes/v2.0/key"
require "routes/v2.0/user"
require "routes/v2.0/provider"
require "routes/v2.0/tag"
require "routes/v2.0/server"
require "routes/v2.0/script"
require "routes/v2.0/status"
require "routes/v2.0/bootstrap_templates"
require "routes/v2.0/handlers/provider"
require "routes/v2.0/handlers/bootstrap_templates"
require "routes/v2.0/handlers/deploy"
require "routes/v2.0/handlers/filter"
require "routes/v2.0/handlers/flavor"
require "routes/v2.0/handlers/group"
require "routes/v2.0/handlers/image"
require "routes/v2.0/handlers/network"
require "routes/v2.0/handlers/key"
require "routes/v2.0/handlers/project"
require "routes/v2.0/handlers/script"
require "routes/v2.0/handlers/status"
require "routes/v2.0/handlers/tag"
require "routes/v2.0/handlers/user"
require "routes/v2.0/handlers/server"
module Devops module Devops
module Loader module Loader
def Loader.included(mod)
puts "#{self} included in #{mod}" class << self
def plugins config
if defined?(Devops::Plugin) if defined?(Devops::Plugin)
routes = {} routes = {}
plugins = Devops::Plugin.constants.collect{|s| Devops::Plugin.const_get(s)}.select {|const| const.class == Module} plugins = Devops::Plugin.constants.collect{|s| Devops::Plugin.const_get(s)}.select {|const| const.class == Module}
puts plugins.inspect puts plugins.inspect
plugins.each do |p| plugins.each do |p|
p.init(mod) p.init(config)
end
end
end end
end end
end
end
end
end end

35
devops-service/routes/v2.0.rb
View File

@ -2,13 +2,44 @@ require "bundler/setup"
require "sinatra/base" require "sinatra/base"
require "sinatra/streaming" require "sinatra/streaming"
require "helpers/version_2" require "helpers/version_2"
require "json"
require "routes/v2.0/flavor"
require "routes/v2.0/image"
require "routes/v2.0/filter"
require "routes/v2.0/network"
require "routes/v2.0/group"
require "routes/v2.0/deploy"
require "routes/v2.0/project"
require "routes/v2.0/key"
require "routes/v2.0/user"
require "routes/v2.0/provider"
require "routes/v2.0/tag"
require "routes/v2.0/server"
require "routes/v2.0/script"
require "routes/v2.0/status"
require "routes/v2.0/bootstrap_templates"
require "routes/v2.0/handlers/provider"
require "routes/v2.0/handlers/bootstrap_templates"
require "routes/v2.0/handlers/deploy"
require "routes/v2.0/handlers/filter"
require "routes/v2.0/handlers/flavor"
require "routes/v2.0/handlers/group"
require "routes/v2.0/handlers/image"
require "routes/v2.0/handlers/network"
require "routes/v2.0/handlers/key"
require "routes/v2.0/handlers/project"
require "routes/v2.0/handlers/script"
require "routes/v2.0/handlers/status"
require "routes/v2.0/handlers/tag"
require "routes/v2.0/handlers/user"
require "routes/v2.0/handlers/server"
module Devops module Devops
module Version2_0 module Version2_0
class Application < Sinatra::Base class Application < Sinatra::Base
include Devops::Loader
class << self class << self
def init config def init config
set :devops_home, config[:devops_dir] set :devops_home, config[:devops_dir]