bento-ya 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff260877c5af06c3daa869b21c3822c10c9744cc
-  data.tar.gz: efa5a7453aefd3b1a45125c86ca14a8331164cbb
+  metadata.gz: f73a2d8eb35d7b9b7bda761031ebccb9ad537a4a
+  data.tar.gz: c4faa62cb9707c09619ecff27791d5ae30653d34
 SHA512:
-  metadata.gz: 666669fe822e85edf1d0c3254f1b5b9cb8cf983df7b8a591e41b16709772c121951637dcd95a80648a77cac9f8c2812eb0291d7dd606dc289dc707aaeab6a2e4
-  data.tar.gz: 2524156427b8f2312c3e23844d8fae40e94cd3b3e207367b9553c9876772ea4c5ec3a9423e4d69597a56c07b0a86d1a6f23c30f2663aed8f5cc18ccc8cfdf193
+  metadata.gz: 194180e9dcd65151a7945c58e829a0c45b00dae6415d867546ef139d2f32b4d9f90162c1466fe19af341e18729fb7c4654e8661278d767091a2a64df38e643cb
+  data.tar.gz: 439513b89ff61c471ae63dc89261dd2efb4bfe05eff52020d09c001d8c1cf4be089eed8ad1387d963fb5603080b15e9868fcaa154c910ad3292ef8c2b4e87afe

data/bento-ya.gemspec

@@ -22,7 +22,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.3.1"
 
   gem.add_dependency 'rake', '~> 11.2'
-  gem.add_dependency 'test-kitchen', '~> 1.14'
-  gem.add_dependency 'aws-sdk', '~> 2.6'
   gem.add_dependency 'buildkit', '~> 0.4'
 end

data/lib/bento/build.rb

@@ -9,7 +9,8 @@ class BuildRunner
   include Common
   include PackerExec
 
-  attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :headless, :override_version, :build_timestamp
+  attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :headed,
+              :override_version, :build_timestamp, :cpus, :mem
 
   def initialize(opts)
     @templates = opts.templates
@@ -18,9 +19,11 @@ class BuildRunner
     @builds = opts.builds ||= "parallels-iso,virtualbox-iso,vmware-iso"
     @except = opts.except
     @mirror = opts.mirror
-    @headless = opts.headless
+    @headed = opts.headed ||= false
     @override_version = opts.override_version
     @build_timestamp = Time.now.gmtime.strftime("%Y%m%d%H%M%S")
+    @cpus = opts.cpus
+    @mem = opts.mem
   end
 
   def start
@@ -52,10 +55,14 @@ class BuildRunner
     cmd.insert(2, "-only=#{builds}") if builds
     cmd.insert(2, "-except=#{except}") if except
     # Build the command line in the correct order and without spaces as future input for the splat operator.
+    cmd.insert(2, "cpus=#{cpus}") if cpus
+    cmd.insert(2, "-var") if cpus
+    cmd.insert(2, "memory=#{mem}") if mem
+    cmd.insert(2, "-var") if mem
     cmd.insert(2, "mirror=#{mirror}") if mirror
     cmd.insert(2, "-var") if mirror
-    cmd.insert(2, "headless=true") if headless
-    cmd.insert(2, "-var") if headless
+    cmd.insert(2, "headless=true") unless headed
+    cmd.insert(2, "-var") unless headed
     cmd.insert(2, "-debug") if debug
     cmd.insert(0, "echo") if dry_run
     cmd
@@ -65,16 +72,12 @@ class BuildRunner
     md = BuildMetadata.new(template, build_timestamp, override_version).read
     path = File.join("#{Dir.pwd}/builds")
     filename = File.join(path, "#{md[:box_basename]}.metadata.json")
-
     md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read
-    md[:tool_versions] = tool_versions
-
-    builders = builds.split(',')
-    md[:build_times] = Hash.new
-    builders.each do |b|
-      md[:build_times][b] = buildtime
+    md[:providers].each do |p|
+      p[:build_time] = buildtime
+      p[:build_cpus] = cpus unless cpus.nil?
+      p[:build_mem] = mem unless mem.nil?
     end
-    
 
     if dry_run
       banner("(Dry run) Metadata file contents would be something similar to:")

data/lib/bento/build_remote.rb

@@ -40,6 +40,10 @@ class BuildRemoteRunner
     "v1/organizations/#{org}"
   end
 
+  def bento_upload
+    "1"
+  end
+
   def build(platform, version, arch, provider, bento_version, dry_run)
     plat =  platform.include?('omnios') ? "#{platform}-#{version}" : "#{platform}-#{version}-#{arch}"
     atlas_name = /(.*)64/.match(arch) ? plat.chomp("-#{arch}") : plat
@@ -109,4 +113,4 @@ class BuildRemoteRunner
       end
     end
   end
-end
+end

data/lib/bento/buildmetadata.rb

@@ -15,11 +15,11 @@ class BuildMetadata
       version:          version,
       build_timestamp:  build_timestamp,
       git_revision:     git_revision,
-      #git_status:       git_clean? ? "clean" : "dirty"
+      git_status:       git_clean? ? "clean" : "dirty",
       box_basename:     box_basename,
       template:         template_vars.fetch("template", UNKNOWN),
-      cpus:             cpus.to_s,
-      memory:           memory.to_s,
+      packer:           packer_ver,
+      vagrant:          vagrant_ver,
     }
   end
 
@@ -67,4 +67,16 @@ class BuildMetadata
       rpartition(".").first.concat(".#{build_timestamp}")
     end
   end
-end
+
+  def packer_ver
+    cmd = Mixlib::ShellOut.new("packer --version")
+    cmd.run_command
+    cmd.stdout.split("\n")[0]
+  end
+
+  def vagrant_ver
+    cmd = Mixlib::ShellOut.new("vagrant --version")
+    cmd.run_command
+    cmd.stdout.split(' ')[1]
+  end
+end

data/lib/bento/cli.rb

@@ -57,6 +57,10 @@ class Options
       options.version = ARGV[1]
     }
 
+    md_json_argv_proc = proc { |options|
+      options.md_json = ARGV[0]
+    }
+
     subcommand = {
       help: {
         parser: OptionParser.new {},
@@ -90,8 +94,16 @@ class Options
             options.mirror = opt
           end
 
-          opts.on("-H", "--headless", "Run providers as headless") do |opt|
-            options.headless = opt
+          opts.on("-C cpus", "--cpus CPUS", "# of CPUs per provider") do |opt|
+            options.cpus = opt
+          end
+
+          opts.on("-M MEMORY", "--memory MEMORY", "Memory (MB) per provider") do |opt|
+            options.mem = opt
+          end
+
+          opts.on("-H", "--headed", "Display provider UI windows") do |opt|
+            options.headed = opt
           end
 
           opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt|
@@ -153,7 +165,7 @@ class Options
         parser: OptionParser.new { |opts|
           opts.banner = "Usage: #{NAME} upload"
         },
-        argv: box_version_argv_proc
+        argv: md_json_argv_proc
       },
       release: {
         class: ReleaseRunner,
@@ -225,4 +237,4 @@ class Runner
   def start
     options.klass.new(options).start
   end
-end
+end

data/lib/bento/common.rb

@@ -36,7 +36,7 @@ module Common
     metadata['name'] = json['name']
     metadata['version'] = json['version']
     metadata['box_basename'] = json['box_basename']
-    metadata['tool_versions'] = json['box_basename']
+    metadata['tools'] = json['tools']
     metadata['providers'] = Hash.new
     json['providers'].each do |provider|
       metadata['providers'][provider['name']] = provider.reject { |k, _| k == 'name' }
@@ -52,34 +52,10 @@ module Common
     `ls builds/*.json`.split("\n")
   end
 
-  def atlas_api
-    @atlas_api ||= 'https://atlas.hashicorp.com/api/v1'
-  end
-
-  def atlas_org
-    @atlas_org ||= ENV['ATLAS_ORG']
-  end
-
-  def atlas_token
-    @atlas_token ||= ENV['ATLAS_TOKEN']
-  end
-
-  def bento_upload
-    "1"
-  end
-
   def bento_version
     @bento_version ||= ENV['BENTO_VERSION']
   end
 
-  def cpus
-    1
-  end
-
-  def memory
-    1024
-  end
-
   def builds
     YAML.load(File.read("builds.yml"))
   end
@@ -88,39 +64,4 @@ module Common
     proprietary_os_list = %w(macosx sles solaris windows)
     proprietary_os_list.any? { |p| boxname.include?(p) }
   end
-
-  def tool_versions
-    tool_versions = Hash.new
-    path = File.join('/Applications/VMware\ Fusion.app/Contents/Library')
-    fusion_cmd = File.join(path, "vmware-vmx -v")
-    ver_hash = {
-      packer: "packer --version",
-      vagrant: "vagrant --version",
-      parallels: "prlctl --version",
-      virtualbox: "VBoxManage --version",
-      vmware_fusion: fusion_cmd
-    }
-    ver_hash.each do |tool, command|
-      cmd = Mixlib::ShellOut.new(command)
-      begin
-        cmd.run_command
-        case tool
-        when /parallels/
-          ver = cmd.stdout.split(' ')[2]
-        when /fusion/
-          ver = cmd.stderr.split(' ')[5]
-        when /vagrant/
-          ver = cmd.stdout.split(' ')[1]
-        when /virtualbox/
-          ver = cmd.stdout.split('r')[0]
-        else
-          ver = cmd.stdout.split("\n")[0]
-        end
-        tool_versions[tool] = ver
-      rescue
-        tool_versions[tool] = 'None'
-      end
-    end
-    tool_versions
-  end
 end

data/lib/bento/delete.rb

@@ -1,9 +1,9 @@
 require 'bento/common'
-require 'bento/httpstuff'
+require 'bento/vagrantcloud'
 
 class DeleteRunner
   include Common
-  include HttpStuff
+  include VgCloud
 
   attr_reader :boxname, :version
 
@@ -15,24 +15,8 @@ class DeleteRunner
   def start
     banner("Starting Delete...")
     time = Benchmark.measure do
-      delete_version(boxname, version)
+      box_delete_version(boxname, version)
     end
     banner("Delete finished in #{duration(time.real)}.")
   end
-
-  private
-
-  def delete_version(boxname, version)
-    banner("Deleting version #{version} of box #{boxname}")
-    req = request('delete', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' })
-
-    case req.code
-    when '200'
-      banner("Version #{version} of box #{boxname} has been successfully deleted")
-    when '404'
-      warn("No box exists for this version")
-    else
-      warn("Something went wrong #{req.code}")
-    end
-  end
-end
+end

data/lib/bento/providermetadata.rb

@@ -10,6 +10,7 @@ class ProviderMetadata
     Dir.glob("#{base}.*.box").map do |file|
       {
         name: provider_from_file(file),
+        version: version(provider_from_file(file)),
         file: "#{File.basename(file)}",
         checksum_type: "sha256",
         checksum: shasum(file),
@@ -23,10 +24,7 @@ class ProviderMetadata
   attr_reader :base
 
   def provider_from_file(file)
-    case provider = file.sub(/^.*\.([^.]+)\.box$/, '\1')
-    when /vmware/i then "vmware_desktop"
-    else provider
-    end
+    file.sub(/^.*\.([^.]+)\.box$/, '\1')
   end
 
   def shasum(file)
@@ -38,4 +36,35 @@ class ProviderMetadata
     size_mb = size /  MEGABYTE
     size_mb.ceil.to_s
   end
-end
+
+  def version(provider)
+    case provider
+    when /vmware/
+      ver_fusion
+    when /virtualbox/
+      ver_vbox
+    when /parallels/
+      ver_parallels
+    end
+  end
+
+  def ver_fusion
+    path = File.join('/Applications/VMware\ Fusion.app/Contents/Library')
+    fusion_cmd = File.join(path, "vmware-vmx -v")
+    cmd = Mixlib::ShellOut.new(fusion_cmd)
+    cmd.run_command
+    cmd.stderr.split(' ')[5]
+  end
+
+  def ver_parallels
+    cmd = Mixlib::ShellOut.new("prlctl --version")
+    cmd.run_command
+    cmd.stdout.split(' ')[2]
+  end
+
+  def ver_vbox
+    cmd = Mixlib::ShellOut.new("VBoxManage --version")
+    cmd.run_command
+    cmd.stdout.split('r')[0]
+  end
+end

data/lib/bento/release.rb

@@ -1,9 +1,9 @@
 require 'bento/common'
-require 'mixlib/shellout'
+require 'bento/vagrantcloud'
 
 class ReleaseRunner
   include Common
-  include HttpStuff
+  include VgCloud
 
   attr_reader :boxname, :version
 
@@ -15,32 +15,8 @@ class ReleaseRunner
   def start
     banner("Starting Release...")
     time = Benchmark.measure do
-      release_version(boxname, version)
+      box_release_version(boxname, version)
     end
     banner("Release finished in #{duration(time.real)}.")
   end
-
-  private
-
-  def release_version(boxname, version)
-    case status(boxname, version)
-    when 'unreleased'
-      banner("Releasing version #{version} of box #{boxname}")
-      req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/release", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' })
-      if req.code == '200'
-        banner("Version #{version} of box #{boxname} has been successfully released")
-      else
-        warn("Something went wrong #{req.code}")
-      end
-    when 'active'
-      banner("Version #{version} of box #{boxname} has already been released - nothing to do")
-    else
-      warn("Unexpected status retrieved from Atlas")
-    end
-  end
-
-  def status(boxname, version)
-    req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' })
-    status = JSON.parse(req.body)['status']
-  end
-end
+end

data/lib/bento/revoke.rb

@@ -1,9 +1,9 @@
 require 'bento/common'
-require 'mixlib/shellout'
+require 'bento/vagrantcloud'
 
 class RevokeRunner
   include Common
-  include HttpStuff
+  include VgCloud
 
   attr_reader :boxname, :version
 
@@ -15,20 +15,8 @@ class RevokeRunner
   def start
     banner("Starting Revoke...")
     time = Benchmark.measure do
-      revoke_version(boxname, version)
+      box_revoke_version(boxname, version)
     end
     banner("Revoke finished in #{duration(time.real)}.")
   end
-
-  private
-
-  def revoke_version(boxname, version)
-    banner("Revoking version #{version} of box #{boxname}")
-    req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/revoke", { 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' })
-    if req.code == '200'
-      banner("Version #{version} of box #{boxname} has been successfully revoked")
-    else
-      banner("Something went wrong #{req.code}")
-    end
-  end
-end
+end

data/lib/bento/test.rb

@@ -16,9 +16,8 @@ class TestRunner
     banner("Starting testing...")
     time = Benchmark.measure do
       metadata_files.each do |metadata_file|
-        m = box_metadata(metadata_file)
         destroy_all_bento
-        test_box(m['name'], m['providers'])
+        test_box(metadata_file)
         destroy_all_bento
       end
     end
@@ -40,32 +39,17 @@ class TestRunner
     end
   end
 
-  def test_box(boxname, providers)
-    providers.each do |provider, provider_data|
+  def test_box(md_json)
+    md = box_metadata(md_json)
+    @boxname = md['name']
+    @providers = md['providers']
+    @share_disabled = shared_folder ? false : true
 
-      if provider == 'vmware_desktop'
-        case RUBY_PLATFORM
-        when /darwin/
-          provider = 'vmware_fusion'
-        when /linux/
-          provider = 'vmware_workstation'
-        end
-      end
-
-      @boxname = boxname
-      @provider = provider
-      @share_disabled = shared_folder ? false : true
-      @box_url = "file://#{ENV['PWD']}/builds/#{provider_data['file']}"
-
-      kitchen_cfg = ERB.new(File.read('.kitchen.yml.erb'), nil, '-').result(binding)
-      File.open(".kitchen.#{provider}.yml", "w") { |f| f.puts kitchen_cfg }
+    t_dir = "#{File.expand_path("../../", File.dirname(__FILE__))}/templates"
+    kitchen_cfg = ERB.new(File.read(t_dir + '/kitchen.yml.erb'), nil, '-').result(binding)
+    File.open(".kitchen.yml", "w") { |f| f.puts kitchen_cfg }
 
-      Kitchen.logger = Kitchen.default_file_logger
-      @loader = Kitchen::Loader::YAML.new(project_config: "./.kitchen.#{provider}.yml")
-      config = Kitchen::Config.new(loader: @loader)
-      config.instances.each do |instance|
-        instance.test(:always)
-      end
-    end
+    kitchen_test = Mixlib::ShellOut.new("kitchen test", :timeout => 900, live_stream: STDOUT)
+    kitchen_test.run_command
   end
-end
+end

data/lib/bento/upload.rb

@@ -1,118 +1,27 @@
-require 'aws-sdk'
 require 'bento/common'
+require 'bento/vagrantcloud'
 
 class UploadRunner
   include Common
-  include HttpStuff
+  include VgCloud
 
-  attr_reader :templates
+  attr_reader :md_json
 
   def initialize(opts)
-    @templates = opts.templates
+    @md_json = opts.md_json
   end
 
   def start
     banner("Starting uploads...")
     time = Benchmark.measure do
-      metadata_files.each do |file|
-        md = box_metadata(file)
-        create_box(md['name'])
-        create_box_version(md['name'], md['version'], file)
-        create_providers(md['name'], md['version'], md['providers'].keys)
-        upload_to_atlas(md['name'], md['version'], md['providers'])
-        #upload_to_s3(md['name'], md['version'], md['providers'])
-      end
-    end
-    banner("Atlas uploads finished in #{duration(time.real)}.")
-  end
-
-  private
-
-  def create_box(boxname)
-    req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[username]' => atlas_org, 'access_token' => atlas_token } )
-    if req.code.eql?('404')
-      if private_box?(boxname)
-        banner("Creating the private box #{boxname} in Atlas.")
-        req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } )
+      if md_json.nil?
+        metadata_files.each do |md_file|
+          box_upload(md_file)
+        end
       else
-        banner("Creating the box #{boxname} in Atlas.")
-        req = request('post', "#{atlas_api}/boxes", { 'box[name]' => boxname, 'box[username]' => atlas_org, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } )
-        make_public(boxname)
-      end
-    else
-      banner("The box #{boxname} exists in Atlas, continuing...")
-    end
-  end
-
-  def make_public(boxname)
-    banner("Making #{boxname} public")
-    req = request('put', "#{atlas_api}/box/#{atlas_org}/#{boxname}", { 'box[is_private]' => false, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' } )
-    banner("#{boxname} successfully made public") if req.code == '200'
-  end
-
-  def create_box_version(boxname, version, md_json)
-		payload = { 
-	  	'version[version]' => version,
-	  	'access_token' => atlas_token,
-		'version[description]' => File.read(md_json)
-		}
-    req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/versions", payload, { 'Content-Type' => 'application/json' } ) 
-
-    banner("Created box version #{boxname} #{version}.") if req.code == '200'
-    banner("Box version #{boxname} #{version} already exists, continuing.") if req.code == '422'
-  end
-
-  def create_providers(boxname, version, provider_names)
-    provider_names.each do |provider|
-      banner("Creating provider #{provider} for #{boxname} #{version}")
-      req = request('post', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => atlas_token }, { 'Content-Type' => 'application/json' }  )
-      banner("Created #{provider} for #{boxname} #{version}") if req.code == '200'
-      banner("Provider #{provider} for #{boxname} #{version} already exists, continuing.") if req.code == '422'
-    end
-  end
-
-  def upload_to_atlas(boxname, version, providers)
-    providers.each do |provider, provider_data|
-      boxfile = provider_data['file']
-      req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{atlas_token}")
-      upload_path = JSON.parse(req.body)['upload_path']
-      token = JSON.parse(req.body)['token']
-
-      banner("Atlas: Uploading #{boxfile}")
-      info("Name: #{boxname}")
-      info("Version: #{version}")
-      info("Provider: #{provider}")
-      info("Upload Path: #{upload_path}")
-      upload_request = request('put', upload_path, File.open("builds/#{boxfile}"))
-
-      req = request('get', "#{atlas_api}/box/#{atlas_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{atlas_token}")
-      hosted_token = JSON.parse(req.body)['hosted_token']
-
-      if token == hosted_token
-        banner("Successful upload of box #{boxfile}")
-      else
-        banner("Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}")
-        warn("Code: #{req.code}")
-        warn("Body: #{req.body}")
-      end
-    end
-
-    def upload_to_s3(boxname, version, providers)
-      providers.each do |provider, provider_data|
-        boxfile = provider_data['file']
-        provider = 'vmware' if provider == 'vmware_desktop'
-        box_path = "vagrant/#{provider}/opscode_#{boxname}_chef-provisionerless.box"
-        credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
-
-        s3 = Aws::S3::Resource.new(credentials: credentials, endpoint: s3_endpoint)
-        banner("S3: Uploading #{boxfile}")
-        info("Name: #{boxname}")
-        info("Version: #{version}")
-        info("Provider: #{provider}")
-        s3_object = s3.bucket(s3_bucket).object(box_path)
-        s3_object.upload_file("builds/#{boxfile}", acl:'public-read')
-        banner("Upload Path: #{s3_object.public_url}")
+        box_upload(md_json)
       end
     end
+    banner("Atlas uploads finished in #{duration(time.real)}.")
   end
 end

data/lib/bento/vagrantcloud.rb

@@ -0,0 +1,138 @@
+require 'bento/common'
+require 'bento/httpstuff'
+
+module VgCloud
+  include Common
+  include HttpStuff
+
+  def vgc_api
+    @vgc_api ||= 'https://vagrantcloud.com/api/v1'
+  end
+
+  def vgc_org
+    @vgc_org ||= ENV['ATLAS_ORG']
+  end
+
+  def vgc_token
+    @vgc_token ||= ENV['ATLAS_TOKEN']
+  end
+
+  def box_create(boxname)
+    req = request('get', "#{vgc_api}/box/#{vgc_org}/#{boxname}", { 'box[username]' => vgc_org, 'access_token' => vgc_token } )
+    if req.code.eql?('404')
+      req = request('post', "#{vgc_api}/boxes", { 'box[name]' => boxname, 'box[username]' => vgc_org, 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' } )
+      box_set_public(boxname) unless private_box?(boxname)
+    else
+      banner("The box #{boxname} exists in Atlas, continuing...")
+    end
+  end
+
+  def box_create_providers(boxname, version, provider_names)
+    provider_names.each do |provider|
+      banner("Creating provider #{provider} for #{boxname} #{version}")
+      req = request('post', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}/providers", { 'provider[name]' => provider, 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' }  )
+      banner("Created #{provider} for #{boxname} #{version}") if req.code == '200'
+      banner("Provider #{provider} for #{boxname} #{version} already exists, continuing.") if req.code == '422'
+    end
+  end
+
+  def box_create_version(boxname, version, md_json)
+    payload = {
+      'version[version]' => version,
+      'access_token' => vgc_token,
+      'version[description]' => File.read(md_json)
+    }
+    req = request('post', "#{vgc_api}/box/#{vgc_org}/#{boxname}/versions", payload, { 'Content-Type' => 'application/json' } )
+
+    banner("Created box version #{boxname} #{version}.") if req.code == '200'
+    banner("Box version #{boxname} #{version} already exists, continuing.") if req.code == '422'
+  end
+
+  def box_delete_version(boxname, version)
+    banner("Deleting version #{version} of box #{boxname}")
+    req = request('delete', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}", { 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' })
+
+    case req.code
+    when '200'
+      banner("Version #{version} of box #{boxname} has been successfully deleted")
+    when '404'
+      warn("No box exists for this version")
+    else
+      warn("Something went wrong #{req.code}")
+    end
+  end
+
+  def box_release_version(boxname, version)
+    case status(boxname, version)
+    when 'unreleased'
+      banner("Releasing version #{version} of box #{boxname}")
+      req = request('put', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}/release", { 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' })
+      if req.code == '200'
+        banner("Version #{version} of box #{boxname} has been successfully released")
+      else
+        warn("Something went wrong #{req.code}")
+      end
+    when 'active'
+      banner("Version #{version} of box #{boxname} has already been released - nothing to do")
+    else
+      warn("Unexpected status retrieved from Atlas")
+    end
+  end
+
+  def box_revoke_version(boxname, version)
+    banner("Revoking version #{version} of box #{boxname}")
+    req = request('put', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}/revoke", { 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' })
+    if req.code == '200'
+      banner("Version #{version} of box #{boxname} has been successfully revoked")
+    else
+      banner("Something went wrong #{req.code}")
+    end
+  end
+
+  def box_status(boxname, version)
+    req = request('get', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}", { 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' })
+    status = JSON.parse(req.body)['status']
+  end
+
+  def box_set_public(boxname)
+    banner("Making #{boxname} public")
+    req = request('put', "#{vgc_api}/box/#{vgc_org}/#{boxname}", { 'box[is_private]' => false, 'access_token' => vgc_token }, { 'Content-Type' => 'application/json' } )
+    banner("#{boxname} successfully made public") if req.code == '200'
+  end
+
+  def box_upload(md_file)
+    md = box_metadata(md_file)
+    boxname = md['name']
+    version = md['version']
+    providers = md['providers']
+
+    box_create(boxname)
+    box_create_version(boxname, version, md_file)
+    box_create_providers(boxname, version, providers.keys)
+
+    providers.each do |provider, provider_data|
+      boxfile = provider_data['file']
+      req = request('get', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}/provider/#{provider}/upload?access_token=#{vgc_token}")
+      upload_path = JSON.parse(req.body)['upload_path']
+      token = JSON.parse(req.body)['token']
+
+      banner("Vagrant Cloud: Uploading #{boxfile}")
+      info("Name: #{boxname}")
+      info("Version: #{version}")
+      info("Provider: #{provider}")
+
+      upload_request = request('put', upload_path, File.open("builds/#{boxfile}"))
+
+      req = request('get', "#{vgc_api}/box/#{vgc_org}/#{boxname}/version/#{version}/provider/#{provider}?access_token=#{vgc_token}")
+      hosted_token = JSON.parse(req.body)['hosted_token']
+
+      if token == hosted_token
+        banner("Successful upload of box #{boxfile}")
+      else
+        banner("Failed upload due to non-matching tokens of box #{boxfile} to atlas box: #{boxname}, version: #{version}, provider: #{provider}")
+        warn("Code: #{req.code}")
+        warn("Body: #{req.body}")
+      end
+    end
+  end
+end

data/lib/bento/version.rb

@@ -1,3 +1,3 @@
 module Bento
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/templates/kitchen.yml.erb

@@ -0,0 +1,26 @@
+---
+provisioner:
+  name: <%= @provisioner %>
+
+platforms:
+<% @providers.each do |k,v| -%>
+- name: <%= @boxname + '-' + k %>
+  driver:
+    name: vagrant
+<% if k == 'vmware' -%>
+<% if RUBY_PLATFORM.match(/darwin/) -%>
+    provider: <%= k + '_fusion' %>
+<% else -%>
+    provider: <%= k + '_workstation' %>
+<% end -%>
+<% else -%>
+    provider: <%= k %>
+<% end -%>
+    box: bento-<%= @boxname %>
+    box_url: file://<%= ENV['PWD'] %>/builds/<%= v['file'] %>
+    synced_folders:
+      - [".", "/vagrant", "disabled: <%= @share_disabled %>"]
+
+<% end -%>
+suites:
+- name: default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bento-ya
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Seth Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.2'
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: buildkit
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +69,9 @@ files:
 - lib/bento/revoke.rb
 - lib/bento/test.rb
 - lib/bento/upload.rb
+- lib/bento/vagrantcloud.rb
 - lib/bento/version.rb
+- templates/kitchen.yml.erb
 homepage: https://github.com/cheeseplus/bento-ya
 licenses:
 - Apache-2.0
@@ -118,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A RubyGem for managing chef/bento builds