Add user/group to pip_requirements.

coderanger · coderanger · commit 919386729029 · 2015-12-30T16:02:51.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Poise-Python Changelog
 
+## v1.2.0
+
+* Add support for passing `user` and `group` to `pip_requirements`.
+* Allow passing a virtualenv resource object to the `virtualenv` property.
+
 ## v1.1.2
 
 * Fix `PythonPackage#response_file_variables` for the Chef 12.6 initializer.
diff --git a/lib/poise_python/resources/pip_requirements.rb b/lib/poise_python/resources/pip_requirements.rb
@@ -44,6 +44,14 @@ class Resource < Chef::Resource
         #   requirements file.
         #   @return [String]
         attribute(:path, kind_of: String, name_attribute: true)
+        # @!attribute group
+        #   System group to install the package.
+        #   @return [String, Integer, nil]
+        attribute(:group, kind_of: [String, Integer, NilClass])
+        # @!attribute user
+        #   System user to install the package.
+        #   @return [String, Integer, nil]
+        attribute(:user, kind_of: [String, Integer, NilClass])
       end
 
       # The default provider for `pip_requirements`.
@@ -80,7 +88,7 @@ def install_requirements(upgrade: false)
           cmd << '--upgrade' if upgrade
           cmd << '--requirement'
           cmd << requirements_path
-          output = python_shell_out!(cmd).stdout
+          output = python_shell_out!(cmd, user: new_resource.user, group: new_resource.group).stdout
           if output.include?('Successfully installed')
             new_resource.updated_by_last_action(true)
           end
diff --git a/lib/poise_python/version.rb b/lib/poise_python/version.rb
@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.1.3.pre'
+  VERSION = '1.2.0.pre'
 end
diff --git a/test/spec/resources/pip_requirements_spec.rb b/test/spec/resources/pip_requirements_spec.rb
@@ -17,19 +17,20 @@
 require 'spec_helper'
 
 describe PoisePython::Resources::PipRequirements do
-  let(:pip_cmd) { }
+  let(:pip_cmd) { %w{-m pip.__main__ install --requirement /test/requirements.txt} }
   let(:pip_output) { '' }
+  let(:pip_user) { nil }
+  let(:pip_group) { nil }
   step_into(:pip_requirements)
   before do
     allow(File).to receive(:directory?).and_return(false)
     allow(File).to receive(:directory?).with('/test').and_return(true)
   end
   before do
-    expect_any_instance_of(PoisePython::Resources::PipRequirements::Provider).to receive(:python_shell_out!).with(pip_cmd).and_return(double(stdout: pip_output))
+    expect_any_instance_of(PoisePython::Resources::PipRequirements::Provider).to receive(:python_shell_out!).with(pip_cmd, {user: pip_user, group: pip_group}).and_return(double(stdout: pip_output))
   end
 
   context 'with a directory' do
-    let(:pip_cmd) { %w{-m pip.__main__ install --requirement /test/requirements.txt} }
     recipe do
       pip_requirements '/test'
     end
@@ -46,6 +47,28 @@
     it { is_expected.to install_pip_requirements('/test/reqs.txt') }
   end # /context with a file
 
+  context 'with a user' do
+    let(:pip_user) { 'testuser' }
+    recipe do
+      pip_requirements '/test' do
+        user 'testuser'
+      end
+    end
+
+    it { is_expected.to install_pip_requirements('/test') }
+  end # /context with a user
+
+  context 'with a group' do
+    let(:pip_group) { 'testgroup' }
+    recipe do
+      pip_requirements '/test' do
+        group 'testgroup'
+      end
+    end
+
+    it { is_expected.to install_pip_requirements('/test') }
+  end # /context with a group
+
   context 'action :upgrade' do
     let(:pip_cmd) { %w{-m pip.__main__ install --upgrade --requirement /test/requirements.txt} }
     recipe do
@@ -58,7 +81,6 @@
   end # /context action :upgrade
 
   context 'with output' do
-    let(:pip_cmd) { %w{-m pip.__main__ install --requirement /test/requirements.txt} }
     let(:pip_output) { 'Successfully installed' }
     recipe do
       pip_requirements '/test'
