foreman_docker 0.2.0 → 1.0.0

data/db/migrate/20141222113313_create_wizard_states.rb

@@ -0,0 +1,42 @@
+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_preliminaries do |t|
+      t.integer :compute_resource_id, :null => false
+      t.references :docker_container_wizard_state, :null => false
+      t.timestamps
+    end
+
+    create_table  :docker_container_wizard_states_images do |t|
+      t.integer :registry_id
+      t.string :repository_name, :null => false
+      t.string :tag, :null => false
+      t.references :docker_container_wizard_state, :null => false
+      t.timestamps
+    end
+
+    create_table  :docker_container_wizard_states_configurations do |t|
+      t.string :name
+      t.string :command
+      t.string :entrypoint
+      t.integer :cpu_set
+      t.float :cpu_shares
+      t.string :memory
+      t.references :docker_container_wizard_state, :null => false
+      t.timestamps
+    end
+
+    create_table :docker_container_wizard_states_environments do |t|
+      t.boolean :tty
+      t.boolean :attach_stdin, :default => true
+      t.boolean :attach_stdout, :default => true
+      t.boolean :attach_stderr, :default => true
+      t.references :docker_container_wizard_state, :null => false
+      t.timestamps
+    end
+  end
+end

data/lib/foreman_docker/engine.rb

@@ -11,17 +11,23 @@ module ForemanDocker
   class Engine < ::Rails::Engine
     engine_name 'foreman_docker'
 
+    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
+    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
     end
 
     initializer "foreman_docker.assets.precompile" do |app|
-      app.config.assets.precompile += %w(foreman_docker/terminal.css foreman_docker/image_step.js)
+      app.config.assets.precompile += %w(foreman_docker/autocomplete.css
+                                         foreman_docker/terminal.css
+                                         foreman_docker/image_step.js)
     end
 
     initializer 'foreman_docker.configure_assets', :group => :assets do
       SETTINGS[:foreman_docker] =
