Make lintastic

Author: taylorific

cookbooks/boxcutter_acme/metadata.rb

@@ -6,3 +6,4 @@
 source_url 'https://github.com/boxcutter/boxcutter-chef-cookbooks/'
 version '0.1.0'
 depends 'boxcutter_onepassword'
+depends 'boxcutter_python'

cookbooks/boxcutter_acme/recipes/certbot.rb

@@ -16,32 +16,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-package ['python3', 'python3-venv'] do
-  action :upgrade
-end
-
-directory '/opt/certbot' do
-  owner node.root_user
-  group node.root_group
-  mode '0755'
-end
+include_recipe 'boxcutter_python::system'
 
-execute 'create certbot virtualenv' do
-  command 'python3 -m venv /opt/certbot/venv'
-  creates '/opt/certbot/venv/bin/python'
-end
+boxcutter_python_virtualenv '/opt/certbot/venv'
 
 %w{
   certbot
   certbot-dns-cloudflare
 }.each do |pkg|
-  execute "install #{pkg} python package" do
-    command "/opt/certbot/venv/bin/python -m pip install #{pkg}"
-    not_if "/opt/certbot/venv/bin/python -m pip list installed | grep ^#{pkg}"
-  end
-
-  execute "update #{pkg} python package" do
-    command "/opt/certbot/venv/bin/python -m pip install --upgrade #{pkg}"
-    only_if "/opt/certbot/venv/bin/python -m pip list --outdated | grep ^#{pkg}"
+  boxcutter_python_pip pkg do
+    virtualenv '/opt/certbot/venv'
+    action :upgrade
   end
 end

cookbooks/boxcutter_acme/test/integration/default/certbot_test.rb

@@ -1,16 +1,7 @@
-# Chef InSpec test for recipe boxcutter_acme::certbot
-
-# The Chef InSpec reference, with examples and extensive documentation, can be
-# found at https://docs.chef.io/inspec/resources/
-
-unless os.windows?
-  # This is an example test, replace with your own test.
-  describe user('root'), :skip do
-    it { should exist }
-  end
+describe pip('certbot', '/opt/certbot/venv/bin/pip3') do
+  it { should be_installed }
 end
 
-# This is an example test, replace it with your own test.
-describe port(80), :skip do
-  it { should_not be_listening }
+describe pip('certbot-dns-cloudflare', '/opt/certbot/venv/bin/pip3') do
+  it { should be_installed }
 end

cookbooks/boxcutter_python/libraries/default.rb

@@ -63,7 +63,7 @@ def install_package(version, new_resource)
         else
           version = "==#{version}"
         end
-        pip_cmd('install', version, new_resource)
+        pip_cmd('install', new_resource, version)
       end
 
       def upgrade_package(version, new_resource)
@@ -76,7 +76,7 @@ def remove_package(_version, new_resource)
         new_resource.extra_options "#{new_resource.extra_options} --yes"
         # Python only allows one version to be installed at a time, so it's
         # not necessary to provide a version on uninstall.
-        pip_cmd('uninstall', '', new_resource)
+        pip_cmd('uninstall', new_resource)
       end
 
       def removing_package?(current_resource, new_resource)
@@ -89,7 +89,7 @@ def removing_package?(current_resource, new_resource)
         end
       end
 
-      def pip_cmd(subcommand, version = '', new_resource)
+      def pip_cmd(subcommand, new_resource, version = '')
         options = { :timeout => new_resource.timeout, :user => new_resource.user, :group => new_resource.group }
         environment = {}
         environment['HOME'] = Dir.home(new_resource.user) if new_resource.user

cookbooks/boxcutter_python/resources/python_pip.rb

@@ -68,9 +68,13 @@ class Helpers
 action :upgrade do
   if current_resource.version != Helpers.candidate_version(new_resource)
     original_version = current_resource.version || 'uninstalled'
-    description = "upgrade #{current_resource} version from #{current_resource.version} to #{Helpers.candidate_version(new_resource)}"
+    description = "upgrade #{current_resource} version from " +
+                  "#{current_resource.version} to " +
+                  Helpers.candidate_version(new_resource)
     converge_by(description) do
-      Chef::Log.info("Upgrading #{new_resource} version from #{original_version} to #{Helpers.candidate_version(new_resource)}")
+      Chef::Log.info("Upgrading #{new_resource} version from " +
+                     "#{original_version} to " +
+                     Helpers.candidate_version(new_resource))
       Helpers.upgrade_package(Helpers.candidate_version(new_resource), new_resource)
     end
   end