vara 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c028dcdfe4d9f29f8802dcb4d5e0da970b69e2
-  data.tar.gz: 7a4cfbee05ecdf94e6f4608f342943e9e1226edd
+  metadata.gz: 53b15fc0f2bf249075d85c00adbcc4bd31a595ed
+  data.tar.gz: 884e2d22736c9c2cb6ad17eccf9e29aff93fcf9c
 SHA512:
-  metadata.gz: dbd59239f1b4f1a3c26a505d45e1c0781cdfaecef6b30354bf945594cf82a8b0974d4d3932247e4fc236aa25da38827831ef706980510ed5681db547d24e8abc
-  data.tar.gz: 5d1ac158c0197ef9c6c43bbc14cb3b9a67dd6038ff9ab332776af0561589ed8a18fe8c1c192ea58e53919a3918bf492fad1683b28bb0a413bb504dbe2053b631
+  metadata.gz: a22c87efc0c7940a3e01d40ae6092c7fd6765ee6d7e9e9241708bee3beaa5b8845393926b6ba8b99c55f19b01d169cc89af65ebb23e1e7f09fbc074fd734044d
+  data.tar.gz: d791843f683c38eefd8078797daddf201650d1832c6d3cca7412f20f4215d9d37eca63bafbe7c8c8324fd37a816262195b8342502dc12b281784d0564046a03c

data/lib/vara/downloader.rb

@@ -7,7 +7,7 @@ module Vara
     # @param source [String] The URL from which to download
     # @param target [String] The path on disk for where to save the downloaded file
     def self.download(metadata, target)
-      fail 'URL or AWS Config required to download!' unless metadata.url || metadata.aws
+      raise 'URL or AWS Config required to download!' unless metadata.url || metadata.aws
       if metadata.aws
         download_from_aws(metadata.aws, target)
       elsif metadata.url

data/lib/vara/git_inspector.rb

@@ -14,7 +14,7 @@ module Vara
 
     # @param repo_path [String] Path to the root of the repository to inspect
     def initialize(repo_path)
-      fail "The directory #{repo_path} must be a git repo" unless self.class.git_repo?(repo_path)
+      raise "The directory #{repo_path} must be a git repo" unless self.class.git_repo?(repo_path)
       @repo_path = repo_path
     end
 

data/lib/vara/linter.rb

@@ -13,7 +13,7 @@ module Vara
 
     def lint!
       validate_metadata_version
-      fail LintError, errors.join("\n") unless errors.empty?
+      raise LintError, errors.join("\n") unless errors.empty?
     end
 
     private

data/lib/vara/log.rb

@@ -30,7 +30,7 @@ module Vara
   class Log
     class << self
       def instance
-        @instance || fail('Logging attempted without being configured first!')
+        @instance || raise('Logging attempted without being configured first!')
       end
 
       def test_mode!

data/lib/vara/metadata/compiled_packages.rb

@@ -59,7 +59,7 @@ module Vara
       # @raise [RuntimeError] if the URL is not set.
       # @return [String]
       def url
-        @url || fail("URL unknown for compiled_packages #{name}")
+        @url || raise("URL unknown for compiled_packages #{name}")
       end
 
       # @return [nil] the interface for downloader requires this method

data/lib/vara/product.rb

@@ -18,12 +18,12 @@ module Vara
     end
 
     def metadata_file
-      @metadata_file ||= find_metadata_file || fail('No metadata file found.')
+      @metadata_file ||= find_metadata_file || raise('No metadata file found.')
     end
 
     def build
       if metadata.explicit_stemcell? && metadata.stemcell_criteria?
-        fail 'binaries.yml includes both stemcell and stemcell criteria keys'
+        raise 'binaries.yml includes both stemcell and stemcell criteria keys'
       end
 
       ProductArtifactZipper.new(path, ProductContents.from_metadata_path(metadata_file), @options).zip!
@@ -83,7 +83,7 @@ module Vara
       when 1 then
         files.first
       else
-        fail("Found: #{files.map { |f| File.basename(f) }}. Vara supports one .yml file under metadata/")
+        raise("Found: #{files.map { |f| File.basename(f) }}. Vara supports one .yml file under metadata/")
       end
     end
   end

data/lib/vara/product_artifact_validator.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 module Vara
   class ProductArtifactValidator
     def self.validate_file_checksum(file_metadata, file_name)
-      fail "No checksum for file #{file_name}!" unless file_metadata.md5 || file_metadata.sha1
+      raise "No checksum for file #{file_name}!" unless file_metadata.md5 || file_metadata.sha1
 
       validate_md5(file_metadata, file_name) if file_metadata.md5
 
@@ -13,13 +13,13 @@ module Vara
     def self.validate_sha1(file_metadata, file_name)
       sha1_got = Digest::SHA1.file(file_name).hexdigest
       sha1_expected = file_metadata.sha1
-      fail "sha1 mismatch for file #{file_name}, expected #{sha1_expected}, got #{sha1_got}" if sha1_got != sha1_expected
+      raise "sha1 mismatch for file #{file_name}, expected #{sha1_expected}, got #{sha1_got}" if sha1_got != sha1_expected
     end
 
     def self.validate_md5(file_metadata, file_name)
       md5_got = Digest::MD5.file(file_name).hexdigest
       md5_expected = file_metadata.md5
-      fail "md5 mismatch for file #{file_name}, expected #{md5_expected}, got #{md5_got}" if md5_got != md5_expected
+      raise "md5 mismatch for file #{file_name}, expected #{md5_expected}, got #{md5_got}" if md5_got != md5_expected
     end
   end
 end

data/lib/vara/product_contents.rb

@@ -20,7 +20,7 @@ module Vara
     # @return [String] The path to the content migration file on disk
     def content_migrations_path
       paths = Dir.glob(File.expand_path(File.join(root_path, 'content_migrations', '*.yml')))
-      fail "Exactly one content_migrations file is required in #{root_path}/content_migrations" if paths.size != 1
+      raise "Exactly one content_migrations file is required in #{root_path}/content_migrations" if paths.size != 1
       paths.first
     end
 

data/lib/vara/product_metadata_processor.rb

@@ -59,7 +59,7 @@ module Vara
           r['name'] == external_release['name']
         end
 
-        fail "Specified release #{external_release['name']} does not exist in binaries.yml" unless replace
+        raise "Specified release #{external_release['name']} does not exist in binaries.yml" unless replace
 
         metadata['releases'][replace] = external_release
       end
@@ -70,24 +70,24 @@ module Vara
       missing_keys = REQUIRED_RELEASE_KEYS - external_release.keys.to_a
       specified_release = "Specified release #{File.basename(external_release_path)} "
 
-      fail specified_release + "is missing required keywords: #{missing_keys}" unless missing_keys.empty?
+      raise specified_release + "is missing required keywords: #{missing_keys}" unless missing_keys.empty?
 
       exclusive_key_count = (EXCLUSIVE_KEYS - external_release.keys.to_a).length
       case
       when exclusive_key_count < 1
-        fail specified_release + "contains more than one of the following keys, but only one is allowed: #{EXCLUSIVE_KEYS}"
+        raise specified_release + "contains more than one of the following keys, but only one is allowed: #{EXCLUSIVE_KEYS}"
       when exclusive_key_count > 1
-        fail specified_release + "requires one of the following keys: #{EXCLUSIVE_KEYS}"
+        raise specified_release + "requires one of the following keys: #{EXCLUSIVE_KEYS}"
       end
 
       if external_release.key?('aws')
         missing_aws_keys = missing_aws_keys(external_release)
 
-        fail specified_release + "is missing required aws hash keywords: #{missing_aws_keys}" unless missing_aws_keys.empty?
+        raise specified_release + "is missing required aws hash keywords: #{missing_aws_keys}" unless missing_aws_keys.empty?
       end
 
       extra_keys = external_release.keys.to_a - REQUIRED_RELEASE_KEYS - EXCLUSIVE_KEYS
-      fail specified_release + "has extra keywords: #{extra_keys}" unless extra_keys.empty?
+      raise specified_release + "has extra keywords: #{extra_keys}" unless extra_keys.empty?
       external_release
     end
     # rubocop:enable CyclomaticComplexity

data/lib/vara/product_resource_downloader.rb

@@ -18,7 +18,7 @@ module Vara
 
     def download
       if product_metadata.explicit_stemcell? && product_metadata.stemcell_criteria?
-        fail 'binaries.yml includes both stemcell and stemcell criteria keys'
+        raise 'binaries.yml includes both stemcell and stemcell criteria keys'
       end
 
       if product_metadata.explicit_stemcell?

data/lib/vara/static_versioner.rb

@@ -1,4 +1,6 @@
 module Vara
+  class VersionError < RuntimeError; end
+
   class StaticVersioner
     PRODUCT_VERSION_KEY = 'product_version'.freeze
     TO_VERSION_KEY = 'to_version'.freeze
@@ -9,6 +11,12 @@ module Vara
     # @param product_directory_path [String]
     # @param version [String] the product version
     def initialize(product_directory_path, version)
+      begin
+        Gem::Version.create(version)
+      rescue
+        raise Vara::VersionError, "Invalid version: #{version}"
+      end
+
       @product_directory_path = product_directory_path
       @version = version
     end

data/lib/vara/tarball.rb

@@ -50,7 +50,7 @@ module Vara
         stderr_string = stderr.read
       end
 
-      fail "Invalid tarball: #{path_to_binary}. Tar command STDOUT: #{stdout_string}\n STDERR:#{stderr_string}" unless status.success?
+      raise "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
@@ -58,7 +58,7 @@ module Vara
     def validate_checksum
       log.info("Beginning checksum validation of #{metadata}")
       log.info("Path to File: #{path_to_binary}")
-      fail "Metadata doesn't include SHA1 or MD5 checksum!" unless metadata.md5 || metadata.sha1
+      raise "Metadata doesn't include SHA1 or MD5 checksum!" unless metadata.md5 || metadata.sha1
       validate_md5 if metadata.md5
       validate_sha1 if metadata.sha1
       log.info("#{metadata} checksum validation complete")
@@ -68,14 +68,14 @@ module Vara
       log.info("Expected SHA1: #{metadata.sha1}")
       actual_sha1 = Digest::SHA1.file(path_to_binary).hexdigest
       log.info("Actual SHA1: #{actual_sha1}")
-      fail "SHA1 doesn't match expected value!" unless actual_sha1 == metadata.sha1
+      raise "SHA1 doesn't match expected value!" unless actual_sha1 == metadata.sha1
     end
 
     def validate_md5
       log.info("Expected MD5: #{metadata.md5}")
       actual_md5 = Digest::MD5.file(path_to_binary).hexdigest
       log.info("Actual MD5: #{actual_md5}")
-      fail "MD5 doesn't match expected value!" unless actual_md5 == metadata.md5
+      raise "MD5 doesn't match expected value!" unless actual_md5 == metadata.md5
     end
   end
 end

data/lib/vara/version.rb

@@ -1,5 +1,5 @@
 module Vara
-  VERSION = '0.21.1'.freeze
+  VERSION = '0.22.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.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - CF Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor