vagrant_cloud 2.0.3 → 3.0.4

data/lib/vagrant_cloud/version.rb

@@ -1,202 +1,3 @@
 module VagrantCloud
-  class Version
-    attr_accessor :box
-    attr_accessor :number
-
-    # @param [Box] box
-    # @param [String] number
-    # @param [Hash] data
-    # @param [String] description
-    # @param [String] access_token
-    def initialize(box, number, data = nil, description = nil, access_token = nil, custom_server = nil)
-      @box = box
-      @number = number
-      @data = data
-      @description = description
-      @client = Client.new(access_token, custom_server)
-    end
-
-    #--------------------
-    # Metadata Helpers
-    #--------------------
-
-    # @return [String]
-    def version
-      data['version'].to_s
-    end
-
-    # @return [String]
-    def description
-      data['description_markdown'].to_s
-    end
-
-    # @return [String]
-    def status
-      data['status'].to_s
-    end
-
-    # @return [Array<Provider>]
-    def providers
-      data['providers'].map { |data| Provider.new(self, data['name'], data, nil, nil, nil, @client.access_token, @client.url_base) }
-    end
-
-    # @return [String]
-    def to_s
-      version
-    end
-
-    #--------------------
-    # Version API Helpers
-    #--------------------
-
-    # @return [Hash]
-    def data
-      @data ||= @client.request('get', version_path)
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    # @return [Hash]
-    def read(username = nil, box_name = nil, version_number = nil)
-      @client.request('get', version_path(username, box_name, version_number))
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @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 }
-      data = @client.request('put',
-                             version_path(username, box_name, version_number),
-                             version: version)
-
-      @data = data if update_data
-      data
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    def delete(username = nil, box_name = nil, version_number = nil)
-      @client.request('delete', version_path(username, box_name, version_number))
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    def release(username = nil, box_name = nil, version_number = nil)
-      data = @client.request('put', "#{version_path(username, box_name, version_number)}/release")
-
-      @data = data if !(username && box_name && version_number)
-      data
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    def revoke(username = nil, box_name = nil, version_number = nil)
-      update_data = !(username && box_name && version_number)
-      data = @client.request('put', "#{version_path(username, box_name, version_number)}/revoke")
-
-      @data = data if update_data
-      data
-    end
-
-    # @param [String] number
-    # @param [String] description
-    # @param [String] org
-    # @param [String] box_name
-    # @return [Hash]
-    def create_version(number = nil, description = nil, org = nil, box_name = nil)
-      update_data = !(org && box_name && description && number)
-      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)
-
-      @data = data if update_data
-      data
-    end
-
-    #--------------------
-    # Old Provider Helpers
-    #--------------------
-
-    # @param [String] name
-    # @param [Hash] data
-    # @return [Provider]
-    def get_provider(name, data = nil)
-      Provider.new(self, name, data, nil, nil, nil, @client.access_token, @client.url_base)
-    end
-
-    # @param [String] name
-    # @param [String] url
-    # @return [Provider]
-    def create_provider(name, url = nil)
-      params = { name: name, url: url }.delete_if { |_, v| v.nil? }
-      data = @client.request('post', "#{version_path}/providers", provider: params)
-      get_provider(name, data)
-    end
-
-    # @param [String] name
-    # @param [String] url
-    # @return [Provider]
-    def ensure_provider(name, url)
-      provider = providers.select { |p| p.name == name }.first
-      provider ||= create_provider(name, url)
-      provider.update(url) if url != provider.url
-      provider
-    end
-
-    private
-
-    # @return [Account]
-    def account
-      box.account
-    end
-
-    # Path used to generate a new version on a box
-    #
-    # @param [String] - username
-    # @param [String] - box_name
-    # @return [String]
-    def create_version_path(username = nil, box_name = nil)
-      if username && box_name
-        "/box/#{username}/#{box_name}/versions"
-      else
-        "/box/#{account.username}/#{box.name}/versions"
-      end
-    end
-
-    # @param [String] - username
-    # @param [String] - box_name
-    # @param [String] - version_number
-    # @return [String]
-    def version_path(username = nil, box_name = nil, version_number = nil)
-      if username && box_name && version_number
-        "/box/#{username}/#{box_name}/version/#{version_number}"
-      else
-        "/box/#{account.username}/#{box.name}/version/#{number}"
-      end
-    end
-  end
+  VERSION = Gem::Version.new(File.read(File.expand_path("../../../version.txt", __FILE__)))
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - HashiCorp
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.73'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.73'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
+        version: 1.1.10
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -89,24 +89,31 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/vagrant_cloud
 - lib/vagrant_cloud.rb
 - lib/vagrant_cloud/account.rb
 - lib/vagrant_cloud/box.rb
+- lib/vagrant_cloud/box/provider.rb
+- lib/vagrant_cloud/box/version.rb
 - lib/vagrant_cloud/client.rb
-- lib/vagrant_cloud/errors.rb
-- lib/vagrant_cloud/provider.rb
+- lib/vagrant_cloud/data.rb
+- lib/vagrant_cloud/error.rb
+- lib/vagrant_cloud/instrumentor.rb
+- lib/vagrant_cloud/instrumentor/collection.rb
+- lib/vagrant_cloud/instrumentor/core.rb
+- lib/vagrant_cloud/instrumentor/logger.rb
+- lib/vagrant_cloud/logger.rb
+- lib/vagrant_cloud/organization.rb
+- lib/vagrant_cloud/response.rb
+- lib/vagrant_cloud/response/create_token.rb
+- lib/vagrant_cloud/response/request_2fa.rb
+- lib/vagrant_cloud/response/search.rb
 - lib/vagrant_cloud/search.rb
 - lib/vagrant_cloud/version.rb
 homepage: https://github.com/hashicorp/vagrant_cloud
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  NOTICE: 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
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Vagrant Cloud API Library

data/bin/vagrant_cloud

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-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/errors.rb

@@ -1,35 +0,0 @@
-module VagrantCloud
-  class ClientError < StandardError
-    attr_accessor :error_arr
-    attr_accessor :error_code
-
-    def initialize(msg, http_body, http_code)
-      message = msg
-
-      begin
-        errors = JSON.parse(http_body)
-        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 => err
-        vagrant_cloud_msg = err.message
-      end
-
-      @error_arr = vagrant_cloud_msg
-      @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
-end

data/lib/vagrant_cloud/provider.rb

@@ -1,155 +0,0 @@
-module VagrantCloud
-  class Provider
-    attr_accessor :version
-    attr_accessor :name
-
-    # @param [Version] version
-    # @param [String] name
-    # @param [Hash] data
-    # @param [String] access_token
-    def initialize(version, name, data = nil, url = nil, username = nil, box_name = nil, access_token = nil, custom_server = nil, checksum = nil, checksum_type = nil) # rubocop:disable LineLength
-      @version = version
-      @name = name
-      @data = data
-      @username = username
-      @box_name = box_name
-      @url = url
-      @checksum = checksum
-      @checksum_type = checksum_type
-      @client = Client.new(access_token, custom_server)
-    end
-
-    #--------------------
-    # Metadata Helpers
-    #--------------------
-
-    # @return [String]
-    def url
-      data['original_url'].to_s
-    end
-
-    # @return [String]
-    def download_url
-      data['download_url'].to_s
-    end
-
-    #--------------------
-    # Provider API Helpers
-    #--------------------
-
-    # @return [Hash]
-    def data
-      @data ||= @client.request('get', provider_path)
-    end
-
-    # Creates a provider for *this* Provider object, or if all params are given,
-    # will make a one-off request to create a Provider and return its data
-    #
-    # @param [String] name
-    # @param [String] url
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    def create_provider(name = nil, url = nil, username = nil, box_name = nil, version_number = nil)
-      update_data = !(username && version_number && box_name)
-      name ||= @name
-      url ||= @url
-      username ||= @username
-      box_name ||= @box_name
-      version_number ||= @version
-      checksum = @checksum
-      checksum_type = @checksum_type
-
-      params = { name: name, url: url, checksum: checksum, checksum_type: checksum_type }.compact
-      data = @client.request('post', create_provider_path(username, box_name, version_number), provider: params)
-
-      @data = data if update_data
-      data
-    end
-
-    # @param [String] url
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    # @param [String] provider_name
-    def update(url = nil, username = nil, box_name = nil, version_number = nil, provider_name = nil)
-      update_data = !(username && version_number && provider_name && box_name)
-      provider_name ||= @name
-      url ||= @url
-      username ||= @username
-      box_name ||= @box_name
-      version_number ||= @version
-      checksum = @checksum
-      checksum_type = @checksum_type
-
-      params = { url: url, checksum: checksum, checksum_type: checksum_type }.compact
-      data = @client.request('put',
-                             provider_path(username, box_name, version_number, provider_name),
-                             provider: params)
-
-      @data = data if update_data
-      data
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    # @param [String] provider_name
-    def delete(username = nil, box_name = nil, version_number = nil, provider_name = nil)
-      @client.request('delete', provider_path(username, box_name, version_number, provider_name))
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    # @param [String] provider_name
-    # @return [String]
-    def upload_url(username = nil, box_name = nil, version_number = nil, provider_name = nil)
-      @client.request('get', "#{provider_path(username, box_name, version_number, provider_name)}/upload")['upload_path']
-    end
-
-    # @param [String] username
-    # @param [String] box_name
-    # @param [String] version_number
-    # @param [String] provider_name
-    # @param [String] file_path
-    def upload_file(file_path, username = nil, box_name = nil, version_number = nil, provider_name = nil)
-      url = upload_url(username, box_name, version_number, provider_name)
-      payload = File.open(file_path, 'r')
-      RestClient::Request.execute(
-        method: :put,
-        url: url,
-        payload: payload,
-        ssl_version: 'TLSv1'
-      )
-    end
-
-    private
-
-    # @return [Box]
-    def box
-      version.box
-    end
-
-    # @return [Account]
-    def account
-      box.account
-    end
-
-    def create_provider_path(username = nil, box_name = nil, version_number = nil)
-      if username && box_name && version_number
-        "/box/#{username}/#{box_name}/version/#{version_number}/providers"
-      else
-        "/box/#{account.username}/#{box.name}/version/#{version.number}/providers"
-      end
-    end
-
-    def provider_path(username = nil, box_name = nil, version_number = nil, provider_name = nil)
-      if username && box_name && version_number && name
-        "/box/#{username}/#{box_name}/version/#{version_number}/provider/#{provider_name}"
-      else
-        "/box/#{account.username}/#{box.name}/version/#{version.number}/provider/#{name}"
-      end
-    end
-  end
-end