RubyGems - foreman_docker - Versions diffs - 2.0.0 → 2.0.1 - Mend

foreman_docker 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3ac12c5dafea1291f34a213907a4ccf7393f88
-  data.tar.gz: b90f1bece1343dab61b41b40d2f96e48aea61ccc
+  metadata.gz: 12e42c771f843e87d2ee36bec11487a4c3336c90
+  data.tar.gz: a81664dbe8b7001f0a7fe7d90fe6ae4acbf5de58
 SHA512:
-  metadata.gz: 77e84e4899f3fff9d53e71d0c11b20fde50b824abfdd7691a5ffc44dd6c85f7798c808cf2675bfe434de5adc6a13438c4679e334a4742deb26bb9a4a402f3b38
-  data.tar.gz: 98f5a41476938823d8a3fd24f8aea148dfb96de47b471d27cbca2dfd7c36c9f5b696c88bb0a67ef23fdb5ec1030d7454a5ebe0a9aec7be3a044009d0c15d807a
+  metadata.gz: a1db2612e76589521267a1ba5ef5a01aaa8b9f865b1d3b5049ae5e13acdfc48f4dad97b5179f9d2d403202098123edb522bfcb71dd496ac665d6178736be0bd9
+  data.tar.gz: 07339351f2555cf31cf7f44d1c28fa14a200ed327da0e41d715228f30bf2fdddfdba7af37551252cb502ae0ad08e164a34ed864dc33c56277fa7ee4189ed3da1

data/app/assets/stylesheets/foreman_docker/autocomplete.css.scss CHANGED

@@ -1,3 +1,3 @@
 .tags-autocomplete-loading {
-  background: white url('/assets/spinner.gif') right center no-repeat;
+  background: white url('spinner.gif') right center no-repeat;
 }

data/app/models/docker_container_wizard_states/configuration.rb CHANGED

@@ -5,5 +5,7 @@ module DockerContainerWizardStates
                               :foreign_key => :docker_container_wizard_state_id
     validates :command, :presence => true
+    attr_accessible :name, :command, :entrypoint, :cpu_set, :cpu_shares, :memory, :wizard_state
   end
 end

data/app/models/docker_container_wizard_states/environment.rb CHANGED

@@ -4,7 +4,9 @@ module DockerContainerWizardStates
     belongs_to :wizard_state, :class_name => DockerContainerWizardState
     attr_accessible :tty, :docker_container_wizard_state_id,
-                    :attach_stdin, :attach_stdout, :attach_stderr
+                    :attach_stdin, :attach_stdout, :attach_stderr,
+                    :exposed_ports_attributes, :environment_variables_attributes,
+                    :dns_attributes
     # Fix me:
     # Validations are off on this association as there's a bug in ::Parameter
     # that forces validation of reference_id. This will fail on new records as

data/app/models/docker_container_wizard_states/image.rb CHANGED

@@ -7,5 +7,7 @@ module DockerContainerWizardStates
     validates :tag,             :presence => true
     validates :repository_name, :presence => true
+    attr_accessible :repository_name, :tag, :wizard_state, :registry_id, :capsule_id, :katello
   end
 end

data/app/models/environment_variable.rb CHANGED

@@ -2,4 +2,5 @@ class EnvironmentVariable < Parameter
   belongs_to :container, :foreign_key => :reference_id, :inverse_of => :environment_variables
   audited :except => [:priority], :associated_with => :container, :allow_mass_assignment => true
   validates :name, :uniqueness => { :scope => :reference_id }
+  attr_accessible :priority
 end

data/app/views/compute_resources/form/_docker.html.erb CHANGED

@@ -8,4 +8,4 @@
                     :class => "btn + #{authenticated ? "btn-success" : "btn-default"}",
                     :'data-url' => test_connection_compute_resources_path %>
-<%= image_tag('/assets/spinner.gif', :id => 'test_connection_indicator', :class => 'hide') %>
+<%= spinner('', :id => 'test_connection_indicator', :class => 'hide') %>

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

@@ -8,7 +8,7 @@
     <th class="hidden-tablet hidden-xs text-center"><%= _("Uptime") %></th>
     <th class="hidden-tablet hidden-xs text-center"><%= _("Running on") %></th>
     <th class="hidden-tablet hidden-xs text-center"><%= _("Managed") %></th>
-    <th></th>
+    <th class="col-md-1 text-center"><%= _('Action') %></th>
   </tr>
   </thead>
@@ -26,12 +26,15 @@
       <td class="hidden-tablet hidden-xs text-center"><%= link_to resource, compute_resource_path(resource) %> </td>
       <td class="hidden-tablet hidden-xs text-center"><%= managed?(container, resource) ? _('Yes') : _('No') %></td>
       <% @compute_resource = resource %>
-      <td><%= action_buttons(container_power_action(container),
-                             display_delete_if_authorized(hash_for_container_path(:compute_resource_id => resource,
-                                                          :id => container.id).
-                                                          merge(:auth_object => resource, :auth_action => 'destroy',
-                                                          :authorizer => authorizer),
-                                                          :confirm => _("Delete %s?") % container.name)) %></td>
+      <td class="text-center">
+        <%= action_buttons(container_power_action(container),
+                           display_delete_if_authorized(hash_for_container_path(
+                             :compute_resource_id => resource,
+                             :id => container.id).
+                             merge(:auth_object => resource, :auth_action => 'destroy',
+                                   :authorizer => authorizer),
+                                   :confirm => _("Delete %s?") % container.name)) %>
+      </td>
     </tr>
   <% end %>
   </tbody>

data/app/views/containers/index.html.erb CHANGED

@@ -10,7 +10,7 @@
     <% if i == 0 %>
       <li class="active"><a href="#<%= "primary" %>" data-toggle="tab"><%= _("#{resource.name}") %></a></li>
     <% else %>
-      <li><a href="#<%= resource.name %>" data-toggle="tab"><%= _("#{resource.name}") %></a></li>
+      <li><a href="#<%= resource.id %>" data-toggle="tab"><%= _("#{resource.name}") %></a></li>
     <% end %>
   <% end %>
 </ul>
@@ -20,7 +20,7 @@
     <% if i == 0 %>
       <div class="tab-pane active" id="primary">
     <% else %>
-      <div class="tab-pane" id="<%= resource.name %>">
+      <div class="tab-pane" id="<%= resource.id %>">
     <% end %>
     <% if resource.test_connection %>
       <%= render 'list', :containers => resource.vms,

data/app/views/containers/steps/_image_hub_tab.html.erb CHANGED

@@ -43,11 +43,11 @@
       <div data-search-spinner=true class='col-md-offset-3 hide'>
         <span data-wait-text=true>
         </span>
-        <%= image_tag('/assets/spinner.gif', :id => "loading_repositories_indicator_#{registry}") %>
+        <%= spinner('', :id => "loading_repositories_indicator_#{registry}") %>
       </div>
       <div data-repository-search-results=true >
       </div>
     </div>
     <%= render :partial => 'form_buttons', locals: { :registry => registry} %>
   </div>
-<% end -%>
+<% end -%>

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

@@ -10,33 +10,21 @@
       </div>
       <div class='col-md-6 col-md-pull-6'>
         <h3><%= _("Environment variables") %></h3>
-        <%= 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,
-                               'foreman_docker/common_parameters/environment_variable') %>
+        <%= render 'foreman_docker/common_parameters/environment_variables', :f => f %>
         <h3><%= _("Exposed Ports") %></h3>
-        <%= f.fields_for :exposed_ports, @docker_container_wizard_states_environment.exposed_ports do |builder| %>
-          <%= render 'foreman_docker/common_parameters/exposed_ports', :f => builder %>
-        <% end %>
-        <%= link_to_add_fields(_("Add Exposed Port"), f, :exposed_ports,
-                               'foreman_docker/common_parameters/exposed_ports') %>
+        <%= render 'foreman_docker/common_parameters/exposed_ports', :f => f %>
         <h3><%= _("DNS") %></h3>
-        <%= f.fields_for :dns, @docker_container_wizard_states_environment.dns do |builder| %>
-          <%= render 'foreman_docker/common_parameters/dns', :f => builder %>
-        <% end %>
-        <%= link_to_add_fields(_("Add DNS"), f, :dns,
-                               'foreman_docker/common_parameters/dns') %>
+        <%= render 'foreman_docker/common_parameters/dns', :f => f %>
       </div>
     </div>
     <div class="row">
       <div class="form-group col-md-6">
-        <label class="col-md-2"><%= _('Run ?') %></label>
-	<div class="col-md-4">
-	  <%= check_box_tag(:start_on_create) %>
-	  <%= content_tag(:span, _('If selected, the container will start after it is created'), :class => "help-block").html_safe %>
-	</div>
+        <label class="col-md-2"><%= _('Run?') %>
+          <%= popover('', _('If selected, the container will start after it is created')) %>
+        </label>
+      <div class="col-md-4">
+        <%= check_box_tag(:start_on_create) %>
+      </div>
       </div>
     </div>
    <%= render :partial => 'form_buttons' %>

data/app/views/foreman_docker/common_parameters/_dns.erb CHANGED

@@ -1,16 +1,8 @@
-<div class='fields'>
-  <table class="table table-bordered table-hover table-striped">
-    <tr class="form-group <%= 'has-error' if f.object.errors.any? %>">
-      <td><%= f.text_field(:name,  :class => "form-control",
-                                   :placeholder => _("DNS e.g: 8.8.8.8")) %></td>
-      <td style='vertical-align: middle' class='text-center'>
-        <span class="help-block">
-          <%= link_to_remove_fields('', f) %>
-        </span>
-      </td>
-      <span class="help-block">
-        <%= f.object.errors.full_messages.to_sentence %>
-      </span>
-    </tr>
-  </table>
-</div>
+<table class="table table-bordered table-hover table-striped" id="dns_table">
+  <tbody>
+    <%= f.fields_for :dns, @docker_container_wizard_states_environment.dns do |builder| %>
+      <%= render 'foreman_docker/common_parameters/dns_entry', :f => builder %>
+    <% end %>
+  </tbody>
+</table>
+<%= link_to_add_fields(_("Add DNS"), f, :dns, 'foreman_docker/common_parameters/dns_entry', :target => '#dns_table tbody') %>

data/app/views/foreman_docker/common_parameters/_dns_entry.html.erb ADDED

@@ -0,0 +1,12 @@
+<tr class="fields form-group <%= 'has-error' if f.object.errors.any? %>">
+  <td><%= f.text_field(:name,  :class => "form-control",
+                       :placeholder => _("DNS e.g: 8.8.8.8")) %></td>
+  <td style='vertical-align: middle' class='text-center'>
+    <span class="help-block">
+      <%= link_to_remove_fields('', f) %>
+    </span>
+  </td>
+  <span class="help-block">
+    <%= f.object.errors.full_messages.to_sentence %>
+  </span>
+</tr>

data/app/views/foreman_docker/common_parameters/_environment_variable.html.erb CHANGED

@@ -1,18 +1,14 @@
-<div class='fields'>
-  <table class="table table-bordered table-hover table-striped">
-    <tr class="form-group <%= 'error' if f.object.errors.any? %>">
-      <td><%= f.text_field(:name,  :class => "form-control",
-                                   :placeholder => _("Name, e.g: PING_HOST")) %></td>
-      <td><%= f.text_field(:value, :class => "form-control",
-                                   :placeholder => _("Value, e.g: theforeman.org")) %></td>
-      <td style='vertical-align: middle' class='text-center'>
-        <span class="help-block">
-          <%= link_to_remove_fields('', f) %>
-        </span>
-      </td>
-      <span class="help-block">
-        <%= f.object.errors.full_messages.to_sentence %>
-      </span>
-    </tr>
-  </table>
-</div>
+<tr class="fields form-group <%= 'error' if f.object.errors.any? %>">
+  <td><%= f.text_field(:name, :class => "form-control",
+                       :placeholder  => _("Name, e.g: PING_HOST")) %></td>
+  <td><%= f.text_field(:value, :class => "form-control",
+                       :placeholder   => _("Value, e.g: theforeman.org")) %></td>
+  <td style='vertical-align: middle' class='text-center'>
+    <span class="help-block">
+      <%= link_to_remove_fields('', f) %>
+    </span>
+  </td>
+  <span class="help-block">
+    <%= f.object.errors.full_messages.to_sentence %>
+  </span>
+</tr>

