vagrant_cloud 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fe589f6de0c2adb068af34c80e7e78740fc3ab
-  data.tar.gz: 6894acccfd45d46a3adcfbeb2ff38fca58e24d2b
+  metadata.gz: dce5d7ff120d58a2f5737a09ae6c541638aaa441
+  data.tar.gz: 4ec95bf75f996ca9dd11f6c53583af591511034f
 SHA512:
-  metadata.gz: 86f7284a726434fcdde1d7dc860912a0c8cfdb8d6fb73181672ce07ec98e2a40028547c36f59fbaa3945c79139c302e610bd27d0a2df68619c1652ca888a0206
-  data.tar.gz: 1d6615c95f7b4c1864bb220e18c42c71d675468e635975765ec2038ace6abf136dc2983f5b02a4569b2a8d36c7fa2320458fc96df22c0c839e6d646b59f7e3f0
+  metadata.gz: 8acc641a56768c54337fff4ff83b27dbf6f613f18238f8dad7a07d27733cb0c86beadc491bd5ad6af17ecf6acd87d268eaa7fe6483b1265ea6e138f98c61ee73
+  data.tar.gz: 2e913f1a82a52921483da97c9bf8d63314f5033e997e1923ea9a820bfa0b00f46fee135c509539bf07846a4b133dbbeda8b60b1e44bf168b5038e9f916da5dd8

data/bin/vagrant_cloud

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'vagrant_cloud'
-
-VagrantCloud::Cli.start(ARGV)
+raise 'As of the 2.0.0 release, the vagrant_cloud gem provides library' \
+      ' functionality and no longer includes a command line client. For a' \
+      ' command line client, use the `vagrant cloud` subcommand from Vagrant.' \
+      ' Vagrant can be downloaded from: https://www.vagrantup.com/downloads.html'

data/lib/vagrant_cloud/account.rb

@@ -104,10 +104,15 @@ module VagrantCloud
     def ensure_box(name, *args)
       params = box_params(*args)
 
+      # try to read the box data
       begin
         box = get_box(name)
         box.data
-      rescue RestClient::ResourceNotFound
+      rescue VagrantCloud::ClientError => err
+        # Check if it's a 404 error. If so, then create
+        # the missing box
+        raise if err.error_code != 404
+
         box = create_box(name, params)
         # If we've just created the box, we're done.
         return box

data/lib/vagrant_cloud/box.rb

@@ -33,10 +33,15 @@ module VagrantCloud
     # @param [Hash] args
     # @param [String] org - organization of the box to read
     # @param [String] box_name - name of the box to read
-    # @return [Hash]
+    # @return [Hash] @data
     def update(args = {})
       # hash arguments kept for backwards compatibility
-      data = @client.request('put', box_path(args[:organization], args[:name]), box: args)
+      return @data if args.empty?
+
+      org = args[:organization] || account.username
+      box_name = args[:name] || @name
+
+      data = @client.request('put', box_path(org, box_name), box: args)
 
       # Update was called on *this* object, so update
       # objects data locally

data/lib/vagrant_cloud/errors.rb

@@ -4,21 +4,31 @@ module VagrantCloud
     attr_accessor :error_code
 
     def initialize(msg, http_body, http_code)
+      message = msg
+
       begin
         errors = JSON.parse(http_body)
-        vagrant_cloud_msg = errors['errors']
-
-        if vagrant_cloud_msg.is_a?(Array)
-          message = msg + ' - ' + vagrant_cloud_msg.join(', ').to_s
-        else
-          message = msg + ' - ' + vagrant_cloud_msg
+        if errors.is_a?(Hash)
+          vagrant_cloud_msg = errors['errors']
+          if vagrant_cloud_msg.is_a?(Array)
+            message = msg + ' - ' + vagrant_cloud_msg.map(&:to_s).join(', ').to_s
+          elsif !vagrant_cloud_msg.to_s.empty?
+            message = msg + ' - ' + vagrant_cloud_msg.to_s
+          end
         end
-      rescue JSON::ParserError
-        message = msg
+      rescue JSON::ParserError => err
+        vagrant_cloud_msg = err.message
       end
 
       @error_arr = vagrant_cloud_msg
-      @error_code = http_code
+      @error_code = http_code.to_i
+      super(message)
+    end
+  end
+
+  class InvalidVersion < StandardError
+    def initialize(version_number)
+      message = 'Invalid version given: ' + version_number
       super(message)
     end
   end

data/lib/vagrant_cloud/version.rb

@@ -67,6 +67,13 @@ module VagrantCloud
     # @param [String] version_number
     # @param [String] description
     def update(description = nil, username = nil, box_name = nil, version_number = nil)
+      # Ensure version given is a 'proper' version
+      begin
+        Gem::Version.new(version_number) if version_number
+      rescue ArgumentError
+        raise VagrantCloud::InvalidVersion, version_number
+      end
+
       update_data = !(username && box_name && version_number)
       description ||= @description
       version = { description: description }
@@ -116,6 +123,13 @@ module VagrantCloud
       number ||= @number
       description ||= @description
 
+      # Ensure version given is a 'proper' version
+      begin
+        Gem::Version.new(number) if number
+      rescue ArgumentError
+        raise VagrantCloud::InvalidVersion, number
+      end
+
       params = { version: number, description: description }
       data = @client.request('post', create_version_path(org, box_name).to_s, version: params)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - HashiCorp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client