bento-ya 0.1.4 → 1.0.0

data/lib/bento/common.rb

@@ -1,12 +1,16 @@
-require 'benchmark'
-require 'fileutils'
-require 'json'
-require 'tempfile'
-require 'yaml'
+require "benchmark"
+require "fileutils"
+require "json"
+require "tempfile"
+require "yaml"
+require "vagrant_cloud"
 
 MEGABYTE = 1024.0 * 1024.0
 
 module Common
+  def vc_account
+    VagrantCloud::Account.new(ENV["VAGRANT_CLOUD_ORG"], ENV["VAGRANT_CLOUD_TOKEN"])
+  end
 
   def banner(msg)
     puts "==> #{msg}"
@@ -33,13 +37,13 @@ module Common
     json = JSON.parse(file)
 
     # metadata needed for upload:  boxname, version, provider, box filename
-    metadata['name'] = json['name']
-    metadata['version'] = json['version']
-    metadata['box_basename'] = 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' }
+    metadata["name"] = json["name"]
+    metadata["version"] = json["version"]
+    metadata["box_basename"] = 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" }
     end
     metadata
   end
@@ -52,16 +56,50 @@ module Common
     `ls builds/*.json`.split("\n")
   end
 
-  def bento_version
-    @bento_version ||= ENV['BENTO_VERSION']
+  def builds_yml
+    YAML.load(File.read("builds.yml"))
   end
 
-  def builds
-    YAML.load(File.read("builds.yml"))
+  def build_list
+    bit32 = []
+    bit64 = []
+    builds_yml["public"].each do |platform, versions|
+      versions.each do |version, archs|
+        archs.each do |arch|
+          folder = case platform
+                   when "opensuse-leap"
+                     "opensuse"
+                   when "oracle"
+                     "oraclelinux"
+                   else
+                     platform
+                   end
+          case arch
+          when "i386"
+            bit32 << "#{folder}/#{platform}-#{version}-#{arch}"
+          else
+            bit64 << "#{folder}/#{platform}-#{version}-#{arch}"
+          end
+        end
+      end
+    end
+    bit64 + bit32
   end
 
   def private_box?(boxname)
-    proprietary_os_list = %w(macosx sles solaris windows)
+    proprietary_os_list = %w{macos windows sles solaris rhel}
     proprietary_os_list.any? { |p| boxname.include?(p) }
   end
+
+  def os_x?
+    !!(RUBY_PLATFORM =~ /darwin/)
+  end
+
+  def unix?
+    !windows?
+  end
+
+  def windows?
+    !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+  end
 end

data/lib/bento/delete.rb

@@ -1,21 +1,21 @@
-require 'bento/common'
-require 'bento/vagrantcloud'
+require "bento/common"
 
 class DeleteRunner
   include Common
-  include VgCloud
 
-  attr_reader :boxname, :version
+  attr_reader :box, :version
 
   def initialize(opts)
-    @boxname = opts.box
+    @box = opts.box
     @version = opts.version
   end
 
   def start
     banner("Starting Delete...")
     time = Benchmark.measure do
-      box_delete_version(boxname, version)
+      box = vc_account.get_box(box)
+      version = box.get_version(version)
+      version.delete
     end
     banner("Delete finished in #{duration(time.real)}.")
   end

data/lib/bento/normalize.rb

@@ -1,7 +1,6 @@
-require 'bento/common'
+require "bento/common"
 
 class NormalizeRunner
-
   include Common
   include PackerExec
 
@@ -25,7 +24,7 @@ class NormalizeRunner
     if !@modified.empty?
       info("")
       info("The following templates were modified:")
-      @modified.sort.each { |template| info("  * #{template}")}
+      @modified.sort.each { |template| info("  * #{template}") }
     end
     banner("Normalizing finished in #{duration(time.real)}.")
   end
@@ -41,7 +40,7 @@ class NormalizeRunner
 
     banner("[#{template}] Fixing")
     original_checksum = checksum(file)