data/app/views/foreman_docker/common_parameters/_environment_variables.html.erb ADDED

@@ -0,0 +1,10 @@
+<table class="table table-bordered table-hover table-striped" id="environment_variable_table">
+  <tbody>
+    <%= f.fields_for :environment_variables, @docker_container_wizard_states_environment.environment_variables do |builder| %>
+      <%= render 'foreman_docker/common_parameters/environment_variable', :f => builder %>
+    <% end %>
+  </tbody>
+</table>
+<%= link_to_add_fields(_("Add environment variable"), f, :environment_variables,
+                       'foreman_docker/common_parameters/environment_variable',
+                       :target => '#environment_variable_table tbody') %>

data/app/views/foreman_docker/common_parameters/_exposed_port.html.erb ADDED

@@ -0,0 +1,13 @@
+<tr class="fields form-group <%= 'has-error' if f.object.errors.any? %>">
+  <td><%= f.text_field(:name,  :class => "form-control",
+                       :placeholder => _("Port Number e.g: 22")) %></td>
+  <td><%= f.select :value, [['TCP','tcp'],['UDP','udp']]  %></td>
+  <td style='vertical-align: middle' class='text-center'>
+    <span class="help-block">
+      <%= link_to_remove_fields('', f) %>
+    </span>
+  </td>
+  <span class="help-block">
+    <%= f.object.errors.full_messages.to_sentence %>
+  </span>
+</tr>

data/app/views/foreman_docker/common_parameters/_exposed_ports.erb CHANGED

@@ -1,17 +1,10 @@
-<div class='fields'>
-  <table class="table table-bordered table-hover table-striped">
-    <tr class="form-group <%= 'has-error' if f.object.errors.any? %>">
-      <td><%= f.text_field(:name,  :class => "form-control",
-                                   :placeholder => _("Port Number e.g: 22")) %></td>
-      <td><%= f.select :value, [['TCP','tcp'],['UDP','udp']]  %></td>
-      <td style='vertical-align: middle' class='text-center'>
-        <span class="help-block">
-          <%= link_to_remove_fields('', f) %>
-        </span>
-      </td>
-      <span class="help-block">
-        <%= f.object.errors.full_messages.to_sentence %>
-      </span>
-    </tr>
-  </table>
-</div>
+<table class="table table-bordered table-hover table-striped"  id="exposed_ports_table">
+  <tbody>
+    <%= f.fields_for :exposed_ports, @docker_container_wizard_states_environment.exposed_ports do |builder| %>
+      <%= render 'foreman_docker/common_parameters/exposed_port', :f => builder %>
+    <% end %>
+  </tbody>
+</table>
+<%= link_to_add_fields(_("Add Exposed Port"), f, :exposed_ports,
+                       'foreman_docker/common_parameters/exposed_port',
+                       :target => '#exposed_ports_table tbody') %>

data/lib/foreman_docker/engine.rb CHANGED

@@ -39,7 +39,7 @@ module ForemanDocker
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
-    initializer 'foreman_docker.register_plugin', :after => :finisher_hook do
+    initializer 'foreman_docker.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_docker do
         requires_foreman '>= 1.11'
         compute_resource ForemanDocker::Docker

data/lib/foreman_docker/version.rb CHANGED

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -109,7 +109,10 @@ files:
 - app/views/containers/steps/image.html.erb
 - app/views/containers/steps/preliminary.html.erb
 - app/views/foreman_docker/common_parameters/_dns.erb
+- app/views/foreman_docker/common_parameters/_dns_entry.html.erb
 - app/views/foreman_docker/common_parameters/_environment_variable.html.erb
+- app/views/foreman_docker/common_parameters/_environment_variables.html.erb
+- app/views/foreman_docker/common_parameters/_exposed_port.html.erb
 - app/views/foreman_docker/common_parameters/_exposed_ports.erb
 - app/views/image_search/_repository_search_results.html.erb
 - app/views/images/form/_docker.html.erb