foreman_scc_manager 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1877e55ef5915c8b11be58c142ee73292f450a0681cabfe0d4b0d410a977b3
-  data.tar.gz: 93678d164b05f4a4fa6a6f5a31ea17f43200acf071a0de58a8266e470b1c90ae
+  metadata.gz: 67a2884348925699e2aadc5796abe4ec48adee8458c577c035c564c1fbd9f950
+  data.tar.gz: 2ea193e0dbc07d41706f908870c610e1411ec200df1c6f10435f8ddc2dde0a4f
 SHA512:
-  metadata.gz: d6e11f9a75def00e1752330fcb7288081f1d2730ac6f0ae865b6ddb711ea545ccfd2db98094d9b71ba7d234669b2cb1491fd688dc34d4feca28cd1ad4bb11e5a
-  data.tar.gz: 4ff67012a62baf789859ccc57f9b450a49446e185dda4520c4ecac387b8b9755f69ffc30a43a93196d15500efc88b9ffd56627c56f2c4d698f881a6449c4cd41
+  metadata.gz: cbac716765fccb60766e4e3a6a205d596bbfd08b1349efe1e9ed56a70bb84696835895520d2b93c6bf079f8ae9d0aebab169d541b5d6291f9519f24347b407c9
+  data.tar.gz: 6419f3962cc8355300132eb6ea01719e5a912a66f18051922e2edc8db482a0d46d224f88bd6c5dbef501c06b877dbe6dc44cfc4e48d4438e62251c46cf6599c3

data/README.md

@@ -7,13 +7,13 @@ Foreman plugin to sync SUSE Customer Center products and repositories into Katel
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 for how to install Foreman plugins
 
-## Usage
+## Compatibility
 
-*Usage here*
-
-## TODO
-
-*Todo list here*
+| Foreman Version | Katello Version | Plugin Version |
+| --------------- | --------------- | -------------- |
+| 1.17            | 3.6             | >= 1.3.1       |
+| 1.16            | 3.5             | <= 1.3.0       |
+| 1.15            | 3.4             | ~> 1.1.0       |
 
 ## Contributing
 

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 
 Bundler::GemHelper.install_tasks
 
@@ -38,7 +38,7 @@ task default: :test
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-rescue => _
+rescue StandardError => _
   puts 'Rubocop not loaded.'
 end
 

data/app/controllers/scc_accounts_controller.rb

@@ -1,7 +1,6 @@
 class SccAccountsController < ApplicationController
   before_action :find_organization
   before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
-  include Api::TaxonomyScope
   include Foreman::Controller::AutoCompleteSearch
 
   # GET /scc_accounts
@@ -32,14 +31,12 @@ class SccAccountsController < ApplicationController
   # POST /scc_accounts/test_connection
   def test_connection
     @scc_account = SccAccount.new(scc_account_params)
-    if params[:scc_account_id].present? && scc_account_params[:password].empty?
-      @scc_account.password = SccAccount.find_by!(id: params[:scc_account_id]).password
-    end
+    @scc_account.password = SccAccount.find_by!(id: params[:scc_account_id]).password if params[:scc_account_id].present? && scc_account_params[:password].empty?
     respond_to do |format|
       if @scc_account.test_connection
         format.json { render json: nil, status: :ok }
       else
-        format.json { render json: nil, status: 404 }
+        format.json { render json: nil, status: :not_found }
       end
     end
   end
@@ -79,7 +76,7 @@ class SccAccountsController < ApplicationController
     scc_products_to_subscribe =
       @scc_account.scc_products.where(id: scc_bulk_subscribe_params[:scc_subscribe_product_ids])
 
-    if (scc_products_to_subscribe.count > 0)
+    if scc_products_to_subscribe.count > 0
       ForemanTasks.async_task(::Actions::BulkAction,
                               ::Actions::SccManager::SubscribeProduct,
                               scc_products_to_subscribe)
@@ -99,9 +96,7 @@ class SccAccountsController < ApplicationController
 
   def find_organization
     @organization = Organization.current
