hammer_cli_katello 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a0c1942a467a8de0c6ed9e0ea81e682488d7885bfe49f2921e9a2a6fd7e99f
-  data.tar.gz: c92458aa1299e5c707323fd9ad96422149400f676002fdd6497e2f171799caef
+  metadata.gz: 96b7e37c04cf182db80991f71900540b53c147a655bc003cffd000c6b6a43675
+  data.tar.gz: 9984c39d7276c1f39012290f6f4d04cf6630d97077096bdf55063cb9115d9265
 SHA512:
-  metadata.gz: '0044948e47d6ada111b0cabb37a925d754b1b4b2e1b38519804886a1c6ebd593a847b429916c2c780efb86d95f4a653399738142b27117c8ce40d4abc20ea33d'
-  data.tar.gz: 3c363f5ddeba819dfc7b4fc3d531583b5c8c5f12d151147e3bd2addc65cd4fbf31b065c4bb6971a824c362092d1cbd79ee1588e1c717b2f5461d0b86f5708558
+  metadata.gz: 014c54b5130dfd01f28162635ef4fe95e7af4e88d1623cd65ac5a9fc33c1f5f2d351a2efef084d09346c86c07e26141438ca6a16f53763c561eba8bbf400379f
+  data.tar.gz: 97d8619b2048661b4a752cbe8680d1ed5f98d9a90af29b50eb5b330ac132292afc31e3ac6b7c0ffb122506f1d4780dcecaf77f4c67e51543c7f20f6ffdce5778

data/lib/hammer_cli_katello/content_view_version.rb

@@ -311,12 +311,12 @@ module HammerCLIKatello
         end
 
         json = export_json(export_json_options)
-        create_tar(cvv, repositories, json)
+        create_tar(cv, cvv, repositories, json)
         return HammerCLI::EX_OK
       end
 
-      def create_tar(cvv, repositories, json)
-        export_prefix = "export-#{cvv['id']}"
+      def create_tar(cv, cvv, repositories, json)
+        export_prefix = "export-#{cv['label']}-#{cvv['id']}"
         export_file = "#{export_prefix}.json"
         export_repos_tar = "#{export_prefix}-repos.tar"
         export_tar = "#{export_prefix}.tar"

data/lib/hammer_cli_katello/ostree_branch.rb

@@ -24,7 +24,6 @@ module HammerCLIKatello
         field :name, _("Name")
         field :version, _("Version")
         field :commit, _("Commit")
-        field :version_date, _("Date")
       end
 
       build_options

data/lib/hammer_cli_katello/sync_plan.rb

@@ -10,6 +10,7 @@ module HammerCLIKatello
         field :interval, _("Interval")
         field :enabled, _("Enabled"), Fields::Boolean
         field :cron_expression, _("Cron Expression")
+        field :foreman_tasks_recurring_logic_id, _("Recurring Logic ID")
       end
 
       build_options

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.16.0')
+    @version ||= Gem::Version.new('0.16.1')
   end
 end

data/test/functional/content_view/version/export_test.rb

@@ -26,7 +26,8 @@ describe 'content-view version export' do
     ex = api_expects(:content_views, :show)
     ex.returns(
       'id' => '4321',
-      'composite' => false
+      'composite' => false,
+      'label' => 'cv'
     )
 
     ex = api_expects(:repositories, :show).with_params('id' => '2')
@@ -50,9 +51,9 @@ describe 'content-view version export' do
     File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
 
     Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").returns(true)
-    Dir.expects(:mkdir).with('/tmp/exports/export-5').returns(0)
+    Dir.expects(:mkdir).with('/tmp/exports/export-cv-5').returns(0)
     Dir.expects(:chdir).with('/tmp/exports').returns(0)
-    Dir.expects(:chdir).with('/tmp/exports/export-5').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-cv-5').returns(0)
 
     result = run_cmd(@cmd + params)
     assert_equal(HammerCLI::EX_OK, result.exit_code)
@@ -78,16 +79,17 @@ describe 'content-view version export' do
     ex.returns(
       'id' => '4321',
       'composite' => true,
-      'components' => [{ 'name' => "injera 95.5" }, {'name' => 'carrot wot 87.0'}]
+      'components' => [{ 'name' => "injera 95.5" }, {'name' => 'carrot wot 87.0'}],
+      'label' => 'cv'
     )
 
     File.expects(:exist?).with('/usr/share/foreman').returns(true)
     File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
 
     Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").never
-    Dir.expects(:mkdir).with('/tmp/exports/export-999').returns(0)
+    Dir.expects(:mkdir).with('/tmp/exports/export-cv-999').returns(0)
     Dir.expects(:chdir).with('/tmp/exports').returns(0)
-    Dir.expects(:chdir).with('/tmp/exports/export-999').returns(0)
+    Dir.expects(:chdir).with('/tmp/exports/export-cv-999').returns(0)
 
     result = run_cmd(@cmd + params)
     assert_equal(HammerCLI::EX_OK, result.exit_code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman