katello 3.9.1 → 3.10.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum.controller.js

@@ -16,6 +16,8 @@ angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Err
             loading: true
         };
 
+        $scope.moduleStreamShowMap = {};
+
         if ($scope.errata) {
             $scope.panel.loading = false;
         }
@@ -26,5 +28,22 @@ angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Err
             $scope.panel.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
+
+        $scope.showModuleStreamList = function (moduleStreamId) {
+            return (!$scope.moduleStreamShowMap.hasOwnProperty(moduleStreamId) ||
+                     $scope.moduleStreamShowMap[moduleStreamId]);
+        };
+
+        $scope.toggleModuleStreamList = function (moduleStreamId) {
+            if ($scope.moduleStreamShowMap.hasOwnProperty(moduleStreamId)) {
+                $scope.moduleStreamShowMap[moduleStreamId] = !$scope.moduleStreamShowMap[moduleStreamId];
+            } else {
+                $scope.moduleStreamShowMap[moduleStreamId] = false;
+            }
+        };
+
+        $scope.moduleStreamChevron = function (moduleStreamId) {
+            return $scope.showModuleStreamList(moduleStreamId) ? 'down' : 'right';
+        };
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-info.html

@@ -43,16 +43,4 @@
     <h3 translate>Solution</h3>
     <p class="info-paragraph">{{ errata.solution }}</p>
   </div>
-
-  <div data-block="right-column">
-    <h3 translate>Affected Packages</h3>
-
-    <ul class="list-unstyled">
-      <li ng-repeat="package in errata.packages">
-        <a href="/packages?search={{package}}">
-          {{ package }}
-        </a>
-      </li>
-    </ul>
-  </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-packages.html

@@ -0,0 +1,36 @@
+<span page-title ng-model="errata">{{ 'Packages for Errata: ' | translate }} {{ errata.title }}</span>
+
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h3 translate>Independent Packages</h3>
+    <ul>
+      <p ng-show="!errata.packages.length" >No Packages to show</p>
+      <li ng-show="errata.packages.length" ng-repeat="package in errata.packages">
+        <a href="/packages?search={{package}}">
+          {{ package }}
+        </a>
+      </li>
+    </ul>
+  </div>
+
+  <div data-block="right-column">
+    <h3 translate>Module Stream Packages</h3>
+    <ul class="list-unstyled">
+      <p ng-show="!errata.module_streams.length" >No Packages to show</p>
+      <li ng-show="errata.module_streams.length" ng-repeat="moduleStream in errata.module_streams">
+        <i class="fa fa-chevron-{{ moduleStreamChevron(moduleStream.id) }} cursor-pointer selected-icon" 
+           ng-click="toggleModuleStreamList(moduleStream.id)"></i>
+        <a href="/module_streams/{{ moduleStream.id }}">
+          <b>{{ moduleStream.name + ":" + moduleStream.stream }}</b>
+        </a>
+        <ul ng-show="showModuleStreamList(moduleStream.id)">
+          <li ng-repeat="package in  moduleStream.packages">
+            <a href="/packages?search={{package}}">
+              {{ package }}
+            </a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum.html

@@ -28,6 +28,13 @@
           </span>
         </a>
       </li>
+      <li ng-class="{active: isState('erratum.packages') || isState('erratum.module_stream_packages')}">
+        <a ui-sref="erratum.packages">
+          <span translate>
+            Packages
+          </span>
+        </a>
+      </li>
     </ul>
   </nav>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.routes.js

@@ -134,5 +134,14 @@ angular.module('Bastion.errata').config(['$stateProvider', function ($stateProvi
             label: "{{ task.id }}",
             parent: 'erratum.info'
         }
+    })
+    .state('erratum.packages', {
+        url: '/packages',
+        permission: ['view_products', 'view_content_views'],
+        templateUrl: 'errata/details/views/erratum-packages.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Packages' | translate }}",
+            parent: 'erratum.info'
+        }
     });
 }]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-module-streams.factory.js

@@ -0,0 +1,18 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.hosts.factory:HostModuleStream
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for the packages of a single content host
+ */
+angular.module('Bastion.hosts').factory('HostModuleStream',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('api/v2/hosts/:id/module_streams/:action', {id: '@id'}, {
+            autocomplete: {method: 'GET', isArray: true, params: {action: 'auto_complete_search'}}
+        });
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -113,7 +113,7 @@
             on-save="save(repository)">
         </dd>
       </span>
-      <span ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
+      <span ng-show="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'puppet'">
         <dt translate>Mirror on Sync</dt>
         <dd bst-edit-checkbox="repository.mirror_on_sync"
             formatter="booleanToYesNo"
@@ -188,7 +188,7 @@
         </dd>
       </span>
 
-      <span ng-if="repository.content_type === 'yum' && !product.redhat">
+      <span ng-if="(repository.content_type === 'yum' && !product.redhat) || repository.content_type === 'deb'">
         <dt translate>GPG Key</dt>
         <dd bst-edit-select="repository.gpg_key.name"
             readonly="product.redhat ||denied('edit_products', product)"
@@ -196,6 +196,8 @@
             options="gpgKeys()"
             on-save="save(repository)">
         </dd>
+      </span>
+      <span ng-if="repository.content_type === 'yum' && !product.redhat">
         <dt translate>SSL CA Cert</dt>
         <dd bst-edit-select="repository.ssl_ca_cert.name"
             readonly="product.redhat ||denied('edit_products', product)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -180,7 +180,7 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-if="repository.content_type === 'yum' || repository.content_type === 'puppet'">
+      <div class="checkbox" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'puppet'">
         <label>
           <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
           <span translate>Mirror on Sync</span>
@@ -224,7 +224,7 @@
         </label>
       </div>
 
-      <div bst-form-group label="{{ 'GPG Key' | translate }}" ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'GPG Key' | translate }}" ng-show="repository.content_type === 'yum' || repository.content_type === 'deb'">
         <select id="gpg_key_id"
                 name="gpg_key_id"
                 ng-model="repository.gpg_key_id"

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -47,3 +47,16 @@
 .drop-down-check-box {
   margin-left: 10px
 };
+
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.kat-clearfix::after {
+  clear: both;
+}
+
+.kat-inline {
+  float: left;
+  padding-right: 5px;
+}

data/lib/katello/permissions/host_permissions.rb

@@ -26,6 +26,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
   'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
+  'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
@@ -39,6 +40,8 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_errata/index',
   'katello/api/v2/host_errata/show',
   'katello/api/v2/host_errata/auto_complete_search',
+  'katello/api/v2/host_module_streams/index',
+  'katello/api/v2/host_module_streams/auto_complete_search',
   'katello/api/v2/host_subscriptions/index',
   'katello/api/v2/host_subscriptions/events',
   'katello/api/v2/host_subscriptions/product_content',

data/lib/katello/repository_types/deb.rb

@@ -1 +1,3 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE)
+Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
+  service_class Katello::Pulp::Repository::Deb
+end

data/lib/katello/repository_types/docker.rb

@@ -1 +1,3 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE)
+Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
+  service_class Katello::Pulp::Repository::Docker
+end

data/lib/katello/repository_types/file.rb

@@ -1,3 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   allow_creation_by_user true
+  service_class Katello::Pulp::Repository::File
 end

data/lib/katello/repository_types/ostree.rb

@@ -1 +1,3 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::OSTREE_TYPE)
+Katello::RepositoryTypeManager.register(::Katello::Repository::OSTREE_TYPE) do
+  service_class Katello::Pulp::Repository::Ostree
+end

data/lib/katello/repository_types/puppet.rb

@@ -1 +1,3 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::PUPPET_TYPE)
+Katello::RepositoryTypeManager.register(::Katello::Repository::PUPPET_TYPE) do
+  service_class Katello::Pulp::Repository::Puppet
+end

data/lib/katello/repository_types/yum.rb

@@ -1 +1,3 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE)
+Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
+  service_class Katello::Pulp::Repository::Yum
+end

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   task :delete_orphaned_content => ["environment"] do
     User.current = User.anonymous_admin
-    SmartProxy.with_content.reverse.each do |proxy|
+    SmartProxy.with_content.reverse_each do |proxy|
       begin
         ForemanTasks.async_task(Actions::Katello::CapsuleContent::RemoveOrphans,
                                 :capsule_id => proxy.id)

data/lib/katello/tasks/reset.rake

@@ -12,6 +12,7 @@ namespace :katello do
       system(service_start.gsub("%s", "mongod"))
       sleep(10)
       fail "Cannot migrate pulp database" unless system("sudo -u apache /usr/bin/pulp-manage-db")
+
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }
       puts "Pulp database reset."
     end

data/lib/katello/tasks/test.rake

@@ -136,6 +136,20 @@ namespace :test do
         Rake::Task[test_task.name].invoke
       end
 
+      desc "Run the Katello plugin unit glue test suite."
+      task :services => ['db:test:prepare'] do
+        test_task = Rake::TestTask.new('katello_services_test_task') do |t|
+          t.libs << ["test", "#{Katello::Engine.root}/test"]
+          t.test_files = [
+            "#{Katello::Engine.root}/test/services/**/*_test.rb"
+          ]
+          t.verbose = true
+          t.warning = false
+        end
+
+        Rake::Task[test_task.name].invoke
+      end
+
       desc "Run the Katello plugin unit lib test suite."
       task :lib => ['db:test:prepare'] do
         test_task = Rake::TestTask.new('katello_lib_test_task') do |t|

data/lib/katello/tasks/unify_hosts.rake

@@ -19,6 +19,7 @@ namespace :katello do
       passed = []
       ::Host.unscoped.where("name like '%.%'").find_each do |host|
         next if passed.include?(host.name.downcase)
+
         passed << host.name.downcase
         puts "Skipping #{host.name}, more than one record." && next if ::Host.unscoped.where(:name => host.name).count > 1
 
@@ -29,6 +30,7 @@ namespace :katello do
 
     def unify_two(name1, name2)
       fail _("#{name1} specified twice") if name1 == name2
+
       host1 = Host.find_by(:name => name1)
       host2 = Host.find_by(:name => name2)
       if host1.nil? || host2.nil?

data/lib/katello/tasks/virt_who_report.rake

@@ -6,7 +6,7 @@ namespace :katello do
     LIMIT - only execute on a specified number of hosts (useful when re-running with different options).  Example:  LIMIT=500
     IGNORE - ignore one or more pools, separated via a pipe character '|'.
       Example:  IGNORE="Red Hat Enterprise Linux Server with Smart Management, Standard (Physical or Virtual Nodes)|Some Other Pool"
-DESCRIPTION
+  DESCRIPTION
   task :virt_who_report => ["environment", "check_ping"] do
     class ProblemItem
       attr_accessor :host, :hypervisor, :message
@@ -111,6 +111,7 @@ DESCRIPTION
 
     for_each_item_with_index do |item, index|
       break if ENV['LIMIT'] && ENV['LIMIT'].to_i < index
+
       puts "#{index + 1}/#{total}"
       begin
         consumer_attributes = candlepin_attributes(item)

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.9.1".freeze
+  VERSION = "3.10.0.rc1".freeze
 end

data/locale/Makefile

@@ -1,33 +1,40 @@
 #
-# Makefile for PO merging and MO generation
+# Makefile for PO merging and MO generation. More info in the README.
 #
-
-POTFILE = katello.pot
-POFILES = $(shell find . -name '*.po')
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = katello
+VERSION = $(shell git describe --abbrev=0 --tags)
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
 
 %.mo: %.po
-	msgfmt -o $@ $<
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+	touch $(shell dirname $@)/LC_MESSAGES/$(MOFILE)
 
 # Generate MO files from PO files
 all-mo: $(MOFILES)
 
 # Check for malformed strings
-# TODO - enable endwhitespace, endpunc, puncspacing, options filters
 %.pox: %.po
 	msgfmt -c $<
 	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
-		-t options -t printf -t validchars --gnome $< > $@
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
 	! grep -q msgid $@
 
-check: $(POXFILES)
+%.edit.po:
+	touch $@
 
-# Merge PO files
-update-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
-	done
+check: $(POXFILES)
 
 # Unify duplicate translations
 uniq-po:
@@ -35,7 +42,35 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-# Remove all MO files
-clean:
-	-rm -f messages.mo
-	find . \( -name "*.mo" -o -name "*.pox" \) -exec rm -f '{}' ';'
+tx-pull: $(EDITFILES)
+	tx pull -f
+	for f in $(EDITFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+tx-update: tx-pull
+	@echo
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo
+
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git commit -m "i18n - pulling from tx"
+	@echo
+	@echo Changes commited!
+	@echo
+
+# Workaround when rake task fails (https://github.com/ruby/rake/pull/182)
+extract:
+	rxgettext \
+		--sort-output \
+		--sort-by-msgid \
+		--no-wrap \
+		--no-location \
+		-o ${DOMAIN}.pot \
+		--package-name=${DOMAIN} \
+		--package-version="${VERSION}" \
+		--msgid-bugs-address=foreman-dev@googlegroups.com \
+		--copyright-holder="Foreman developers" \
+		--copyright-year=$(shell date +%Y) \
+		$(shell find ../app -type f -name \*.rb -o -name \*.erb)

data/locale/update-i18n

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+FOREMAN_DIR="../../foreman"
+BASTION_DIR="../engines/bastion_katello"
+
+#this actuall pulls the strings from transifex for both directions
+make -C locale tx-update
+
+#Extract the main strings
+pushd $FOREMAN_DIR
+bundle exec rake plugin:gettext[katello]
+popd
+
+# Now extract the bastion files
+pushd $BASTION_DIR
+bundle exec grunt i18n:extract
+bundle exec grunt i18n:compile
+popd
+
+# This step creates the mo files and does the commit
+make -C locale mo-files
+