foreman_scc_manager 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d2baaf07d83319e14477fbb5ca896df93f2154
-  data.tar.gz: 6ad133edc24b85d703fd6a1360152de37032fced
+  metadata.gz: daa248fe4014c5156df6c1ab4be7dce1af64659f
+  data.tar.gz: 6cf03c575cbc81688eb43965025c4ecfbb33f9b8
 SHA512:
-  metadata.gz: 0bc7aac431276b7b866aa82529f783bf98ce46ce63c6c48bbc34eaf188dffea1cd8f40efc114c87d71ddb25c76a11279ee3d223c2baf2df39a058daf58cb22fa
-  data.tar.gz: d0830f921dfc1dfd93799d4aaeeec5d6c0c1dcaf52dd97036526ea6afcf88219367c6c6fb5744d5fcee88eebc5e382904212e5a6c554622fa581c6b72a8f7fc9
+  metadata.gz: 5a67ebb39edf2962ed0aa880a7b0da53dcbf01d945f938463c78234a037f3e811967f5b9e7e0a3790c55df2cbe00fc982fdd0e418302b8b23f380f949608c93c
+  data.tar.gz: 2b00b136da8f133584b0082b45e951d0c2219455cf3a949c5352c5871a13270a3ca3a5a50d6b612914cb84293a828554f9d46d1aa65baf18905b7ae6adf6b6bf

data/README.md

@@ -21,7 +21,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2017 ATIX AG
+Copyright (c) 2017 ATIX AG - http://www.atix.de
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/controllers/scc_accounts_controller.rb

@@ -1,5 +1,6 @@
 class SccAccountsController < ApplicationController
-  before_filter :find_resource, only: [:show, :edit, :update, :destroy, :sync, :bulk_subscribe]
+  before_filter :find_organization
+  before_filter :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
   include Api::TaxonomyScope
   include Foreman::Controller::AutoCompleteSearch
 
@@ -12,7 +13,7 @@ class SccAccountsController < ApplicationController
   # GET /scc_accounts/new
   def new
     @scc_account = SccAccount.new
-    @scc_account.organization = Organization.current
+    @scc_account.organization = @organization
   end
 
   # POST /scc_accounts
@@ -63,37 +64,40 @@ class SccAccountsController < ApplicationController
 
   # PUT /scc_accounts/1/sync
   def sync
-    begin
-      sync_task = ForemanTasks.async_task(::Actions::SccManager::Sync, @scc_account)
-      notice _("Sync task started.")
-    rescue ::Foreman::Exception => e
-      error _("Failed to add task to queue: %s") % e.to_s
-    rescue ForemanTasks::Lock::LockConflict => e
-      error _("Lock on SCC account already taken: %s") % e.to_s
-    ensure
-      redirect_to scc_accounts_path
-    end
+    sync_task = ForemanTasks.async_task(::Actions::SccManager::Sync, @scc_account)
+    notice _('Sync task started.')
+  rescue ::Foreman::Exception => e
+    error _('Failed to add task to queue: %s') % e.to_s
+  rescue ForemanTasks::Lock::LockConflict => e
+    error _('Lock on SCC account already taken: %s') % e.to_s
+  ensure
+    redirect_to scc_accounts_path
   end
 
   def bulk_subscribe
-    begin
-      scc_products_to_subscribe =
-        @scc_account.scc_products.where(id: scc_bulk_subscribe_params[:scc_subscribe_product_ids])
-      ForemanTasks.async_task(::Actions::BulkAction,
-                              ::Actions::SccManager::SubscribeProduct,
-                              scc_products_to_subscribe)
-      notice _("Task to subscribe products started.")
-    rescue ::Foreman::Exception => e
-      error _("Failed to add task to queue: %s") % e.to_s
-    rescue ForemanTasks::Lock::LockConflict => e
-      error _("Lock on SCC account already taken: %s") % e.to_s
-    ensure
-      redirect_to scc_accounts_path
-    end
+    scc_products_to_subscribe =
+      @scc_account.scc_products.where(id: scc_bulk_subscribe_params[:scc_subscribe_product_ids])
+    ForemanTasks.async_task(::Actions::BulkAction,
+                            ::Actions::SccManager::SubscribeProduct,
+                            scc_products_to_subscribe)
+    notice _('Task to subscribe products started.')
+  rescue ::Foreman::Exception => e
+    error _('Failed to add task to queue: %s') % e.to_s
+  rescue ForemanTasks::Lock::LockConflict => e
+    error _('Lock on SCC account already taken: %s') % e.to_s
+  ensure
+    redirect_to scc_accounts_path
   end
 
   private
 
+  def find_organization
+    @organization = Organization.current
+    unless @organization
+      redirect_to '/select_organization?toState=' + request.path
+    end
+  end
+
   # Use callbacks to share common setup or constraints between actions.
   # Only allow a trusted parameter "white list" through.
   def scc_account_params

data/app/controllers/scc_products_controller.rb

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

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

@@ -65,6 +65,7 @@ module Actions
         repository.arch = input[:arch]
         repository.mirror_on_sync = true
         repository.verify_ssl_on_sync = true
+        repository.download_policy = ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
         trigger(::Actions::Katello::Repository::Create, repository, false, false)
       end
     end

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

@@ -15,7 +15,7 @@ module Actions
 
       def finalize
         scc_account = SccAccount.find(input[:scc_account][:id])
-        if input[:repo_status] == 'SUCCESS' and input[:prod_status] == 'SUCCESS'
+        if input[:repo_status] == 'SUCCESS' && input[:prod_status] == 'SUCCESS'
           scc_account.sync_status = 'successful'
           scc_account.synced = DateTime.current
         else

