foreman_docker 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0281f21fc99f53f8f25eb6ff797e5679ba9486b
-  data.tar.gz: 5444b8d765abd9a9293fbf22cf7e08c7da951643
+  metadata.gz: 3b3ac12c5dafea1291f34a213907a4ccf7393f88
+  data.tar.gz: b90f1bece1343dab61b41b40d2f96e48aea61ccc
 SHA512:
-  metadata.gz: 56e3a1b4b644a6aa7a8c14df0ded0f23ca9ab74f1d4bc0c6fa209f632c68a358d0ce73d06df0a6f9bf971deedac8c9b315aa3cd7f1f0a403aeab88fef86a255b
-  data.tar.gz: 00cd84d57c7c4180cbca74fa729f2136e48e24e72aa97711b6d94b1bc4804096f89f81e3bf0cc3ad1c3dac76310a05688a9b09e80f02f27dcea01c1b6ce4c490
+  metadata.gz: 77e84e4899f3fff9d53e71d0c11b20fde50b824abfdd7691a5ffc44dd6c85f7798c808cf2675bfe434de5adc6a13438c4679e334a4742deb26bb9a4a402f3b38
+  data.tar.gz: 98f5a41476938823d8a3fd24f8aea148dfb96de47b471d27cbca2dfd7c36c9f5b696c88bb0a67ef23fdb5ec1030d7454a5ebe0a9aec7be3a044009d0c15d807a

data/.rubocop.yml

@@ -0,0 +1,39 @@
+AllCops:
+  RunRailsCops: true # always run the rails cops
+
+# Don't enforce documentation
+Style/Documentation:
+  Enabled: false
+
+# Need to support ruby 1.8
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# Force before_filter until upgrade to Rails 4
+Rails/ActionFilter:
+  EnforcedStyle: filter
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Max: 20
+
+StringLiterals:
+  Enabled: false
+
+Metrics/ClassLength:
+  Max: 200
+
+Metrics/AbcSize:
+  Enabled: false # should we turn this on?
+
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+
+Style/DotPosition:
+  EnforcedStyle: 'leading'
+
+Rails/Date:
+  Exclude:
+   - foreman_docker.gemspec

data/README.md

@@ -34,8 +34,6 @@
 * Events stream ([#8037](http://projects.theforeman.org/issues/8037))
 * Tight integration between Docker hosts [Atomic](http://www.projectatomic.io/) and [CoreOS](http://coreos.com/) and containers ([#7653](http://projects.theforeman.org/issues/7653), [#7652](http://projects.theforeman.org/issues/7652))
 * Quickstart images - pre-supplied images and configuration ([#7869](http://projects.theforeman.org/issues/7869))
-* Environment variables support ([#8226](http://projects.theforeman.org/issues/8226))
-* Support to expose ports during creation or at runtime ([#7864](http://projects.theforeman.org/issues/7864))
 * Links to other containers ([#7866](http://projects.theforeman.org/issues/7866))
 * API ([#7874](http://projects.theforeman.org/issues/7874))
 * [Hammer CLI](http://github.com/theforeman/hammer-cli-foreman) support ([#8227](http://projects.theforeman.org/issues/8227))

data/app/controllers/api/v2/containers_controller.rb

@@ -20,7 +20,7 @@ module Api
         if params[:compute_resource_id].present?
           scoped = Container.where(:compute_resource_id => params[:compute_resource_id])
         else
-          scoped = Container.scoped
+          scoped = Container.where(nil)
         end
         @containers = scoped.search_for(params[:search], :order => params[:order])
                       .paginate(:page => params[:page])
@@ -108,7 +108,7 @@ module Api
         render :json => { :logs => Docker::Container.get(@container.uuid)
           .logs(:stdout => (params[:stdout] || true),
                 :stderr => (params[:stderr] || false),
-                :tail   => (params[:tail]   || 100)) }
+                :tail   => (params[:tail] || 100)) }
       end
 
       api :PUT, '/containers/:id/power', N_('Run power operation on a container')

data/app/controllers/containers/steps_controller.rb

@@ -41,8 +41,8 @@ module Containers
 
     def set_form
       instance_variable_set(
-          "@docker_container_wizard_states_#{step}",
-          @state.send(:"#{step}") || @state.send(:"build_#{step}"))
+        "@docker_container_wizard_states_#{step}",
+        @state.send(:"#{step}") || @state.send(:"build_#{step}"))
     end
 
     def create_container(start = true)
@@ -58,9 +58,9 @@ module Containers
       else
         @docker_container_wizard_states_environment = @state.environment
         process_error(
-            :error_msg => service.errors.full_messages.join(','),
-            :object => @state.environment,
-            :render => 'environment')
+          :error_msg => service.errors.full_messages.join(','),
+          :object => @state.environment,
+          :render => 'environment')
       end
     end
   end

data/app/controllers/containers_controller.rb

@@ -96,7 +96,7 @@ class ContainersController < ::ApplicationController
   def container_deletion
     # Unmanaged container - only present in Compute Resource
     if params[:compute_resource_id].present?
-      @deleted_identifier  = params[:id]
+      @deleted_identifier = params[:id]
       destroy_compute_resource_vm(params[:compute_resource_id], params[:id])
     else # Managed container
       find_container

data/app/controllers/image_search_controller.rb

@@ -1,18 +1,30 @@
 class ImageSearchController < ::ApplicationController
   before_filter :find_resource
 
+  # this is incredibly odd. for some reason, rails sees the
+  # requests ImageSearchControllerTest makes as requests from another host
+  # thus, violating CSRF.
+  protect_from_forgery :only => :nothing if Rails.env.test?
+
   def auto_complete_repository_name
     catch_network_errors do
-      render :text => (use_hub? ? hub_image_exists?(params[:search]) :
-          registry_image_exists?(params[:search])).to_s
+      text = if use_hub?
+               hub_image_exists?(params[:search])
+             else
+               registry_image_exists?(params[:search])
+             end
+      render :text => text.to_s
     end
   end
 
   def auto_complete_image_tag
     catch_network_errors do
       # This is the format jQuery UI autocomplete expects
-      tags = use_hub? ? hub_auto_complete_image_tags(params[:search]) :
-          registry_auto_complete_image_tags(params[:search])
+      tags = if use_hub?
+               hub_auto_complete_image_tags(params[:search])
+             else
+               registry_auto_complete_image_tags(params[:search])
+             end
       respond_to do |format|
         format.js do
           tags.map! { |tag| { :label => CGI.escapeHTML(tag), :value => CGI.escapeHTML(tag) } }
@@ -24,8 +36,12 @@ class ImageSearchController < ::ApplicationController
 
   def search_repository
     catch_network_errors do
-      repositories = use_hub? ? hub_search_image(params[:search]) :
-                                registry_search_image(params[:search])
+      repositories = if use_hub?
+                       hub_search_image(params[:search])
+                     else
+                       registry_search_image(params[:search])
+                     end
+
       respond_to do |format|
         format.js do
           render :partial => 'repository_search_results',
@@ -75,8 +91,12 @@ class ImageSearchController < ::ApplicationController
     result = ::Service::RegistryApi.new(:url => @registry.url,
                                         :user => @registry.username,
                                         :password => @registry.password).search(term)
-    registry_name = term.split('/').size > 1 ? term :
-        'library/' + term
+    registry_name = if term.split('/').size > 1
+                      term
+                    else
+                      "library/#{term}"
+                    end
+
     result['results'].any? { |r| r['name'] == registry_name }
   end
 

data/app/helpers/containers_helper.rb

@@ -30,18 +30,18 @@ module ContainersHelper
   def container_title_actions(container)
     @compute_resource = container.compute_resource
     title_actions(
-        button_group(
-          link_to(_('Commit'), '#commit-modal', :'data-toggle' => 'modal')
-        ),
-        button_group(container_power_action(container.in_fog)),
-        button_group(
-          display_delete_if_authorized(
-            hash_for_container_path(:id => container.id)
-                                    .merge(:auth_object => container,
-                                           :auth_action => 'destroy',
-                                           :authorizer  => authorizer),
-            :confirm     => _("Delete %s?") % container.name)
-        )
+      button_group(
+        link_to(_('Commit'), '#commit-modal', :'data-toggle' => 'modal')
+      ),
+      button_group(container_power_action(container.in_fog)),
+      button_group(
+        display_delete_if_authorized(
+          hash_for_container_path(:id => container.id)
+                                  .merge(:auth_object => container,
+                                         :auth_action => 'destroy',
+                                         :authorizer  => authorizer),
+          :confirm     => _("Delete %s?") % container.name)
+      )
     )
   end
 
@@ -69,7 +69,7 @@ module ContainersHelper
 
   def power_on_off_message(vm)
     _("Are you sure you want to power %{act} %{vm}?") % { :act => action_string(vm).downcase.strip,
-                                                          :vm => vm  }
+                                                          :vm => vm }
   end
 
   def auto_complete_docker_search(name, val, options = {})
@@ -77,13 +77,6 @@ module ContainersHelper
     text_field_tag(name, val, options)
   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
-
   def processes(container)
     ForemanDocker::Docker.get_container(container).top
   end

data/app/models/docker_container_wizard_states/environment.rb

@@ -2,6 +2,9 @@ module DockerContainerWizardStates
   class Environment < ActiveRecord::Base
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState
+
+    attr_accessible :tty, :docker_container_wizard_state_id,
+                    :attach_stdin, :attach_stdout, :attach_stderr
     # 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/preliminary.rb

@@ -2,6 +2,8 @@ module DockerContainerWizardStates
   class Preliminary < ActiveRecord::Base
     include Taxonomix
 
+    attr_accessible :wizard_state, :compute_resource_id
+
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id
@@ -10,14 +12,14 @@ module DockerContainerWizardStates
 
     def used_location_ids
       Location.joins(:taxable_taxonomies).where(
-          'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
-          'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
+        'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
+        'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
     end
 
     def used_organization_ids
       Organization.joins(:taxable_taxonomies).where(
-          'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
-          'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
+        'taxable_taxonomies.taxable_type' => 'DockerContainerWizardStates::Preliminary',
+        'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
     end
   end
 end

data/app/models/docker_registry.rb

@@ -3,9 +3,13 @@ class DockerRegistry < ActiveRecord::Base
   include Taxonomix
   include Encryptable
 
+  attr_accessible :name, :url, :username, :password, :locations, :organizations
+
   has_many :containers, :foreign_key => "registry_id", :dependent => :destroy
   encrypts :password
 
+  attr_accessible :name, :url, :username, :password, :locations, :organizations
+
   validates_lengths_from_database
   validates :name, :presence => true, :uniqueness => true
   validates :url,  :presence => true, :uniqueness => true
@@ -15,14 +19,14 @@ class DockerRegistry < ActiveRecord::Base
 
   def used_location_ids
     Location.joins(:taxable_taxonomies).where(
-        'taxable_taxonomies.taxable_type' => 'DockerRegistry',
-        'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
+      'taxable_taxonomies.taxable_type' => 'DockerRegistry',
+      'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
   end
 
   def used_organization_ids
     Organization.joins(:taxable_taxonomies).where(
-        'taxable_taxonomies.taxable_type' => 'DockerRegistry',
-        'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
+      'taxable_taxonomies.taxable_type' => 'DockerRegistry',
+      'taxable_taxonomies.taxable_id' => id).pluck("#{Taxonomy.table_name}.id")
   end
 
   def prefixed_url(image_name)

data/app/models/exposed_port.rb

@@ -1,4 +1,5 @@
 class ExposedPort < Parameter
+  attr_accessible :priority
   # The Parameter class from which ExposedPort class inherits,validates for the
   # presence of an  associated domain, operating system, host or host group. We
   # will have to reset those validations for the  ExposedPort class as  they do

data/app/models/foreman_docker/dns.rb

@@ -2,6 +2,8 @@ require 'resolv'
 
 module ForemanDocker
   class Dns < Parameter
+    attr_accessible :priority
+
     # The Parameter class from which this Dns class inherits,validates for the
     # presence of an associated domain,  operating system, host or host group.
     # We will have to reset those validations for the Dns class as they do not

data/app/models/foreman_docker/docker.rb

@@ -2,6 +2,8 @@ require 'uri'
 
 module ForemanDocker
   class Docker < ::ComputeResource
+    attr_accessible :email
+
     validates :url, :format => { :with => URI.regexp }
 
     def self.model_name

data/app/models/service/containers.rb

@@ -27,7 +27,7 @@ module Service
       container = Container.new(wizard_state.container_attributes) do |r|
         # eagerly load environment variables and exposed ports configuration
         state = DockerContainerWizardState.includes(
-            :environment => [:environment_variables, :exposed_ports]).find(wizard_state.id)
+          :environment => [:environment_variables, :exposed_ports]).find(wizard_state.id)
 
         load_environment_variables(state, r)
         load_exposed_ports(state, r)
@@ -66,7 +66,7 @@ module Service
 
     def destroy_wizard_state(wizard_state)
       wizard_state.destroy
-      DockerContainerWizardState.destroy_all(["updated_at < ?", (Time.now - 24.hours)])
+      DockerContainerWizardState.destroy_all(["updated_at < ?", (Time.now.utc - 24.hours)])
     end
 
     def load_environment_variables(state, r)

data/app/views/api/v2/registries/main.json.rabl

@@ -2,5 +2,5 @@ object @registry
 
 extends 'api/v2/registries/base'
 
-attributes :url, :description, :created_at, :updated_at
+attributes :url, :description, :created_at, :updated_at, :username
 

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

@@ -15,7 +15,7 @@
   <tbody>
   <% containers.each do |container| %>
     <tr>
-      <td class="ellipsis text-center"><%= link_to_container(container, resource) %></td>
+      <td class="ellipsis text-center" id="<%= container.name[1..-1] %>"><%= 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_with_tooltip(container.image_friendly_name) %></td>

data/db/migrate/20141010173220_create_docker_images.rb

@@ -7,7 +7,7 @@ class CreateDockerImages < ActiveRecord::Migration
     end
 
     create_table :docker_tags do |t|
-      t.string  :tag
+      t.string :tag
       t.references :docker_image, :null => false
       t.timestamps
     end

data/db/migrate/20141024163003_create_docker_registries.rb

@@ -3,13 +3,11 @@ class CreateDockerRegistries < ActiveRecord::Migration
     create_table :docker_registries do |t|
       t.string :url
       t.string :name
-      t.integer :id
       t.string :description
       t.timestamps
     end
 
     create_table :docker_image_docker_registries do |t|
-      t.integer :id
       t.integer :docker_registry_id
       t.integer :docker_image_id
     end

data/db/migrate/20141209182008_remove_docker_tables.rb

@@ -44,7 +44,7 @@ class RemoveDockerTables < ActiveRecord::Migration
       t.timestamps
     end
     create_table :docker_tags do |t|
-      t.string  :tag
+      t.string :tag
       t.references :docker_image, :null => false
       t.timestamps
     end

data/db/migrate/20141222113313_create_wizard_states.rb

@@ -1,9 +1,7 @@
 class CreateWizardStates < ActiveRecord::Migration
   # rubocop:disable Metrics/MethodLength
   def change
-    create_table :docker_container_wizard_states do |t|
-      t.timestamps
-    end
+    create_table :docker_container_wizard_states, &:timestamps
 
     create_table :docker_container_wizard_states_preliminaries do |t|
       t.integer :compute_resource_id, :null => false
@@ -11,7 +9,7 @@ class CreateWizardStates < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table  :docker_container_wizard_states_images do |t|
+    create_table :docker_container_wizard_states_images do |t|
       t.integer :registry_id
       t.string :repository_name, :null => false
       t.string :tag, :null => false
@@ -19,7 +17,7 @@ class CreateWizardStates < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table  :docker_container_wizard_states_configurations do |t|
+    create_table :docker_container_wizard_states_configurations do |t|
       t.string :name
       t.string :command
       t.string :entrypoint

data/lib/foreman_docker/engine.rb

@@ -14,7 +14,9 @@ module ForemanDocker
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
 
     initializer 'foreman_docker.load_app_instance_data' do |app|
-      app.config.paths['db/migrate'] += ForemanDocker::Engine.paths['db/migrate'].existent
+      ForemanDocker::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
     end
 
     initializer "foreman_docker.assets.precompile" do |app|
@@ -39,7 +41,7 @@ module ForemanDocker
 
     initializer 'foreman_docker.register_plugin', :after => :finisher_hook do
       Foreman::Plugin.register :foreman_docker do
-        requires_foreman '> 1.4'
+        requires_foreman '>= 1.11'
         compute_resource ForemanDocker::Docker
 
         sub_menu :top_menu, :containers_menu, :caption => N_('Containers'),

data/lib/foreman_docker/version.rb

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

data/test/functionals/api/v2/containers_controller_test.rb

@@ -34,7 +34,7 @@ module Api
           assert_equal ActiveSupport::JSON.decode(response.body)['logs'], fake_container.logs
         end
 
-        test 'show returns information about container'  do
+        test 'show returns information about container' do
           get :show, :id => @container.id
           assert_response :success
           assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'

data/test/integration/container_steps_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class ContainerStepsTest < ActionDispatch::IntegrationTest
-  test 'shows a link to a new compute resource if none is available'  do
+  test 'shows a link to a new compute resource if none is available' do
     visit new_container_path
     assert has_selector?("div.alert", :text => 'Please add a new one')
   end
 
-  test 'shows taxonomies tabs'  do
+  test 'shows taxonomies tabs' do
     visit new_container_path
     assert has_selector?("a", :text => 'Locations') if SETTINGS[:locations_enabled]
     assert has_selector?("a", :text => 'Organizations') if SETTINGS[:organizations_enabled]

data/test/integration/container_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ContainerIntegrationTest < ActionDispatch::IntegrationTest
-  test 'redirects to a new compute resource if none is available'  do
+  test 'redirects to a new compute resource if none is available' do
     visit containers_path
     assert_equal current_path, new_compute_resource_path
   end

data/test/units/containers_service_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class ContainersServiceTest <  ActiveSupport::TestCase
+class ContainersServiceTest < ActiveSupport::TestCase
   setup do
     @state = DockerContainerWizardState.create! do |s|
       s.build_preliminary(:compute_resource_id => FactoryGirl.create(:docker_cr).id,

data/test/units/registry_api_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class RegistryApiTest <  ActiveSupport::TestCase
+class RegistryApiTest < ActiveSupport::TestCase
   test "initialize handles username password info correctly" do
     uname = "tardis"
     password = "boo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - LICENSE
 - README.md
 - Rakefile
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
@@ -208,3 +209,4 @@ test_files:
 - test/test_plugin_helper.rb
 - test/integration/container_steps_test.rb
 - test/integration/container_test.rb
+- ".rubocop.yml"