chefdk-julia 0.4.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243bda0d3b41548c15f2e220dbc15713db6a0bed
-  data.tar.gz: 33698fbee94488b9be7469294249c32cc8f24b17
+  metadata.gz: a2223aff2fa250675cf2911a1802f536b2cd1a26
+  data.tar.gz: f63fbdbd8cd5c5f037793f8b5d8393369e44a20a
 SHA512:
-  metadata.gz: 5317090dc8b5561b26b9836207c9a6f53252061ff234d0a4f5e3159add58d8eab2f1d1c5ea721d2ef74fe57bcdd13a03e381c4c467c9a2b17b4d967234da9810
-  data.tar.gz: f1612a71aed796c022d57e15e6269164df9beaf30eee331043c7d4a5d80a12ec9bad90232fed5c1ac92a00d7186c9fccc708af5e232917a91b59889d24df359e
+  metadata.gz: d9b8eb9db38b319b752ca15523327f7b12844315f24be072475cb1da135d3ee79e225ecf23fd69a4bb9d5287a95eb326a73f5b69565d89d5092088b0de2d7b24
+  data.tar.gz: 6fefdfaa34031804d04407d5fdae00185edf7fe16f6b08949c706073e77f1366103ebb9e70ae9f90bd4ef411d237a008864f7756f22030efb9b869117700f86f

data/.gitignore

@@ -13,3 +13,6 @@ bin/*
 
 # RSpec
 /spec/examples.txt
+
+# Gem-related
+/pkg/

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Changelog for chefdk-julia
 
+## 1.0.0
+* Set InSpec as the verifier in generated .kitchen.yml [#22](https://github.com/Nordstrom/chefdk-julia/issues/22)
+
+* Remove support for ServerSpec
+
+* Switch from ServerRunner to SoloRunner in generated specs [#21](https://github.com/Nordstrom/chefdk-julia/issues/21)
+
+* Remove `require 'spec_helper'` line from generated specs [#20](https://github.com/Nordstrom/chefdk-julia/issues/20)
+
+* Remove berksfile.lock from generated .gitignore [#18](https://github.com/Nordstrom/chefdk-julia/issues/18)
+
+* Add minimum ChefDK version in README [#14](https://github.com/Nordstrom/chefdk-julia/issues/14)
+
+* Add Windows platform to generated .kitchen.yml
+
+* Add ChefSpec coverage task to generated Rakefile
+
 ## 0.4.4
 * Fix foodcritic.options[:fail_tags] in generated cookbook Rakefile
+
 * Add "How is it better than the basic ChefDK generator?" section to README
 
 ## 0.4.3

data/README.md

@@ -23,7 +23,7 @@ Generated Cookbooks will contain:
 
 
 ## Prerequisites
-[ChefDK](https://downloads.chef.io/chef-dk/) must already be installed.
+[ChefDK](https://downloads.chef.io/chef-dk/) version 0.10 or greater must already be installed.
 
 ## Installation
 

data/files/default/Rakefile

@@ -19,3 +19,9 @@ desc 'Run all style checks and unit tests'
 task test: [:style, :spec]
 
 task default: :test
+
+desc 'Generate ChefSpec coverage report'
+task :coverage do
+  ENV['COVERAGE'] = 'true'
+  Rake::Task[:spec].invoke
+end

data/files/default/gitignore

@@ -1,5 +1,4 @@
 .vagrant
-Berksfile.lock
 *~
 *#
 .#*

data/lib/chefdk/julia/version.rb

@@ -15,6 +15,6 @@
 module ChefDK
   # namespace for VERSION constant
   module Julia
-    VERSION = '0.4.4'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/recipes/app.rb

@@ -28,21 +28,12 @@ template "#{app_dir}/.kitchen.yml" do
   helpers(ChefDK::Generator::TemplateHelper)
 end
 
-directory "#{app_dir}/test/integration/default/serverspec" do
+directory "#{app_dir}/test/integration/default" do
   recursive true
 end
 
-directory "#{app_dir}/test/integration/helpers/serverspec" do
-  recursive true
-end
-
-cookbook_file "#{app_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
-  source 'serverspec_spec_helper.rb'
-  action :create_if_missing
-end
-
-template "#{app_dir}/test/integration/default/serverspec/default_spec.rb" do
-  source 'serverspec_default_spec.rb.erb'
+template "#{app_dir}/test/integration/default/default_spec.rb" do
+  source 'inspec_default_spec.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end

data/recipes/cookbook.rb

@@ -44,7 +44,7 @@ else
   end
 end
 
-# Test-kitchen and ServerSpec
+# Test-kitchen and InSpec
 template "#{cookbook_dir}/.kitchen.yml" do
   if context.use_berkshelf
     source 'kitchen.yml.erb'
@@ -55,25 +55,16 @@ template "#{cookbook_dir}/.kitchen.yml" do
   action :create_if_missing
 end
 
-directory "#{cookbook_dir}/test/integration/default/serverspec" do
+directory "#{cookbook_dir}/test/integration/default" do
   recursive true
 end
 
-template "#{cookbook_dir}/test/integration/default/serverspec/default_spec.rb" do
-  source 'serverspec_default_spec.rb.erb'
+template "#{cookbook_dir}/test/integration/default/default_spec.rb" do
+  source 'inspec_default_spec.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
 
-directory "#{cookbook_dir}/test/integration/helpers/serverspec" do
-  recursive true
-end
-
-cookbook_file "#{cookbook_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
-  source 'serverspec_spec_helper.rb'
-  action :create_if_missing
-end
-
 # ChefSpec
 cookbook_file File.join(cookbook_dir, '.rspec') do
   source '.rspec'

data/templates/default/inspec_default_spec.rb.erb

@@ -0,0 +1,5 @@
+# See InSpec docs for more info: https://docs.chef.io/compliance.html#audit-resources
+
+describe command('whoami') do
+  it { should exist }
+end

data/templates/default/kitchen.yml.erb

@@ -5,14 +5,15 @@ driver:
 provisioner:
   name: chef_zero
 
-# Uncomment the following verifier to leverage Inspec instead of Busser (the
-# default verifier)
-# verifier:
-#   name: inspec
+verifier:
+  name: inspec
 
 platforms:
-  - name: ubuntu-14.04
-  - name: centos-7.1
+  - name: ubuntu-16.04
+  - name: centos-7.2
+  - name: windows-2012r2
+    driver_config:
+      box: mwrock/Windows2012R2
 
 suites:
   - name: default

data/templates/default/recipe_spec.rb.erb

@@ -4,12 +4,10 @@
 #
 <%= license_description('#') %>
 
-require 'spec_helper'
-
 RSpec.describe '<%= cookbook_name %>::<%= recipe_name %>' do
   context 'When all attributes are default, on an unspecified platform' do
     let(:chef_run) do
-      runner = ChefSpec::ServerRunner.new
+      runner = ChefSpec::SoloRunner.new
       runner.converge(described_recipe)
     end
 

data/templates/default/spec_spec_helper.rb.erb

@@ -92,3 +92,5 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 end
+
+ChefSpec::Coverage.start! if ENV['COVERAGE']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefdk-julia
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Orion Ifland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies: []
 description: An Opinionated Cookbook creator, with spunk and a grin, by Nordstrom
 email:
@@ -50,7 +50,6 @@ files:
 - files/default/repo/policies/README.md
 - files/default/repo/roles/README.md
 - files/default/repo/roles/example.json
-- files/default/serverspec_spec_helper.rb
 - julia-icon.svg
 - lib/chefdk/julia.rb
 - lib/chefdk/julia/version.rb
@@ -73,6 +72,7 @@ files:
 - templates/default/README.md.erb
 - templates/default/attribute.rb.erb
 - templates/default/cookbook_file.erb
+- templates/default/inspec_default_spec.rb.erb
 - templates/default/kitchen.yml.erb
 - templates/default/kitchen_policyfile.yml.erb
 - templates/default/metadata.rb.erb
@@ -81,7 +81,6 @@ files:
 - templates/default/recipe_spec.rb.erb
 - templates/default/repo/gitignore.erb
 - templates/default/resource.rb.erb
-- templates/default/serverspec_default_spec.rb.erb
 - templates/default/spec_spec_helper.rb.erb
 - templates/default/template.erb
 homepage: https://github.com/Nordstrom/chefdk-julia

data/files/default/serverspec_spec_helper.rb

@@ -1,8 +0,0 @@
-require 'serverspec'
-
-if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil?
-  set :backend, :exec
-else
-  set :backend, :cmd
-  set :os, family: 'windows'
-end

data/templates/default/serverspec_default_spec.rb.erb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe '<%= cookbook_name %>::default' do
-  # Serverspec examples can be found at
-  # http://serverspec.org/resource_types.html
-  it 'does something' do
-    skip 'Replace this with meaningful tests'
-  end
-end