data/app/models/scc_account.rb

@@ -1,10 +1,10 @@
-class SccAccount < ActiveRecord::Base
+class SccAccount < ApplicationRecord
   include Authorizable
   include Encryptable
   include ForemanTasks::Concerns::ActionSubject
   encrypts :password
 
-  SYNC_STATI = [ nil, 'running', 'successful', 'failed' ]
+  SYNC_STATI = [nil, 'running', 'successful', 'failed'].freeze
 
   self.include_root_in_json = false
 
@@ -18,7 +18,7 @@ class SccAccount < ActiveRecord::Base
   validates :login, presence: true
   validates :password, presence: true
   validates :base_url, presence: true
-  validates_inclusion_of :sync_status, in: SYNC_STATI
+  validates :sync_status, inclusion: { in: SYNC_STATI }
 
   default_scope -> { order(:login) }
 
@@ -29,7 +29,7 @@ class SccAccount < ActiveRecord::Base
   end
 
   def get_sync_status
-    if sync_status == nil
+    if sync_status.nil?
       return _('never synced')
     elsif sync_status == 'running'
       return _('sync in progress')
@@ -42,12 +42,10 @@ class SccAccount < ActiveRecord::Base
   end
 
   def test_connection
-    begin
-      SccManager::get_scc_data(base_url, '/connect/organizations/subscriptions', login, password)
-      true
-    rescue
-      false
-    end
+    SccManager.get_scc_data(base_url, '/connect/organizations/subscriptions', login, password)
+    true
+  rescue
+    false
   end
 
   def update_scc_repositories(upstream_repositories)

data/app/models/scc_extending.rb

@@ -1,4 +1,4 @@
-class SccExtending < ActiveRecord::Base
+class SccExtending < ApplicationRecord
   belongs_to :scc_product
   belongs_to :scc_extension, class_name: :SccProduct
 end

data/app/models/scc_product.rb

@@ -1,4 +1,4 @@
-class SccProduct < ActiveRecord::Base
+class SccProduct < ApplicationRecord
   include Authorizable
   include ForemanTasks::Concerns::ActionSubject
 
@@ -20,7 +20,7 @@ class SccProduct < ActiveRecord::Base
   scoped_search on: :name, complete_value: true
 
   def uniq_name
-    return "#{scc_id} " + friendly_name;
+    "#{scc_id} " + friendly_name
   end
 
   def subscribe

data/app/models/scc_repository.rb

@@ -1,4 +1,4 @@
-class SccRepository < ActiveRecord::Base
+class SccRepository < ApplicationRecord
   after_commit :token_changed_callback
 
   self.include_root_in_json = false

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

@@ -10,7 +10,7 @@
     <div class="tab-pane active" id="primary">
       <div>
         <%= text_f f, :name %>
-        <%= text_f f, :login %>
+        <%= text_f f, :login, :help_block => _("Use your 'Organization credentials' obtained from the SUSE Customer Center.") %>
         <%= password_f f, :password %>
         <%= text_f f, :base_url, label: _('Base URL') %>
         <div class='clearfix'>

data/config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
       put 'bulk_subscribe'
     end
   end
-  resources :scc_products, only: [:index, :show] do
+  resources :scc_products, only: %i[index show] do
     member do
       put 'subscribe'
       put 'unsubscribe'

data/db/migrate/20170303085304_add_organization_to_scc_account.rb

@@ -1,9 +1,9 @@
 class AddOrganizationToSccAccount < ActiveRecord::Migration
-  class SccAccount < ActiveRecord::Base
+  class SccAccount < ApplicationRecord
     belongs_to :organization
   end
 
-  class Organization < ActiveRecord::Base
+  class Organization < ApplicationRecord
   end
 
   def up

data/lib/foreman_scc_manager/engine.rb

@@ -1,3 +1,5 @@
+require 'katello'
+
 module ForemanSccManager
   class Engine < ::Rails::Engine
     engine_name 'foreman_scc_manager'
@@ -17,20 +19,21 @@ module ForemanSccManager
     initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_scc_manager do
         requires_foreman '>= 1.13'
+        requires_foreman_plugin 'katello', '>= 3.2.0'
 
         # Add permissions
         security_block :foreman_scc_manager do
-          permission :view_scc, :scc_account => [:index, :show]
+          permission :view_scc, :scc_account => %i[index show]
           permission :use_scc, :scc_account => [:bulk_subscribe]
           # permission :use_scc, :scc_product => [:subscribe, :unsubscribe]
-          permission :new_scc, :scc_account => [:new, :create]
-          permission :edit_scc, :scc_account => [:edit, :update]
+          permission :new_scc, :scc_account => %i[new create]
+          permission :edit_scc, :scc_account => %i[edit update]
           permission :delete_scc, :scc_account => [:destroy]
           permission :sync_scc, :scc_account => [:sync]
         end
 
         # Add a new role called 'SccManager' if it doesn't exist
-        role 'SccManager', [:view_scc, :use_scc, :new_scc, :edit_scc, :delete_scc, :sync_scc]
+        role 'SccManager', %i[view_scc use_scc new_scc edit_scc delete_scc sync_scc]
 
         # add menu entry
         menu :top_menu, :scc_manager,
@@ -43,7 +46,7 @@ module ForemanSccManager
 
     initializer 'foreman_scc_manager.register_actions', :before => :finisher_hook do |_app|
       ForemanTasks.dynflow.require!
-      action_paths = %W(#{ForemanSccManager::Engine.root}/app/lib/actions)
+      action_paths = %W[#{ForemanSccManager::Engine.root}/app/lib/actions]
       ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
     end
 

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman