manifest-builder 0.5.2 → 0.5.4

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/Gemfile.lock +3 -3
  3. data/lib/cicd/builder/manifest/mixlib/build.rb +2 -1
  4. data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb +2 -2
  5. data/lib/cicd/builder/manifest/version.rb +1 -1
  6. data/manifest-builder.gemspec +1 -1
  7. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eb7a10cea298c3e7dd6c62870a4e69a9c86c6ecd
4
- data.tar.gz: 2630a89b347baaff18da7893e3c93670201ae310
3
+ metadata.gz: 60db236a806378564e531600878a0f8b04c7364c
4
+ data.tar.gz: 08cc016081a8f04a9a2fca6c0034aabe9591f0e9
5
5
  SHA512:
6
- metadata.gz: 6fe600a91561d1eef1f90c240f18dfd73c84e5270f32ccf351eb07b39147c4728bfb2d8ae1d91ac6d35230954106fda7349ed7269d3501f5549ddedec8fd1520
7
- data.tar.gz: 85ab2a8d2699e79e12b4b36cd7091ebdeb7749625629b62cd9253f417eb38770f68a5c06a1d7f09afeca5358527bdaac749e94a1e045c73e9945d461635b58cd
6
+ metadata.gz: 86e83f836a183772433dd1c63323fd0e4fdaa0465f0c4115929170815c7b4228ea1964c48bc491db0312f7b18a4f5e50b233c8adceadeb2eb563bca51b9f3956
7
+ data.tar.gz: 36731d0cc6942426305adee38cfadaddb23228f8ed004d6bd8adcccfb20d0ab60bea70f8cedf006e963c045f2ca8abb70117e689d70757a113feffa47ce7637d
data/Gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- manifest-builder (0.5.2)
4
+ manifest-builder (0.5.4)
5
5
  archive-tar-minitar (= 0.5.2)
6
6
  chefrepo-builder (>= 0.9.27, < 1.1)
7
- cicd-builder (>= 0.9.36, < 1.1)
7
+ cicd-builder (>= 0.9.37, < 1.1)
8
8
  json (>= 1.8.1, < 1.9)
9
9
  s3etag (>= 0.0.1, < 0.1.0)
10
10
 
@@ -18,7 +18,7 @@ PATH
18
18
  PATH
19
19
  remote: ../cicd-builder
20
20
  specs:
21
- cicd-builder (0.9.36)
21
+ cicd-builder (0.9.37)
22
22
  artifactory (>= 2.2.1, < 2.3)
23
23
  awesome_print (>= 1.6, < 2.0)
24
24
  aws-sdk (>= 2.0, < 2.1)
data/lib/cicd/builder/manifest/mixlib/build.rb CHANGED
@@ -70,10 +70,11 @@ module CiCd
70
70
 
71
71
  VER_RGX = %r'^\d+\.\d+(\.?\d)*$'
72
72
  MMP_RGX = %r'^(\d+\.?){2,3}$'
73
+ EXT_RGX = %r'\.*(tar\.gz|tgz|tar.bzip2|bzip2|bz2|jar|war|[a-z]+)$'
73
74
  # ---------------------------------------------------------------------------------------------------------------
74
75
  def getVersionBuildFromName(artifact)
75
76
  version = artifact.dup
76
- version.gsub!(%r'\.*(tar\.gz|tgz|bzip2|bz2|jar|war|[a-z]+)$', '')
77
+ version.gsub!(EXT_RGX, '')
77
78
  version.gsub!(%r'^[a-zA-Z\-._]+', '')
78
79
  build = ''
79
80
  if version.match(VER_RGX)
data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb CHANGED
@@ -48,13 +48,13 @@ module CiCd
48
48
  unless ENV['PROJECT_NAMES'].nil?
49
49
  if File.exists?(ENV['PROJECT_NAMES'])
50
50
  @logger.info "Load PROJECT_NAMES: #{ENV['PROJECT_NAMES']}"
51
- project_names = JSON.load(IO.read(ENV['PROJECT_NAMES']))
51
+ project_names = JSON.load(IO.read(ENV['PROJECT_NAMES'])) || {}
52
52
  else
53
53
  @logger.error "The PROJECT_NAMES file (#{ENV['PROJECT_NAMES']}) does not exist!"
54
54
  @vars[:return_code] = Errors::NO_PROJECT_NAMES
55
55
  end
56
56
  end
57
- exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.extname(File.basename(a[:data][:file])).gsub(%r'^\.', '')] }]
57
+ exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.basename(a[:data][:file]).match(CiCd::Builder::Manifest::Build::EXT_RGX)[1]] }]
58
58
  @manifest.each do |mod, man|
59
59
  man.each do |prod, build|
60
60
  projects[prod] = {
data/lib/cicd/builder/manifest/version.rb CHANGED
@@ -2,7 +2,7 @@ module CiCd
2
2
  module Builder
3
3
  module Manifest
4
4
  # manifest-builder version
5
- VERSION = '0.5.2'
5
+ VERSION = '0.5.4'
6
6
  MAJOR, MINOR, TINY = VERSION.split('.')
7
7
  PATCH = TINY
8
8
  end
data/manifest-builder.gemspec CHANGED
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
17
17
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
18
18
  gem.require_paths = ['lib']
19
19
 
20
- gem.add_dependency 'cicd-builder', '>= 0.9.36', '< 1.1'
20
+ gem.add_dependency 'cicd-builder', '>= 0.9.37', '< 1.1'
21
21
  gem.add_dependency 'chefrepo-builder', '>= 0.9.27', '< 1.1'
22
22
  # gem.add_dependency 'ansiblerepo-builder', '>= 0.3.7', '< 0.5'
23
23
  gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manifest-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.2
4
+ version: 0.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christo De Lange
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-16 00:00:00.000000000 Z
11
+ date: 2015-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cicd-builder
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 0.9.36
19
+ version: 0.9.37
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 0.9.36
29
+ version: 0.9.37
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '1.1'