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/.travis.yml b/.travis.yml index eb6566e..18bf4d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,68 @@ sudo: false cache: bundler language: ruby -rvm: -- '2.2' -addons: - apt: - packages: - - libgecode-dev env: global: - - USE_SYSTEM_GECODE=true - - secure: rz8Ej7Zx5zArH+OwuAsRB8CH0rZVKIAm6nhB29wg73d7FrMv6cWEl5/B2uQqlefqZ1GYosAifhmoW7lVB1S2O9pDPB8wSpr2P9dsaHEupad4jBi6rIufxoCrx3YZIFPcmvL71u2+STi021VQpsXjcwfP6h2i+pVkPXxVr0Ihv3U= -before_install: "gem install bundler" -bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3" + - secure: rz8Ej7Zx5zArH+OwuAsRB8CH0rZVKIAm6nhB29wg73d7FrMv6cWEl5/B2uQqlefqZ1GYosAifhmoW7lVB1S2O9pDPB8wSpr2P9dsaHEupad4jBi6rIufxoCrx3YZIFPcmvL71u2+STi021VQpsXjcwfP6h2i+pVkPXxVr0Ihv3U= +before_install: + - 'if [[ $BUNDLE_GEMFILE == *master.gemfile ]]; then gem update --system; fi' + - gem --version + - gem install bundler + - bundle --version + - 'bundle config --local path ${BUNDLE_PATH:-$(dirname $BUNDLE_GEMFILE)/vendor/bundle}' + - bundle config --local bin $PWD/bin +install: bundle update --jobs=3 --retry=3 script: -- "./bin/rake travis" -gemfile: -- test/gemfiles/chef-12.gemfile -- test/gemfiles/chef-12.1.gemfile -- test/gemfiles/chef-12.2.gemfile -- test/gemfiles/chef-12.3.gemfile -- test/gemfiles/chef-12.4.gemfile -- test/gemfiles/chef-12.5.gemfile -- test/gemfiles/chef-12.6.gemfile -- test/gemfiles/master.gemfile + - ./bin/rake travis +matrix: + include: + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.gemfile + - rvm: 2.4.1 + gemfile: test/gemfiles/chef-13.gemfile + - rvm: 2.1.4 + gemfile: test/gemfiles/chef-12.1.gemfile + - rvm: 2.1.4 + gemfile: test/gemfiles/chef-12.2.gemfile + - rvm: 2.1.4 + gemfile: test/gemfiles/chef-12.3.gemfile + - rvm: 2.1.6 + gemfile: test/gemfiles/chef-12.4.gemfile + - rvm: 2.1.6 + gemfile: test/gemfiles/chef-12.5.gemfile + - rvm: 2.1.6 + gemfile: test/gemfiles/chef-12.6.gemfile + - rvm: 2.1.6 + gemfile: test/gemfiles/chef-12.7.gemfile + - rvm: 2.1.6 + gemfile: test/gemfiles/chef-12.8.gemfile + - rvm: 2.1.8 + gemfile: test/gemfiles/chef-12.9.gemfile + - rvm: 2.1.8 + gemfile: test/gemfiles/chef-12.10.gemfile + - rvm: 2.1.8 + gemfile: test/gemfiles/chef-12.11.gemfile + - rvm: 2.1.8 + gemfile: test/gemfiles/chef-12.12.gemfile + - rvm: 2.1.9 + gemfile: test/gemfiles/chef-12.13.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.14.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.15.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.16.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.17.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.18.gemfile + - rvm: 2.3.1 + gemfile: test/gemfiles/chef-12.19.gemfile + - rvm: 2.4.1 + gemfile: test/gemfiles/chef-13.0.gemfile + - rvm: 2.4.1 + gemfile: test/gemfiles/chef-13.1.gemfile + - rvm: 2.4.1 + gemfile: test/gemfiles/chef-13.2.gemfile + - rvm: 2.4.1 + gemfile: test/gemfiles/master.gemfile 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 25e422c..200b1cb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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://github.com/#{github}.git" end end @@ -31,6 +31,7 @@ dev_gem 'halite' dev_gem 'poise' dev_gem 'poise-application', path: '../application' dev_gem 'poise-application-git', path: '../application_git' +dev_gem 'poise-archive' dev_gem 'poise-boiler' dev_gem 'poise-languages' dev_gem 'poise-profiler' diff --git a/README.md b/README.md index eed6cbe..74ed6f7 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ end * `path` – Base path for the application. *(name attribute)* * `app_module` – Celery application module. *(default: auto-detect)* +* `worker_pool` – The Pool implementation used by the Celery worker (gevent,eventlet or prefork). *(default: prefork)* * `service_name` – Name of the service to create. *(default: auto-detect)* # `user` – User to run the service as. *(default: application owner)* @@ -308,8 +309,8 @@ All actions and properties are the same as the [`python_virtualenv` resource](ht Some test recipes are available as examples for common application frameworks: -* [Flask](https://github.com/poise/application_python/blob/master/test/cookbooks/application_python_test/recipes/flask.rb) -* [Django](https://github.com/poise/application_python/blob/master/test/cookbooks/application_python_test/recipes/django.rb) +* [Flask](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/flask.rb) +* [Django](https://github.com/poise/application_python/blob/master/test/cookbook/recipes/django.rb) ## Sponsors @@ -319,7 +320,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa ## License -Copyright 2015-2016, Noah Kantrowitz +Copyright 2015-2017, Noah Kantrowitz Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Rakefile b/Rakefile index 8e19409..d2b12d0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python.rb b/lib/poise_application_python.rb index b0c9f8c..028595f 100644 --- a/lib/poise_application_python.rb +++ b/lib/poise_application_python.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/app_mixin.rb b/lib/poise_application_python/app_mixin.rb index b5c4d74..048ce6e 100644 --- a/lib/poise_application_python/app_mixin.rb +++ b/lib/poise_application_python/app_mixin.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/cheftie.rb b/lib/poise_application_python/cheftie.rb index ed8a0ad..ad04a51 100644 --- a/lib/poise_application_python/cheftie.rb +++ b/lib/poise_application_python/cheftie.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/error.rb b/lib/poise_application_python/error.rb index 187831f..dfdacd0 100644 --- a/lib/poise_application_python/error.rb +++ b/lib/poise_application_python/error.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources.rb b/lib/poise_application_python/resources.rb index 9d69155..a7b8fa3 100644 --- a/lib/poise_application_python/resources.rb +++ b/lib/poise_application_python/resources.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/celery_beat.rb b/lib/poise_application_python/resources/celery_beat.rb index 03700f7..e5664ca 100644 --- a/lib/poise_application_python/resources/celery_beat.rb +++ b/lib/poise_application_python/resources/celery_beat.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/celery_config.rb b/lib/poise_application_python/resources/celery_config.rb index 77bd3d7..f4a835e 100644 --- a/lib/poise_application_python/resources/celery_config.rb +++ b/lib/poise_application_python/resources/celery_config.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/celery_worker.rb b/lib/poise_application_python/resources/celery_worker.rb index 2bb6513..520a446 100644 --- a/lib/poise_application_python/resources/celery_worker.rb +++ b/lib/poise_application_python/resources/celery_worker.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ class Resource < Chef::Resource include PoiseApplicationPython::ServiceMixin provides(:application_celery_worker) + attribute(:worker_pool, kind_of: [String, NilClass], default: "prefork") attribute(:app_module, kind_of: [String, NilClass], default: lazy { default_app_module }) private @@ -68,7 +69,7 @@ class Provider < Chef::Provider def service_options(resource) super raise PoiseApplicationPython::Error.new("Unable to determine app module for #{new_resource}") unless new_resource.app_module - resource.command("#{new_resource.python} -m celery --app=#{new_resource.app_module} worker") + resource.command("#{new_resource.python} -m celery --app=#{new_resource.app_module} -P #{new_resource.worker_pool} worker") end end diff --git a/lib/poise_application_python/resources/django.rb b/lib/poise_application_python/resources/django.rb index 91b9c7c..61dd5d7 100644 --- a/lib/poise_application_python/resources/django.rb +++ b/lib/poise_application_python/resources/django.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ module Resources # @since 4.0.0 module Django # Aliases for Django database engine names. Based on https://github.com/kennethreitz/dj-database-url/blob/master/dj_database_url.py - # Copyright 2014-2016, Kenneth Reitz. + # Copyright 2014-2017, Kenneth Reitz. ENGINE_ALIASES = { 'postgres' => 'django.db.backends.postgresql_psycopg2', 'postgresql' => 'django.db.backends.postgresql_psycopg2', @@ -232,7 +232,7 @@ def parse_database_url(url) db[:USER] = parsed.user if parsed.user && !parsed.user.empty? db[:PASSWORD] = parsed.password if parsed.password && !parsed.password.empty? db[:HOST] = parsed.host if parsed.host && !parsed.host.empty? - db[:PORT] = parsed.port if parsed.port && !parsed.port.empty? + db[:PORT] = parsed.port if parsed.port && !parsed.port.nil? end end diff --git a/lib/poise_application_python/resources/gunicorn.rb b/lib/poise_application_python/resources/gunicorn.rb index ece8198..e9daed3 100644 --- a/lib/poise_application_python/resources/gunicorn.rb +++ b/lib/poise_application_python/resources/gunicorn.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ def port(val) # Compute the default application module to pass to gunicorn. This # checks the app state and then looks for commonly used filenames. - # Raises an exception if no default can be found. + # Returns nil if no default can be found. # # @return [String] def default_app_module diff --git a/lib/poise_application_python/resources/pip_requirements.rb b/lib/poise_application_python/resources/pip_requirements.rb index e01dba8..8c236d8 100644 --- a/lib/poise_application_python/resources/pip_requirements.rb +++ b/lib/poise_application_python/resources/pip_requirements.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/python.rb b/lib/poise_application_python/resources/python.rb index 22ee945..021bec0 100644 --- a/lib/poise_application_python/resources/python.rb +++ b/lib/poise_application_python/resources/python.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/python_execute.rb b/lib/poise_application_python/resources/python_execute.rb index b24f074..6b79fdf 100644 --- a/lib/poise_application_python/resources/python_execute.rb +++ b/lib/poise_application_python/resources/python_execute.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,9 +40,9 @@ class Resource < PoisePython::Resources::PythonExecute::Resource def initialize(*args) super # Clear some instance variables so my defaults work. - remove_instance_variable(:@cwd) - remove_instance_variable(:@group) - remove_instance_variable(:@user) + remove_instance_variable(:@cwd) if defined?(@cwd) + remove_instance_variable(:@group) if defined?(@group) + remove_instance_variable(:@user) if defined?(@user) end # #!attribute cwd diff --git a/lib/poise_application_python/resources/python_package.rb b/lib/poise_application_python/resources/python_package.rb index e3604bb..54ec9ee 100644 --- a/lib/poise_application_python/resources/python_package.rb +++ b/lib/poise_application_python/resources/python_package.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/resources/virtualenv.rb b/lib/poise_application_python/resources/virtualenv.rb index fba83b7..3bec6fa 100644 --- a/lib/poise_application_python/resources/virtualenv.rb +++ b/lib/poise_application_python/resources/virtualenv.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/service_mixin.rb b/lib/poise_application_python/service_mixin.rb index d21d18b..2c52420 100644 --- a/lib/poise_application_python/service_mixin.rb +++ b/lib/poise_application_python/service_mixin.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib/poise_application_python/version.rb b/lib/poise_application_python/version.rb index 80d8e5b..50af440 100644 --- a/lib/poise_application_python/version.rb +++ b/lib/poise_application_python/version.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/poise-application-python.gemspec b/poise-application-python.gemspec index b0e9d19..8394013 100644 --- a/poise-application-python.gemspec +++ b/poise-application-python.gemspec @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,21 +26,23 @@ Gem::Specification.new do |spec| spec.description = "A Chef cookbook for deploying Python application code." spec.summary = spec.description spec.homepage = 'https://github.com/poise/application_python' - spec.license = 'Apache 2.0' + spec.license = 'Apache-2.0' spec.metadata['halite_name'] = 'application_python' + spec.metadata['platforms'] = 'any' spec.files = `git ls-files`.split($/) spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = %w{lib} + spec.add_dependency 'chef', '>= 12.1', '< 14' spec.add_dependency 'halite', '~> 1.0' spec.add_dependency 'poise', '~> 2.0' spec.add_dependency 'poise-application', '~> 5.0' spec.add_dependency 'poise-python', '~> 1.0' spec.add_dependency 'poise-service', '~> 1.0' - spec.add_development_dependency 'berkshelf', '~> 4.0' spec.add_development_dependency 'poise-boiler', '~> 1.6' - spec.add_development_dependency 'poise-application-git', '~> 1.0' + spec.add_development_dependency 'poise-application-git', '~> 1.2' + spec.add_development_dependency 'poise-build-essential', '~> 1.0' end diff --git a/test/cookbook/attributes/default.rb b/test/cookbook/attributes/default.rb index 4e6ae40..56cb0d7 100644 --- a/test/cookbook/attributes/default.rb +++ b/test/cookbook/attributes/default.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/cookbook/metadata.rb b/test/cookbook/metadata.rb index 9658053..149dbeb 100644 --- a/test/cookbook/metadata.rb +++ b/test/cookbook/metadata.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,4 +17,4 @@ name 'application_python_test' depends 'application_git' depends 'application_python' -depends 'build-essential' +depends 'poise-build-essential' diff --git a/test/cookbook/recipes/default.rb b/test/cookbook/recipes/default.rb index a54694c..e1db35e 100644 --- a/test/cookbook/recipes/default.rb +++ b/test/cookbook/recipes/default.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/cookbook/recipes/django.rb b/test/cookbook/recipes/django.rb index 4d15589..c115174 100644 --- a/test/cookbook/recipes/django.rb +++ b/test/cookbook/recipes/django.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ # limitations under the License. # -include_recipe 'build-essential' +include_recipe 'poise-build-essential' include_recipe 'poise-python' application '/opt/test_django' do git 'https://github.com/poise/test_django.git' - python 'pypy3' + python 'pypy3-5.7' virtualenv pip_requirements django do @@ -29,4 +29,8 @@ gunicorn do port 9000 end + # PyPy is a bit slower to shut down. + poise_service_options '/opt/test_django' do + restart_delay 30 + end end diff --git a/test/cookbook/recipes/flask.rb b/test/cookbook/recipes/flask.rb index 868dad8..59d98f2 100644 --- a/test/cookbook/recipes/flask.rb +++ b/test/cookbook/recipes/flask.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/gemfiles/chef-12.1.gemfile b/test/gemfiles/chef-12.1.gemfile index d06524e..83ee246 100644 --- a/test/gemfiles/chef-12.1.gemfile +++ b/test/gemfiles/chef-12.1.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,3 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.1.2' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/Berksfile b/test/gemfiles/chef-12.10.gemfile similarity index 69% rename from Berksfile rename to test/gemfiles/chef-12.10.gemfile index 5b70b2d..b3f1bce 100644 --- a/Berksfile +++ b/test/gemfiles/chef-12.10.gemfile @@ -1,7 +1,5 @@ # -# Author:: Noah Kantrowitz -# -# Copyright 2013-2016, Balanced, Inc. +# Copyright 2016-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,10 +14,11 @@ # limitations under the License. # -source 'https://supermarket.chef.io/' -extension 'halite' +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) -group :test do - cookbook 'application_git', gem: 'poise-application-git' - cookbook 'git' -end +gem 'chef', '~> 12.10.24' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.11.gemfile b/test/gemfiles/chef-12.11.gemfile new file mode 100644 index 0000000..e1a1b77 --- /dev/null +++ b/test/gemfiles/chef-12.11.gemfile @@ -0,0 +1,24 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.11.18' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.12.gemfile b/test/gemfiles/chef-12.12.gemfile new file mode 100644 index 0000000..cdbf048 --- /dev/null +++ b/test/gemfiles/chef-12.12.gemfile @@ -0,0 +1,23 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.12.15' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' diff --git a/test/gemfiles/chef-12.13.gemfile b/test/gemfiles/chef-12.13.gemfile new file mode 100644 index 0000000..76b2217 --- /dev/null +++ b/test/gemfiles/chef-12.13.gemfile @@ -0,0 +1,23 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.13.37' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' diff --git a/test/gemfiles/chef-12.14.gemfile b/test/gemfiles/chef-12.14.gemfile new file mode 100644 index 0000000..e0cb5c1 --- /dev/null +++ b/test/gemfiles/chef-12.14.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.14.89' diff --git a/test/gemfiles/chef-12.15.gemfile b/test/gemfiles/chef-12.15.gemfile new file mode 100644 index 0000000..1095dd8 --- /dev/null +++ b/test/gemfiles/chef-12.15.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.15.19' diff --git a/test/gemfiles/chef-12.16.gemfile b/test/gemfiles/chef-12.16.gemfile new file mode 100644 index 0000000..601a96c --- /dev/null +++ b/test/gemfiles/chef-12.16.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.16.42' diff --git a/test/gemfiles/chef-12.17.gemfile b/test/gemfiles/chef-12.17.gemfile new file mode 100644 index 0000000..2b2dbab --- /dev/null +++ b/test/gemfiles/chef-12.17.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.17.44' diff --git a/test/gemfiles/chef-12.18.gemfile b/test/gemfiles/chef-12.18.gemfile new file mode 100644 index 0000000..eef6f42 --- /dev/null +++ b/test/gemfiles/chef-12.18.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.18.31' diff --git a/test/gemfiles/chef-12.19.gemfile b/test/gemfiles/chef-12.19.gemfile new file mode 100644 index 0000000..62c4b98 --- /dev/null +++ b/test/gemfiles/chef-12.19.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.19.36' diff --git a/test/gemfiles/chef-12.2.gemfile b/test/gemfiles/chef-12.2.gemfile index 7b7ce03..1be9dc1 100644 --- a/test/gemfiles/chef-12.2.gemfile +++ b/test/gemfiles/chef-12.2.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,3 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.2.1' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.3.gemfile b/test/gemfiles/chef-12.3.gemfile index b670201..f467b24 100644 --- a/test/gemfiles/chef-12.3.gemfile +++ b/test/gemfiles/chef-12.3.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,3 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.3.0' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.4.gemfile b/test/gemfiles/chef-12.4.gemfile index 2f1f66c..3982e37 100644 --- a/test/gemfiles/chef-12.4.gemfile +++ b/test/gemfiles/chef-12.4.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,5 +17,9 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.4.3' -# Pending https://github.com/berkshelf/ridley/pull/335 -gem 'ridley', '4.4.1' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +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 09ec87d..cce7846 100644 --- a/test/gemfiles/chef-12.5.gemfile +++ b/test/gemfiles/chef-12.5.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,3 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.5.1' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.6.gemfile b/test/gemfiles/chef-12.6.gemfile index b220e23..5f699c5 100644 --- a/test/gemfiles/chef-12.6.gemfile +++ b/test/gemfiles/chef-12.6.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,3 +17,8 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) gem 'chef', '~> 12.6.0' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.7.gemfile b/test/gemfiles/chef-12.7.gemfile new file mode 100644 index 0000000..8eb0df8 --- /dev/null +++ b/test/gemfiles/chef-12.7.gemfile @@ -0,0 +1,24 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.7.2' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.8.gemfile b/test/gemfiles/chef-12.8.gemfile new file mode 100644 index 0000000..cf1531f --- /dev/null +++ b/test/gemfiles/chef-12.8.gemfile @@ -0,0 +1,24 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.8.1' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.9.gemfile b/test/gemfiles/chef-12.9.gemfile new file mode 100644 index 0000000..4295ec5 --- /dev/null +++ b/test/gemfiles/chef-12.9.gemfile @@ -0,0 +1,24 @@ +# +# Copyright 2016-2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 12.9.41' +gem 'chefspec', '< 6' +gem 'fauxhai', '<= 3.9.0' +gem 'ffi-yajl', '< 2.3.1' +gem 'foodcritic', '< 8' +gem 'rack', '< 2' diff --git a/test/gemfiles/chef-12.gemfile b/test/gemfiles/chef-12.gemfile index b27748e..bd22a0f 100644 --- a/test/gemfiles/chef-12.gemfile +++ b/test/gemfiles/chef-12.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,4 +16,4 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) -gem 'chef', '~> 12.6' +gem 'chef', '~> 12.19' diff --git a/test/gemfiles/chef-13.0.gemfile b/test/gemfiles/chef-13.0.gemfile new file mode 100644 index 0000000..7e864da --- /dev/null +++ b/test/gemfiles/chef-13.0.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 13.0.118' diff --git a/test/gemfiles/chef-13.1.gemfile b/test/gemfiles/chef-13.1.gemfile new file mode 100644 index 0000000..05668a3 --- /dev/null +++ b/test/gemfiles/chef-13.1.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 13.1.31' diff --git a/test/gemfiles/chef-13.2.gemfile b/test/gemfiles/chef-13.2.gemfile new file mode 100644 index 0000000..a466fdb --- /dev/null +++ b/test/gemfiles/chef-13.2.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 13.2.20' diff --git a/test/gemfiles/chef-13.gemfile b/test/gemfiles/chef-13.gemfile new file mode 100644 index 0000000..3f49de1 --- /dev/null +++ b/test/gemfiles/chef-13.gemfile @@ -0,0 +1,19 @@ +# +# Copyright 2017, Noah Kantrowitz +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +eval_gemfile File.expand_path('../../../Gemfile', __FILE__) + +gem 'chef', '~> 13.2' diff --git a/test/gemfiles/master.gemfile b/test/gemfiles/master.gemfile index a284541..182ae64 100644 --- a/test/gemfiles/master.gemfile +++ b/test/gemfiles/master.gemfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,13 +16,18 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__) -gem 'chef', github: 'chef/chef' -gem 'halite', github: 'poise/halite' -gem 'poise', github: 'poise/poise' -gem 'poise-application', github: 'poise/application' -gem 'poise-application-git', github: 'poise/application_git' -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/application.git' +gem 'poise-application-git', git: 'https://github.com/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' diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb index bea8ab0..7d56643 100644 --- a/test/integration/default/serverspec/default_spec.rb +++ b/test/integration/default/serverspec/default_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/integration/default/serverspec/django_spec.rb b/test/integration/default/serverspec/django_spec.rb index c054c3a..b9d8380 100644 --- a/test/integration/default/serverspec/django_spec.rb +++ b/test/integration/default/serverspec/django_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/integration/default/serverspec/flask_spec.rb b/test/integration/default/serverspec/flask_spec.rb index 45f8e82..8c0d0f2 100644 --- a/test/integration/default/serverspec/flask_spec.rb +++ b/test/integration/default/serverspec/flask_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/app_mixin_spec.rb b/test/spec/app_mixin_spec.rb index ae4e96f..2e34119 100644 --- a/test/spec/app_mixin_spec.rb +++ b/test/spec/app_mixin_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/resources/celery_config_spec.rb b/test/spec/resources/celery_config_spec.rb index 8c5ae3f..846c221 100644 --- a/test/spec/resources/celery_config_spec.rb +++ b/test/spec/resources/celery_config_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/resources/django_spec.rb b/test/spec/resources/django_spec.rb index 65a712e..dccbd3c 100644 --- a/test/spec/resources/django_spec.rb +++ b/test/spec/resources/django_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/resources/gunicorn_spec.rb b/test/spec/resources/gunicorn_spec.rb index 0ba6cb9..c50da3b 100644 --- a/test/spec/resources/gunicorn_spec.rb +++ b/test/spec/resources/gunicorn_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ describe '#default_app_module' do let(:app_state) { {} } let(:files) { [] } - let(:test_resource) { described_class.new(nil, nil) } + let(:test_resource) { described_class.new('/test', nil) } before do allow(test_resource).to receive(:app_state).and_return(app_state) allow(Dir).to receive(:exist?).and_return(!files.empty?) diff --git a/test/spec/resources/python_execute_spec.rb b/test/spec/resources/python_execute_spec.rb index 0803339..29107f8 100644 --- a/test/spec/resources/python_execute_spec.rb +++ b/test/spec/resources/python_execute_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,7 +30,13 @@ end it do - expect_any_instance_of(described_class::Provider).to receive(:shell_out!).with( + # Check which method to stub. I'm not super proud of this code, sorry. + method_to_stub = if IO.read(described_class::Provider.instance_method(:action_run).source_location.first) =~ /shell_out_with_systems_locale/ + :shell_out_with_systems_locale! + else + :shell_out! + end + expect_any_instance_of(described_class::Provider).to receive(method_to_stub).with( '/python myapp.py', user: 'myuser', group: 'mygroup', diff --git a/test/spec/resources/python_spec.rb b/test/spec/resources/python_spec.rb index cb819cd..6e5ff3c 100644 --- a/test/spec/resources/python_spec.rb +++ b/test/spec/resources/python_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/resources/virtualenv_spec.rb b/test/spec/resources/virtualenv_spec.rb index e007509..082d2e7 100644 --- a/test/spec/resources/virtualenv_spec.rb +++ b/test/spec/resources/virtualenv_spec.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb index 3e9a0bf..2ed212f 100644 --- a/test/spec/spec_helper.rb +++ b/test/spec/spec_helper.rb @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Noah Kantrowitz +# Copyright 2015-2017, Noah Kantrowitz # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.