-        { :assets => { :precompile => ['foreman_docker/terminal.css',
+        { :assets => { :precompile => ['foreman_docker/autocomplete.css',
+                                       'foreman_docker/terminal.css',
                                        'foreman_docker/image_step.js'] } }
     end
 
@@ -45,17 +51,31 @@ module ForemanDocker
           menu :top_menu, :new_container, :caption => N_('New container'),
                                           :url_hash => { :controller => :containers,
                                                          :action => :new }
+          menu :top_menu, :registries, :caption => N_('Registries'),
+                                       :url_hash => { :controller => :registries,
+                                                      :action => :index }
         end
 
         security_block :containers do
-          permission :view_containers,    :containers         => [:index, :show,
-                                                                  :auto_complete_image,
-                                                                  :auto_complete_image_tags]
+          permission :view_containers,    :containers         => [:index, :show]
           permission :commit_containers,  :containers         => [:commit]
           permission :create_containers,  :'containers/steps' => [:show, :update],
                                           :containers         => [:new]
           permission :destroy_containers, :containers         => [:destroy]
         end
+
+        security_block :registries do
+          permission :view_registries,    :registries         => [:index, :show]
+          permission :create_registries,  :registries         => [:new, :create, :update, :edit]
+          permission :destroy_registries, :registries         => [:destroy]
+        end
+
+        security_block :image_search do
+          permission :search_repository_image_search,
+                     :image_search => [:auto_complete_repository_name,
+                                       :auto_complete_image_tag,
+                                       :search_repository]
+        end
       end
 
     end

data/lib/foreman_docker/version.rb

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

data/test/factories/containers.rb

@@ -2,5 +2,7 @@ FactoryGirl.define do
   factory :container do
     sequence(:name) { |n| "container_#{n}" }
     association :compute_resource, :factory => :docker_cr
+    sequence(:repository_name) { |n| "repo#{n}" }
+    sequence(:tag) { |n| "tag#{n}" }
   end
 end

data/test/factories/docker_registry.rb

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :docker_registry do
+    sequence(:name) { |n| "hub#{n}" }
+    sequence(:url) { |n| "http://localhost/#{n}" }
+    sequence(:username) { |n| "username#{n}" }
+    sequence(:password) { |n| "password#{n}" }
+  end
+
+  trait :with_location do
+    locations { [FactoryGirl.build(:location)] }
+  end
+
+  trait :with_organization do
+    organizations { [FactoryGirl.build(:organization)] }
+  end
+end

data/test/functionals/containers_steps_controller_test.rb

@@ -6,47 +6,14 @@ module Containers
       @container = FactoryGirl.create(:container)
     end
 
-    test 'sets a docker image and tag for a new container' do
-      put :update, { :id => :image,
-                     :container_id => @container.id,
-                     :image => 'centos',
-                     :container => { :tag => 'latest' } }, set_session_user
-      assert_response :found
-      assert_redirected_to container_step_path(:container_id => @container.id,
-                                               :id           => :configuration)
-      assert_equal DockerImage.find_by_image_id('centos'), @container.reload.image
-      assert_equal DockerTag.find_by_tag('latest'), @container.tag
-    end
-
-    context 'container creation' do
-      setup do
-        @container.update_attribute(:image, (image = FactoryGirl.create(:docker_image,
-                                                                        :image_id => 'centos')))
-        @container.update_attribute(:tag, FactoryGirl.create(:docker_tag, :image => image,
-                                                                          :tag   => 'latest'))
-      end
-
-      test 'uuid of the created container is saved at the end of the wizard' do
-        Fog.mock!
-        fake_container = @container.compute_resource.send(:client).servers.first
-        ForemanDocker::Docker.any_instance.expects(:create_container).returns(fake_container)
-        put :update, { :id           => :environment,
-                       :container_id => @container.id }, set_session_user
-        assert_equal fake_container.id, Container.find(@container.id).uuid
-      end
-
-      test 'errors are displayed when container creation fails' do
-        Docker::Container.expects(:create).raises(Docker::Error::DockerError, 'some error')
-        put :update, { :id           => :environment,
-                       :container_id => @container.id }, set_session_user
-        assert_template 'environment'
-        assert_match(/some error/, flash[:error])
-      end
-    end
-
     test 'wizard finishes with a redirect to the managed container' do
-      get :show, { :id => :wicked_finish,
-                   :container_id => @container.id }, set_session_user
+      state = DockerContainerWizardState.create!
+      Service::Containers.expects(:start_container!).with(equals(state)).returns(@container)
+      put :update, { :wizard_state_id => state.id,
+                     :id => :environment,
+                     :docker_container_wizard_states_environment => { :tty => false } },
+          set_session_user
+
       assert_redirected_to container_path(:id => @container.id)
     end
   end

data/test/integration/container_steps_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class ContainerStepsTest < ActionDispatch::IntegrationTest
+  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
+    visit new_container_path
+    assert has_selector?("a", :text => 'Locations')
+    assert has_selector?("a", :text => 'Organizations')
+  end
+  # test 'clicking on search loads repositories' do
+  #   Capybara.javascript_driver = :webkit
+  #   container = FactoryGirl.create(:container)
+  #   visit container_step_path(:container_id => container.id, :id => :repository)
+  #   ComputeResource.any_instance.expects(:search).returns([{'name' => 'my_fake_repository_result',
+  #                                                           'star_count' => 300,
+  #                                                           'description' => 'fake repository'}])
+  #   click_button 'search_repository'
+  #   assert has_link? 'my_fake_repository_result'
+  # end
+end

data/test/integration/container_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class ContainerIntegrationTest < ActionDispatch::IntegrationTest
+  test 'redirects to a new compute resource if none is available'  do
+    visit containers_path
+    assert_equal current_path, new_compute_resource_path
+  end
+
+  context 'available compute resource' do
+    test 'shows containers list if compute resource is available' do
+      ComputeResource.any_instance.stubs(:vms).returns([])
+      FactoryGirl.create(:docker_cr)
+      visit containers_path
+      assert page.has_link? 'New container'
+      refute_equal current_path, new_compute_resource_path
+    end
+  end
+end

data/test/units/container_test.rb

@@ -1,11 +1,4 @@
 require 'test_plugin_helper'
 
 class ContainerTest < ActiveSupport::TestCase
-  test 'validations do not happen if inactive' do
-    FactoryGirl.build(:container)
-  end
-
-  test 'attributes are validated when active' do
-    FactoryGirl.build(:container)
-  end
 end

data/test/units/containers_service_test.rb

@@ -0,0 +1,21 @@
+require 'test_plugin_helper'
+
+class ContainersServiceTest <  ActiveSupport::TestCase
+  setup do
+    @state = DockerContainerWizardState.create! do |s|
+      s.build_preliminary(:compute_resource_id => FactoryGirl.create(:docker_cr).id,
+                          :locations           => [taxonomies(:location1)],
+                          :organizations       => [taxonomies(:organization1)])
+      s.build_image(:repository_name => 'test', :tag => 'test')
+      s.build_configuration(:name => 'test')
+      s.build_environment(:tty => false)
+    end
+  end
+
+  test 'removes current state after successful container creation' do
+    ForemanDocker::Docker.any_instance.expects(:create_container)
+                                      .returns(OpenStruct.new(:uuid => 1))
+    Service::Containers.start_container!(@state)
+    assert_equal DockerContainerWizardState.where(:id => @state.id).count, 0
+  end
+end

data/test/units/docker_registry_test.rb

@@ -0,0 +1,24 @@
+require 'test_plugin_helper'
+
+class DockerRegistryTest < ActiveSupport::TestCase
+  test 'used_location_ids should return correct location ids' do
+    location = FactoryGirl.build(:location)
+    r = as_admin do
+      FactoryGirl.create(:docker_registry, :locations => ([location]))
+    end
+    assert r.used_location_ids.include?(location.id)
+  end
+
+  test 'used_organization_ids should return correct organization ids' do
+    organization = FactoryGirl.build(:organization)
+    r = as_admin do
+      FactoryGirl.create(:docker_registry, :organizations => ([organization]))
+    end
+    assert r.used_organization_ids.include?(organization.id)
+  end
+
+  test 'password is stored encrypted' do
+    r = as_admin { FactoryGirl.create(:docker_registry) }
+    assert r.is_decryptable?(r.password_in_db)
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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.
@@ -65,16 +65,28 @@ files:
 - app/assets/javascripts/foreman_docker/image_step.js
 - app/assets/stylesheets/foreman_docker/autocomplete.css.scss
 - app/assets/stylesheets/foreman_docker/terminal.css.scss
+- app/controllers/concerns/foreman_docker/find_container.rb
 - app/controllers/containers/steps_controller.rb
 - app/controllers/containers_controller.rb
+- app/controllers/image_search_controller.rb
+- app/controllers/registries_controller.rb
 - app/helpers/container_steps_helper.rb
 - app/helpers/containers_helper.rb
 - app/models/concerns/fog_extensions/fogdocker/image.rb
 - app/models/concerns/fog_extensions/fogdocker/server.rb
+- app/models/concerns/foreman_docker/parameter_validators.rb
 - app/models/container.rb
-- app/models/docker_image.rb
-- app/models/docker_tag.rb
+- app/models/docker_container_wizard_state.rb
+- app/models/docker_container_wizard_states/configuration.rb
+- app/models/docker_container_wizard_states/environment.rb
+- app/models/docker_container_wizard_states/environment_variable.rb
+- app/models/docker_container_wizard_states/image.rb
+- app/models/docker_container_wizard_states/preliminary.rb
+- app/models/docker_registry.rb
+- app/models/environment_variable.rb
 - app/models/foreman_docker/docker.rb
+- app/models/service/containers.rb
+- app/models/service/registry_api.rb
 - app/views/api/v1/compute_resources/docker.json
 - app/views/api/v2/compute_resources/docker.json
 - app/views/compute_resources/form/_docker.html.erb
@@ -91,7 +103,13 @@ files:
 - app/views/containers/steps/environment.html.erb
 - app/views/containers/steps/image.html.erb
 - app/views/containers/steps/preliminary.html.erb
+- app/views/foreman_docker/common_parameters/_environment_variable.html.erb
+- app/views/image_search/_repository_search_results.html.erb
 - app/views/images/form/_docker.html.erb
+- app/views/registries/_form.html.erb
+- app/views/registries/edit.html.erb
+- app/views/registries/index.html.erb
+- app/views/registries/new.html.erb
 - config/routes.rb
 - db/migrate/20140930175337_add_email_to_compute_resource.rb
 - db/migrate/20141005233312_create_containers.rb
@@ -100,8 +118,12 @@ files:
 - db/migrate/20141009011026_add_attributes_to_container.rb
 - db/migrate/20141010173220_create_docker_images.rb
 - db/migrate/20141018110810_add_uuid_to_containers.rb
+- db/migrate/20141024163003_create_docker_registries.rb
 - db/migrate/20141028164206_change_memory_in_container.rb
 - db/migrate/20141028164633_change_cpuset_in_container.rb
+- db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb
+- db/migrate/20141209182008_remove_docker_tables.rb
+- db/migrate/20141222113313_create_wizard_states.rb
 - lib/foreman_docker.rb
 - lib/foreman_docker/engine.rb
 - lib/foreman_docker/tasks/test.rake
@@ -109,14 +131,15 @@ files:
 - locale/Makefile
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
-- test/factories/docker_image.rb
-- test/factories/docker_tag.rb
+- test/factories/docker_registry.rb
 - test/functionals/container_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
+- test/integration/container_steps_test.rb
+- test/integration/container_test.rb
 - test/test_plugin_helper.rb
 - test/units/container_test.rb
-- test/units/docker_image_test.rb
-- test/units/docker_tag_test.rb
+- test/units/containers_service_test.rb
+- test/units/docker_registry_test.rb
 homepage: http://github.com/theforeman/foreman-docker
 licenses:
 - GPL-3
@@ -127,29 +150,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provision and manage Docker containers and images from Foreman
 test_files:
 - test/functionals/containers_steps_controller_test.rb
 - test/functionals/container_controller_test.rb
-- test/factories/docker_image.rb
+- test/factories/docker_registry.rb
 - test/factories/compute_resources.rb
-- test/factories/docker_tag.rb
 - test/factories/containers.rb
-- test/units/docker_image_test.rb
 - test/units/container_test.rb
-- test/units/docker_tag_test.rb
+- test/units/docker_registry_test.rb
+- test/units/containers_service_test.rb
 - test/test_plugin_helper.rb
-has_rdoc: 
+- test/integration/container_steps_test.rb
+- test/integration/container_test.rb