-    unless @organization
-      redirect_to '/select_organization?toState=' + request.path
-    end
+    redirect_to '/select_organization?toState=' + request.path unless @organization
   end
 
   # Use callbacks to share common setup or constraints between actions.

data/app/controllers/scc_products_controller.rb

@@ -1,6 +1,5 @@
 class SccProductsController < ApplicationController
   before_action :find_resource, only: %i[show subscribe unsubscribe]
-  include Api::TaxonomyScope
   include Foreman::Controller::AutoCompleteSearch
 
   def index

data/app/lib/actions/scc_manager/subscribe_product.rb

@@ -61,15 +61,14 @@ module Actions
         label = ::Katello::Util::Model.labelize(uniq_name)
         unprotected = true
         gpg_key = product.gpg_key
-        repo_param = {  :label => label,
-                :name => uniq_name,
-                :url => input[:url],
-                :content_type => 'yum',
-                :unprotected => unprotected,
-                :gpg_key => gpg_key,
-                :arch => input[:arch],
-                :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
-        }
+        repo_param = { :label => label,
+                       :name => uniq_name,
+                       :url => input[:url],
+                       :content_type => 'yum',
+                       :unprotected => unprotected,
+                       :gpg_key => gpg_key,
+                       :arch => input[:arch],
+                       :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE }
         repository = product.add_repo(repo_param)
         repository.mirror_on_sync = true
         repository.verify_ssl_on_sync = true

data/app/lib/actions/scc_manager/sync.rb

@@ -14,11 +14,8 @@ module Actions
 
       def finalize
         scc_account = SccAccount.find(input[:scc_account][:id])
-        if input[:repo_status] == 'SUCCESS' && input[:prod_status] == 'SUCCESS'
-          scc_account.update! synced: DateTime.current
-        else
-          raise 'Updating failed'
-        end
+        raise 'Updating failed' unless input[:repo_status] == 'SUCCESS' && input[:prod_status] == 'SUCCESS'
+        scc_account.update! synced: Time.current
       end
 
       def rescue_strategy

data/app/lib/actions/scc_manager/sync_products.rb

@@ -16,7 +16,7 @@ module Actions
                                                     '/connect/organizations/products',
                                                     input.fetch(:login),
                                                     input.fetch(:password))
-        rescue
+        rescue StandardError
           output[:status] = 'FAILURE'
         end
       end

data/app/lib/actions/scc_manager/sync_repositories.rb

@@ -15,7 +15,7 @@ module Actions
                                                     '/connect/organizations/repositories',
                                                     input[:login],
                                                     input[:password])
-        rescue
+        rescue StandardError
           output[:status] = 'FAILURE'
         end
       end

data/app/models/scc_account.rb

@@ -26,24 +26,24 @@ class SccAccount < ApplicationRecord
     name
   end
 
-  def get_sync_status
+  def sync_status
     if sync_task.nil?
-      return _('never synced')
+      _('never synced')
     elsif sync_task.state == 'stopped'
       if sync_task.result == 'success'
-        return synced
+        synced
       else
-        return sync_task.result
+        sync_task.result
       end
     else
-      return sync_task.state
+      sync_task.state
     end
   end
 
   def test_connection
     SccManager.get_scc_data(base_url, '/connect/organizations/subscriptions', login, password)
     true
-  rescue
+  rescue StandardError
     false
   end
 
@@ -67,10 +67,14 @@ class SccAccount < ApplicationRecord
     if upstream_repo_ids.empty?
       urid_query_fragment = ''
     else
-      upstream_repo_ids_str = upstream_repo_ids.map{ |id| ActiveRecord::Base.connection.quote(id) }.join(',')
+      upstream_repo_ids_str = upstream_repo_ids.map do |id|
+        ActiveRecord::Base.connection.quote(id)
+      end.join(',')
       urid_query_fragment = " and scc_repositories.scc_id not in (#{upstream_repo_ids_str})"
     end
