vagrant_cloud 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360b98c309f3b2804dce161d08972266978ac3059dbc5516bd12b52e5c1fff98
-  data.tar.gz: d258cb4d89be2bc698e4f087e8a504e2ba9a4e085ff9ab5e48c24c262926784f
+  metadata.gz: 00b96df31d811857d6e1322587604bc91195401913872e3340fa89eb8c0816fd
+  data.tar.gz: 52da865c61e7d50b5777a2a9ea2cc3bd6d7c22c1a3e2a34bc2bfdd537515b0da
 SHA512:
-  metadata.gz: 4dadf15e12aa55529ff8023f73c19a59f4882496003246cca6ee5e2b798f86004beb343b68c97dcda465205a227312ba49023ba91b83429ac24da8cb919c8372
-  data.tar.gz: b46249ed808cf36ffe8e65f0e234ef7fb291e9648e8cc1d8e044c1fe0ac7b1da2814eda39a14b048728bd5376b7a14a24a31d2ab68ab56f832e4ea0c2ebafb4b
+  metadata.gz: 9e6a2b72a501bc694992e9de0b789cba4c38fb8c6f176cd4c2e5ca4bd0fb387db5d2b23ada2307b7c63d6590b4ad3b1a8c8f98c74fbcd4f95ffd9c49cb028604
+  data.tar.gz: a0e90c8f8adad13d0dccd154cf50407065048a8e773df01c50482bdf79787d744e91d5b2e1a6f431c20c7d37656d894aa82c3fdf3e4f7501da5882bd029dff42

data/README.md

@@ -163,7 +163,7 @@ Release a new version:
 1. Update the version in the `version.txt` file
 1. Commit the change to master
 1. Create a new version tag in git: `git tag vX.X.X`
-1. Push the new tag and master to GitHub `git push origin master --tags`
+1. Push the new tag and master to GitHub `git push origin main --tags`
 
 The new release will be automatically built and published.
 

data/lib/vagrant_cloud/box.rb

@@ -37,7 +37,13 @@ module VagrantCloud
     # @note This will delete the box, and all versions
     def delete
       if exist?
-        organization.account.client.box_delete(username: username, name: name)
+        organization.account.client.box_delete(
+          username: username,
+          name: name
+        )
+        b = organization.boxes.dup
+        b.delete(self)
+        organization.clean(data: {boxes: b})
       end
       nil
     end
@@ -82,11 +88,15 @@ module VagrantCloud
     # only when requested
     def versions_on_demand
       if !@versions_loaded
-        r = self.organization.account.client.box_get(username: username, name: name)
-        v = Array(r[:versions]).map do |version|
-          Box::Version.load(box: self, **version)
+        if exist?
+          r = self.organization.account.client.box_get(username: username, name: name)
+          v = Array(r[:versions]).map do |version|
+            Box::Version.load(box: self, **version)
+          end
+          clean(data: {versions: v + Array(plain_versions)})
+        else
+          clean(data: {versions: []})
         end
-        clean(data: {versions: v + Array(plain_versions)})
         @versions_loaded = true
       end
       plain_versions

data/lib/vagrant_cloud/box/provider.rb

@@ -7,7 +7,8 @@ module VagrantCloud
       #
       # @param [String] upload_url URL for uploading file asset
       # @param [String] callback_url URL callback to PUT after successful upload
-      DirectUpload = Struct.new(:upload_url, :callback_url, keyword_init: true)
+      # @param [Proc] callback Callable proc to perform callback via configured client
+      DirectUpload = Struct.new(:upload_url, :callback_url, :callback, keyword_init: true)
 
       attr_reader :version
       attr_required :name
@@ -36,7 +37,9 @@ module VagrantCloud
             version: version.version,
             provider: name
           )
-          version.providers.delete(self)
+          pv = version.providers.dup
+          pv.delete(self)
+          version.clean(data: {providers: pv})
         end
         nil
       end
@@ -93,25 +96,24 @@ module VagrantCloud
         end
         result = DirectUpload.new(
           upload_url: r[:upload_path],
-          callback_url: r[:callback]
+          callback_url: r[:callback],
+          callback: proc {
+            if r[:callback]
+              version.box.organization.account.client.
+                request(method: :put, path: URI.parse(r[:callback]).path)
+            end
+          }
         )
         if block_given?
           block_r = yield result.upload_url
-          Excon.put(result.callback_url) if direct
+          result[:callback].call
           block_r
         elsif path
           File.open(path, "rb") do |file|
             chunks = lambda { file.read(Excon.defaults[:chunk_size]).to_s }
-            # When performing a direct upload, we must POST the request
-            # to the provided upload URL. If it's just a regular upload
-            # then we just PUT to the upload URL.
-            if direct
-              Excon.post(result.upload_url, request_block: chunks)
-            else
-              Excon.put(result.upload_url, request_block: chunks)
-            end
+            Excon.put(result.upload_url, request_block: chunks)
           end
-          Excon.put(result.callback_url) if direct
+          result[:callback].call
           self
         else
           # When returning upload information for requester to complete,

data/lib/vagrant_cloud/box/version.rb

@@ -36,7 +36,9 @@ module VagrantCloud
             version: version
           )
           # Remove self from box
-          box.versions.delete(self)
+          v = box.versions.dup
+          v.delete(self)
+          box.clean(data: {versions: v})
         end
         nil
       end

data/lib/vagrant_cloud/client.rb

@@ -91,8 +91,10 @@ module VagrantCloud
     # @param [Hash] params Parameters to send with request
     # @return [Hash]
     def request(path:, method: :get, params: {})
-      # Build the full path for the request and clean it
-      path = [path_base, path].compact.join("/").gsub(/\/{2,}/, "/")
+      if !path.start_with?(path_base)
+        # Build the full path for the request and clean it
+        path = [path_base, path].compact.join("/").gsub(/\/{2,}/, "/")
+      end
       method = method.to_s.downcase.to_sym
 
       # Build base request parameters
@@ -172,8 +174,12 @@ module VagrantCloud
           login: username,
           password: password
         },
-        description: description,
-        two_factor: code
+        token: {
+          description: description
+        },
+        two_factor: {
+          code: code
+        }
       }
       request(method: :post, path: "authenticate", params: params)
     end

data/lib/vagrant_cloud/error.rb

@@ -42,6 +42,7 @@ module VagrantCloud
       class ProviderNotFoundError < BoxError; end
       class VersionExistsError < BoxError; end
       class VersionStatusChangeError < BoxError; end
+      class VersionProviderExistsError < BoxError; end
     end
   end
 end

data/lib/vagrant_cloud/logger.rb

@@ -26,11 +26,15 @@ module VagrantCloud
           # sure that the log level is an integer, as Log4r requires.
           level = nil if !level.is_a?(Integer)
 
-          base_formatter = Log4r::PatternFormatter.new(
-            pattern: "%d [%5l] %m",
-            date_pattern: "%F %T"
-          )
-          Log4r::Outputter.stderr.formatter = base_formatter
+          # Only override the log output format if the default is set
+          if Log4r::Outputter.stderr.formatter.is_a?(Log4r::DefaultFormatter)
+            base_formatter = Log4r::PatternFormatter.new(
+              pattern: "%d [%5l] %m",
+              date_pattern: "%F %T"
+            )
+            Log4r::Outputter.stderr.formatter = base_formatter
+          end
+
           logger = Log4r::Logger.new("vagrantcloud")
           logger.outputters = Log4r::Outputter.stderr
           logger.level = level

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - HashiCorp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Vagrant Cloud API Library