packer-config 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4920f738fb0ed191d9670882f3336847462a085
-  data.tar.gz: c41a894f64a07e8e61c1f94dfc5160fdf700880d
+  metadata.gz: 640bd565ae84e2e9346f9e3a5cb0f323f041150c
+  data.tar.gz: 5f695eb2687ca6a915cb3eb19fea6f41af858759
 SHA512:
-  metadata.gz: 59da5cd9f6be7590e63b8210049d4db889d4339e7f64b6f18e20cded754a377dddc8531e211fad5c801fde8aea16750aa931a27d61823d114c58756c8ccff963
-  data.tar.gz: 304585133fb571ad92c8864f731f0454d5888cc9c85ef47879ad18ba44db52d2e82feb56535964f6430b9f73d0922ecf9a9175c3e6254315f32d327ac0aabbd0
+  metadata.gz: ab824fc394e16948c945c1de6914c5bbb68cc9d741bae62776a09efcfd1d7d3793927c61425dd541f8c5ee25efd8c5392d7a853a778a03a8cfa44debddbfe0ca
+  data.tar.gz: 5ef5968062edb9298a75f5af20a5da17d1b2ccb415a4770277719395f1d5d1cd8364af456d6125bdabc67a06bdd6a9675abff2f070dd23e89f87cf6d0aaa18e4

data/.gitignore

@@ -12,6 +12,7 @@ spec/integration/centos-6.*-x86_64-virtualbox
 /test/version_tmp/
 /tmp/
 /.idea/
+tags
 
 ## Specific to RubyMotion:
 .dat*

data/.rubocop.yml

@@ -1,133 +1,17 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-05-14 11:00:31 -0400 using RuboCop version 0.21.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 6
-AmbiguousOperator:
-  Enabled: false
-
-# Offense count: 22
-AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 5
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-ClassAndModuleChildren:
-  Enabled: false
-
-# Turn this on eventually
-ClassLength:
-  Enabled: false
-
-# Offense count: 57
-# Cop supports --auto-correct.
-DeprecatedClassMethods:
-  Enabled: false
-
-# Offense count: 19
-# Cop supports --auto-correct.
-DeprecatedHashMethods:
-  Enabled: false
+inherit_from: .rubocop_todo.yml
 
 Documentation:
   Enabled: false
 
-# Offense count: 1
-DoubleNegation:
-  Enabled: false
-
-# Offense count: 8
-# Configuration parameters: Exclude.
-FileName:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-FormatString:
-  Enabled: false
-
-# Offense count: 9
-# Cop supports --auto-correct.
-IndentArray:
-  Enabled: false
-
-# Offense count: 261
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-IndentHash:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-IndentationConsistency:
-  Enabled: false
-
 LeadingCommentSpace:
   Enabled: false
 
-# Offense count: 32
-# Cop supports --auto-correct.
-LineEndConcatenation:
-  Enabled: false
-
 LineLength:
   Enabled: false
 
-# We'll turn this on eventually
-MethodLength:
-  Enabled: false
-
-# Offense count: 9
-# Cop supports --auto-correct.
-NegatedIf:
-  Enabled: false
-
-# Offense count: 7
-# Cop supports --auto-correct.
-NegatedWhile:
-  Enabled: false
-
-# Offense count: 11
-# Cop supports --auto-correct.
-NonNilCheck:
-  Enabled: false
-
-# Offense count: 110
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-PercentLiteralDelimiters:
-  Enabled: false
-
-# Offense count: 3
-SelfAssignment:
-  Enabled: false
-
 SignalException:
   Enabled: false
 
-# Offense count: 53
-# Cop supports --auto-correct.
-SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-SpaceAroundOperators:
-  Enabled: false
-
-# Offense count: 382
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 784
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-SpaceInsideBlockBraces:
-  Enabled: false
-
 # Don't care enough about this one
 SpaceInsideHashLiteralBraces:
   Enabled: false
@@ -136,11 +20,6 @@ SpaceInsideHashLiteralBraces:
 SpecialGlobalVars:
   Enabled: false
 
-# Offense count: 5
-# Cop supports --auto-correct.
-StringConversionInInterpolation:
-  Enabled: false
-
 StringLiterals:
   Description: Checks if uses of quotes match the configured preference.
   Enabled: false
@@ -292,46 +171,6 @@ Style/WhileUntilDo:
 Style/WhileUntilModifier:
   Enabled: false
 
-
-# Things that are off but we should turn on eventually
-
-Style/Next:
-  Enabled: false
-
-Style/NumericLiterals:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Style/TrailingComma:
-  # EnforcedStyleForMultiline: comma
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-####
-
-# Offense count: 1
-UnderscorePrefixedVariableName:
-  Enabled: false
-
-# Offense count: 108
-UnusedBlockArgument:
-  Enabled: false
-
-# Offense count: 159
-UnusedMethodArgument:
-  Enabled: false
-
-# Offense count: 2
-UselessAccessModifier:
-  Enabled: false
-
 # As of rubocop 0.21, it thinks kwargs are useless assignments
 UselessAssignment:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,151 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-01-27 13:13:41 +0000 using RuboCop version 0.36.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'lib/packer/builder.rb'
+    - 'lib/packer/postprocessor.rb'
+    - 'lib/packer/provisioner.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'lib/packer/runner.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/packer/dataobject.rb'
+    - 'lib/packer/envvar.rb'
+    - 'lib/packer/macro.rb'
+    - 'lib/packer/provisioners/powershell.rb'
+
+# Offense count: 2
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/packer/postprocessor.rb'
+    - 'lib/packer/provisioner.rb'
+
+# Offense count: 8
+Metrics/AbcSize:
+  Max: 30
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 137
+
+# Offense count: 7
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 27
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: SingleLineConditionsOnly.
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/packer/dataobject.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/DeprecatedHashMethods:
+  Exclude:
+    - 'lib/packer-config.rb'
+    - 'lib/packer/dataobject.rb'
+    - 'lib/packer/postprocessor.rb'
+    - 'lib/packer/provisioner.rb'
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Style/FileName:
+  Exclude:
+    - 'lib/packer-config.rb'
+
+# Offense count: 1
+Style/IfInsideElse:
+  Exclude:
+    - 'lib/packer/dataobject.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 31
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/packer-config.rb'
+    - 'lib/packer/builder.rb'
+    - 'lib/packer/postprocessor.rb'
+    - 'lib/packer/provisioner.rb'
+    - 'lib/packer/version.rb'
+    - 'spec/integration/centos_vagrant_spec.rb'
+    - 'spec/packer/postprocessor_spec.rb'
+    - 'spec/packer/provisioner_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'lib/packer/dataobject.rb'
+
+# Offense count: 9
+Style/NestedParenthesizedCalls:
+  Exclude:
+    - 'spec/packer/envvar_spec.rb'
+    - 'spec/packer/macro_spec.rb'
+    - 'spec/packer/runner_spec.rb'
+    - 'spec/packer_config_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Exclude:
+    - 'lib/packer/dataobject.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 6
+
+# Offense count: 34
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'lib/packer/runner.rb'

data/.travis.yml

@@ -7,3 +7,4 @@ rvm:
 - 2.2.0
 - 2.2.3
 - ruby-head
+before_install: gem install bundler

data/COPYRIGHT

@@ -6,6 +6,7 @@ Including, but not limited to:
   Fraser Cobb
   Greg Poirier
   Greg Diamond
+  Enzo Rivello
 
 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

@@ -53,6 +53,7 @@ The following [Packer provisioners](http://www.packer.io/docs/templates/provisio
 * [salt](https://www.packer.io/docs/provisioners/salt-masterless.html)
 * [puppet server](https://www.packer.io/docs/provisioners/puppet-server.html)
 * [puppet masterless](https://www.packer.io/docs/provisioners/puppet-masterless.html)
+* [windows-restart](https://www.packer.io/docs/provisioners/windows-restart.html)
 
 ### Post-Processors
 

data/RELEASENOTES.md

@@ -1,5 +1,10 @@
 # packer-config Release Notes
 
+## 1.5.0
+
+* Adds json object support the the chef-solo provisioner (via [enzo][]).
+* Fixes Travis-CI setup so tests work with newer bundler
+
 ## 1.4.0
 
 * Adds support for Communicators (with help from [diamond29][]).
@@ -41,3 +46,4 @@
   [grepory]: https://github.com/grepory
   [ianchesal]: https://github.com/ianchesal
   [diamond29]: https://github.com/diamond29
+  [enzor]: https://github.com/enzor

data/lib/packer/dataobject.rb

@@ -3,16 +3,26 @@ module Packer
   class DataObject
     attr_accessor :data
     attr_accessor :required
+    attr_accessor :key_dependencies
 
     def initialize
       self.data = {}
       self.required = []
+      self.key_dependencies = {}
     end
 
     class DataValidationError < StandardError
     end
 
     def validate
+      validate_required
+      validate_key_dependencies
+
+      # TODO(ianc) Also validate the data with the packer command?
+      true
+    end
+
+    def validate_required
       self.required.each do |r|
         if (r.is_a? Array) && (r.length > 0)
           if r.length - (r - self.data.keys).length == 0
@@ -27,8 +37,16 @@ module Packer
           end
         end
       end
-      # TODO(ianc) Also validate the data with the packer command?
-      true
+    end
+
+    def validate_key_dependencies
+      self.data.keys.each do |data_key|
+        if self.key_dependencies.has_key? data_key
+          if ! (self.key_dependencies[data_key] - self.data.keys).empty?
+            raise DataValidationError.new("Key #{data_key} requires that keys be defined: #{self.key_dependencies[data_key]}")
+          end
+        end
+      end
     end
 
     def add_required(*keys)
@@ -37,6 +55,10 @@ module Packer
       end
     end
 
+    def add_key_dependencies(key_deps)
+      self.key_dependencies.merge!(key_deps)
+    end
+
     def deep_copy
       Marshal.load(Marshal.dump(self.data))
     end
@@ -82,6 +104,12 @@ module Packer
       end
     end
 
+    def __add_array_of_ints(key, values, exclusives = [])
+      self.__exclusive_key_error(key, exclusives)
+      raise TypeError.new() unless Array.try_convert(values)
+      self.data[key.to_s] = values.to_ary.map(&:to_i)
+    end
+
     def __add_string(key, data, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       self.data[key.to_s] = data.to_s
@@ -92,6 +120,7 @@ module Packer
       self.data[key.to_s] = data.to_i
     end
 
+
     def __add_boolean(key, bool, exclusives = [])
       self.__exclusive_key_error(key, exclusives)
       if bool
@@ -109,5 +138,15 @@ module Packer
         self.data[key.to_s][k] = data[k].to_s
       end
     end
+
+
+    def __add_json(key, data, exclusives = [])
+      self.__exclusive_key_error(key, exclusives)
+      raise TypeError.new() unless data.is_a?(Hash)
+      self.data[key.to_s] = {}
+      data.keys.each do |k|
+        self.data[key.to_s][k] = data[k]
+      end
+    end
   end
 end