-    ActiveRecord::Base.connection.execute("delete from scc_repositories where scc_repositories.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{urid_query_fragment};")
+    ActiveRecord::Base.connection.execute(
+      "delete from scc_repositories where scc_repositories.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{urid_query_fragment};"
+    )
   end
 
   def update_scc_products(upstream_products)
@@ -94,10 +98,14 @@ class SccAccount < ApplicationRecord
     if upstream_product_ids.empty?
       upid_query_fragment = ''
     else
-      upstream_product_ids_str = upstream_product_ids.map{ |id| ActiveRecord::Base.connection.quote(id) }.join(',')
+      upstream_product_ids_str = upstream_product_ids.map do |id|
+        ActiveRecord::Base.connection.quote(id)
+      end.join(',')
       upid_query_fragment = " and scc_products.scc_id not in (#{upstream_product_ids_str})"
     end
-    ActiveRecord::Base.connection.execute("delete from scc_products where scc_products.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{upid_query_fragment};")
+    ActiveRecord::Base.connection.execute(
+      "delete from scc_products where scc_products.scc_account_id = #{ActiveRecord::Base.connection.quote(id)}#{upid_query_fragment};"
+    )
     # rewire product to product relationships
     upstream_products.each do |up|
       extensions = scc_products.where(scc_id: up['extensions'].map { |ext| ext['id'] })

data/app/models/scc_repository.rb

@@ -12,7 +12,7 @@ class SccRepository < ApplicationRecord
   end
 
   def token_changed_callback
-    User.current = User.anonymous_admin unless User.current
+    User.current ||= User.anonymous_admin
     scc_products.where.not(product: nil).find_each do |sp|
       reponame = sp.friendly_name + ' ' + description
       repository = sp.product.repositories.find_by(name: reponame)

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

@@ -18,7 +18,7 @@
           <%= link_to_if_authorized(scc_account.name, hash_for_edit_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)) %>
         </td>
         <td><%= scc_account.scc_products.count.to_s %></td>
-        <td><%= link_to_if(scc_account.sync_task, scc_account.get_sync_status, scc_account.sync_task) %></td>
+        <td><%= link_to_if(scc_account.sync_task, scc_account.sync_status, scc_account.sync_task) %></td>
         <td>
           <%= action_buttons(
             display_link_if_authorized(_("Select products"), hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)),

data/lib/foreman_scc_manager/engine.rb

@@ -18,8 +18,8 @@ module ForemanSccManager
 
     initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_scc_manager do
-        requires_foreman '>= 1.16'
-        requires_foreman_plugin 'katello', '>= 3.5.0'
+        requires_foreman '>= 1.18'
+        requires_foreman_plugin 'katello', '>= 3.7.0'
 
         # Add permissions
         security_block :foreman_scc_manager do
@@ -75,7 +75,7 @@ module ForemanSccManager
     end
 
     initializer 'foreman_scc_manager.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
       locale_domain = 'foreman_scc_manager'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/lib/tasks/foreman_scc_manager_tasks.rake

@@ -31,7 +31,7 @@ namespace :foreman_scc_manager do
                          "#{ForemanSccManager::Engine.root}/lib/**/*.rb",
                          "#{ForemanSccManager::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 
@@ -42,6 +42,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_scc_manager']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_scc_manager', 'foreman_scc_manager:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_scc_manager', 'foreman_scc_manager:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/locale/action_names.rb

@@ -1,61 +1,61 @@
 # Autogenerated!
-_("Delete Lifecycle Environment")
-_("Destroy Content Host")
-_("Hypervisors")
-_("Hypervisors update")
-_("Install package")
-_("Remove package")
-_("Update for host")
-_("Install Applicable Errata")
-_("Update package")
-_("Update")
-_("Install package group")
-_("Package Profile Update")
-_("Configure capsule")
-_("Auto-attach subscriptions")
-_("Create repos")
-_("Create")
-_("Remove package group")
-_("Install erratum")
-_("Register Host")
-_("Remove subscriptions")
-_("Unregister Host")
-_("Delete Activation Key")
-_("Abstract async task")
-_("Incremental Update")
-_("Destroy")
-_("Synchronize capsule content")
-_("Product Create")
-_("Export")
-_("Delete Product")
-_("Delete")
-_("Auto attach subscriptions")
-_("Reindex subscriptions")
-_("Errata mail")
-_("Attach subscriptions")
-_("Incremental Update of 0 Content View Version(s) ")
-_("Import Puppet classes")
-_("Import facts")
-_("Filtered index content")
-_("Upload into")
-_("Action with sub plans")
-_("Upload errata into")
-_("Remove from Environment")
-_("Sync SUSE subscriptions")
-_("Enable")
-_("Index errata")
-_("Remove Version")
-_("Index package groups")
-_("Add Sync Plan Products")
-_("Sync SUSE subscriptions (Products)")
-_("Remove Content")
-_("Index content")
-_("Disable")
-_("Sync SUSE subscriptions (Repositories)")
-_("Subscribe SCC Product")
-_("Remove Versions and Associations")
-_("Synchronize")
-_("Publish")
-_("Update Sync Plan Products")
-_("Promotion")
-_("Update Sync Plan")
+_('Delete Lifecycle Environment')
+_('Destroy Content Host')
+_('Hypervisors')
+_('Hypervisors update')
+_('Install package')
+_('Remove package')
+_('Update for host')
+_('Install Applicable Errata')
+_('Update package')
+_('Update')
+_('Install package group')
+_('Package Profile Update')
+_('Configure capsule')
+_('Auto-attach subscriptions')
+_('Create repos')
+_('Create')
+_('Remove package group')
+_('Install erratum')
+_('Register Host')
+_('Remove subscriptions')
+_('Unregister Host')
+_('Delete Activation Key')
+_('Abstract async task')
+_('Incremental Update')
+_('Destroy')
+_('Synchronize capsule content')
+_('Product Create')
+_('Export')
+_('Delete Product')
+_('Delete')
+_('Auto attach subscriptions')
+_('Reindex subscriptions')
+_('Errata mail')
+_('Attach subscriptions')
+_('Incremental Update of 0 Content View Version(s) ')
+_('Import Puppet classes')
+_('Import facts')
+_('Filtered index content')
+_('Upload into')
+_('Action with sub plans')
+_('Upload errata into')
+_('Remove from Environment')
+_('Sync SUSE subscriptions')
+_('Enable')
+_('Index errata')
+_('Remove Version')
+_('Index package groups')
+_('Add Sync Plan Products')
+_('Sync SUSE subscriptions (Products)')
+_('Remove Content')
+_('Index content')
+_('Disable')
+_('Sync SUSE subscriptions (Repositories)')
+_('Subscribe SCC Product')
+_('Remove Versions and Associations')
+_('Synchronize')
+_('Publish')
+_('Update Sync Plan Products')
+_('Promotion')
+_('Update Sync Plan')

data/test/controllers/foreman_scc_manager/scc_accounts_controller_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+module ForemanSccManager
+  class SccAccountsControllerTest < ActionController::TestCase
+    context 'GET #index' do
+      test 'should get index' do
+      end
+    end
+  end
+end

data/test/factories/foreman_scc_manager_factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :host do
     name 'foreman_scc_manager'
   end

data/test/test_plugin_helper.rb

@@ -1,6 +1,2 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
-
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: foreman-tasks
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '5.1'
 description: Foreman plugin to sync SUSE Customer Center products and repositories
   into Katello.
 email:
@@ -122,6 +122,7 @@ files:
 - locale/en/foreman_scc_manager.po
 - locale/foreman_scc_manager.pot
 - locale/gemspec.rb
+- test/controllers/foreman_scc_manager/scc_accounts_controller_test.rb
 - test/factories/foreman_scc_manager_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_scc_manager_test.rb
@@ -150,6 +151,7 @@ signing_key:
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
+- test/controllers/foreman_scc_manager/scc_accounts_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_scc_manager_test.rb
 - test/factories/foreman_scc_manager_factories.rb