uploading appliance definition files works now

boxgrinder · Dec 1, 2010 · 4ca98a7 · 4ca98a7
1 parent 550e634
commit 4ca98a7
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 86 deletions.
diff --git a/app/helpers/appliances_helper.rb b/app/helpers/appliances_helper.rb
@@ -18,13 +18,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-load '/home/goldmann/torquebox-current/jruby/lib/ruby/gems/1.8/gems/boxgrinder-core-0.1.3/lib/boxgrinder-core/helpers/appliance-helper.rb'
-load '/home/goldmann/torquebox-current/jruby/lib/ruby/gems/1.8/gems/boxgrinder-core-0.1.3/lib/boxgrinder-core/validators/appliance-config-validator.rb'
-
-#require 'boxgrinder-core/helpers/appliance-helper'
-#require 'boxgrinder-core/validators/appliance-config-validator'
-
-require 'rest-config'
+require 'boxgrinder-core/helpers/appliance-helper'
+require 'boxgrinder-core/validators/appliance-config-validator'
 
 module AppliancesHelper
   include BaseHelper
@@ -40,7 +35,7 @@ def validate_appliance_definition_file
     end
 
     begin
-      appliance_configs, appliance_config = BoxGrinder::ApplianceHelper.new( :log => logger ).read_definitions( definition_file.path, definition_file.content_type )
+      appliance_configs, appliance_config = BoxGrinder::ApplianceHelper.new( :log => logger ).read_definitions( definition_file.tempfile.path, definition_file.content_type )
       appliance_config_helper = BoxGrinder::ApplianceConfigHelper.new( appliance_configs )
 
       @appliance_config = appliance_config_helper.merge(appliance_config.clone)

diff --git a/app/models/rest-config.rb b/app/models/rest-config.rb
diff --git a/config/initializers/boxgrinder.rb b/config/initializers/boxgrinder.rb
@@ -1,41 +1,76 @@
-#require 'models/rest-config'
-#
-#log = ActiveRecord::Base.logger
-#
-#plugin_config_file = "#{Rails.root}/config/boxgrinder.yml"
-#
-#if File.exists?(plugin_config_file)
-#  plugin_config = YAML.load_file(plugin_config_file)
-#  return if plugin_config.nil?
-#
-#  log.info "Preparing BoxGrinder REST server..."
-#
-#  ['platform', 'delivery'].each do |type|
-#
-#    log.info "Registering #{type} plugins..."
-#
-#    plugin_config['plugins'][type].each do |plugins|
-#      plugins.each do |plugin|
-#        log.info "- #{plugin}"
-#        BoxGrinder::RESTConfig.instance.register_plugin(plugin.to_s.downcase, type.to_sym)
-#      end
-#    end unless plugin_config['plugins'][type].nil?
-#  end unless plugin_config['plugins'].nil?
-#
-#  plugin_config['operating_systems'].each do |name, versions|
-#
-#    log.info "Registering operating system plugin for #{name} #{versions.join(', ')}..."
-#
-#    versions.each do |version|
-#      BoxGrinder::RESTConfig.instance.register_operating_system(name.downcase, version.to_s.downcase)
-#    end
-#  end unless plugin_config['operating_systems'].nil?
-#
-#  plugin_config['architectures'].each do |arch|
-#    log.info "Registering #{arch} architecture..."
-#    BoxGrinder::RESTConfig.instance.register_architecture(arch.downcase)
-#  end unless plugin_config['architectures'].nil?
-#
-#  log.info "BoxGrinder REST server prepared."
-#end
-#
+require 'singleton'
+
+module BoxGrinder
+  class RESTConfig
+    include Singleton
+
+    def initialize
+      @plugins            = {}
+      @operating_systems  = {}
+      @architectures      = []
+    end
+
+    def register_plugin(name, type)
+      @plugins[type] = [] if @plugins[type].nil?
+
+      begin
+        @plugins[type] << name
+      rescue
+        raise "Not supported plugin type: #{type}"
+      end
+    end
+
+    def register_operating_system(name, version)
+      @operating_systems[name] = [] if @operating_systems[name].nil?
+
+      @operating_systems[name] << version
+    end
+
+    def register_architecture(arch)
+      @architectures << arch
+    end
+
+    attr_reader :plugins
+    attr_reader :architectures
+    attr_reader :operating_systems
+  end
+end
+
+log = ActiveRecord::Base.logger
+
+plugin_config_file = "#{Rails.root}/config/boxgrinder.yml"
+
+if File.exists?(plugin_config_file)
+  plugin_config = YAML.load_file(plugin_config_file)
+  return if plugin_config.nil?
+
+  log.info "Preparing BoxGrinder REST server..."
+
+  ['platform', 'delivery'].each do |type|
+
+    log.info "Registering #{type} plugins..."
+
+    plugin_config['plugins'][type].each do |plugins|
+      plugins.each do |plugin|
+        log.info "- #{plugin}"
+        BoxGrinder::RESTConfig.instance.register_plugin(plugin.to_s.downcase, type.to_sym)
+      end
+    end unless plugin_config['plugins'][type].nil?
+  end unless plugin_config['plugins'].nil?
+
+  plugin_config['operating_systems'].each do |name, versions|
+
+    log.info "Registering operating system plugin for #{name} #{versions.join(', ')}..."
+
+    versions.each do |version|
+      BoxGrinder::RESTConfig.instance.register_operating_system(name.downcase, version.to_s.downcase)
+    end
+  end unless plugin_config['operating_systems'].nil?
+
+  plugin_config['architectures'].each do |arch|
+    log.info "Registering #{arch} architecture..."
+    BoxGrinder::RESTConfig.instance.register_architecture(arch.downcase)
+  end unless plugin_config['architectures'].nil?
+
+  log.info "BoxGrinder REST server prepared."
+end