berkshelf 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fc48892092998c6c4609f996e7a0470b6dea6af
-  data.tar.gz: df867ca3468c988b011781e3c645f21a4eb8bfa6
+  metadata.gz: 337dda20878f2853b12de31de35dc8494dd7db0f
+  data.tar.gz: 64cac8f89b420097552be7c5f85bd1b497b250f5
 SHA512:
-  metadata.gz: 0423feeb86a7f1163daabb1ebf9e98aa6a69c945162bf48b39b83b08353a9402f035640519c028d6156d3c89a9802e44119966581b2a1f2f8b91bee419b808c5
-  data.tar.gz: ee5e644f38a0fa4a7a86b7565f290c749c0ab10be15716c54ac477e095315807280b49d8a1c779bf1317dd4217515bfe137b61c39f4f3e007f8546421e3c9288
+  metadata.gz: f63ff185f5d45c161e6e86e82001097d439d53c0eef3c0f8643f9038a5824fa83a90017b52890d66c17e03cea5a5653fc575491b305d65f32339179ed5e8b462
+  data.tar.gz: 67d89ec5fb953f45ffc7560cf204e3b42a1d7ed1f3d62d97e3b5d767f05a03f1bbd7acbb870c098b016ade7668d284446dfbd65abd6ee5c87e7521d5c631db8e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 > This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
 
+# 3.2.3
+
+* Bug Fixes
+  * Specifying the --skip-syntax-check flag to upload will once again cause validations to be skipped
+
 # 3.2.2
 
 * Enhancements

data/Gemfile

@@ -31,5 +31,5 @@ group :guard do
 end
 
 group :test do
-  gem "berkshelf-api", "~> 1.4"
+  gem "berkshelf-api", github: "berkshelf/berkshelf-api"
 end

data/README.md

@@ -44,9 +44,6 @@ Ruby 1.9.1 and 1.9.2 are not officially supported. If you encounter problems, pl
 Berkshelf will search in specific locations for a configuration file. In order:
 
     $PWD/.berkshelf/config.json
-    $PWD/berkshelf/config.json
-    $PWD/berkshelf-config.json
-    $PWD/config.json
     ~/.berkshelf/config.json
 
 You are encouraged to keep project-specific configuration in the `$PWD/.berkshelf` directory. A default configuration file is generated for you, but you can update the values to suit your needs.

data/berkshelf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'cleanroom',            '~> 1.0'
   s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
-  s.add_dependency 'retryable',            '~> 1.3.3'
+  s.add_dependency 'retryable',            '~> 2.0'
   s.add_dependency 'ridley',               '~> 4.0'
   s.add_dependency 'solve',                '~> 1.1'
   s.add_dependency 'thor',                 '~> 0.19'

data/lib/berkshelf/community_rest.rb

@@ -182,7 +182,7 @@ module Berkshelf
       local = Tempfile.new('community-rest-stream')
       local.binmode
 
-      retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
+      Retryable.retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
         open(target, 'rb', open_uri_options) do |remote|
           local.write(remote.read)
         end

data/lib/berkshelf/errors.rb

@@ -15,6 +15,7 @@ module Berkshelf
   class InternalError < BerkshelfError; set_status_code(99); end
   class ArgumentError < InternalError; end
   class AbstractFunction < InternalError; end
+  class ConfigurationError < InternalError; end
 
   class BerksfileNotFound < BerkshelfError
     set_status_code(100)
@@ -28,6 +29,8 @@ module Berkshelf
     def to_s
       "No Berksfile or Berksfile.lock found at '#{@filepath}'!"
     end
+
+    alias_method :message, :to_s
   end
 
   class CookbookNotFound < BerkshelfError
@@ -46,6 +49,8 @@ module Berkshelf
         "Cookbook '#{@name}' not found #{@location}!"
       end
     end
+
+    alias_method :message, :to_s
   end
 
   class DuplicateDependencyDefined < BerkshelfError
@@ -61,6 +66,8 @@ module Berkshelf
       out << "different groups."
       out
     end
+
+    alias_method :message, :to_s
   end
 
   class NoSolutionError < BerkshelfError
@@ -78,6 +85,8 @@ module Berkshelf
       @original_exception.to_s +
       "Unable to find a solution for demands: #{demands.join(', ')}"
     end
+
+    alias_method :message, :to_s
   end
 
   class CookbookSyntaxError < BerkshelfError; set_status_code(107); end
@@ -108,6 +117,8 @@ module Berkshelf
         "  #{@error_message}",
       ].join("\n")
     end
+
+    alias_method :message, :to_s
   end
 
   class MismatchedCookbookName < BerkshelfError
@@ -136,6 +147,8 @@ module Berkshelf
       out << "is often a cause of confusion for dependency solving."
       out
     end
+
+    alias_method :message, :to_s
   end
 
   class InvalidConfiguration < BerkshelfError
@@ -155,6 +168,8 @@ module Berkshelf
 
       out.strip
     end
+
+    alias_method :message, :to_s
   end
 
   class InsufficientPrivledges < BerkshelfError
@@ -169,6 +184,8 @@ module Berkshelf
       "path to the current user, chmod the permissions to include the " \
       "user, or choose a different path."
     end
+
+    alias_method :message, :to_s
   end
 
   class DependencyNotFound < BerkshelfError
@@ -197,6 +214,8 @@ module Berkshelf
         out
       end
     end
+
+    alias_method :message, :to_s
   end
 
   class CommunitySiteError < BerkshelfError
@@ -211,6 +230,8 @@ module Berkshelf
       "An unexpected error occurred retrieving #{@message} from the cookbook " \
       "site at '#{@api_uri}'."
     end
+
+    alias_method :message, :to_s
   end
 
   class CookbookValidationFailure < BerkshelfError
@@ -228,6 +249,8 @@ module Berkshelf
     def to_s
       "The cookbook downloaded for #{@dependency} did not satisfy the constraint."
     end
+
+    alias_method :message, :to_s
   end
 
   class UploadFailure < BerkshelfError; end
@@ -244,6 +267,8 @@ module Berkshelf
       "already exists and is frozen on the Chef Server. Use the --force " \
       "option to override."
     end
+
+    alias_method :message, :to_s
   end
 
   class OutdatedDependency < BerkshelfError
@@ -267,6 +292,8 @@ module Berkshelf
       "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
         "'#{@dependency.version_constraint}'."
     end
+
+    alias_method :message, :to_s
   end
 
   class EnvironmentNotFound < BerkshelfError
@@ -279,6 +306,8 @@ module Berkshelf
     def to_s
       "The environment '#{@environment_name}' does not exist"
     end
+
+    alias_method :message, :to_s
   end
 
   class ChefConnectionError < BerkshelfError
@@ -299,6 +328,8 @@ module Berkshelf
     def to_s
       "The file at '#{@destination}' is not a known compression type"
     end
+
+    alias_method :message, :to_s
   end
 
   # Raised when a cookbook or its recipes contain a space or invalid
@@ -325,6 +356,8 @@ module Berkshelf
         "Please note, spaces are not a valid character in filenames",
       ].join("\n")
     end
+
+    alias_method :message, :to_s
   end
 
   class LicenseNotFound < BerkshelfError
@@ -340,6 +373,8 @@ module Berkshelf
       "Unknown license: '#{license}'\n" +
       "Available licenses: #{CookbookGenerator::LICENSES.join(', ')}"
     end
+
+    alias_method :message, :to_s
   end
 
   # Raised when a cookbook or its recipes contain a space or invalid
@@ -359,6 +394,8 @@ module Berkshelf
     def to_s
       "No #{@type.capitalize} config file found at: '#{@path}'!"
     end
+
+    alias_method :message, :to_s
   end
 
   class LockfileParserError < BerkshelfError
@@ -376,6 +413,8 @@ module Berkshelf
       "Error reading the Berkshelf lockfile:\n\n" \
       "  #{@original.class}: #{@original.message}"
     end
+
+    alias_method :message, :to_s
   end
 
   class InvalidSourceURI < BerkshelfError
@@ -391,6 +430,8 @@ module Berkshelf
       msg << " #{@reason}." unless @reason.nil?
       msg
     end
+
+    alias_method :message, :to_s
   end
 
   class DuplicateDemand < BerkshelfError; set_status_code(138); end
@@ -415,6 +456,8 @@ module Berkshelf
       "The resource at '#{@path}' does not appear to be a valid cookbook. " \
       "Does it have a metadata.rb?"
     end
+
+    alias_method :message, :to_s
   end
 
   class PackageError < BerkshelfError; set_status_code(143); end
@@ -439,6 +482,8 @@ module Berkshelf
       "The cookbook '#{@name} (#{@version})' is not installed. Please run " \
       "`berks install` to download and install the missing dependency."
     end
+
+    alias_method :message, :to_s
   end
 
   class NoAPISourcesDefined < BerkshelfError
@@ -477,6 +522,8 @@ module Berkshelf
       "The Graphviz command `#{@command}` failed to execute properly. Here " \
       "is the standard error from the command:\n\n#{@output}"
     end
+
+    alias_method :message, :to_s
   end
 
   class MissingLockfileCookbookVersion < CookbookNotFound

data/lib/berkshelf/uploader.rb

@@ -8,13 +8,14 @@ module Berkshelf
     def initialize(berksfile, *args)
       @berksfile = berksfile
       @lockfile  = berksfile.lockfile
+      opts       = args.last.respond_to?(:to_hash) ? args.pop.to_hash.symbolize_keys : {}
 
       @options = {
         force:          false,
         freeze:         true,
         halt_on_frozen: false,
         validate:       true,
-      }.merge(args.last.is_a?(Hash) ? args.pop : {})
+      }.merge(opts)
 
       @names = Array(args).flatten
     end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement