bento-ya 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e04c6c78424c7c84671934d4a8c136e8b541a84
-  data.tar.gz: 06a45a721b281df3715d595f81608331f1644795
+  metadata.gz: d80f43a61098c9b321b679f1518f54a033fcd3eb
+  data.tar.gz: fe4d410bb82744e2757d5717072019b222782daa
 SHA512:
-  metadata.gz: 8fecf29f4e438211731618e669552a1cd2084aa28f949c44ca784f412c6414aac94a0fda73918910e18f50d651cc78dad2f1a0b9cb10a79ab60990ce5c2ed462
-  data.tar.gz: 4d6f3fa0b79dd0c640fe989c66aeec40b3304e49c6aa4bdcedfb445d8d039dc746651e32ba154ee5c7759de885f8ee567942afc8fcbbd7be703d9dfa97da5a53
+  metadata.gz: db56b1404c177c23ca3229c08b3281b5d524a7e01c3f82a8c76a331798a21ea1d86058312637250881c5fbdd8aba141a9479846abc1dbd86bf4885ea00b6e9c1
+  data.tar.gz: 3d004b6eb6e7fcd13f1a36ed86d991bbb24d5c9f678fbe5024d323e73f34aa27e1cf9e7b8ddd4c6be5643571748ff68b6065a81d0e50b4f08ad185625ba7b4a2

data/.travis.yml

@@ -0,0 +1,19 @@
+sudo: false
+dist: trusty
+
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.1
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
+branches:
+  only:
+    - master
+
+script:
+  - bundle exec chefstyle

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## [v1.0.0](https://github.com/cheeseplus/bento-ya/tree/v1.0.0) (2017-09-05)
+[Full Changelog](https://github.com/cheeseplus/bento-ya/compare/v0.1.4...v1.0.0)
+
+### IMPROVEMENTS
+
+* Use `vagrant_cloud` gem
+* Refactor all Vagrant Cloud related code
+* cleanup deps, options, style
+* drop remote build support
+* add Chefstyle
+* configure TravisCI
+* moved more things out of bento and into bento-ya
+* support for loading `builds.yml`
+* support folder re-organzation in bento project
+
+### BUG FIXES
+
+* Fix provider being set incorrectly for VMware builds
+
 ## [v0.1.4](https://github.com/cheeseplus/bento-ya/tree/v0.1.4) (2017-07-05)
 [Full Changelog](https://github.com/cheeseplus/bento-ya/compare/v0.1.3...v0.1.4)
 
@@ -76,4 +95,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,3 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gemspec
+gemspec
+
+group :development do
+  gem "chefstyle"
+  gem "rake", ">= 10.1.0"
+  gem "rspec-core", "~> 3.0"
+  gem "rspec-expectations", "~> 3.0"
+  gem "rspec-mocks", "~> 3.0"
+  gem "rspec-collection_matchers", "~> 1.0"
+end

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/bento-ya.svg)](http://badge.fury.io/rb/bento-ya)
+[![Gem Version](https://badge.fury.io/rb/bento-ya.svg)](http://badge.fury.io/rb/bento-ya) [![Build Status Master](https://travis-ci.org/cheeseplus/bento-ya.svg?branch=master)](https://travis-ci.org/cheeseplus/bento-ya)
 
 # bento-ya
 A RubyGem for managing chef/bento builds

data/Rakefile

@@ -1 +1,22 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+
+begin
+  require "rspec/core/rake_task"
+
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+  end
+rescue LoadError
+  desc "rspec is not installed, this task is disabled"
+  task :spec do
+    abort "rspec is not installed. `(sudo) gem install rspec` to run unit tests"
+  end
+end
+
+task :default => :spec
+
+require "chefstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options += ["--display-cop-names", "--no-color"]
+end

data/bento-ya.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/cheeseplus/bento-ya"
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.bindir = "bin"
-  gem.executables   = %w[bento]
+  gem.bindir        = "bin"
+  gem.executables   = %w{bento}
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = ">= 2.3.1"
 
-  gem.add_dependency 'rake', '~> 11.2'
-  gem.add_dependency 'mixlib-shellout', '~> 2.2'
-  gem.add_dependency 'buildkit', '~> 0.4'
+  gem.add_dependency "mixlib-shellout", ">= 2.3.2"
+  gem.add_dependency "vagrant_cloud", "~> 1.0"
 end

data/bin/bento

@@ -6,7 +6,7 @@ Signal.trap("INT") { exit 1 }
 $stdout.sync = true
 $stderr.sync = true
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w[.. lib])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w{.. lib})
 require "bento/cli"
 
 begin

data/lib/bento.rb

@@ -1,2 +1,2 @@
-require 'bento/common'
-require 'bento/version'
+require "bento/common"
+require "bento/version"

data/lib/bento/build.rb

@@ -1,20 +1,21 @@
-require 'bento/common'
-require 'bento/buildmetadata'
-require 'bento/providermetadata'
-require 'bento/packerexec'
+require "bento/common"
+require "bento/buildmetadata"
+require "bento/providermetadata"
+require "bento/packerexec"
 
 class BuildRunner
   include Common
   include PackerExec
 
-  attr_reader :templates, :dry_run, :debug, :builds, :except, :mirror, :headed,
+  attr_reader :template_files, :config, :dry_run, :debug, :only, :except, :mirror, :headed,
               :override_version, :build_timestamp, :cpus, :mem
 
   def initialize(opts)
-    @templates = opts.templates
+    @template_files = opts.template_files
+    @config = opts.config ||= false
     @dry_run = opts.dry_run
     @debug = opts.debug
-    @builds = opts.builds ||= "parallels-iso,virtualbox-iso,vmware-iso"
+    @only = opts.only ||= "parallels-iso,virtualbox-iso,vmware-iso"
     @except = opts.except
     @mirror = opts.mirror
     @headed = opts.headed ||= false
@@ -25,7 +26,9 @@ class BuildRunner
   end
 
   def start
-    banner("Starting build for templates: #{templates}")
+    templates = config ? build_list : template_files
+    banner("Starting build for templates:")
+    templates.each { |t| puts "- #{t}" }
     time = Benchmark.measure do
       templates.each { |template| build(template) }
     end
@@ -34,23 +37,26 @@ class BuildRunner
 
   private
 
-  def build(template)
+  def build(file)
+    dir, template = file.split("/")[0], file.split("/")[1]
+    Dir.chdir dir
     for_packer_run_with(template) do |md_file, var_file|
       cmd = packer_build_cmd(template, md_file.path)
       banner("[#{template}] Building: '#{cmd.join(' ')}'")
       time = Benchmark.measure do
-        system(*cmd) or raise "[#{template}] Error building, exited #{$?}"
+        system(*cmd) || raise("[#{template}] Error building, exited #{$?}")
       end
       write_final_metadata(template, time.real.ceil)
       banner("[#{template}] Finished building in #{duration(time.real)}.")
     end
+    Dir.chdir("..")
   end
 
   def packer_build_cmd(template, var_file)
     vars = "#{template}.variables.json"
-    cmd = %W[packer build -var-file=#{var_file} #{template}.json]
+    cmd = %W{packer build -var-file=#{var_file} #{template}.json}
     cmd.insert(2, "-var-file=#{vars}") if File.exist?(vars)
-    cmd.insert(2, "-only=#{builds}") if builds
+    cmd.insert(2, "-only=#{only}")
     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
@@ -68,7 +74,7 @@ class BuildRunner
 
   def write_final_metadata(template, buildtime)
     md = BuildMetadata.new(template, build_timestamp, override_version).read
-    path = File.join("#{Dir.pwd}/builds")
+    path = File.join("../builds")
     filename = File.join(path, "#{md[:box_basename]}.metadata.json")
     md[:providers] = ProviderMetadata.new(path, md[:box_basename]).read
     md[:providers].each do |p|

data/lib/bento/buildmetadata.rb

@@ -1,5 +1,5 @@
-require 'bento/common'
-require 'mixlib/shellout'
+require "bento/common"
+require "mixlib/shellout"
 
 class BuildMetadata
   include Common
@@ -35,11 +35,11 @@ class BuildMetadata
   end
 
   def git_revision
-    sha = %x{git rev-parse HEAD}.strip
+    sha = `git rev-parse HEAD`.strip
   end
 
   def git_clean?
-    %x{git status --porcelain}.strip.empty?
+    `git status --porcelain`.strip.empty?
   end
 
   def merged_vars
@@ -62,10 +62,10 @@ class BuildMetadata
 
   def version
     if override_version
-       override_version
+      override_version
     else
-    merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP").
-      rpartition(".").first.concat(".#{build_timestamp}")
+      merged_vars.fetch("version", "#{UNKNOWN}.TIMESTAMP").
+        rpartition(".").first.concat(".#{build_timestamp}")
     end
   end
 
@@ -76,12 +76,12 @@ class BuildMetadata
   end
 
   def vagrant_ver
-    if ENV['TRAVIS']
-      'travis'
+    if ENV["TRAVIS"]
+      "travis"
     else
       cmd = Mixlib::ShellOut.new("vagrant --version")
       cmd.run_command
-      cmd.stdout.split(' ')[1]
+      cmd.stdout.split(" ")[1]
     end
   end
 end

data/lib/bento/cli.rb

@@ -1,31 +1,27 @@
-require 'optparse'
-require 'ostruct'
-
-require 'bento/common'
-require 'bento/build'
-require 'bento/build_remote'
-require 'bento/delete'
-require 'bento/normalize'
-require 'bento/release'
-require 'bento/revoke'
-require 'bento/test'
-require 'bento/upload'
-
+require "optparse"
+require "ostruct"
+
+require "bento/common"
+require "bento/build"
+require "bento/delete"
+require "bento/normalize"
+require "bento/release"
+require "bento/revoke"
+require "bento/test"
+require "bento/upload"
 
 class Options
-
   NAME = File.basename($0).freeze
 
   def self.parse(args)
     options = OpenStruct.new
-    options.templates = calculate_templates("*.json")
+    options.template_files = calculate_templates("**/*.json")
 
     global = OptionParser.new do |opts|
       opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]"
       opts.separator ""
       opts.separator <<-COMMANDS.gsub(/^ {8}/, "")
         build        :   build one or more templates
-        build_remote :   build one or more templates via buildkite
         help         :   prints this help message
         list         :   list all templates in project
         normalize    :   normalize one or more templates
@@ -38,13 +34,13 @@ class Options
     end
 
     platforms_argv_proc = proc { |options|
-      options.platforms = builds['public'] unless args.empty?
+      options.platforms = builds["public"] unless args.empty?
     }
 
     templates_argv_proc = proc { |options|
       options.templates = calculate_templates(args) unless args.empty?
 
-      options.templates.each do |t|
+      options.template_files.each do |t|
         if !File.exists?("#{t}.json")
           $stderr.puts "File #{t}.json does not exist for template '#{t}'"
           exit(1)
@@ -67,23 +63,27 @@ class Options
         argv: proc { |options|
           puts global
           exit(0)
-        }
+        },
       },
       build: {
         class: BuildRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]"
 
           opts.on("-n", "--dry-run", "Dry run (what would happen)") do |opt|
             options.dry_run = opt
           end
 
+          opts.on("-c BUILD_YML", "--config BUILD_YML", "Use a configuration file") do |opt|
+            options.config = opt
+          end
+
           opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt|
             options.debug = opt
           end
 
           opts.on("-o BUILDS", "--only BUILDS", "Only build some Packer builds") do |opt|
-            options.builds = opt
+            options.only = opt
           end
 
           opts.on("-e BUILDS", "--except BUILDS", "Build all Packer builds except these") do |opt|
@@ -109,45 +109,30 @@ class Options
           opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt|
             options.override_version = opt
           end
-        },
-        argv: templates_argv_proc
-      },
-      build_remote: {
-        class: BuildRemoteRunner,
-        parser: OptionParser.new { |opts|
-          opts.banner = "Usage: #{NAME} build_remote [options] [PLATFORM ...]"
-
-          opts.on("-v VERSION", "--version VERSION", "Override the version set in the template") do |opt|
-            options.override_version = opt
-          end
-
-          opts.on("--dry-run", "Show me what you got") do |opt|
-            options.dry_run = opt
-          end
-        },
-        argv: platforms_argv_proc
+        end,
+        argv: templates_argv_proc,
       },
       list: {
         class: ListRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} list [TEMPLATE ...]"
-        },
-        argv: templates_argv_proc
+        end,
+        argv: templates_argv_proc,
       },
       normalize: {
         class: NormalizeRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} normalize TEMPLATE[ TEMPLATE ...]"
 
           opts.on("-d", "--[no-]debug", "Run packer with debug output") do |opt|
             options.debug = opt
           end
-        },
-        argv: templates_argv_proc
+        end,
+        argv: templates_argv_proc,
       },
       test: {
         class: TestRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} test [options]"
 
           opts.on("--no-shared-folder", "Disable shared folder testing") do |opt|
@@ -157,37 +142,37 @@ class Options
           opts.on("-p", "--provisioner PROVISIONER", "Use a specfic provisioner") do |opt|
             options.provisioner = opt
           end
-        },
-        argv: Proc.new {}
+        end,
+        argv: Proc.new {},
       },
       upload: {
         class: UploadRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} upload"
-        },
-        argv: md_json_argv_proc
+        end,
+        argv: md_json_argv_proc,
       },
       release: {
         class: ReleaseRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} release BOX VERSION"
-        },
-        argv: box_version_argv_proc
+        end,
+        argv: box_version_argv_proc,
       },
       revoke: {
         class: RevokeRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} revoke BOX VERSION"
-        },
-        argv: box_version_argv_proc
+        end,
+        argv: box_version_argv_proc,
       },
       delete: {
         class: DeleteRunner,
-        parser: OptionParser.new { |opts|
+        parser: OptionParser.new do |opts|
           opts.banner = "Usage: #{NAME} delete BOX VERSION"
-        },
-        argv: box_version_argv_proc
-      }
+        end,
+        argv: box_version_argv_proc,
+      },
     }
 
     global.order!
@@ -206,13 +191,12 @@ class Options
       map { |glob| result = Dir.glob(glob); result.empty? ? glob : result }.
       flatten.
       sort.
-      delete_if { |file| file =~ /\.variables\./ }.
-      map { |template| template.sub(/\.json$/, '') }
+      delete_if { |file| file =~ /\.(variables||metadata)\./ }.
+      map { |template| template.sub(/\.json$/, "") }
   end
 end
 
 class ListRunner
-
   include Common
 
   attr_reader :templates
@@ -227,7 +211,6 @@ class ListRunner
 end
 
 class Runner
-
   attr_reader :options
 
   def initialize(options)