.travis.yml

@@ -23,11 +23,14 @@ env:
     - PUPPET_GEM_VERSION="~> 4.0.0"
     - PUPPET_GEM_VERSION="~> 4.1.0"
     - PUPPET_GEM_VERSION="~> 4.2.0"
+    - PUPPET_GEM_VERSION="~> 4.3.0"
+    - PUPPET_GEM_VERSION="~> 4.4.0"
+    - PUPPET_GEM_VERSION="~> 4.5.0"
     - PUPPET_GEM_VERSION="~> 4"
 
 sudo: false
 
-script: 'bundle exec metadata-json-lint metadata.json && bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
 
 matrix:
   fast_finish: true
@@ -48,6 +51,12 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.1.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.2.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.3.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.4.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
 

Gemfile

@@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 group :development, :test do
   gem 'metadata-json-lint',      :require => false
   gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'puppetlabs_spec_helper', '>= 1.1.1'
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
@@ -18,7 +18,12 @@ else
 end
 
 if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
-  gem 'json', '~> 1.0'
+  # json 2.x requires ruby 2.0. Lock to 1.8
+  gem 'json', '~> 1.8'
+  # json_pure 2.0.2 requires ruby 2.0. Lock to 2.0.1
+  gem 'json_pure', '= 2.0.1'
+else
+  gem 'json'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

manifests/gunicorn.pp

@@ -42,6 +42,9 @@
 # [*template*]
 #  Which ERB template to use. Default: python/gunicorn.erb
 #
+# [*args*]
+#  Custom arguments to add in gunicorn config file. Default: []
+#
 # === Examples
 #
 # python::gunicorn { 'vhost':
@@ -83,6 +86,7 @@
   $errorlog          = false,
   $log_level          = 'error',
   $template          = 'python/gunicorn.erb',
+  $args              = [],
 ) {
 
   # Parameter validation

manifests/install.pp

@@ -18,7 +18,7 @@
   $python = $::python::version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    default  => "${python::version}",
+    default  => "${python::version}", # lint:ignore:only_variable_string
   }
 
   $pythondev = $::osfamily ? {
@@ -71,7 +71,8 @@
       # Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
       exec { 'bootstrap pip':
         command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
-        creates => '/usr/local/bin/pip',
+        unless  => 'which pip',
+        path    => [ '/bin', '/usr/bin', '/usr/local/bin' ],
         require => Package['python'],
       }
 
@@ -219,8 +220,8 @@
     }
 
     package { 'gunicorn':
-      name   => $python::gunicorn_package_name,
       ensure => $gunicorn_ensure,
+      name   => $python::gunicorn_package_name,
     }
   }
 }

manifests/pip.pp

@@ -125,6 +125,11 @@
       default => "--index-url=${index}",
     }
 
+  $pypi_search_index = $index ? {
+      false   => '',
+      default => "--index=${index}",
+    }
+
   $proxy_flag = $proxy ? {
     false    => '',
     default  => "--proxy=${proxy}",
@@ -242,7 +247,7 @@
         # Latest version.
         exec { "pip_install_${name}":
           command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${log}/pip.log install --upgrade \$wheel_support_flag ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install --upgrade ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
-          unless      => "${pip_env} search ${proxy_flag} ${source} | grep -i INSTALLED | grep -i latest",
+          unless      => "${pip_env} search ${pypi_search_index} ${proxy_flag} ${source} | grep -i INSTALLED.*latest",
           user        => $owner,
           group       => $group,
           cwd         => $cwd,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "stankevich-python",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "author": "stankevich",
   "summary": "Python Module",
   "license": "Apache-2.0",

spec/defines/gunicorn_spec.rb

@@ -26,6 +26,11 @@
         let(:params) { { :dir => '/srv/testapp', :log_level => 'info' } }
         it { is_expected.to contain_file('/etc/gunicorn.d/test-app').with_mode('0644').with_content(/--log-level=info/) }
       end
+
+      context 'test-app with custom gunicorn preload arguments' do
+        let(:params) { { :dir => '/srv/testapp', :args  => ['--preload'] } }
+        it { is_expected.to contain_file('/etc/gunicorn.d/test-app').with_mode('0644').with_content(/--preload/) }
+      end
     end
   end
 end

spec/defines/pip_spec.rb

@@ -48,7 +48,7 @@
       context "adds proxy to search command if set to latest" do
         let (:params) {{ :proxy => "http://my.proxy:3128", :ensure => 'latest' }}
         it { is_expected.to contain_exec("pip_install_rpyc").with_command("pip wheel --help > /dev/null 2>&1 && { pip wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { pip --log /tmp/pip.log install --upgrade $wheel_support_flag  --proxy=http://my.proxy:3128   rpyc || pip --log /tmp/pip.log install --upgrade  --proxy=http://my.proxy:3128   rpyc ;}") }
-        it { is_expected.to contain_exec("pip_install_rpyc").with_unless('pip search --proxy=http://my.proxy:3128 rpyc | grep -i INSTALLED | grep -i latest') }
+        it { is_expected.to contain_exec("pip_install_rpyc").with_unless('pip search  --proxy=http://my.proxy:3128 rpyc | grep -i INSTALLED.*latest') }
       end
     end
 

templates/gunicorn.erb

@@ -24,6 +24,11 @@ CONFIG = {
   'python': '/usr/bin/python',
 <% end -%>
   'args': (
+<% if @args.any? -%>
+<% for arg in @args do -%>
+    '<%= arg %>',
+<% end -%>
+<% end -%>
 <% if !@virtualenv and !@bind -%>
     '--bind=unix:/tmp/gunicorn-<%= @name %>.socket',
 <% elsif @virtualenv and !@bind -%>