packer-config 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83b6084bc9fc5e7f733b5cd914555e1f5ec5b21
-  data.tar.gz: 58691f783c9828674fa806d3c14ca589f4b01269
+  metadata.gz: 659f4e3b9308a22f46bacda9dd600cc57be00ea0
+  data.tar.gz: 14536389dcf3295577d64ef5e773d76e84b3e115
 SHA512:
-  metadata.gz: 485f6738bda938b9ca79e9f594df1e0daab586380a0cd51a8b3747ccf1338784d1751d92a02c9229608614f892528964f68146ebc8aaa2af64659d782333896f
-  data.tar.gz: aa530dfdd9d9ce3024c2498c0d64ecfafc38467ff9ab8bf1a1f2946a6046d74b7d4ee1f901551a21982d3b9908a9fbcbc89e21890041fba010d6e05d2b1d4f6c
+  metadata.gz: 322a6cf6cdff456baf89b32e1059db7b09a863d042431ec26e3714b6e4e1b402e7bb776ad4a3221dc7652d9bf38223e0eae4bf9377ab78bde7974863f3bf80d1
+  data.tar.gz: 5b47a91f0c4d7f3e6d651d225db1228b0ff5f4e5979d2e5da392140f04d58c6c26aa62ea97a8b76402694e9b10dc1757157c4ad0710e6ffddca851299811c9c3

data/.rubocop.yml

@@ -29,10 +29,10 @@ StringLiterals:
   - double_quotes
 
 # disabling a bunch of style linters
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Enabled: false
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: false
 
 Lint/Loop:
@@ -49,23 +49,23 @@ Lint/Void:
   Exclude:
     - dashboard/spec/**/*
 
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'lib/packer-config.rb'
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
-Style/AlignArray:
+Layout/AlignArray:
   Enabled: false
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: false
 
-Style/AlignParameters:
+Layout/AlignParameters:
   Enabled: false
 
 Metrics/BlockNesting:
@@ -83,7 +83,7 @@ Metrics/MethodLength:
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   Enabled: false
 
 Style/CollectionMethods:
@@ -92,25 +92,25 @@ Style/CollectionMethods:
 Style/CommentAnnotation:
   Enabled: false
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: false
 
 Style/DefWithParentheses:
   Enabled: false
 
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
 
 Style/EachWithObject:
   Enabled: false
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Enabled: false
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: false
 
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
 
 Style/GuardClause:
@@ -122,7 +122,7 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: false
 
 Style/Lambda:
@@ -131,7 +131,7 @@ Style/Lambda:
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/MultilineIfThen:
@@ -146,7 +146,7 @@ Style/MultilineTernaryOperator:
 Style/NilComparison:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 Style/RaiseArgs:
@@ -164,22 +164,19 @@ Style/RegexpLiteral:
 Style/SingleLineMethods:
   Enabled: false
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: false
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   Enabled: false
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideParens:
   Enabled: false
 
-Style/SpaceInsideParens:
-  Enabled: false
-
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: false
 
 Style/TrivialAccessors:
@@ -191,7 +188,7 @@ Style/WhileUntilDo:
 Style/WhileUntilModifier:
   Enabled: false
 
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: false
 
 # As of rubocop 0.21, it thinks kwargs are useless assignments
@@ -200,3 +197,24 @@ UselessAssignment:
 
 WordArray:
   Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-- 2.0.0
-- 2.1.1
-- 2.1.5
-- 2.1.6
-- 2.2.0
-- 2.2.3
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- 2.5
+- 2.6
 - ruby-head
 before_install: gem install bundler

data/Gemfile

@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'bundler', '~> 1.11'
+  gem 'fakefs', '~> 0.7'
   gem 'rake', '~> 10.5'
   gem 'rspec', '~> 3.4'
   gem 'rspec-mocks', '~> 3.4'
-  gem 'fakefs', '~> 0.7'
-  gem 'rubocop', '~> 0.36'
+  gem 'rubocop', '~> 0.49'
   gem 'rubygems-tasks', '~> 0.2'
 end
 

data/README.md

@@ -147,9 +147,7 @@ I'm using Travis CI to build and test on every push to the public github reposit
 
 ### Branching in Git
 
-I'm using [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) for development in git via github. I've loved the branching model git-flow proposed from day one and the addon to git makes it very intuitive and easy to follow. I generally don't push my `feature/*` branches to the public repository; I do keep `development` and `master` up to date here though.
-
-**PLEASE OPEN PULL REQUESTS AGAINST `develop` AND NOT `master`! THANK YOU!**
+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.
 
 ### TODO Work
 

data/RELEASENOTES.md

@@ -1,5 +1,11 @@
 # packer-config Release Notes
 
+## 1.6.2
+
+* Updates for CVE-2017-8418
+* Lots of fixes for things that broke because of the updates for CVE-2017-8418
+* Updated integration spec to use to a CentOS version that exists
+
 ## 1.6.1
 
 * Added a verbose option to the `verify` method on `Packer::Config`. Closes issue #19.

data/lib/packer/dataobject.rb

@@ -31,7 +31,7 @@ module Packer
           if r.length - (r - self.data.keys).length > 1
             raise DataValidationError.new("Found more than one exclusive setting in data from set #{r}")
           end
