Merge pull request voxpupuli#183 from petems/fix_proxy_search

stankevich · stankevich · commit 50e0b5251914 · 2015-03-27T09:07:10.000+03:00
Fix proxy search
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -214,7 +214,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 ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
-          unless      => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest",
+          unless      => "${pip_env} search ${proxy_flag} ${source} | grep -i INSTALLED | grep -i latest",
           user        => $owner,
           cwd         => $cwd,
           environment => $environment,
diff --git a/spec/defines/pip_spec.rb b/spec/defines/pip_spec.rb
@@ -30,5 +30,27 @@
         it { is_expected.to contain_exec("pip_install_rpyc").with_cwd('/') }
       end
     end
+
+    describe "proxy as" do
+      context "defaults to empty" do
+        let (:params) {{ }}
+        it { is_expected.to contain_exec("pip_install_rpyc").without_command(/--proxy/) }
+      end
+      context "does not add proxy to search command if set to latest and proxy is unset" do
+        let (:params) {{ :ensure => 'latest' }}
+        it { is_expected.to contain_exec("pip_install_rpyc").without_command(/--proxy/) }
+        it { is_expected.to contain_exec("pip_install_rpyc").without_unless(/--proxy/) }
+      end
+      context "adds proxy to install command if proxy set" do
+        let (:params) {{ :proxy => "http://my.proxy:3128" }}
+        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 $wheel_support_flag --proxy=http://my.proxy:3128   rpyc || pip --log /tmp/pip.log install --proxy=http://my.proxy:3128   rpyc ;}") }
+      end
+      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') }
+      end
+    end
+
   end
 end
