cicd-builder 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7953fecede88c14d87ae392f9b76b22aa34187
-  data.tar.gz: f09d13dedc8a18c24afdcf1bc0ee06f88e09896a
+  metadata.gz: f1292566262e8d37935da0cd8fa62469e6bc2ae2
+  data.tar.gz: 1f29f999a3157626139cee70fa91179c684ae8ed
 SHA512:
-  metadata.gz: 94820a8c5887e8d3e09e56c2014e06cfb1a2a94984ad01ccd072426267ace427a5bb525b68e66d6f6b6cccce7e38a7092cdf1f19c34daa046e60eb4dfe93c066
-  data.tar.gz: 0bc990f7d0140df5c6f0671eb9fbbbe6de80cce04464099e748a88854f3b0586a0aa66d814511a1ba304113deb2c7d82b466ebc651f72eac08c1149609d0029e
+  metadata.gz: ccfd4687b72ab03643ee139ad163558f9f27e5116c2a03a8c80a3ad8e1f68534f6c8178292aa4b6927222bd2fd533cd471104a1220fe9db0c5b8b264bdd51c06
+  data.tar.gz: c5975d2711a7e1a443c5ec19a790dca1f38aef1d9446e1ec86cfa41f62874cfbc6168200e3b6bcc1f69b11e95b49f8e28a2d58dc0e20a0968eb2a83d22522f4a

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.27)
+    cicd-builder (0.9.28)
       artifactory (>= 2.2.1, < 2.3)
-      awesome_print (>= 1.2.0, < 1.3)
+      awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)
-      chef (>= 11.18.2, < 12)
+      chef (>= 12.0.3, < 12.1)
       git (>= 1.2.7, < 1.3)
       inifile (>= 3.0.0, < 3.1)
       json (>= 1.8.1, < 1.9)
@@ -17,7 +17,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     artifactory (2.2.1)
-    awesome_print (1.2.0)
+    awesome_print (1.6.1)
     aws-sdk (2.0.28)
       aws-sdk-resources (= 2.0.28)
     aws-sdk-core (2.0.28)
@@ -28,29 +28,28 @@ GEM
     aws-sdk-resources (2.0.28)
       aws-sdk-core (= 2.0.28)
     builder (3.2.2)
-    chef (11.18.6)
-      chef-zero (~> 2.2, >= 2.2.1)
+    chef (12.0.3)
+      chef-zero (~> 3.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
-      mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
       mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.4)
+      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.4)
+      ohai (~> 8.0)
       plist (~> 3.1.0)
       pry (~> 0.9)
-      rest-client (>= 1.0.4, <= 1.6.7)
-    chef-zero (2.2.1)
+    chef-zero (3.2.1)
       ffi-yajl (~> 1.1)
       hashie (~> 2.0)
       mixlib-log (~> 1.3)
       rack
+      uuidtools (~> 2.1)
     coderay (1.1.0)
     cucumber (0.10.7)
       builder (>= 2.1.2)
@@ -80,30 +79,33 @@ GEM
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.6.1)
+    mixlib-shellout (2.0.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
+    net-dhcp (1.3.2)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.0)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (7.4.1)
+    ohai (8.1.1)
       ffi (~> 1.9)
       ffi-yajl (~> 1.1)
       ipaddress
-      mime-types (~> 1.16)
+      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout (~> 1.2)
+      mixlib-shellout (~> 2.0)
+      net-dhcp
+      rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
@@ -113,8 +115,6 @@ GEM
       slop (~> 3.4)
     rack (1.6.0)
     rake (10.3.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rubygems-tasks (0.2.4)
     semverse (1.2.1)
     slop (3.6.0)
@@ -122,6 +122,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     tins (1.3.4)
+    uuidtools (2.1.5)
     wmi-lite (1.0.0)
     yajl-ruby (1.2.1)
 
@@ -129,7 +130,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.6, < 1.7)
+  bundler (>= 1.7, < 1.8)
   cicd-builder!
   cucumber (>= 0.10.7, < 0.11)
   rake (>= 10.3, < 11)

data/cicd-builder.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'awesome_print', '>= 1.2.0', '< 1.3'
+  gem.add_dependency 'awesome_print', '>= 1.6', '< 2.0'
   gem.add_dependency 'inifile', '>= 3.0.0', '< 3.1'
   gem.add_dependency 'logging', '>= 1.8.2', '< 1.9'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
-  gem.add_dependency 'chef', '>= 11.18.2', '< 12'
+  gem.add_dependency 'chef', '>= 12.0.3', '< 12.1'
   gem.add_dependency 'aws-sdk', '>= 2.0', '< 2.1'
   gem.add_dependency 'yajl-ruby', '>= 1.2.1', '< 1.3'
   gem.add_dependency 'git', '>= 1.2.7', '< 1.3'
   gem.add_dependency 'semverse', '>= 1.2.1', '< 1.3'
   gem.add_dependency 'artifactory', '>= 2.2.1', '< 2.3'
 
-  gem.add_development_dependency 'bundler', '>= 1.6', '< 1.7'
+  gem.add_development_dependency 'bundler', '>= 1.7', '< 1.8'
   gem.add_development_dependency 'rake', '>= 10.3', '< 11'
   gem.add_development_dependency 'rubygems-tasks', '>= 0.2', '< 1.1'
   gem.add_development_dependency 'cucumber', '>= 0.10.7', '< 0.11'

data/lib/cicd/builder/mixlib/repo/S3.rb

@@ -16,6 +16,7 @@ module CiCd
         def getS3()
           region = ENV['AWS_REGION'] || ::Aws.config[:region] || 'us-east-1'
           unless @s3
+            # noinspection RubyArgCount
             @s3 = ::Aws::S3::Client.new(region: region)
           end
           unless @s3 and ((@s3.config.access_key_id and @s3.config.secret_access_key) or @s3.config.credentials)
@@ -29,6 +30,7 @@ EC2 Instance profile
               @logger.info "Trying profile '#{ENV['AWS_PROFILE']}' explicitly"
               creds = Aws::SharedCredentials.new( path: File.expand_path('~/.aws/credentials'), profile: ENV['AWS_PROFILE'] )
               if creds.loadable?
+                # noinspection RubyArgCount
                 @s3 = ::Aws::S3::Client.new(region: region, credentials: creds)
               end
             else
@@ -48,22 +50,24 @@ EC2 Instance profile
 
             s3_obj = maybeS3Object(art[:key], s3)
             upload = false
-            md5 = nil
             if art[:data][:data]
               # md5 = Digest::MD5.hexdigest(art[:data][:data])
               tempArtifactFile('artifact', art[:data])
             end
             if s3_obj.nil?
               upload = true
+              etag   = ''
             else
               @logger.info "s3://#{ENV['AWS_S3_BUCKET']}/#{art[:key]} exists"
               etag = s3_obj.etag.gsub(/"/, '')
-              md5 = if art[:data].has_key?(:file)
-                      # md5 = Digest::MD5.file(art[:data][:file]).hexdigest
-                      calcLocalETag(etag, art[:data][:file])
-                    else
-                      raise "Internal error: No :file in #{art[:data].ai}"
-                    end
+            end
+            md5 = if art[:data].has_key?(:file)
+                    # md5 = Digest::MD5.file(art[:data][:file]).hexdigest
+                    calcLocalETag(etag, art[:data][:file])
+                  else
+                    raise "Internal error: No :file in #{art[:data].ai}"
+                  end
+            unless s3_obj.nil?
               unless etag == md5
                 checksum = s3_obj.metadata[:checksum]
                 unless checksum and checksum == md5

data/lib/cicd/builder/version.rb

@@ -4,7 +4,7 @@ module CiCd
 		# file    = File.expand_path("#{File.dirname(__FILE__)}/../../../VERSION")
 		# lines   = File.readlines(file)
 		# version = lines[0]
-		version = '0.9.27'
+		version = '0.9.28'
 		VERSION = version unless const_defined?('VERSION')
 		major, minor, tiny = VERSION.split('.')
 		MAJOR   = major unless const_defined?('MAJOR')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cicd-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
 platform: ruby
 authors:
 - Christo De Lange
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +96,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.18.2
+        version: 12.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '12.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.18.2
+        version: 12.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -216,20 +216,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement