From 1cd9985d039aa4f2d12ae32b3d7045ac6172c0fd Mon Sep 17 00:00:00 2001 From: Noah Kantrowitz Date: Sun, 23 Apr 2017 21:30:50 -0700 Subject: [PATCH] Update test harness. --- .gitignore | 4 ++-- .yardopts | 4 ++++ .yo-rc.json | 7 +++++++ Gemfile | 2 +- test/gemfiles/chef-12.1.gemfile | 6 +++--- test/gemfiles/chef-12.10.gemfile | 6 +++--- test/gemfiles/chef-12.11.gemfile | 6 +++--- test/gemfiles/chef-12.12.gemfile | 4 ++-- test/gemfiles/chef-12.13.gemfile | 4 ++-- test/gemfiles/chef-12.2.gemfile | 6 +++--- test/gemfiles/chef-12.3.gemfile | 6 +++--- test/gemfiles/chef-12.4.gemfile | 6 +++--- test/gemfiles/chef-12.5.gemfile | 6 +++--- test/gemfiles/chef-12.6.gemfile | 6 +++--- test/gemfiles/chef-12.7.gemfile | 6 +++--- test/gemfiles/chef-12.8.gemfile | 6 +++--- test/gemfiles/chef-12.9.gemfile | 6 +++--- test/gemfiles/chef-13.0.gemfile | 2 +- test/gemfiles/master.gemfile | 27 +++++++++++++++------------ 19 files changed, 67 insertions(+), 53 deletions(-) create mode 100644 .yo-rc.json diff --git a/.gitignore b/.gitignore index 38f93b5..d83b2bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ +Berksfile.lock Gemfile.lock test/gemfiles/*.lock -Berksfile.lock .kitchen/ .kitchen.local.yml test/docker/ +test/ec2/ coverage/ pkg/ .yardoc/ doc/ - diff --git a/.yardopts b/.yardopts index 1c11d2a..be7cdef 100644 --- a/.yardopts +++ b/.yardopts @@ -1,3 +1,7 @@ --plugin classmethods +--embed-mixin ClassMethods +--hide-api private --markup markdown --hide-void-return +--tag provides:Provides +--tag action:Actions diff --git a/.yo-rc.json b/.yo-rc.json new file mode 100644 index 0000000..9cb8344 --- /dev/null +++ b/.yo-rc.json @@ -0,0 +1,7 @@ +{ + "generator-poise": { + "created": true, + "name": "poise-application-python", + "cookbookName": "application_python" + } +} \ No newline at end of file diff --git a/Gemfile b/Gemfile index 3f42884..77f0b86 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ def dev_gem(name, path: File.join('..', name), github: nil) if File.exist?(path) gem name, path: path elsif github - gem name, github: github + gem name, git: "https://gitub.com/#{github}.git" end end diff --git a/test/gemfiles/chef-12.1.gemfile b/test/gemfiles/chef-12.1.gemfile index c7ace12..170e314 100644 --- a/test/gemfiles/chef-12.1.gemfile +++ b/test/gemfiles/chef-12.1.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.1.2' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.10.gemfile b/test/gemfiles/chef-12.10.gemfile index 4e96ed4..a98cfc0 100644 --- a/test/gemfiles/chef-12.10.gemfile +++ b/test/gemfiles/chef-12.10.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.10.24' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.11.gemfile b/test/gemfiles/chef-12.11.gemfile index f6f55c6..302cf79 100644 --- a/test/gemfiles/chef-12.11.gemfile +++ b/test/gemfiles/chef-12.11.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.11.18' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.12.gemfile b/test/gemfiles/chef-12.12.gemfile index 0b673e4..4724162 100644 --- a/test/gemfiles/chef-12.12.gemfile +++ b/test/gemfiles/chef-12.12.gemfile @@ -17,6 +17,6 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.12.15' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' diff --git a/test/gemfiles/chef-12.13.gemfile b/test/gemfiles/chef-12.13.gemfile index 9cc50eb..67e00b8 100644 --- a/test/gemfiles/chef-12.13.gemfile +++ b/test/gemfiles/chef-12.13.gemfile @@ -17,6 +17,6 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.13.37' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' diff --git a/test/gemfiles/chef-12.2.gemfile b/test/gemfiles/chef-12.2.gemfile index 157048b..3b3d674 100644 --- a/test/gemfiles/chef-12.2.gemfile +++ b/test/gemfiles/chef-12.2.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.2.1' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.3.gemfile b/test/gemfiles/chef-12.3.gemfile index 963a1f9..8700b6c 100644 --- a/test/gemfiles/chef-12.3.gemfile +++ b/test/gemfiles/chef-12.3.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.3.0' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.4.gemfile b/test/gemfiles/chef-12.4.gemfile index e3a9da2..00fc198 100644 --- a/test/gemfiles/chef-12.4.gemfile +++ b/test/gemfiles/chef-12.4.gemfile @@ -17,8 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.4.3' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' gem 'gh', '0.14.0' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.5.gemfile b/test/gemfiles/chef-12.5.gemfile index 91a0f0d..d0c73a4 100644 --- a/test/gemfiles/chef-12.5.gemfile +++ b/test/gemfiles/chef-12.5.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.5.1' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.6.gemfile b/test/gemfiles/chef-12.6.gemfile index 2cf21ed..fdd4417 100644 --- a/test/gemfiles/chef-12.6.gemfile +++ b/test/gemfiles/chef-12.6.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.6.0' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.7.gemfile b/test/gemfiles/chef-12.7.gemfile index d9a353c..9c22595 100644 --- a/test/gemfiles/chef-12.7.gemfile +++ b/test/gemfiles/chef-12.7.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.7.2' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.8.gemfile b/test/gemfiles/chef-12.8.gemfile index 16834cd..2b390eb 100644 --- a/test/gemfiles/chef-12.8.gemfile +++ b/test/gemfiles/chef-12.8.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.8.1' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.9.gemfile b/test/gemfiles/chef-12.9.gemfile index 7e4aea3..b67456e 100644 --- a/test/gemfiles/chef-12.9.gemfile +++ b/test/gemfiles/chef-12.9.gemfile @@ -17,7 +17,7 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.9.41' -gem 'rack', '< 2' -gem 'foodcritic', '< 8' -gem 'fauxhai', '<= 3.9.0' gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-13.0.gemfile b/test/gemfiles/chef-13.0.gemfile index ff571d0..7e864da 100644 --- a/test/gemfiles/chef-13.0.gemfile +++ b/test/gemfiles/chef-13.0.gemfile @@ -16,4 +16,4 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) -gem 'chef', '~> 13.0.113' +gem 'chef', '~> 13.0.118' diff --git a/test/gemfiles/master.gemfile b/test/gemfiles/master.gemfile index fe57d7b..4c902cb 100644 --- a/test/gemfiles/master.gemfile +++ b/test/gemfiles/master.gemfile @@ -16,15 +16,18 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) -gem 'chef', github: 'chef/chef' -gem 'halite', github: 'poise/halite' -gem 'ohai', github: 'chef/ohai' -gem 'poise', github: 'poise/poise' -gem 'poise-application', github: 'poise/application' -gem 'poise-application-git', github: 'poise/application_git' -gem 'poise-archive', github: 'poise/poise-archive' -gem 'poise-boiler', github: 'poise/poise-boiler' -gem 'poise-languages', github: 'poise/poise-languages' -gem 'poise-profiler', github: 'poise/poise-profiler' -gem 'poise-python', github: 'poise/poise-python' -# gem 'poise-service', github: 'poise/poise-service' +gem 'chef', git: 'https://github.com/chef/chef.git' +gem 'chefspec', git: 'https://github.com/sethvargo/chefspec.git' +gem 'fauxhai', git: 'https://github.com/customink/fauxhai.git' +gem 'foodcritic', git: 'https://github.com/foodcritic/foodcritic.git' +gem 'halite', git: 'https://github.com/poise/halite.git' +gem 'ohai', git: 'https://github.com/chef/ohai.git' +gem 'poise', git: 'https://github.com/poise/poise.git' +gem 'poise-application', git: 'https://github.com/poise/poise-application.git' +gem 'poise-application-git', git: 'https://github.com/poise/poise-application-git.git' +gem 'poise-archive', git: 'https://github.com/poise/poise-archive.git' +gem 'poise-boiler', git: 'https://github.com/poise/poise-boiler.git' +gem 'poise-languages', git: 'https://github.com/poise/poise-languages.git' +gem 'poise-profiler', git: 'https://github.com/poise/poise-profiler.git' +gem 'poise-python', git: 'https://github.com/poise/poise-python.git' +gem 'poise-service', git: 'https://github.com/poise/poise-service.git'