packer-config 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659f4e3b9308a22f46bacda9dd600cc57be00ea0
-  data.tar.gz: 14536389dcf3295577d64ef5e773d76e84b3e115
+  metadata.gz: 01133b9d2fb0e22d4412694baed496349e7abfbd
+  data.tar.gz: c22b355228f0a5a40deb29caa81d1ee76d68ff25
 SHA512:
-  metadata.gz: 322a6cf6cdff456baf89b32e1059db7b09a863d042431ec26e3714b6e4e1b402e7bb776ad4a3221dc7652d9bf38223e0eae4bf9377ab78bde7974863f3bf80d1
-  data.tar.gz: 5b47a91f0c4d7f3e6d651d225db1228b0ff5f4e5979d2e5da392140f04d58c6c26aa62ea97a8b76402694e9b10dc1757157c4ad0710e6ffddca851299811c9c3
+  metadata.gz: b955805634e3dc46e646193b12c521524d5971fc29bff2c97657381954ac0bf212f466e5212cef87f2586abdd44e9c8b4e5f3baedb42d28aecce625e9d2e8136
+  data.tar.gz: e6e8fea9c9c111b06573713d556e8965410a4816731ed3c9a803959f809df97ca5ceeb873a00a9342e0143f35baf8bcff39ae635be0fbc33fa9be00aeee0e7f2

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation

data/.rubocop.yml

@@ -78,7 +78,13 @@ Metrics/ClassLength:
   Max: 150
 
 Metrics/MethodLength:
-  Max: 27
+  Max: 50
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Max: 10
 
 Style/BracesAroundHashParameters:
   Enabled: false

data/COPYRIGHT

@@ -7,6 +7,8 @@ Including, but not limited to:
   Greg Poirier
   Greg Diamond
   Enzo Rivello
+  Edwin Biemond
+  Andrei Shiniti Nakagawa
 
 For licensing information please see LICENSE. Copyright holders contributing to
 this project agree to have their contributions licensed under the terms of the

data/README.md

