foreman_scc_manager 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6946578ff8b15ec04a5c14a78e12107481d47d9f5093a4e1d2501bc79c4c4f94
-  data.tar.gz: f800326b64951b7909427f7fa7d126e6300550f5bee9afacbb394f83d5fe1cf7
+  metadata.gz: d7c8972758e41cdce58310d4614d5cb752da659cc9582007a044fe1b1ef604e7
+  data.tar.gz: 335ad36e989387edf40be0684367842c8cc7d066b000575dc7222dfdf835c3ef
 SHA512:
-  metadata.gz: d90c05393fe090f811d6cfbb038dd2cb5e45f73ed1359e3bd172c422131a9acb53ac17c0e85c253f9a350462fa5a7954d767af01ffdb9baf3766fcae5acee014
-  data.tar.gz: acbbdc19ee139f505415d328fe51f463e2d249a82635b75750b73bfbbdd4fd3a84a32f465cac22c806d36b8044f6d07f14045ecb931830af58a39dac19ce94ee
+  metadata.gz: 1a88281c4ee2f87c48858b361113f5d5d18660859a70068ded6d551e0d424425595473b18023346fcf948e15a66beeec6bea3a66b5c4808b5d86ee71d61ebc93
+  data.tar.gz: 942e5a886da564164213a2f65f75d2b08520d13a9d7ff6ff5a67615b4b0f24ac1cdf865439924ce5006e1b9937e968eb237ba2c56dc695f48586aad2c4fa7d4d

data/README.md

@@ -39,7 +39,7 @@ foreman-installer
 
 ## Documentation
 
-[Plugin documentation](https://docs.orcharhino.com/or/docs/sources/guides/suse_linux_enterprise_server/managing_content/managing_suse_content.html)
+[Plugin documentation](https://docs.theforeman.org/nightly/Managing_Content/index-katello.html#Managing_SUSE_Content_content-management)
 
 ## Hammer CLI Extension
 

data/app/models/scc_account.rb

@@ -287,16 +287,24 @@ class SccAccount < ApplicationRecord
   end
 
   def self.download_policy_selection_values
-    names = { 'on_demand' => _('On Demand'), 'immediate' => _('Immediate') }
+    names = {
+      ::Katello::RootRepository::DOWNLOAD_ON_DEMAND => _('On Demand'),
+      ::Katello::RootRepository::DOWNLOAD_IMMEDIATE => _('Immediate')
+    }
+
     ::Katello::RootRepository::DOWNLOAD_POLICIES.map do |p|
-      names.include?(p) ? [names[p], p] : [p, p]
+      [names.fetch(p, p), p]
     end
   end
 
   def self.mirroring_policy_selection_values
-    names = { 'additive' => _('Additive'), 'mirror_content_only' => _('Content Only') }
-    SCC_MIRRORING_POLICIES.map do |p|
-      names.include?(p) ? [names[p], p] : [p, p]
+    names = {
+      ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE => _('Additive'),
+      ::Katello::RootRepository::MIRRORING_POLICY_CONTENT => _('Content Only')
+    }
+
+    ::Katello::RootRepository::MIRRORING_POLICIES.map do |p|
+      [names.fetch(p, p), p]
     end
   end
 end

data/db/migrate/20210713092440_add_permissions.rb

@@ -5,9 +5,9 @@ class AddPermissions < ActiveRecord::Migration[6.0]
   ].freeze
 
   def up
-    Permission.create!(:name => 'test_connection_scc_accounts', :resource_type => 'SccAccount')
+    Permission.find_or_create_by!(:name => 'test_connection_scc_accounts', :resource_type => 'SccAccount')
     PRODUCT_PERMISSION_NAMES.each do |p|
-      Permission.create!(:name => p, :resource_type => SccProduct)
+      Permission.find_or_create_by!(:name => p, :resource_type => 'SccProduct')
     end
   end
 

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/locale/Makefile

@@ -6,8 +6,8 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_scc_manager
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
 POFILES = $(shell find . -name '$(DOMAIN).po')
@@ -41,7 +41,10 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-pull: $(EDITFILES)
+tx-new:
+	tx pull --minimum-perc 50 --all
+
+tx-pull: tx-new $(EDITFILES)
 	tx pull -f
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
@@ -52,7 +55,9 @@ tx-update: tx-pull
 	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
 	@echo
 
-mo-files: $(MOFILES)
+build-mo-files: $(MOFILES)
+
+mo-files: build-mo-files
 	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo

data/locale/action_names.rb

@@ -1,5 +1,88 @@
-_("Subscribe SCC Product")
-_("Sync SUSE subscriptions")
-_("Update SUSE repositories")
-_("Sync SUSE subscriptions (Products)")
+# Autogenerated!
+_("Import")
+_("Export Repository")
+_("Export Library")
+_("Generate host applicability")
+_("Bulk generate applicability for hosts")
+_("Generate repository applicability")
+_("Synchronize smart proxy")
+_("Sync capsule")
+_("Update CDN Configuration")
+_("Update")
+_("Delete")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
+_("Syncable export")
+_("Export")
+_("Copy version units to library")
+_("Create Syncable Export History")
+_("Create Import History")
+_("Create")
+_("Delete Activation Key")
+_("Create Export History")
+_("Agent action")
+_("Create Alternate Content Source")
+_("Destroy Alternate Content Source")
+_("Refresh Alternate Content Source")
+_("Update Alternate Content Source")
+_("Action with sub plans")
+_("Abstract")
+_("Remove from Environment")
+_("Promote")
+_("Promotion to Environment")
+_("Publish")
+_("Remove Versions and Associations")
+_("Remove Version")
+_("Import Content View Version")
+_("Import Default Content View")
+_("Import Repository")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Delete Lifecycle Environment")
+_("Publish Lifecycle Environment Repositories")
+_("Attach subscriptions")
+_("Auto attach subscriptions")
+_("Destroy Content Host")
+_("Install Applicable Errata")
+_("Hypervisors")
+_("Hypervisors update")
+_("Remove subscriptions")
+_("Combined Profile Update")
+_("Update Content Overrides")
+_("Update for host")
+_("Update release version for host")
+_("Updating System Purpose for host")
+_("Package Profile Update")
+_("Destroy")
+_("Run Sync Plan:")
+_("Enable")
+_("Disable")
+_("Verify checksum")
+_("Create Package Group")
+_("Upload into")
+_("Update redhat repository")
+_("Update http proxy details")
+_("Update content urls")
+_("Discover")
+_("Synchronize")
+_("Remove Content")
+_("Instance update")
+_("Index package groups")
+_("Index module streams")
+_("Index errata")
+_("Index content")
+_("Filtered index content")
+_("Fetch pxe files")
+_("Delete Package Group")
+_("Update http proxy")
+_("Reindex subscriptions")
+_("Delete Product")
+_("Product Create")
 _("Sync SUSE subscriptions (Repositories)")
+_("Sync SUSE subscriptions (Products)")
+_("Update SUSE repositories")
+_("Sync SUSE subscriptions")
+_("Subscribe SCC Product")