-    output = %x{packer fix #{file}}
+    output = `packer fix #{file}`
     raise "[#{template}] Error fixing, exited #{$?}" if $?.exitstatus != 0
     # preserve ampersands in shell commands,
     # see: https://github.com/mitchellh/packer/issues/784
@@ -59,7 +58,7 @@ class NormalizeRunner
 
   def packer_validate_cmd(template, var_file)
     vars = "#{template}.variables.json"
-    cmd = %W[packer validate -var-file=#{var_file} #{template}.json]
+    cmd = %W{packer validate -var-file=#{var_file} #{template}.json}
     cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars)
     cmd
   end
@@ -74,7 +73,7 @@ class NormalizeRunner
         banner("[#{template}] DEBUG: md_file(#{md_file.path}) is:")
         puts IO.read(md_file.path)
       end
-      system(*cmd) or raise "[#{template}] Error validating, exited #{$?}"
+      system(*cmd) || raise( "[#{template}] Error validating, exited #{$?}")
     end
   end
 end

data/lib/bento/packerexec.rb

@@ -1,6 +1,5 @@
 
 module PackerExec
-
   def for_packer_run_with(template)
     Tempfile.open("#{template}-metadata.json") do |md_file|
       Tempfile.open("#{template}-metadata-var-file") do |var_file|

data/lib/bento/providermetadata.rb

@@ -1,6 +1,8 @@
-require 'digest'
+require "digest"
+require "bento/common"
 
 class ProviderMetadata
+  include Common
 
   def initialize(path, box_basename)
     @base = File.join(path, box_basename)
@@ -24,7 +26,12 @@ class ProviderMetadata
   attr_reader :base
 
   def provider_from_file(file)
-    file.sub(/^.*\.([^.]+)\.box$/, '\1')
+    provider = file.sub(/^.*\.([^.]+)\.box$/, '\1')
+    if provider == "vmware"
+      "vmware_desktop"
+    else
+      provider
+    end
   end
 
   def shasum(file)
@@ -33,14 +40,14 @@ class ProviderMetadata
 
   def size_in_mb(file)
     size = File.size(file)
-    size_mb = size /  MEGABYTE
+    size_mb = size / MEGABYTE
     size_mb.ceil.to_s
   end
 
   def version(provider)
     case provider
     when /vmware/
-      ver_fusion
+      ver_vmware
     when /virtualbox/
       ver_vbox
     when /parallels/
@@ -48,23 +55,30 @@ class ProviderMetadata
     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]
+  def ver_vmware
+    if os_x?
+      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]
+    else
+      cmd = Mixlib::ShellOut.new("vmware --version")
+      cmd.run_command
+      cmd.stdout.split(" ")[2]
+    end
   end
 
   def ver_parallels
+    raise "Platform is not macOS / OS X, exiting..." unless os_x?
     cmd = Mixlib::ShellOut.new("prlctl --version")
     cmd.run_command
-    cmd.stdout.split(' ')[2]
+    cmd.stdout.split(" ")[2]
   end
 
   def ver_vbox
     cmd = Mixlib::ShellOut.new("VBoxManage --version")
     cmd.run_command
-    cmd.stdout.split('r')[0]
+    cmd.stdout.split("r")[0]
   end
 end

data/lib/bento/release.rb

@@ -1,21 +1,21 @@
-require 'bento/common'
-require 'bento/vagrantcloud'
+require "bento/common"
 
 class ReleaseRunner
   include Common
-  include VgCloud
 
-  attr_reader :boxname, :version
+  attr_reader :box, :version
 
   def initialize(opts)
-    @boxname = opts.box
+    @box = opts.box
     @version = opts.version
   end
 
   def start
-    banner("Starting Release...")
+    banner("Releasing #{box}/#{version}...")
     time = Benchmark.measure do
-      box_release_version(boxname, version)
+      box = vc_account.get_box(box)
+      version = box.get_version(version)
+      version.release
     end
     banner("Release finished in #{duration(time.real)}.")
   end

data/lib/bento/revoke.rb

@@ -1,21 +1,21 @@
-require 'bento/common'
-require 'bento/vagrantcloud'
+require "bento/common"
 
 class RevokeRunner
   include Common
-  include VgCloud
 
-  attr_reader :boxname, :version
+  attr_reader :box, :version
 
   def initialize(opts)
-    @boxname = opts.box
+    @box = opts.box
     @version = opts.version
   end
 
   def start
-    banner("Starting Revoke...")
+    banner("Revoking #{box}/#{version}...")
     time = Benchmark.measure do
-      box_revoke_version(boxname, version)
+      box = vc_account.get_box(box)
+      version = box.get_version(version)
+      version.revoke
     end
     banner("Revoke finished in #{duration(time.real)}.")
   end

data/lib/bento/test.rb

@@ -1,6 +1,6 @@
-require 'bento/common'
-require 'mixlib/shellout'
-require 'erb'
+require "bento/common"
+require "mixlib/shellout"
+require "erb"
 
 class TestRunner
   include Common
@@ -33,7 +33,7 @@ class TestRunner
     boxes = cmd.stdout.split("\n")
 
     boxes.each do |box|
-      b = box.split(' ')
+      b = box.split(" ")
       rm_cmd = Mixlib::ShellOut.new("vagrant box remove --force #{b[0]} --provider #{b[1].to_s.gsub(/(,|\()/, '')}")
       banner("Removing #{b[0]} for provider #{b[1].to_s.gsub(/(,|\()/, '')}")
       rm_cmd.run_command
@@ -42,15 +42,19 @@ class TestRunner
 
   def test_box(md_json)
     md = box_metadata(md_json)
-    @boxname = md['name']
-    @providers = md['providers']
-    @share_disabled = no_shared || /freebsd/.match(boxname) ? true : false
+    @boxname = md["name"]
+    @providers = md["providers"]
+    @share_disabled = no_shared || /(freebsd|opensuse)/.match(boxname) ? true : false
 
     dir = "#{File.expand_path("../../", File.dirname(__FILE__))}/templates"
-    kitchen_cfg = ERB.new(File.read(dir + '/kitchen.yml.erb'), nil, '-').result(binding)
-    File.open(".kitchen.yml", "w") { |f| f.puts kitchen_cfg }
+    %w{.kitchen.yml bootstrap.sh}.each do |file|
+      t = file =~ /kitchen/ ? "kitchen.yml.erb" : "#{file}.erb"
+      erb = ERB.new(File.read(dir + "/#{t}"), nil, "-").result(binding)
+      File.open(file, "w") { |f| f.puts erb }
+    end
 
-    kitchen_test = Mixlib::ShellOut.new("kitchen test", :timeout => 900, live_stream: STDOUT)
-    kitchen_test.run_command
+    test = Mixlib::ShellOut.new("kitchen test", :timeout => 900, live_stream: STDOUT)
+    test.run_command
+    test.error!
   end
 end

data/lib/bento/upload.rb

@@ -1,9 +1,7 @@
-require 'bento/common'
-require 'bento/vagrantcloud'
+require "bento/common"
 
 class UploadRunner
   include Common
-  include VgCloud
 
   attr_reader :md_json
 
@@ -14,14 +12,25 @@ class UploadRunner
   def start
     banner("Starting uploads...")
     time = Benchmark.measure do
-      if md_json.nil?
-        metadata_files.each do |md_file|
-          box_upload(md_file)
-        end
-      else
-        box_upload(md_json)
+      files = md_json ? [md_json] : metadata_files
+      files.each do |md_file|
+        upload(md_file)
       end
     end
-    banner("Atlas uploads finished in #{duration(time.real)}.")
+    banner("Uploads finished in #{duration(time.real)}.")
+  end
+
+  def upload(md_file)
+    md = box_metadata(md_file)
+    box_description = "a bento box for #{md['name']}"
+    box = vc_account.ensure_box(md["name"], box_description, private_box?(md["name"]))
+    version = box.ensure_version(md["version"], File.read(md_file))
+
+    md["providers"].each do |k, v|
+      provider = version.ensure_provider(k, nil)
+      banner("Uploading #{box.name}/#{version.version}/#{provider.name}...")
+      provider.upload_file("builds/#{v['file']}")
+      banner("#{provider.download_url}")
+    end
   end
 end

data/lib/bento/version.rb

@@ -1,3 +1,3 @@
 module Bento
-  VERSION = "0.1.4"
+  VERSION = "1.0.0"
 end

data/templates/bootstrap.sh.erb

@@ -0,0 +1 @@
+echo "Shell Provisioner Says What"

data/templates/kitchen.yml.erb

@@ -7,11 +7,11 @@ platforms:
 - name: <%= @boxname + '-' + k %>
   driver:
     name: vagrant
-<% if k == 'vmware' -%>
+<% if k =~ /vmware/ -%>
 <% if RUBY_PLATFORM.match(/darwin/) -%>
-    provider: <%= k + '_fusion' %>
+    provider: <%= 'vmware_fusion' %>
 <% else -%>
-    provider: <%= k + '_workstation' %>
+    provider: <%= 'vmware_workstation' %>
 <% end -%>
 <% else -%>
     provider: <%= k %>

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bento-ya
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Seth Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
-  name: buildkit
+  name: vagrant_cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 description: bento-ya builds bento boxes
 email:
 - sthomas@chef.io
@@ -61,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -70,12 +57,10 @@ files:
 - bin/bento
 - lib/bento.rb
 - lib/bento/build.rb
-- lib/bento/build_remote.rb
 - lib/bento/buildmetadata.rb
 - lib/bento/cli.rb
 - lib/bento/common.rb
 - lib/bento/delete.rb
-- lib/bento/httpstuff.rb
 - lib/bento/normalize.rb
 - lib/bento/packerexec.rb
 - lib/bento/providermetadata.rb
@@ -83,8 +68,8 @@ files:
 - lib/bento/revoke.rb
 - lib/bento/test.rb
 - lib/bento/upload.rb
-- lib/bento/vagrantcloud.rb
 - lib/bento/version.rb
+- templates/bootstrap.sh.erb
 - templates/kitchen.yml.erb
 homepage: https://github.com/cheeseplus/bento-ya
 licenses: