foreman_docker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4806b85ddbb93562b7c2c718f5daa8bf5a84d48d
-  data.tar.gz: 531ccfeaf0fadf4c227d89d98e1f53635a3dd7d2
+  metadata.gz: 79d46d67b21374126131d7fc7550feb71bbabb2c
+  data.tar.gz: 1b8d4d788c2ba1c72ab8aa62641082aff4a7c8e1
 SHA512:
-  metadata.gz: 8601bd6d7fab40b502542717f707e4fbe60252140da0483c975e3b31749d3db3261a92176cfbe989a70ca12767d0c3551b3cd7dfd6c330d6163fa6432a51f209
-  data.tar.gz: 721dc7939ecb7d142471baa127e30b83530b216b8f56738c609bdee784ba7346043f81513e13cd92d1eaed4adb4e973ca703f9ebff9384b5e33c9164e4e312db
+  metadata.gz: 813096a864f743b67807f6065aa581d18a6c5182653dcb93c5e0d187378dcf62e91e92c1a377090cd32b76eac5df61faf5d0ffc2efa6f8ceb6840f49cacba30b
+  data.tar.gz: 7d1e069cdbc84cc05078274476f19ad69441f454f5d20775e155fb3cdfe4df1cd949f25c8db582bbaa00284e4ac8db01ce5dbf64f1d5e008dae7538c476b00fc

data/app/assets/javascripts/foreman_docker/image_step.js

@@ -18,7 +18,7 @@ $(document).ready(function() {
   });
 
   $('#hub_tab').click( function() {
-      $('#wizard_states_image_registry_id').val('');
+      $('#docker_container_wizard_states_image_registry_id').val('');
   });
 });
 
@@ -26,7 +26,7 @@ function autoCompleteRepo(item) {
   $.ajax({
     type:'get',
     url: $(item).attr('data-url'),
-    data: { search: item.val(), registry_id: $('#wizard_states_image_registry_id').val() },
+    data: { search: item.val(), registry_id: $('#docker_container_wizard_states_image_registry_id').val() },
     //data:'search=' + item.val(),
     success:function (result) {
       if(result == 'true'){
@@ -52,7 +52,7 @@ function setAutocompleteTags() {
   tag.addClass('tags-autocomplete-loading');
   tag.val('');
   var source = [];
-  $.getJSON( tag.data("url"), { search: $('#search').val(), registry_id: $('#wizard_states_image_registry_id').val() },
+  $.getJSON( tag.data("url"), { search: $('#search').val(), registry_id: $('#docker_container_wizard_states_image_registry_id').val() },
       function(data) {
         $('#searching_spinner').hide();
         tag.removeClass('tags-autocomplete-loading');
@@ -72,7 +72,7 @@ function searchRepo(item) {
     type:'get',
     dataType:'text',
     url: $(item).attr('data-url'),
-    data: { search: $('#search').val(), registry_id: $('#wizard_states_image_registry_id').val() },
+    data: { search: $('#search').val(), registry_id: $('#docker_container_wizard_states_image_registry_id').val() },
     success: function (result) {
       $('#repository_search_results').html(result);
     },

data/app/controllers/concerns/foreman_docker/find_container.rb

@@ -9,7 +9,7 @@ module ForemanDocker
         return
       end
       @container = Container.authorized("#{action_permission}_#{controller_name}".to_sym)
-                            .find(params[:id])
+                   .find(params[:id])
     end
 
     def allowed_resources

data/app/controllers/containers/steps_controller.rb

@@ -5,8 +5,9 @@ module Containers
 
     steps :preliminary, :image, :configuration, :environment
 
-    before_filter :build_state
-    before_filter :set_form
+    before_filter :find_state
+    before_filter :build_state, :only => [:update]
+    before_filter :set_form, :only => [:show]
 
     def show
       @container_resources = allowed_resources if step == :preliminary
@@ -23,25 +24,34 @@ module Containers
 
     private
 
-    def build_state
+    def find_state
       @state = DockerContainerWizardState.find(params[:wizard_state_id])
-      @state.send(:"build_#{step}", params[:"docker_container_wizard_states_#{step}"])
     rescue ActiveRecord::RecordNotFound
       not_found
     end
 
+    def build_state
+      s = @state.send(:"build_#{step}", params[:"docker_container_wizard_states_#{step}"])
+      instance_variable_set("@docker_container_wizard_states_#{step}", s)
+    end
+
     def set_form
-      instance_variable_set("@#{step}", @state.send(:"#{step}") || @state.send(:"build_#{step}"))
+      instance_variable_set(
+          "@docker_container_wizard_states_#{step}",
+          @state.send(:"#{step}") || @state.send(:"build_#{step}"))
     end
 
     def create_container
       @state.send(:"create_#{step}", params[:"docker_container_wizard_states_#{step}"])
-      container = Service::Containers.start_container!(@state)
+      container = (service = Service::Containers.new).start_container!(@state)
       if container.present?
         process_success(:object => container, :success_redirect => container_path(container))
       else
-        @environment = @state.environment
-        process_error(:object => @state.environment, :render => 'environment')
+        @docker_container_wizard_states_environment = @state.environment
+        process_error(
+            :error_msg => service.errors,
+            :object => @state.environment,
+            :render => 'environment')
       end
     end
   end

data/app/controllers/containers_controller.rb

@@ -42,10 +42,10 @@ class ContainersController < ::ApplicationController
 
     process_success :success_redirect => :back,
                     :success_msg      => _("%{container} commit was successful") %
-                                         { :container => @container }
+                      { :container => @container }
   rescue => e
     process_error :redirect => :back, :error_msg => _("Failed to commit %{container}: %{e}") %
-                                                    { :container => @container, :e => e }
+      { :container => @container, :e => e }
   end
 
   private
@@ -71,13 +71,13 @@ class ContainersController < ::ApplicationController
       @deleted_identifier = @container.name
 
       destroy_compute_resource_vm(@container.compute_resource, @container.uuid) &&
-      @container.destroy
+        @container.destroy
     end
   end
 
   def destroy_compute_resource_vm(resource_id, uuid)
     @container_resource = ComputeResource.authorized(:destroy_compute_resources_vms)
-                                         .find(resource_id)
+                          .find(resource_id)
     @container_resource.destroy_vm(uuid)
   rescue => error
     logger.error "#{error.message} (#{error.class})\n#{error.backtrace.join("\n")}"

data/app/controllers/registries_controller.rb

@@ -4,7 +4,7 @@ class RegistriesController < ::ApplicationController
 
   def index
     @registries = DockerRegistry.search_for(params[:search], :order => params[:order])
-      .paginate :page => params[:page]
+                  .paginate :page => params[:page]
   end
 
   def new

data/app/helpers/container_steps_helper.rb

@@ -8,9 +8,9 @@ module ContainerStepsHelper
 
   def select_registry(f)
     registries = DockerRegistry.with_taxonomy_scope_override(@location, @organization)
-      .authorized(:view_registries)
+                 .authorized(:view_registries)
     field(f, 'docker_container_wizard_states_image[registry_id]', :label => _("Registry")) do
-      collection_select :wizard_states_image, :registry_id,
+      collection_select :docker_container_wizard_states_image, :registry_id,
                         registries,
                         :id, :name,
                         { :prompt => _("Select a registry") },

data/app/helpers/containers_helper.rb

@@ -10,7 +10,7 @@ module ContainersHelper
   def uuids_in_resource(resource)
     @uuids_in_resource ||= {}
     @uuids_in_resource[resource.id] ||= Container.where(:compute_resource_id => resource.id)
-                                                 .pluck(:uuid)
+                                        .pluck(:uuid)
   end
 
   def link_to_container(container, resource)
@@ -63,4 +63,11 @@ module ContainersHelper
       "https://registry.hub.docker.com/u/#{image['name']}"
     end
   end
+
+  # Compatibility fixes - to be removed once 1.7 compatibility is no longer required
+  if SETTINGS[:version].to_s.to_f <= 1.7
+    def trunc_with_tooltip(text, length = 32)
+      trunc(text, length)
+    end
+  end
 end

data/app/models/docker_container_wizard_state.rb

@@ -1,12 +1,12 @@
 class DockerContainerWizardState < ActiveRecord::Base
   has_one :preliminary, :class_name => DockerContainerWizardStates::Preliminary,
-          :dependent => :destroy, :validate => true, :autosave => true
+                        :dependent => :destroy, :validate => true, :autosave => true
   has_one :image, :class_name => DockerContainerWizardStates::Image,
-          :dependent => :destroy, :validate => true, :autosave => true
+                  :dependent => :destroy, :validate => true, :autosave => true
   has_one :configuration, :class_name => DockerContainerWizardStates::Configuration,
-          :dependent => :destroy, :validate => true, :autosave => true
+                          :dependent => :destroy, :validate => true, :autosave => true
   has_one :environment, :class_name => DockerContainerWizardStates::Environment,
-          :dependent => :destroy, :validate => true, :autosave => true
+                        :dependent => :destroy, :validate => true, :autosave => true
 
   delegate :compute_resource_id,   :to => :preliminary
   delegate :environment_variables, :to => :environment

data/app/models/docker_container_wizard_states/configuration.rb

@@ -3,5 +3,8 @@ module DockerContainerWizardStates
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id
+
+    validates :name, :presence => true
+    validates :command, :presence => true
   end
 end

data/app/models/docker_container_wizard_states/environment.rb

@@ -7,9 +7,10 @@ module DockerContainerWizardStates
     # that forces validation of reference_id. This will fail on new records as
     # validations are executed before parent and children records have been persisted.
     has_many :environment_variables, :dependent  => :destroy, :foreign_key => :reference_id,
-             :inverse_of => :environment,
-             :class_name => 'DockerContainerWizardStates::EnvironmentVariable',
-             :validate => false
+                                     :inverse_of => :environment,
+                                     :class_name =>
+                                       'DockerContainerWizardStates::EnvironmentVariable',
+                                     :validate => false
     include ::ParameterValidators
 
     accepts_nested_attributes_for :environment_variables, :allow_destroy => true

data/app/models/docker_container_wizard_states/environment_variable.rb

@@ -1,7 +1,7 @@
 module DockerContainerWizardStates
   class EnvironmentVariable < Parameter
     belongs_to :environment, :foreign_key => :reference_id, :inverse_of => :environment_variables,
-               :class_name => 'DockerContainerWizardStates::Environment'
+                             :class_name => 'DockerContainerWizardStates::Environment'
     validates :name, :uniqueness => { :scope => :reference_id }
   end
 end

data/app/models/docker_container_wizard_states/preliminary.rb

@@ -7,5 +7,17 @@ module DockerContainerWizardStates
                               :foreign_key => :docker_container_wizard_state_id
 
     validates :compute_resource_id, :presence => true
+
+    def used_location_ids
+      Location.joins(:taxable_taxonomies).where(
+          'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
+          'taxable_taxonomies.taxable_id' => id).pluck(:id)
+    end
+
+    def used_organization_ids
+      Organization.joins(:taxable_taxonomies).where(
+          'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
+          'taxable_taxonomies.taxable_id' => id).pluck(:id)
+    end
   end
 end

data/app/models/foreman_docker/docker.rb

@@ -24,6 +24,10 @@ module ForemanDocker
       16 * 1024 * 1024 * 1024
     end
 
+    def max_cpu_count
+      ::Docker.info['NCPU'] || 1
+    end
+
     def available_images
       client.images.all
     end
@@ -71,16 +75,21 @@ module ForemanDocker
     def create_container(args = {})
       options = vm_instance_defaults.merge(args)
       logger.debug("Creating container with the following options: #{options.inspect}")
-      ::Docker::Container.create(options)
-    rescue Excon::Errors::Error, ::Docker::Error::DockerError => e
-      logger.debug "Fog error: #{e.message}\n " + e.backtrace.join("\n ")
-      errors.add(:base, _("Error creating container. Check the Foreman logs: %s") % e.message.to_s)
-      false
+      docker_command do
+        ::Docker::Container.create(options)
+      end
+    end
+
+    def create_image(args = {})
+      logger.debug("Creating docker image with the following options: #{args.inspect}")
+      docker_command do
+        ::Docker::Image.create(args)
+      end
     end
 
     def vm_instance_defaults
       ActiveSupport::HashWithIndifferentAccess.new('name' => "foreman_#{Time.now.to_i}",
-                                                   'cmd' => ['/bin/bash'])
+                                                   'Cmd' => ['/bin/bash'])
     end
 
     def console(uuid)
@@ -104,6 +113,16 @@ module ForemanDocker
 
     protected
 
+    def docker_command
+      yield
+    rescue Excon::Errors::Error, ::Docker::Error::DockerError => e
+      logger.debug "Fog error: #{e.message}\n " + e.backtrace.join("\n ")
+      errors.add(:base,
+                 _("Error creating communicating with Docker. Check the Foreman logs: %s") %
+                 e.message.to_s)
+      false
+    end
+
     def bootstrap(args)
       client.servers.bootstrap vm_instance_defaults.merge(args.to_hash)
     rescue Fog::Errors::Error => e

data/app/models/foreman_docker/taxonomy_extensions.rb

@@ -0,0 +1,14 @@
+module ForemanDocker
+  module TaxonomyExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      if SETTINGS[:version].to_s.to_f <= 1.7
+        def self.enabled_taxonomies
+          %w(locations organizations).select { |taxonomy| SETTINGS["#{taxonomy}_enabled".to_sym] }
+        end
+      end
+    end
+  end
+end
+# To be removed after 1.7 compatibility is no longer required

data/app/models/service/containers.rb

@@ -1,11 +1,15 @@
 module Service
   class Containers
-    def self.start_container!(wizard_state)
+    def errors
+      @errors ||= []
+    end
+
+    def start_container!(wizard_state)
       ActiveRecord::Base.transaction do
         container = Container.new(wizard_state.container_attributes) do |r|
           # eagerly load environment variables
           state = DockerContainerWizardState.includes(:environment => [:environment_variables])
-            .find(wizard_state.id)
+                  .find(wizard_state.id)
           state.environment_variables.each do |environment_variable|
             r.environment_variables.build :name     => environment_variable.name,
                                           :value    => environment_variable.value,
@@ -16,7 +20,7 @@ module Service
           container.send(:"#{taxonomy}=", wizard_state.preliminary.send(:"#{taxonomy}"))
         end
 
-        fail ActiveRecord::Rollback unless start_container(container)
+        fail ActiveRecord::Rollback unless pull_image(container) && start_container(container)
 
         container.save!
         destroy_wizard_state(wizard_state)
@@ -24,13 +28,21 @@ module Service
       end
     end
 
-    def self.start_container(container)
+    def pull_image(container)
+      container.compute_resource.create_image(:fromImage => container.repository_pull_url)
+    end
+
+    def start_container(container)
       started = container.compute_resource.create_container(container.parametrize)
-      container.uuid = started.id if started
+      if started
+        container.uuid = started.id
+      else
+        errors << container.compute_resource.errors[:base]
+      end
       started
     end
 
-    def self.destroy_wizard_state(wizard_state)
+    def destroy_wizard_state(wizard_state)
       wizard_state.destroy
       DockerContainerWizardState.destroy_all(["updated_at < ?", (Time.now - 24.hours)])
     end

data/app/views/containers/_list.html.erb

@@ -18,8 +18,8 @@
       <td class="ellipsis text-center"><%= link_to_container(container, resource) %></td>
       <td class="hidden-tablet hidden-xs text-center">
         <span <%= vm_power_class(container.ready?) %>><%= vm_state(container) %></span></td>
-      <td class="hidden-tablet hidden-xs text-center"><%= trunc(container.image_friendly_name) %></td>
-      <td class="hidden-tablet hidden-xs text-center"><%= trunc(container.command) %></td>
+      <td class="hidden-tablet hidden-xs text-center"><%= trunc_with_tooltip(container.image_friendly_name) %></td>
+      <td class="hidden-tablet hidden-xs text-center"><%= trunc_with_tooltip(container.command) %></td>
       <td class="hidden-tablet hidden-xs text-center">
         <span class="glyphicon glyphicon-time"></span> <%= container.ready? ? time_ago_in_words(container.started_at) : "N/A" %>
       </td>

data/app/views/containers/show.html.erb

@@ -29,7 +29,7 @@
             </tr>
             <tr>
               <td><%= _('UUID') %></td>
-              <td><%= trunc @container.in_fog.identity %></td>
+              <td><%= trunc_with_tooltip @container.in_fog.identity %></td>
             </tr>
             <tr>
               <td><%= _('Memory') %></td>

data/app/views/containers/steps/configuration.html.erb

@@ -1,5 +1,5 @@
 <%= render :layout => 'title', :locals => { :step => 3 } do %>
-  <%= form_for @configuration, :url => wizard_path, :method => :put do |f| %>
+  <%= form_for @docker_container_wizard_states_configuration, :url => wizard_path, :method => :put do |f| %>
     <h3><%= _("Basic options") %></h3>
     <%= text_f f, :name,       :size => 'col-md-4' %>
     <%= text_f f, :command,    :size => 'col-md-4' %>

data/app/views/containers/steps/environment.html.erb

@@ -1,5 +1,5 @@
 <%= render :layout => 'title', :locals => { :step => 4 } do %>
-  <%= form_for @environment, :url => wizard_path, :method => :put do |f| %>
+  <%= form_for @docker_container_wizard_states_environment, :url => wizard_path, :method => :put do |f| %>
     <div class='row'>
       <div class='col-md-6 col-md-push-7'>
         <h3><%= _("Shell") %></h3>
@@ -10,7 +10,7 @@
       </div>
       <div class='col-md-6 col-md-pull-6'>
         <h3><%= _("Environment variables") %></h3>
-        <%= f.fields_for :environment_variables, @environment.environment_variables do |builder| %>
+        <%= f.fields_for :environment_variables, @docker_container_wizard_states_environment.environment_variables do |builder| %>
           <%= render 'foreman_docker/common_parameters/environment_variable', :f => builder %>
         <% end %>
         <%= link_to_add_fields(_("Add environment variable"), f, :environment_variables,

data/app/views/containers/steps/image.html.erb

@@ -3,21 +3,27 @@
 
 <%= render :layout => 'title', :locals => { :step => 2 } do %>
     <ul class="nav nav-tabs" data-tabs="tabs">
-      <li class="active"><a href="#hub" data-toggle="tab" id="hub_tab">
+      <li class=<%= ("active" if @docker_container_wizard_states_image.registry_id.nil?) %>><a href="#hub" data-toggle="tab" id="hub_tab">
         <span class="glyphicon glyphicon-cloud-download"></span>
         <%= _("Docker hub") %>
       </a></li>
-      <li><a href="#registry" data-toggle="tab" id="registry_tab">
+      <li class=<%= ("active" unless @docker_container_wizard_states_image.registry_id.nil?) %>><a href="#registry" data-toggle="tab" id="registry_tab">
         <span class="glyphicon glyphicon-cloud-download"></span>
         <%= _("External registry") %>
       </a></li>
     </ul>
 
-    <%= form_for @image, :class => 'form-horizontal', :url => wizard_path, :method => :put do |f| %>
+    <%= form_for @docker_container_wizard_states_image, :class => 'form-horizontal', :url => wizard_path, :method => :put do |f| %>
         <div class="tab-content">
-          <div class="tab-pane active" id="hub">
-          </div>
-          <div class="tab-pane" id="registry">
+          <% if @docker_container_wizard_states_image.registry_id.nil? %>
+              <div class="tab-pane active" id="hub">
+              </div>
+              <div class="tab-pane" id="registry">
+          <% else %>
+              <div class="tab-pane" id="hub">
+              </div>
+              <div class="tab-pane active" id="registry">
+          <% end %>
             <div class="input-group col-md-6">
               <%= select_registry f %>
             </div>
@@ -28,7 +34,7 @@
               <div class="input-group">
 
                 <%= auto_complete_docker_search('docker_container_wizard_states_image[repository_name]', '',
-                                         :'data-url'  => auto_complete_repository_name_image_search_path(@image.compute_resource_id),
+                                         :'data-url'  => auto_complete_repository_name_image_search_path(@docker_container_wizard_states_image.compute_resource_id),
                                          :value       => f.object.repository_name.present? ? f.object.repository_name : '',
                                          :id          => :search,
                                          :focus_on_load => true,
@@ -38,7 +44,7 @@
                   <%= button_tag(:class      => 'btn btn-default',
                                  :type       => 'button',
                                  :id         => 'search_repository',
-                                 :'data-url' => search_repository_image_search_path(@image.compute_resource_id),
+                                 :'data-url' => search_repository_image_search_path(@docker_container_wizard_states_image.compute_resource_id),
                                  :onclick    => 'searchRepo(this)') do %>
                     <span class="glyphicon glyphicon-search"></span>
                   <% end %>
@@ -47,7 +53,7 @@
             </div>
             <%= text_f f, :tag,
                           :id         => 'tag',
-                          :'data-url' => auto_complete_image_tag_image_search_path(@image.compute_resource_id) %>
+                          :'data-url' => auto_complete_image_tag_image_search_path(@docker_container_wizard_states_image.compute_resource_id) %>
             <div class="col-md-12">
               <div id='searching_spinner' class='col-md-offset-3 hide'>
                 <span id='waiting_text'>

data/app/views/containers/steps/preliminary.html.erb

@@ -1,5 +1,5 @@
 <%= render :layout => 'title', :locals => { :step => 1 } do %>
-<%= form_for @preliminary, :url => wizard_path, :method => :put do |f| %>
+<%= form_for @docker_container_wizard_states_preliminary, :url => wizard_path, :method => :put do |f| %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab">
       <span class="glyphicon glyphicon-tasks"></span>
@@ -26,7 +26,7 @@
         </div>
       <% end %>
     </div>
-    <%= render "taxonomies/loc_org_tabs", :f => f, :obj => @preliminary %>
+    <%= render "taxonomies/loc_org_tabs", :f => f, :obj => @docker_container_wizard_states_preliminary %>
   </div>
   <% if @container_resources.present? %>
     <%= render :partial => 'form_buttons' %>

data/app/views/image_search/_repository_search_results.html.erb

@@ -6,7 +6,7 @@
       <span class="glyphicon glyphicon-star"></span> <%= repository['star_count'] %>
     </p>
     <p>
-      <%= trunc(repository['description']) %>
+      <%= trunc_with_tooltip(repository['description']) %>
       <%= link_to '<span class="glyphicon glyphicon-share"></span>'.html_safe, hub_url(repository), :target => '_blank' %>
     </p>
 <% end %>

data/app/views/registries/index.html.erb

@@ -17,9 +17,9 @@
 
   <% @registries.each do |r| %>
       <tr>
-        <td><%= link_to_if_authorized trunc(r.name), hash_for_edit_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer) %></td>
-        <td class="hidden-tablet hidden-xs text-center"><%= trunc(r.url) %></td>
-        <td class="hidden-tablet hidden-xs text-center"><%= trunc(r.description) %></td>
+        <td><%= link_to_if_authorized trunc_with_tooltip(r.name), hash_for_edit_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer) %></td>
+        <td class="hidden-tablet hidden-xs text-center"><%= trunc_with_tooltip(r.url) %></td>
+        <td class="hidden-tablet hidden-xs text-center"><%= trunc_with_tooltip(r.description) %></td>
         <td><%= display_delete_if_authorized hash_for_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer), :confirm => _("Delete %s?") % r.name %></td>
       </tr>
   <% end %>

data/lib/foreman_docker/engine.rb

@@ -77,19 +77,22 @@ module ForemanDocker
                                        :search_repository]
         end
       end
-
     end
 
     rake_tasks do
       load "#{ForemanDocker::Engine.root}/lib/foreman_docker/tasks/test.rake"
     end
-  end
 
-  # extend fog docker server and image models.
-  require 'fog/fogdocker/models/compute/server'
-  require 'fog/fogdocker/models/compute/image'
-  require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/server', __FILE__)
-  require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/image', __FILE__)
-  Fog::Compute::Fogdocker::Server.send(:include, ::FogExtensions::Fogdocker::Server)
-  Fog::Compute::Fogdocker::Image.send(:include, ::FogExtensions::Fogdocker::Image)
+    require 'fog/fogdocker/models/compute/server'
+    require 'fog/fogdocker/models/compute/image'
+    require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/server',
+                             __FILE__)
+    require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/image',
+                             __FILE__)
+    config.to_prepare do
+      Fog::Compute::Fogdocker::Server.send(:include, ::FogExtensions::Fogdocker::Server)
+      Fog::Compute::Fogdocker::Image.send(:include, ::FogExtensions::Fogdocker::Image)
+      ::Taxonomy.send(:include, ForemanDocker::TaxonomyExtensions)
+    end
+  end
 end

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/functionals/containers_steps_controller_test.rb

@@ -8,7 +8,8 @@ module Containers
 
     test 'wizard finishes with a redirect to the managed container' do
       state = DockerContainerWizardState.create!
-      Service::Containers.expects(:start_container!).with(equals(state)).returns(@container)
+      Service::Containers.any_instance.expects(:start_container!).with(equals(state))
+        .returns(@container)
       put :update, { :wizard_state_id => state.id,
                      :id => :environment,
                      :docker_container_wizard_states_environment => { :tty => false } },

data/test/units/containers_service_test.rb

@@ -7,15 +7,19 @@ class ContainersServiceTest <  ActiveSupport::TestCase
                           :locations           => [taxonomies(:location1)],
                           :organizations       => [taxonomies(:organization1)])
       s.build_image(:repository_name => 'test', :tag => 'test')
-      s.build_configuration(:name => 'test')
+      s.build_configuration(:name => 'test', :command => '/bin/bash')
       s.build_environment(:tty => false)
     end
   end
 
   test 'removes current state after successful container creation' do
+    ret = OpenStruct.new(:id => 1)
+    ForemanDocker::Docker.any_instance.expects(:create_image).returns(ret).with do |subject|
+      subject.must_equal(:fromImage => "test:test")
+    end
     ForemanDocker::Docker.any_instance.expects(:create_container)
-                                      .returns(OpenStruct.new(:uuid => 1))
-    Service::Containers.start_container!(@state)
+      .returns(OpenStruct.new(:uuid => 1))
+    Service::Containers.new.start_container!(@state)
     assert_equal DockerContainerWizardState.where(:id => @state.id).count, 0
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
 description: Provision and manage Docker containers and images from Foreman.
 email:
 - dlobatog@redhat.com, abenari@redhat.com
@@ -85,6 +71,7 @@ files:
 - app/models/docker_registry.rb
 - app/models/environment_variable.rb
 - app/models/foreman_docker/docker.rb
+- app/models/foreman_docker/taxonomy_extensions.rb
 - app/models/service/containers.rb
 - app/models/service/registry_api.rb
 - app/views/api/v1/compute_resources/docker.json