@@ -37,6 +37,7 @@ The following [Packer builders](http://www.packer.io/docs/templates/builders.htm
 * [virtualbox-iso](http://www.packer.io/docs/builders/virtualbox-iso.html)
 * [vmware-vmx](https://www.packer.io/docs/builders/vmware-vmx)
 * [vmware-iso](https://www.packer.io/docs/builders/vmware-iso)
+* [qemu](https://www.packer.io/docs/builders/qemu.html)
 * [null](https://www.packer.io/docs/builders/null.html)
 
 [Communicators](https://www.packer.io/docs/templates/communicator.html) are supported as options on Builders in `packer-config`. The `none`, `ssh`, and `winrm` communicators are all available as is the `docker` communicator on the Docker-type builders. `packer-config` will raise an error if you try to use a Communicator type that isn't valid for the Builder.
@@ -47,6 +48,7 @@ The following [Packer provisioners](http://www.packer.io/docs/templates/provisio
 
 * [file](http://www.packer.io/docs/provisioners/file.html)
 * [shell](http://www.packer.io/docs/provisioners/shell.html)
+* [shell-local](https://www.packer.io/docs/provisioners/shell-local.html)
 * [ansible](https://www.packer.io/docs/provisioners/ansible-local.html)
 * [chef-client](https://www.packer.io/docs/provisioners/chef-client.html)
 * [chef-solo](https://www.packer.io/docs/provisioners/chef-solo.html)
@@ -64,6 +66,7 @@ The following [Packer post-processors](http://www.packer.io/docs/templates/post-
 * [docker-save](http://www.packer.io/docs/post-processors/docker-save.html)
 * [docker-tag](http://www.packer.io/docs/post-processors/docker-tag.html)
 * [vagrant](http://www.packer.io/docs/post-processors/vagrant.html)
+* [compress](https://www.packer.io/docs/post-processors/compress.html)
 
 ## Examples
 
@@ -147,7 +150,9 @@ I'm using Travis CI to build and test on every push to the public github reposit
 
 ### Branching in Git
 
-We release off the `master` branch -- open your pull requests against `master` for the time being. We were using git-flow but I've fallen out of love with its style in favor of more ad hoc branching and just keeping `master` clean for releases.
+We release off the `master` branch. Please open your pull requests against `develop`. We were using git-flow but I've fallen out of love with its style in favor of more ad hoc branching and just keeping `master` clean for releases.
+
+**PLEASE OPEN ALL PULL REQUESTS AGAINST `develop` NOT `master`!**
 
 ### TODO Work
 

data/RELEASENOTES.md

@@ -1,5 +1,12 @@
 # packer-config Release Notes
 
+## 1.6.3
+
+* Add support for the shell-local provisioner (via [shinitiandrei])
+* Add support for QEMU builder (via [biemond])
+* Add support for the Compress post-processor (via [biemond])
+* Add support for `-debug` in the packer command line call (via [diamond29])
+
 ## 1.6.2
 
 * Updates for CVE-2017-8418
@@ -61,3 +68,5 @@
   [ianchesal]: https://github.com/ianchesal
   [diamond29]: https://github.com/diamond29
   [enzor]: https://github.com/enzor
+  [biemond]: https://github.com/biemond
+  [shinitiandrei]: https://github.com/shinitiandrei

data/lib/packer/builder.rb

@@ -9,6 +9,7 @@ module Packer
     VIRTUALBOX_ISO  = 'virtualbox-iso'
     VMWARE_VMX      = 'vmware-vmx'
     VMWARE_ISO      = 'vmware-iso'
+    QEMU            = 'qemu'
     NULL            = 'null'
 
     VALID_BUILDER_TYPES = [
@@ -18,6 +19,7 @@ module Packer
       VIRTUALBOX_ISO,
       VMWARE_VMX,
       VMWARE_ISO,
+      QEMU,
       NULL
     ]
 
@@ -35,6 +37,7 @@ module Packer
         VIRTUALBOX_ISO  => Packer::Builder::VirtualBoxISO,
         VMWARE_VMX      => Packer::Builder::VMWareVMX,
         VMWARE_ISO      => Packer::Builder::VMWareISO,
+        QEMU            => Packer::Builder::Qemu,
         NULL            => Packer::Builder::Null
       }.fetch(type).new
     end

data/lib/packer/builders/all.rb

@@ -4,4 +4,5 @@ require 'packer/builders/docker'
 require 'packer/builders/virtualbox'
 require 'packer/builders/vmware_vmx'
 require 'packer/builders/vmware_iso'
+require 'packer/builders/qemu'
 require 'packer/builders/null'

data/lib/packer/builders/qemu.rb

@@ -0,0 +1,105 @@
+# Encoding: utf-8
+require 'packer/builder'
+require 'packer/dataobject'
+
+module Packer
+  class Builder < Packer::DataObject
+    class Qemu < Builder
+      def initialize
+        super
+        self.data['type'] = QEMU
+        self.add_required(
+          'iso_checksum',
+          'iso_checksum_type',
+          'iso_url',
+          'communicator'
+        )
+        self.communicators = %w(none ssh winrm)
+      end
+
+      def iso_checksum(checksum)
+        self.__add_string('iso_checksum', checksum)
+      end
+
+      def iso_checksum_type(type)
+        self.__add_string('iso_checksum_type', type)
+      end
+
+      def iso_url(url)
+        self.__add_string('iso_url', url, %w[iso_urls])
+      end
+
+      def boot_command(commands)
+        self.__add_array_of_strings('boot_command', commands)
+      end
+
+      def boot_wait(time)
+        self.__add_string('boot_wait',time)
+      end
+
+      def disk_size(megabytes)
+        self.__add_integer('disk_size', megabytes)
+      end
+
+      def accelerator(accelerator)
+        self.__add_string('accelerator', accelerator)
+      end
+
+      def format(format)
+        self.__add_string('format', format)
+      end
+
+      def net_device(net_device)
+        self.__add_string('net_device', net_device)
+      end
+
+      def floppy_files(files)
+        self.__add_array_of_strings('floppy_files', files)
+      end
+
+      def qemu_binary(qemu_binary)
+        self.__add_string('qemu_binary', qemu_binary)
+      end
+
+      def disk_interface(disk_interface)
+        self.__add_string('disk_interface', disk_interface)
+      end
+
+      def headless(bool)
+        self.__add_boolean('headless', bool)
+      end
+
+      def http_directory(directory)
+        self.__add_string('http_directory', directory)
+      end
+
+      def http_port_min(port_number)
+        self.__add_integer('http_port_min', port_number)
+      end
+
+      def http_port_max(port_number)
+        self.__add_integer('http_port_max', port_number)
+      end
+
+      def output_directory(directory)
+        self.__add_string('output_directory', directory)
+      end
+
+      def shutdown_command(command)
+        self.__add_string('shutdown_command', command)
+      end
+
+      def shutdown_timeout(time)
+        self.__add_string('shutdown_timeout', time)
+      end
+
+      def qemuargs(array_of_commands)
+        self.__add_array_of_array_of_strings('qemuargs', array_of_commands)
+      end
+
+      def vm_name(name)
+        self.__add_string('vm_name', name)
+      end
+    end
+  end
+end

data/lib/packer/postprocessor.rb

@@ -9,13 +9,17 @@ module Packer
     DOCKER_SAVE = 'docker-save'
     DOCKER_TAG = 'docker-tag'
     VAGRANT = 'vagrant'
+    COMPRESS = 'compress'
+    SHELL_LOCAL = 'shell-local'
 
     VALID_POST_PROCESSOR_TYPES = [
       DOCKER_IMPORT,
       DOCKER_PUSH,
       DOCKER_SAVE,
       DOCKER_TAG,
-      VAGRANT
+      COMPRESS,
+      VAGRANT,
+      SHELL_LOCAL
     ]
 
     class UnrecognizedPostProcessorTypeError < StandardError
@@ -30,6 +34,8 @@ module Packer
         DOCKER_PUSH   => Packer::PostProcessor::DockerPush,
         DOCKER_SAVE   => Packer::PostProcessor::DockerSave,
         DOCKER_TAG    => Packer::PostProcessor::DockerTag,
+        COMPRESS      => Packer::PostProcessor::Compress,
+        SHELL_LOCAL   => Packer::PostProcessor::ShellLocal,
         VAGRANT       => Packer::PostProcessor::Vagrant
       }.fetch(type).new
     end

data/lib/packer/postprocessors/all.rb

@@ -1,3 +1,5 @@
 # Encoding: utf-8
 require_relative 'docker'
 require_relative 'vagrant'
+require_relative 'compress'
+require_relative 'shell-local'

data/lib/packer/postprocessors/compress.rb

@@ -0,0 +1,26 @@
+# Encoding: utf-8
+require 'packer/postprocessor'
+require 'packer/dataobject'
+
+module Packer
+  class PostProcessor < Packer::DataObject
+    class Compress < PostProcessor
+      def initialize
+        super()
+        self.data['type'] = COMPRESS
+      end
+
+      def compression_level(level)
+        self.__add_integer('compression_level', level)
+      end
+
+      def keep_input_artifact(bool)
+        self.__add_boolean('keep_input_artifact', bool)
+      end
+
+      def output(file)
+        self.__add_string('output', file)
+      end
+    end
+  end
+end

data/lib/packer/postprocessors/shell-local.rb

@@ -0,0 +1,46 @@
+# Encoding: utf-8
+require 'packer/postprocessor'
+require 'packer/dataobject'
+
+module Packer
+  class PostProcessor < Packer::DataObject
+    class ShellLocal < PostProcessor
+      def initialize
+        super
+        self.data['type'] = SHELL_LOCAL
+        self.add_required(['inline', 'script', 'scripts'])
+      end
+      def inline(commands)
+        self.__add_array_of_strings('inline', commands, %w[script scripts])
+      end
+
+      def script(filename)
+        self.__add_string('script', filename, %w[inline scripts])
+      end
+
+      def scripts(filenames)
+        self.__add_array_of_strings('scripts', filenames, %w[inline script])
+      end
+
+      def binary(bool)
+        self.__add_boolean('binary', bool, [])
+      end
+
+      def environment_vars(envpairs)
+        self.__add_array_of_strings('environment_vars', envpairs)
+      end
+
+      def execute_command(command)
+        self.__add_string('execute_command', command)
+      end
+
+      def inline_shebang(command)
+        self.__add_string('inline_shebang', command)
+      end
+
+      def remote_path(command)
+        self.__add_string('remote_path', command)
+      end
+    end
+  end
+end

data/lib/packer/provisioners/chef/client.rb

@@ -69,6 +69,10 @@ module Packer
         def validation_key_path(path)
           self.__add_string('validation_key_path', path)
         end
+
+        def client_key(keyname)
+          self.__add_string('client_key', keyname)
+        end
       end
     end
   end

data/lib/packer/runner.rb

@@ -8,10 +8,13 @@ module Packer
 
     def self.run!(*args, quiet: false)
       cmd = Shellwords.shelljoin(args.flatten)
+
+      debug = cmd.include? '-debug'
+
       status = 0
       stdout = ''
       stderr = ''
-      if quiet
+      if quiet && !debug
         # Run without streaming std* to any screen
         stdout, stderr, status = Open3.capture3(cmd)
       else
@@ -31,6 +34,10 @@ module Packer
             end
           end
 
+          Thread.new do
+            std_in.puts $stdin.gets while thread.alive?
+          end
+
           thread.join # don't exit until the external process is done
           status = thread.value
         end

data/lib/packer/version.rb

@@ -1,3 +1,3 @@
 module Packer
-  VERSION = '1.6.2'.freeze
+  VERSION = '1.6.3'.freeze
 end

data/packer-config.gemspec

@@ -6,7 +6,7 @@ require 'packer/version'
 Gem::Specification.new do |spec|
   spec.name          = 'packer-config'
   spec.version       = Packer::VERSION
-  spec.authors       = ["Ian Chesal", "Fraser Cobb", "Greg Poirier", "Matasano Security", "Greg Diamond", "Enzo Rivello"]
+  spec.authors       = ["Ian Chesal", "Fraser Cobb", "Greg Poirier", "Matasano Security", "Greg Diamond", "Enzo Rivello", "Edwin Biemond", "Andrei Shiniti Nakagawa"]
   spec.email         = %w(ian.chesal@gmail.com)
   spec.summary       = 'An object model to build packer.io configurations in Ruby.'
   spec.description   = <<-END

data/spec/packer/builders/qemu_spec.rb

@@ -0,0 +1,29 @@
+# Encoding: utf-8
+require 'spec_helper'
+
+RSpec.describe Packer::Builder::Qemu do
+  let(:builder) { Packer::Builder.get_builder(Packer::Builder::QEMU) }
+  let(:in_commands_mixed)    { [["command1",  1], ["command2",  2]] }
+  let(:out_commands_strings) { [["command1", "1"], ["command2", "2"]] }
+
+  it 'has a type of qemu' do
+    expect(builder.data['type']).to eq(Packer::Builder::QEMU)
+  end
+
+  it 'requires iso_checksum, iso_checksum_type, iso_url, and communicator' do
+    expect { builder.validate }.to raise_error(Packer::DataObject::DataValidationError)
+    builder.iso_checksum '88197272b2a442402820fcc788a8cc7a'
+    builder.iso_checksum_type "MD5"
+    builder.iso_url 'path'
+    builder.communicator 'ssh'
+    expect { builder.validate }.not_to raise_error
+  end
+
+  describe '#qemuargs' do
+    it 'builds an array of arrays of strings' do
+      builder.qemuargs(in_commands_mixed)
+      expect( builder.data['qemuargs'] ).to eq(out_commands_strings)
+      builder.data.delete('qemuargs')
+    end
+  end
+end

data/spec/packer/postprocessors/shell_local_spec.rb

@@ -0,0 +1,108 @@
+# Encoding: utf-8
+require 'spec_helper'
+
+RSpec.describe Packer::PostProcessor::ShellLocal do
+  let(:postprocessor) do
+    Packer::PostProcessor.get_postprocessor(Packer::PostProcessor::SHELL_LOCAL)
+  end
+
+  let(:some_string) do
+    'some string'
+  end
+
+  let(:some_array_of_strings) do
+    %w[command1 command2]
+  end
+
+  let(:some_array_of_ints) do
+    [1, 2, 3]
+  end
+
+  describe '#initialize' do
+    it 'has a type of shell' do
+      expect(postprocessor.data['type']).to eq(Packer::PostProcessor::SHELL_LOCAL)
+    end
+  end
+
+  describe '#inline' do
+    it 'accepts an array of commands' do
+      postprocessor.inline(some_array_of_strings)
+      expect(postprocessor.data['inline']).to eq(some_array_of_strings)
+      postprocessor.data.delete('inline')
+    end
+
+    it 'raise an error if it is empty' do
+      expect { postprocessor.inline('') }.to raise_error
+      postprocessor.data.delete('inline')
+    end
+
+    it 'converts all commands to strings' do
+      postprocessor.inline(some_array_of_ints)
+      expect(postprocessor.data['inline']).to eq(some_array_of_ints.map(&:to_s))
+      postprocessor.data.delete('inline')
+    end
+
+    it 'raises an error if the commands argument cannot be made an Array' do
+      expect { postprocessor.inline(some_string) }.to raise_error
+    end
+
+    it 'raises an error if #script or #scripts method was already called' do
+      postprocessor.data['script'] = 1
+      expect { postprocessor.inline(some_array_of_strings) }.to raise_error
+      postprocessor.data.delete('script')
+      postprocessor.data['scripts'] = 1
+      expect { postprocessor.inline(some_array_of_strings) }.to raise_error
+      postprocessor.data.delete('scripts')
+    end
+  end
+
+  describe '#script' do
+    it 'accepts a string' do
+      postprocessor.script(some_string)
+      expect(postprocessor.data['script']).to eq(some_string)
+      postprocessor.data.delete('script')
+    end
+
+    it 'converts any argument passed to a string' do
+      postprocessor.script(some_array_of_ints)
+      expect(postprocessor.data['script']).to eq(some_array_of_ints.to_s)
+      postprocessor.data.delete('script')
+    end
+
+    it 'raises an error if #inline or #scripts method was already called' do
+      postprocessor.data['inline'] = 1
+      expect { postprocessor.script(some_string) }.to raise_error
+      postprocessor.data.delete('inline')
+      postprocessor.data['scripts'] = 1
+      expect { postprocessor.script(some_string) }.to raise_error
+      postprocessor.data.delete('scripts')
+    end
+  end
+
+  describe '#scripts' do
+    it 'accepts an array of commands' do
+      postprocessor.scripts(some_array_of_strings)
+      expect(postprocessor.data['scripts']).to eq(some_array_of_strings)
+      postprocessor.data.delete('scripts')
+    end
+
+    it 'converts all commands to strings' do
+      postprocessor.scripts(some_array_of_ints)
+      expect(postprocessor.data['scripts']).to eq(some_array_of_ints.map(&:to_s))
+      postprocessor.data.delete('scripts')
+    end
+
+    it 'raises an error if the commands argument cannot be made an Array' do
+      expect { postprocessor.scripts(some_string) }.to raise_error
+    end
+
+    it 'raises an error if #inline or #script method was already called' do
+      postprocessor.data['script'] = 1
+      expect { postprocessor.scripts(some_array_of_strings) }.to raise_error
+      postprocessor.data.delete('scripts')
+      postprocessor.data['inline'] = 1
+      expect { postprocessor.scripts(some_array_of_strings) }.to raise_error
+      postprocessor.data.delete('scripts')
+    end
+  end
+end

data/spec/packer/provisioners/chef/client_spec.rb

@@ -63,4 +63,12 @@ RSpec.describe Packer::Provisioner::Chef::Client do
       expect { provisioner.run_list(some_string) }.to raise_error
     end
   end
+
+  describe '#client_key' do
+    it 'accepts a string' do
+      provisioner.client_key some_string
+      expect(provisioner.data['client_key']).to eq(some_string)
+      provisioner.data.delete('client_key')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packer-config
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ian Chesal
@@ -10,10 +10,12 @@ authors:
 - Matasano Security
 - Greg Diamond
 - Enzo Rivello
+- Edwin Biemond
+- Andrei Shiniti Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   Building the Packer JSON configurations in raw JSON can be quite an adventure.
@@ -29,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
@@ -45,6 +48,7 @@ files:
 - lib/packer/builders/amazon.rb
 - lib/packer/builders/docker.rb
 - lib/packer/builders/null.rb
+- lib/packer/builders/qemu.rb
 - lib/packer/builders/virtualbox.rb
 - lib/packer/builders/vmware_iso.rb
 - lib/packer/builders/vmware_vmx.rb
@@ -53,7 +57,9 @@ files:
 - lib/packer/macro.rb
 - lib/packer/postprocessor.rb
 - lib/packer/postprocessors/all.rb
+- lib/packer/postprocessors/compress.rb
 - lib/packer/postprocessors/docker.rb
+- lib/packer/postprocessors/shell-local.rb
 - lib/packer/postprocessors/vagrant.rb
 - lib/packer/provisioner.rb
 - lib/packer/provisioners/all.rb
@@ -88,6 +94,7 @@ files:
 - spec/packer/builders/amazon_spec.rb
 - spec/packer/builders/docker_spec.rb
 - spec/packer/builders/null_spec.rb
+- spec/packer/builders/qemu_spec.rb
 - spec/packer/builders/virtualbox_spec.rb
 - spec/packer/builders/vmware_iso_spec.rb
 - spec/packer/builders/vmware_vmx_spec.rb
@@ -99,6 +106,7 @@ files:
 - spec/packer/postprocessors/docker_push_spec.rb
 - spec/packer/postprocessors/docker_save_spec.rb
 - spec/packer/postprocessors/docker_tag_spec.rb
+- spec/packer/postprocessors/shell_local_spec.rb
 - spec/packer/postprocessors/vagrant_spec.rb
 - spec/packer/provisioner_spec.rb
 - spec/packer/provisioners/ansible_spec.rb
@@ -140,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An object model to build packer.io configurations in Ruby.
@@ -162,6 +170,7 @@ test_files:
 - spec/packer/builders/amazon_spec.rb
 - spec/packer/builders/docker_spec.rb
 - spec/packer/builders/null_spec.rb
+- spec/packer/builders/qemu_spec.rb
 - spec/packer/builders/virtualbox_spec.rb
 - spec/packer/builders/vmware_iso_spec.rb
 - spec/packer/builders/vmware_vmx_spec.rb
@@ -173,6 +182,7 @@ test_files:
 - spec/packer/postprocessors/docker_push_spec.rb
 - spec/packer/postprocessors/docker_save_spec.rb
 - spec/packer/postprocessors/docker_tag_spec.rb
+- spec/packer/postprocessors/shell_local_spec.rb
 - spec/packer/postprocessors/vagrant_spec.rb
 - spec/packer/provisioner_spec.rb
 - spec/packer/provisioners/ansible_spec.rb