foreman_content 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66165cc1d29ef234bd0d15923511264f87045b55
-  data.tar.gz: 2166c67ba266eaf2c9d478ba4e64839fb7a703a9
+  metadata.gz: 76fd79ca9fac589c6e62a1a0ec2ba6c9df2ac608
+  data.tar.gz: 34734b08623ad025a96fa107974143e5678c80e2
 SHA512:
-  metadata.gz: 851db5cbe0dda9500b5bd6d30506d4ab63c565e0802cd5365b81a1b5a53c15d3362410e3ae347fbe82dc1da385c8e881953f72117253925bcc973916e3d0f444
-  data.tar.gz: c202eedf2998d5baca4d8a76ad2df98c745b280fd2a02726ae604c43477aea38a2c1a658e0b9bbea85276a518fa9e6623fa7b1db78247e5da2dfd3d728428377
+  metadata.gz: 1bb2945c7a124cc7ebd769ff32f2181f9f617f44efc283b5536b8e409feb738afe3defc05ae2a4d8de6aedbf778695ee5dd71707c6b00914b173f0206db1bb44
+  data.tar.gz: 86d1ef1b4b71b460f5af210bac3523e6d61323ab7b3a41a34263abc1de637081c020866386e39c4cc15681bf46451654bc1627a8965325fab680931ba21cf96d

data/app/models/{content → concerns/content}/custom_repository_paths.rb

@@ -1,5 +1,7 @@
 module Content
   module CustomRepositoryPaths
+    extend ActiveSupport::Concern
+
     def repo_path_from_content_path(environment, content_path)
       content_path = content_path.sub(/^\//, "")
       path_prefix  = [environment.organization.label, environment.label].join("/")

data/app/models/concerns/content/environment_extensions.rb

@@ -0,0 +1,9 @@
+module Content::EnvironmentExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :environment_products, :dependent => :destroy, :uniq => true, :class_name => 'Content::EnvironmentProduct'
+    has_many :products, :through => :environment_products, :class_name => 'Content::Product'
+  end
+
+end

data/app/models/concerns/content/home_helper.rb

@@ -0,0 +1,18 @@
+module Content::HomeHelper
+  extend ActiveSupport::Concern
+  included do
+    alias_method_chain :setting_options, :content_link
+  end
+
+  # Adds a content link to the More menu
+  def setting_options_with_content_link
+    choices       = setting_options_without_content_link
+    content_group =
+      [
+        [_('Products'), :"content/products"],
+        [_('Repositories'), :"content/repositories"],
+        [_('Gpg keys'), :"content/gpg_keys"]
+    ]
+    choices.insert(3, [:divider], [:group, _("Content"), content_group])
+  end
+end

data/app/models/concerns/content/host_extensions.rb

@@ -0,0 +1,50 @@
+module Content::HostExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :host_products, :dependent => :destroy, :uniq => true, :foreign_key => :host_id, :class_name => 'Content::HostProduct'
+    has_many :products, :through => :host_products, :class_name => 'Content::Product'
+
+    scoped_search :in => :products, :on => :name, :complete_value => true, :rename => :product
+
+    alias_method_chain :params, :repositories
+  end
+
+  # adds repository hash to ENC global parameters
+  def params_with_repositories
+    # convert all repos to a format that puppet create_resource with yumrepo can consume
+    repos = Hash[attached_repositories.map { |repo| [repo.to_label, format_repo(repo)] }]
+    # adds a global parameter called repositories contain all repos
+    params_without_repositories.merge('repositories' => repos)
+  end
+
+  # product_ids from the os default and hostgroup.
+  def inherited_product_ids
+    products = []
+    products += operatingsystem.product_ids if operatingsystem
+    products += Content::HostgroupProduct.where(:hostgroup_id => hostgroup.path_ids).pluck(:product_id) if hostgroup_id
+    products.uniq
+  end
+
+  def all_product_ids
+    (inherited_product_ids + product_ids).uniq
+  end
+
+  def attached_repositories
+    Content::Repository.attached_to_host(self)
+  end
+
+  private
+
+  # convert a repository to a format that puppet create_resource with yumrepo can consume
+  def format_repo repo
+    {
+      'baseurl'  => repo.full_path,
+      # yum repos have descr field but no name, if descr is empty use the repo name
+      'descr'    => repo.description.blank? ? repo.name : repo.description,
+      'enabled'  => repo.enabled ? '1' : '0',
+      'gpgcheck' => !!repo.gpg_key ? '1' : '0'
+    }
+  end
+
+end

data/app/models/concerns/content/hostgroup_extensions.rb

@@ -0,0 +1,18 @@
+module Content::HostgroupExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :hostgroup_products, :dependent => :destroy, :uniq => true, :class_name => 'Content::HostgroupProduct'
+    has_many :products, :through => :hostgroup_products, :class_name => 'Content::Product'
+
+    scoped_search :in => :products, :on => :name, :complete_value => true, :rename => :product
+  end
+
+  def inherited_product_ids
+    Content::HostgroupProduct.where(:hostgroup_id => hostgroup.ancestor_ids).pluck(:product_id)
+  end
+
+  def all_product_ids
+    (inherited_product_ids + product_ids).uniq
+  end
+end

data/app/models/concerns/content/operatingsystem_extensions.rb

@@ -0,0 +1,12 @@
+module Content::OperatingsystemExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :operatingsystem_repositories, :dependent => :destroy, :uniq => true, :class_name => 'Content::OperatingsystemRepository'
+    has_many :repositories, :through => :operatingsystem_repositories, :class_name => 'Content::Repository'
+    has_many :product_operatingsystems, :dependent => :destroy, :uniq => true, :class_name => 'Content::ProductOperatingsystem'
+    has_many :products, :through => :product_operatingsystems, :class_name => 'Content::Product'
+    has_many :default_repositories, :through => :products, :source => :repositories, :class_name => 'Content::Repository'
+  end
+
+end

data/app/models/concerns/content/redhat_extensions.rb

@@ -0,0 +1,33 @@
+module Content::RedhatExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :medium_uri, :content_uri
+  end
+
+  def medium_uri_with_content_uri host, url = nil
+    if url.nil? && (full_path = Content::Repository.available_for_host(host).kickstart.first.try(:full_path))
+      URI.parse(full_path)
+    else
+      medium_uri_without_content_uri(host, url)
+    end
+  end
+
+  # return an array of repositories for kickstart script as additional repos
+  # to the kickstart main repo, this list will typically include updates and epel
+  def repos host
+    host.attached_repositories.yum.map { |repo| format_repo(repo) }
+  end
+
+  private
+  # convert a repository to a format that kickstart script can consume
+  def format_repo repo
+    {
+      :baseurl     => repo.full_path,
+      :name        => repo.to_label,
+      :description => repo.product.description,
+      :enabled     => repo.enabled,
+      :gpgcheck    => !!repo.gpg_key
+    }
+  end
+end

data/app/models/concerns/content/taxonomy_extensions.rb

@@ -0,0 +1,14 @@
+module Content::TaxonomyExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :products, :through => :taxable_taxonomies, :source => :taxable, :source_type => 'Content::Product'
+    alias_method_chain :dup, :content_dup
+  end
+
+  def dup_with_content_dup
+    new          = dup_without_content_dup
+    new.products = products
+    new
+  end
+end

data/app/models/content/remote/pulp/repository.rb

@@ -37,6 +37,8 @@ module Content
 
         protected
         def initialize_pulp
+          # initiate pulp connection
+          Content::PulpConfiguration.new
           self.pulp_id       ||= Foreman.uuid.gsub("-", '')
           self.relative_path ||= custom_repo_path("acme_org", "library", product.name, name) if name
         end

data/{lib → app/services/content}/pulp_configuration.rb

@@ -1,11 +1,12 @@
 require 'runcible'
+require 'uri'
 
-class PulpConfiguration
-  def self.initialize_runcible
-    Runcible::Base.config = runcible_config
+class Content::PulpConfiguration
+  def initialize options = {}
+    Runcible::Base.config = runcible_config.merge(options)
   end
 
-  def self.runcible_config
+  def runcible_config
     pulp_url = URI(Setting.pulp_url)
     {
       :url          => "#{pulp_url.scheme}://#{pulp_url.host}:#{pulp_url.port}",

data/lib/content/engine.rb

@@ -1,18 +1,11 @@
-require 'content_home_helper_patch'
-require 'content_taxonomy'
-require 'content_environment'
-require 'content_operatingsystem'
-require 'content_redhat'
-require 'content_hostgroup'
-require 'content_host'
-require 'pulp_configuration'
-
-
 module Content
   ENGINE_NAME = "content"
   class Engine < ::Rails::Engine
     engine_name Content::ENGINE_NAME
 
+    config.autoload_paths += Dir["#{config.root}/app/services"]
+    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
+
     # Load this before the Foreman config initializers, so that the Setting.descendants
     # list includes the plugin STI setting class
     initializer 'foreman_content.load_default_settings', :before => :load_config_initializers do |app|
@@ -21,26 +14,24 @@ module Content
 
     initializer "foreman_content.load_app_instance_data" do |app|
       app.config.paths['db/migrate'] += Content::Engine.paths['db/migrate'].existent
-      app.config.autoload_paths += Dir["#{config.root}/app/services)"]
     end
 
     # Include extensions to models in this config.to_prepare block
     config.to_prepare do
-      ::PulpConfiguration.initialize_runcible
       # Patch the menu
-      ::HomeHelper.send :include, ContentHomeHelperPatch
+      ::HomeHelper.send :include, Content::HomeHelper
       # Extend the taxonomy model
-      ::Taxonomy.send :include, ContentTaxonomy
+      ::Taxonomy.send :include, Content::TaxonomyExtensions
       # Extend the environment model
-      ::Environment.send :include, ContentEnvironment
+      ::Environment.send :include, Content::EnvironmentExtensions
       # Extend OS model
-      ::Operatingsystem.send :include, ContentOperatingsystem
+      ::Operatingsystem.send :include, Content::OperatingsystemExtensions
       # Extend RedHat OS family model
-      ::Redhat.send :include, ContentRedhat
+      ::Redhat.send :include, Content::RedhatExtensions
       # Extend the hostgroup model
-      ::Hostgroup.send :include, ContentHostgroup
+      ::Hostgroup.send :include, Content::HostgroupExtensions
       # Extend the host model
-      ::Host::Managed.send :include, ContentHost
+      ::Host::Managed.send :include, Content::HostExtensions
     end
   end
 

data/lib/content/version.rb

@@ -1,3 +1,3 @@
 module Content
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_content
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Dmitri Dolguikh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
   name: runcible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.10
 - !ruby/object:Gem::Dependency
@@ -86,7 +86,6 @@ files:
 - app/models/content/gpg_key.rb
 - app/models/content/orchestration/pulp.rb
 - app/models/content/hostgroup_product.rb
-- app/models/content/custom_repository_paths.rb
 - app/models/content/operatingsystem_repository.rb
 - app/models/content/validators/no_trailing_space.rb
 - app/models/content/validators/name_format.rb
@@ -95,7 +94,16 @@ files:
 - app/models/content/repository.rb
 - app/models/content/product.rb
 - app/models/content/environment_product.rb
+- app/models/concerns/content/taxonomy_extensions.rb
+- app/models/concerns/content/hostgroup_extensions.rb
+- app/models/concerns/content/environment_extensions.rb
+- app/models/concerns/content/operatingsystem_extensions.rb
+- app/models/concerns/content/custom_repository_paths.rb
+- app/models/concerns/content/home_helper.rb
+- app/models/concerns/content/host_extensions.rb
+- app/models/concerns/content/redhat_extensions.rb
 - app/services/content/pulp_event_handler.rb
+- app/services/content/pulp_configuration.rb
 - app/overrides/add_os_conent_tab.rb
 - app/overrides/add_host_conent_tab.rb
 - app/overrides/add_hostgroup_conent_tab.rb
@@ -135,18 +143,10 @@ files:
 - db/migrate/20130729032320_create_content_product_operatingsystems.rb
 - db/migrate/20130702140034_create_content_repositories.rb
 - db/migrate/20130723084911_create_content_hostgroup_products.rb
-- lib/content_hostgroup.rb
-- lib/content_environment.rb
-- lib/content_redhat.rb
-- lib/content_home_helper_patch.rb
-- lib/content_taxonomy.rb
 - lib/content/engine.rb
 - lib/content/version.rb
-- lib/content_operatingsystem.rb
 - lib/foreman_content.rb
 - lib/tasks/content_tasks.rake
-- lib/content_host.rb
-- lib/pulp_configuration.rb
 - Rakefile
 - README.md
 - test/unit/content/description_format_validator_test.rb

data/lib/content_environment.rb

@@ -1,13 +0,0 @@
-module ContentEnvironment
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      has_many :environment_products, :dependent => :destroy, :uniq=>true, :class_name => 'Content::EnvironmentProduct'
-      has_many :products, :through => :environment_products, :class_name => 'Content::Product'
-    end
-  end
-
-  module InstanceMethods
-  end
-end

data/lib/content_home_helper_patch.rb

@@ -1,23 +0,0 @@
-module ContentHomeHelperPatch
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      alias_method_chain :setting_options, :content_link
-    end
-  end
-
-  module InstanceMethods
-    # Adds a content link to the More menu
-    def setting_options_with_content_link
-      choices       = setting_options_without_content_link
-      content_group =
-        [
-          [_('Products'),     :"content/products"],
-          [_('Repositories'), :"content/repositories"],
-          [_('Gpg keys'),     :"content/gpg_keys"]
-        ]
-      choices.insert(3, [:divider], [:group, _("Content"), content_group])
-    end
-  end
-end

data/lib/content_host.rb

@@ -1,55 +0,0 @@
-module ContentHost
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      has_many :host_products, :dependent => :destroy, :uniq=>true,:foreign_key => :host_id, :class_name => 'Content::HostProduct'
-      has_many :products, :through => :host_products, :class_name => 'Content::Product'
-
-      scoped_search :in=>:products, :on=>:name, :complete_value => true, :rename => :product
-
-      alias_method_chain :params, :repositories
-    end
-  end
-
-  module InstanceMethods
-
-    # adds repository hash to ENC global parameters
-    def params_with_repositories
-      # convert all repos to a format that puppet create_resource with yumrepo can consume
-      repos = Hash[attached_repositories.map{ |repo| [repo.to_label, format_repo(repo)] }]
-      # adds a global parameter called repositories contain all repos
-      params_without_repositories.merge('repositories' => repos)
-    end
-
-    # product_ids from the os default and hostgroup.
-    def inherited_product_ids
-      products = []
-      products += operatingsystem.product_ids if operatingsystem
-      products += Content::HostgroupProduct.where(:hostgroup_id => hostgroup.path_ids).pluck(:product_id) if hostgroup_id
-      products.uniq
-    end
-
-    def all_product_ids
-      (inherited_product_ids + product_ids).uniq
-    end
-
-    def attached_repositories
-      Content::Repository.attached_to_host(self)
-    end
-
-    private
-
-    # convert a repository to a format that puppet create_resource with yumrepo can consume
-    def format_repo repo
-       {
-         'baseurl' => repo.full_path,
-         # yum repos have descr field but no name, if descr is empty use the repo name
-         'descr' => repo.description.blank? ? repo.name : repo.description,
-         'enabled' => repo.enabled ? '1': '0',
-         'gpgcheck' => !!repo.gpg_key ? '1': '0'
-       }
-     end
-
-  end
-end

data/lib/content_hostgroup.rb

@@ -1,22 +0,0 @@
-module ContentHostgroup
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      has_many :hostgroup_products, :dependent => :destroy, :uniq=>true, :class_name => 'Content::HostgroupProduct'
-      has_many :products, :through => :hostgroup_products, :class_name => 'Content::Product'
-
-      scoped_search :in=>:products, :on=>:name, :complete_value => true, :rename => :product
-    end
-  end
-
-  module InstanceMethods
-    def inherited_product_ids
-      Content::HostgroupProduct.where(:hostgroup_id => hostgroup.ancestor_ids).pluck(:product_id)
-    end
-
-    def all_product_ids
-      (inherited_product_ids + product_ids).uniq
-    end
-  end
-end

data/lib/content_operatingsystem.rb

@@ -1,17 +0,0 @@
-module ContentOperatingsystem
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      has_many :operatingsystem_repositories, :dependent => :destroy, :uniq => true, :class_name => 'Content::OperatingsystemRepository'
-      has_many :repositories, :through => :operatingsystem_repositories, :class_name => 'Content::Repository'
-
-      has_many :product_operatingsystems, :dependent => :destroy, :uniq => true, :class_name => 'Content::ProductOperatingsystem'
-      has_many :products, :through => :product_operatingsystems, :class_name => 'Content::Product'
-      has_many :default_repositories, :through => :products, :source => :repositories, :class_name => 'Content::Repository'
-    end
-  end
-
-  module InstanceMethods
-  end
-end

data/lib/content_redhat.rb

@@ -1,36 +0,0 @@
-module ContentRedhat
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-    base.class_eval do
-      alias_method_chain :medium_uri, :content_uri
-    end
-  end
-
-  module InstanceMethods
-    def medium_uri_with_content_uri host, url = nil
-      if url.nil? && (full_path = Content::Repository.available_for_host(host).kickstart.first.try(:full_path))
-        URI.parse(full_path)
-      else
-        medium_uri_without_content_uri(host, url)
-      end
-    end
-
-    # return an array of repositories for kickstart script as additional repos
-    # to the kickstart main repo, this list will typically include updates and epel
-    def repos host
-      host.attached_repositories.yum.map{ |repo| format_repo(repo) }
-    end
-
-    private
-    # convert a repository to a format that kickstart script can consume
-    def format_repo repo
-      {
-        :baseurl     => repo.full_path,
-        :name        => repo.to_label,
-        :description => repo.product.description,
-        :enabled     => repo.enabled,
-        :gpgcheck    => !!repo.gpg_key
-      }
-    end
-  end
-end

data/lib/content_taxonomy.rb

@@ -1,18 +0,0 @@
-module ContentTaxonomy
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      has_many :products, :through => :taxable_taxonomies, :source => :taxable, :source_type => 'Content::Product'
-      alias_method_chain :dup, :content_dup
-    end
-  end
-
-  module InstanceMethods
-    def dup_with_content_dup
-      new = dup_without_content_dup
-      new.products = products
-      new
-    end
-  end
-end