packer-config 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640bd565ae84e2e9346f9e3a5cb0f323f041150c
-  data.tar.gz: 5f695eb2687ca6a915cb3eb19fea6f41af858759
+  metadata.gz: bdd9616df0548b2607fc93a93880270f58ca46fa
+  data.tar.gz: 9a184d7d17f0a6682aefd1f17fbf3d66a53978ff
 SHA512:
-  metadata.gz: ab824fc394e16948c945c1de6914c5bbb68cc9d741bae62776a09efcfd1d7d3793927c61425dd541f8c5ee25efd8c5392d7a853a778a03a8cfa44debddbfe0ca
-  data.tar.gz: 5ef5968062edb9298a75f5af20a5da17d1b2ccb415a4770277719395f1d5d1cd8364af456d6125bdabc67a06bdd6a9675abff2f070dd23e89f87cf6d0aaa18e4
+  metadata.gz: c3b494a1807f093cd67c9e700d9c622941cef01b5c3d613aa74f59d55ada1665372deac186da75fbc224c49adbc31d6a8f636a3509e3993804729de9465cd2df
+  data.tar.gz: d93976dd629da5c2437d2f071e51ad4db552fe886adf388a231de2a015f8db473216deb74e4950bba610a9187e1f460c140902ddcd9a488f380929c0768c4f50

data/.rubocop_todo.yml

@@ -43,7 +43,7 @@ Metrics/AbcSize:
 # Offense count: 4
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 137
+  Max: 150
 
 # Offense count: 7
 # Configuration parameters: CountComments.

data/Gemfile

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

data/README.md

@@ -13,7 +13,7 @@ model to build the Packer configurations in that would easily write to the
 correct JSON format. It also saved me having to remember the esoteric Packer
 syntax for referencing variables and whatnot in the JSON.
 
-Bonus: you can really go to town with templates when it's all done it Ruby.
+Bonus: you can really go to town with templates when it's all done in Ruby.
 
 ## Installation
 

data/RELEASENOTES.md

@@ -1,8 +1,12 @@
 # packer-config Release Notes
 
+## 1.6.0
+
+* Support for running Packer on Windows!
+
 ## 1.5.0
 
-* Adds json object support the the chef-solo provisioner (via [enzo][]).
+* Adds json object support the the chef-solo provisioner (via [enzor][]).
 * Fixes Travis-CI setup so tests work with newer bundler
 
 ## 1.4.0

data/lib/packer-config.rb

@@ -8,7 +8,7 @@ require 'packer/postprocessor'
 require 'packer/macro'
 require 'packer/envvar'
 require 'packer/version'
-require 'lowered/expectations'
+require 'rubygems/dependency'
 
 module Packer
   class Config < Packer::DataObject
@@ -21,7 +21,7 @@ module Packer
     attr_reader   :envvar
     attr_reader   :output_file
 
-    PACKER_VERSION = '0.8.5'
+    PACKER_VERSION = '0.9.0'
 
     def initialize(file)
       super()
@@ -39,7 +39,7 @@ module Packer
     def validate
       super
       verify_packer_version
-      if self.builders.length == 0
+      if self.builders.empty?
         raise DataValidationError.new("At least one builder is required")
       end
       self.builders.each(&:validate)
@@ -67,13 +67,13 @@ module Packer
       self.builders.each do |thing|
         data_copy['builders'].push(thing.deep_copy)
       end
-      if self.provisioners.length > 0
+      unless self.provisioners.empty?
         data_copy['provisioners'] = []
         self.provisioners.each do |thing|
           data_copy['provisioners'].push(thing.deep_copy)
         end
       end
-      if self.postprocessors.length > 0
+      unless self.postprocessors.empty?
         data_copy['post-processors'] = []
         self.postprocessors.each do |thing|
           data_copy['post-processors'].push(thing.deep_copy)
@@ -159,19 +159,22 @@ module Packer
       "{{user `#{name}`}}"
     end
 
-    private
-
-    attr_writer :output_file
-    attr_writer :macro
-    attr_writer :envvar
+    def verify_packer_version
+      min_packer_version PACKER_VERSION
+      version = /Packer v(\d+\.\d+\.\d+)/.match(
+        Packer::Runner.run!(packer, 'version', quiet: true)
+      )[1]
+      Gem::Dependency.new('', ">= #{PACKER_VERSION}").match?('', version) || raise("Packer version #{version} is not new enough (requires >= #{PACKER_VERSION})")
+    end
 
     def min_packer_version(version)
       self.__add_string('min_packer_version', version)
     end
 
-    def verify_packer_version
-      min_packer_version PACKER_VERSION
-      LoweredExpectations.expect('packer', ">= #{PACKER_VERSION}", vopt: 'version')
-    end
+    private
+
+    attr_writer :output_file
+    attr_writer :macro
+    attr_writer :envvar
   end
 end

data/lib/packer/dataobject.rb

@@ -24,7 +24,7 @@ module Packer
 
     def validate_required
       self.required.each do |r|
-        if (r.is_a? Array) && (r.length > 0)
+        if (r.is_a? Array) && !r.empty?
           if r.length - (r - self.data.keys).length == 0
             raise DataValidationError.new("Missing one required setting from the set #{r}")
           end

data/lib/packer/version.rb

@@ -1,3 +1,3 @@
 module Packer
-    VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/packer-config.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'packer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "packer-config"
+  spec.name          = 'packer-config'
   spec.version       = Packer::VERSION
   spec.authors       = ["Ian Chesal", "Fraser Cobb", "Greg Poirier", "Matasano Security", "Greg Diamond", "Enzo Rivello"]
-  spec.email         = ["ian.chesal@gmail.com"]
+  spec.email         = %w(ian.chesal@gmail.com)
   spec.summary       = 'An object model to build packer.io configurations in Ruby.'
   spec.description   = <<-END
 Building the Packer JSON configurations in raw JSON can be quite an adventure.
@@ -17,22 +17,12 @@ model to build the Packer configurations in that would easily write to the
 correct JSON format. It also saved me having to remember the esoteric Packer
 syntax for referencing variables and whatnot in the JSON.
 END
-  spec.homepage      = "https://github.com/ianchesal/packer-config"
-  spec.license       = "Apache 2.0"
+  spec.homepage      = 'https://github.com/ianchesal/packer-config'
+  spec.license       = 'Apache 2.0'
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "lowered-expectations", '~> 1'
-
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.5"
-  spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "rspec-mocks", "~> 3.4"
-  spec.add_development_dependency "fakefs", "~> 0.7"
-  spec.add_development_dependency "rubocop", "~> 0.36"
-  spec.add_development_dependency "rubygems-tasks", "~> 0.2"
+  spec.require_paths = %w(lib)
 end

data/spec/packer/provisioners/puppet/masterless_spec.rb

@@ -104,7 +104,7 @@ RSpec.describe Packer::Provisioner do
   end
 
   describe '#module_paths' do
-    it 'accepts an array of strings'do
+    it 'accepts an array of strings' do
       provisioner.module_paths(some_array_of_strings)
       expect(provisioner.data['module_paths']).to eq(some_array_of_strings)
       provisioner.data.delete('module_paths')
@@ -138,4 +138,4 @@ RSpec.describe Packer::Provisioner do
       provisioner.data.delete('staging_directory')
     end
   end
-end
+end

data/spec/packer_config_spec.rb

@@ -20,32 +20,13 @@ RSpec.describe Packer::Config do
 
   describe "#validate" do
     it 'returns true for a valid instance' do
-      expect(packer.builders).to receive(:length).and_return(1)
+      expect(packer.builders).to receive(:empty?).and_return(false)
       expect(Packer::Runner).to receive(:run!).and_return('')
-      expect(LoweredExpectations).to receive(:expect).and_return(true)
+      expect(packer).to receive(:verify_packer_version).and_return(true)
       FakeFS do
         expect(packer.validate).to be_truthy
       end
     end
-
-    it 'raises an error for an invalid instance' do
-      expect(packer.builders).to receive(:length).and_return(0)
-      expect(LoweredExpectations).to receive(:expect).and_return(true)
-      FakeFS do
-        expect { packer.validate }.to raise_error
-      end
-    end
-
-    it 'sets the minimum Packer version' do
-      expect(packer.builders).to receive(:length).and_return(1)
-      expect(Packer::Runner).to receive(:run!).and_return('')
-      expect(LoweredExpectations).to receive(:expect).and_return(true)
-      expect(packer.data['min_packer_version']).to be_falsey
-      FakeFS do
-        expect(packer.validate).to be_truthy
-      end
-      expect(packer.data['min_packer_version']).to eq(Packer::Config::PACKER_VERSION)
-    end
   end
 
   describe '#dump' do
@@ -190,4 +171,16 @@ RSpec.describe Packer::Config do
       expect(packer.macro.var).to eq('{{ .Var }}')
     end
   end
+
+  describe '#verify_packer_version' do
+    it 'validates Packer is a high enough version' do
+      expect(Packer::Runner).to receive(:run!).and_return('Packer v1.0.0')
+      expect(packer.verify_packer_version).to be_truthy
+    end
+
+    it 'raises an error if the version of Packer is not high enough' do
+      expect(Packer::Runner).to receive(:run!).and_return('Packer v0.0.1')
+      expect{ packer.verify_packer_version }.to raise_error
+    end
+  end
 end

data/tasks/rubocop.rake

@@ -1,3 +1,5 @@
 require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new(:lint)
+RuboCop::RakeTask.new(:lint) do |tsk|
+  tsk.options = ['-D'] # display cop name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packer-config
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ian Chesal
@@ -13,120 +13,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: lowered-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.36'
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+date: 2016-04-08 00:00:00.000000000 Z
+dependencies: []
 description: |
   Building the Packer JSON configurations in raw JSON can be quite an adventure.
   There's limited facilities for variable expansion and absolutely no support for
@@ -252,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An object model to build packer.io configurations in Ruby.