-        elsif ! self.data.keys.include? r
+        elsif ! self.data.key? r
           raise DataValidationError.new("Missing required setting #{r}")
         end
       end

data/lib/packer/envvar.rb

@@ -1,11 +1,12 @@
 # Encoding: utf-8
-# rubocop:disable Style/MethodMissing
 
 module Packer
   class EnvVar
+    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method_name, *args)
       "{{env `#{method_name}`}}"
     end
+    # rubocop:enable Style/MethodMissingSuper
 
     def respond_to_missing?(method_name, include_private = false)
       true

data/lib/packer/macro.rb

@@ -1,12 +1,13 @@
 # Encoding: utf-8
-# rubocop:disable Style/MethodMissing
 
 module Packer
   class Macro
+    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method_name, *args)
       name = method_name.to_s.slice(0,1).capitalize + method_name.to_s.slice(1..-1)
       "{{ .#{name} }}"
     end
+    # rubocop:enable Style/MethodMissingSuper
 
     def respond_to_missing?(method_name, include_private = false)
       true

data/lib/packer/runner.rb

@@ -38,6 +38,7 @@ module Packer
       # rubocop:disable Style/NumericPredicate
       raise CommandExecutionError.new(stderr) unless status == 0
       stdout
+      # rubocop:enable Style/NumericPredicate
     end
 
     def self.exec!(*args)

data/lib/packer/version.rb

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

data/packer-config.gemspec

@@ -1,5 +1,5 @@
 # Encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'packer/version'
 

data/spec/integration/centos_vagrant_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 RSpec.describe Packer::Config do
-  it 'can build a centos-6.7 Vagrant base box' do
-    CENTOS_VERSION = '6.8'
+  it 'can build a centos-6.10 Vagrant base box' do
+    CENTOS_VERSION = '6.10'
 
     pconfig = Packer::Config.new "centos-#{CENTOS_VERSION}-vagrant.json"
     pconfig.description "CentOS #{CENTOS_VERSION} VirtualBox Vagrant"
@@ -18,7 +18,7 @@ RSpec.describe Packer::Config do
     builder.guest_additions_path "VBoxGuestAdditions_#{pconfig.macro.Version}.iso"
     builder.guest_os_type "RedHat_64"
     builder.http_directory "scripts/kickstart"
-    builder.iso_checksum 'afab3a588cda94cd768826e77ad4db2b5ee7c485'
+    builder.iso_checksum '48908ca17bc4ba2fb8e365c9fe7648eb6cd6bd67'
     builder.iso_checksum_type 'sha1'
     builder.iso_url "#{pconfig.variable 'mirror'}/6/isos/x86_64/CentOS-#{CENTOS_VERSION}-x86_64-bin-DVD1.iso"
     builder.output_directory "centos-#{CENTOS_VERSION}-x86_64-virtualbox"

data/spec/packer/builders/virtualbox_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 RSpec.describe Packer::Builder::VirtualBoxISO do
   let(:builder) { Packer::Builder.get_builder(Packer::Builder::VIRTUALBOX_ISO) }
   let(:in_commands_strings)  { [["command1", "1"], ["command2", "2"]] }
-  let(:in_commands_mixed)    { [["command1",  1 ], ["command2",  2 ]] }
+  let(:in_commands_mixed)    { [["command1",  1], ["command2",  2]] }
   let(:out_commands_strings) { [["command1", "1"], ["command2", "2"]] }
 
   it 'has a type of virtualbox-iso' do

data/spec/packer/dataobject_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Packer::DataObject do
   let(:some_hash_of_mixed)    { { 'a' =>  1,  'b' =>  2  } }
   let(:some_hash_of_strings)  { { 'a' => '1', 'b' => '2' } }
   let(:in_commands_strings)   { [["command1", "1"], ["command2", "2"]] }
-  let(:in_commands_mixed)     { [["command1",  1 ], ["command2",  2 ]] }
+  let(:in_commands_mixed)     { [["command1",  1], ["command2",  2]] }
   let(:out_commands_strings)  { [["command1", "1"], ["command2", "2"]] }
 
   describe "#initialize" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packer-config
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ian Chesal
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   Building the Packer JSON configurations in raw JSON can be quite an adventure.
@@ -79,7 +79,7 @@ files:
 - spec/integration/scripts/cleanup.sh
 - spec/integration/scripts/fix-slow-dns.sh
 - spec/integration/scripts/hello.sh
-- spec/integration/scripts/kickstart/centos-6.8-ks.cfg
+- spec/integration/scripts/kickstart/centos-6.10-ks.cfg
 - spec/integration/scripts/minimize.sh
 - spec/integration/scripts/sshd.sh
 - spec/integration/scripts/vagrant.sh
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: An object model to build packer.io configurations in Ruby.
@@ -153,7 +153,7 @@ test_files:
 - spec/integration/scripts/cleanup.sh
 - spec/integration/scripts/fix-slow-dns.sh
 - spec/integration/scripts/hello.sh
-- spec/integration/scripts/kickstart/centos-6.8-ks.cfg
+- spec/integration/scripts/kickstart/centos-6.10-ks.cfg
 - spec/integration/scripts/minimize.sh
 - spec/integration/scripts/sshd.sh
 - spec/integration/scripts/vagrant.sh