hammer_cli_katello 0.16.0 → 0.16.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/hammer_cli_katello/content_view_version.rb +3 -3
  3. data/lib/hammer_cli_katello/ostree_branch.rb +0 -1
  4. data/lib/hammer_cli_katello/sync_plan.rb +1 -0
  5. data/lib/hammer_cli_katello/version.rb +1 -1
  6. data/test/functional/content_view/version/export_test.rb +8 -6
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a5a0c1942a467a8de0c6ed9e0ea81e682488d7885bfe49f2921e9a2a6fd7e99f
4
- data.tar.gz: c92458aa1299e5c707323fd9ad96422149400f676002fdd6497e2f171799caef
3
+ metadata.gz: 96b7e37c04cf182db80991f71900540b53c147a655bc003cffd000c6b6a43675
4
+ data.tar.gz: 9984c39d7276c1f39012290f6f4d04cf6630d97077096bdf55063cb9115d9265
5
5
  SHA512:
6
- metadata.gz: '0044948e47d6ada111b0cabb37a925d754b1b4b2e1b38519804886a1c6ebd593a847b429916c2c780efb86d95f4a653399738142b27117c8ce40d4abc20ea33d'
7
- data.tar.gz: 3c363f5ddeba819dfc7b4fc3d531583b5c8c5f12d151147e3bd2addc65cd4fbf31b065c4bb6971a824c362092d1cbd79ee1588e1c717b2f5461d0b86f5708558
6
+ metadata.gz: 014c54b5130dfd01f28162635ef4fe95e7af4e88d1623cd65ac5a9fc33c1f5f2d351a2efef084d09346c86c07e26141438ca6a16f53763c561eba8bbf400379f
7
+ data.tar.gz: 97d8619b2048661b4a752cbe8680d1ed5f98d9a90af29b50eb5b330ac132292afc31e3ac6b7c0ffb122506f1d4780dcecaf77f4c67e51543c7f20f6ffdce5778
data/lib/hammer_cli_katello/content_view_version.rb CHANGED
@@ -311,12 +311,12 @@ module HammerCLIKatello
311
311
  end
312
312
 
313
313
  json = export_json(export_json_options)
314
- create_tar(cvv, repositories, json)
314
+ create_tar(cv, cvv, repositories, json)
315
315
  return HammerCLI::EX_OK
316
316
  end
317
317
 
318
- def create_tar(cvv, repositories, json)
319
- export_prefix = "export-#{cvv['id']}"
318
+ def create_tar(cv, cvv, repositories, json)
319
+ export_prefix = "export-#{cv['label']}-#{cvv['id']}"
320
320
  export_file = "#{export_prefix}.json"
321
321
  export_repos_tar = "#{export_prefix}-repos.tar"
322
322
  export_tar = "#{export_prefix}.tar"
data/lib/hammer_cli_katello/ostree_branch.rb CHANGED
@@ -24,7 +24,6 @@ module HammerCLIKatello
24
24
  field :name, _("Name")
25
25
  field :version, _("Version")
26
26
  field :commit, _("Commit")
27
- field :version_date, _("Date")
28
27
  end
29
28
 
30
29
  build_options
data/lib/hammer_cli_katello/sync_plan.rb CHANGED
@@ -10,6 +10,7 @@ module HammerCLIKatello
10
10
  field :interval, _("Interval")
11
11
  field :enabled, _("Enabled"), Fields::Boolean
12
12
  field :cron_expression, _("Cron Expression")
13
+ field :foreman_tasks_recurring_logic_id, _("Recurring Logic ID")
13
14
  end
14
15
 
15
16
  build_options
data/lib/hammer_cli_katello/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module HammerCLIKatello
2
2
  def self.version
3
- @version ||= Gem::Version.new('0.16.0')
3
+ @version ||= Gem::Version.new('0.16.1')
4
4
  end
5
5
  end
data/test/functional/content_view/version/export_test.rb CHANGED
@@ -26,7 +26,8 @@ describe 'content-view version export' do
26
26
  ex = api_expects(:content_views, :show)
27
27
  ex.returns(
28
28
  'id' => '4321',
29
- 'composite' => false
29
+ 'composite' => false,
30
+ 'label' => 'cv'
30
31
  )
31
32
 
32
33
  ex = api_expects(:repositories, :show).with_params('id' => '2')
@@ -50,9 +51,9 @@ describe 'content-view version export' do
50
51
  File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
51
52
 
52
53
  Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").returns(true)
53
- Dir.expects(:mkdir).with('/tmp/exports/export-5').returns(0)
54
+ Dir.expects(:mkdir).with('/tmp/exports/export-cv-5').returns(0)
54
55
  Dir.expects(:chdir).with('/tmp/exports').returns(0)
55
- Dir.expects(:chdir).with('/tmp/exports/export-5').returns(0)
56
+ Dir.expects(:chdir).with('/tmp/exports/export-cv-5').returns(0)
56
57
 
57
58
  result = run_cmd(@cmd + params)
58
59
  assert_equal(HammerCLI::EX_OK, result.exit_code)
@@ -78,16 +79,17 @@ describe 'content-view version export' do
78
79
  ex.returns(
79
80
  'id' => '4321',
80
81
  'composite' => true,
81
- 'components' => [{ 'name' => "injera 95.5" }, {'name' => 'carrot wot 87.0'}]
82
+ 'components' => [{ 'name' => "injera 95.5" }, {'name' => 'carrot wot 87.0'}],
83
+ 'label' => 'cv'
82
84
  )
83
85
 
84
86
  File.expects(:exist?).with('/usr/share/foreman').returns(true)
85
87
  File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
86
88
 
87
89
  Dir.expects(:chdir).with("/var/lib/pulp/published/yum/https/repos/").never
88
- Dir.expects(:mkdir).with('/tmp/exports/export-999').returns(0)
90
+ Dir.expects(:mkdir).with('/tmp/exports/export-cv-999').returns(0)
89
91
  Dir.expects(:chdir).with('/tmp/exports').returns(0)
90
- Dir.expects(:chdir).with('/tmp/exports/export-999').returns(0)
92
+ Dir.expects(:chdir).with('/tmp/exports/export-cv-999').returns(0)
91
93
 
92
94
  result = run_cmd(@cmd + params)
93
95
  assert_equal(HammerCLI::EX_OK, result.exit_code)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hammer_cli_katello
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0
4
+ version: 0.16.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Price
@@ -34,7 +34,7 @@ authors:
34
34
  autorequire:
35
35
  bindir: bin
36
36
  cert_chain: []
37
- date: 2018-12-04 00:00:00.000000000 Z
37
+ date: 2019-04-17 00:00:00.000000000 Z
38
38
  dependencies:
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: hammer_cli_foreman