vara 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8620fbfdfd18af314cc45d3e02e44088523d3e8b
-  data.tar.gz: fe6a19b66417313cf0473d477a15b96d363805c1
+  metadata.gz: e41d610b2187ae48c3fd50782d51cac3453588a0
+  data.tar.gz: 9c450bf99a4a73351c510ba95287abf7f6562b4c
 SHA512:
-  metadata.gz: c723d85456760a5171762141d9ca7d9107af884c1a97cbac7344a6ae4308ff254c9e2b619bbf60fe0c8634b26fa1a05fa57d36e4c621acf1116eedf3576cba34
-  data.tar.gz: 46767ec90d9b672340e8ae0ba3e8bf0ec46969f41835938eb9ca1bdae9ec74289e1993cfc4029dda5433c661e229617d1f73b3587a79cdabacbd2d4c93f6a27f
+  metadata.gz: 255859e178c8e8ea85f902d80700072c8534584b8ff80bd062c2e21cc7b65c2e923b3ed07004f3bcb7040d3aaf0175ba044fc6a177d787b513498d020c528e63
+  data.tar.gz: 7b62a9c3dc6f952f0d6e3c41a5fd98bc1538fe4bbbc4798d9e0b4852000f423aa48f8cbcc962db1591a6fc45760ca64b9a5e000f5952c32c9d0c59266187ed31

data/lib/vara/log.rb

@@ -17,7 +17,11 @@ module Vara
     end
 
     def self.included(other_module)
-      def other_module.log
+      other_module.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def log
         @_releng_class_log ||= LoggerWithProgName.new(name)
       end
     end

data/lib/vara/product_artifact_zipper.rb

@@ -57,7 +57,16 @@ module Vara
       end
 
       FileUtils.mkdir('metadata')
-      FileUtils.cp(product_contents.metadata_path, 'metadata')
+      metadata = YAML.load_file(product_contents.metadata_path)
+
+      metadata.fetch('releases').each do |r|
+        r.delete('aws')
+      end
+
+      File.write(
+        File.join('metadata', File.basename(product_contents.metadata_path)),
+        metadata.to_yaml
+      )
     end
 
     def copy_and_validate_releases(product_metadata)

data/lib/vara/product_metadata_processor.rb

@@ -31,9 +31,9 @@ module Vara
 
     attr_reader :product_dir, :versioner, :external_release_paths
 
-    REQUIRED_RELEASE_KEYS = %w(file name md5 version)
-    EXCLUSIVE_KEYS = %w(url aws)
-    REQUIRED_AWS_KEYS = %w(access_key_id secret_access_key bucket_name region filename)
+    REQUIRED_RELEASE_KEYS = %w(file name md5 version).freeze
+    EXCLUSIVE_KEYS = %w(url aws).freeze
+    REQUIRED_AWS_KEYS = %w(access_key_id secret_access_key bucket_name region filename).freeze
 
     def merged_metadata
       binaries_path = File.join(product_dir, 'metadata_parts', 'binaries.yml')

data/lib/vara/tarball.rb

@@ -50,11 +50,9 @@ module Vara
         stderr_string = stderr.read
       end
 
-      if status.success?
-        log.info("Verified that #{path_to_binary} as a valid tar file")
-      else
-        fail "Invalid tarball: #{path_to_binary}. Tar command STDOUT: #{stdout_string}\n STDERR:#{stderr_string}"
-      end
+      fail "Invalid tarball: #{path_to_binary}. Tar command STDOUT: #{stdout_string}\n STDERR:#{stderr_string}" unless status.success?
+
+      log.info("Verified that #{path_to_binary} as a valid tar file")
     end
 
     def validate_checksum

data/lib/vara/version.rb

@@ -1,5 +1,5 @@
 module Vara
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'.freeze
 end
 
 # Copyright (c) 2014-2015 Pivotal Software, Inc.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vara
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - CF Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor