vagrant-proxyconf 1.0.1 → 1.1.0

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/locales/en.yml

@@ -24,6 +24,14 @@ en:
       configuring: |-
         Configuring proxy environment variables...
 
+    pear_proxy:
+      not_enabled: |-
+        pear_proxy not enabled or configured
+      not_supported: |-
+        Skipping PEAR proxy config as `pear` is not found
+      configuring: |-
+        Configuring proxy for PEAR...
+
     yum_proxy:
       not_enabled: |-
         yum_proxy not enabled or configured
@@ -34,4 +42,4 @@ en:
 
     errors:
       vagrant_version: |-
-        vagrant-proxyconf plugin requires Vagrant %{min_version} or newer
+        vagrant-proxyconf plugin requires Vagrant version %{requirement}

data/spec/spec_helper.rb

@@ -1,3 +1,14 @@
+require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  coverage_dir('tmp/coverage')
+  add_filter '/spec/'
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -5,12 +16,3 @@ RSpec.configure do |config|
   config.color = true
   config.tty = true
 end
-
-require 'simplecov'
-SimpleCov.start do
-  coverage_dir('tmp/coverage')
-  add_filter '/spec/'
-end
-
-require 'tempfile'
-require 'vagrant-proxyconf'

data/spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb

@@ -9,7 +9,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureChefProxy do
     let(:config) { OpenStruct.new }
 
     def configure_chef
-      described_class.new(nil, nil).send(:configure_chef, chef, config)
+      action = described_class.new(nil, nil)
+      action.stub(:config => config)
+      action.send(:configure_chef, chef)
     end
 
     context "with no configurations" do

data/spec/unit/vagrant-proxyconf/action/configure_pear_proxy_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/configure_pear_proxy'
+
+describe VagrantPlugins::ProxyConf::Action::ConfigurePearProxy do
+
+  describe '#config_name' do
+    subject { described_class.new(double, double).config_name }
+    it      { should eq 'pear_proxy' }
+  end
+end

data/spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb

@@ -9,7 +9,11 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureYumProxy do
   end
 
   describe '#proxy_params' do
-    subject { described_class.new(nil, nil).send(:proxy_params, config) }
+    subject do
+      action = described_class.new(nil, nil)
+      action.stub(:config => config)
+      action.send(:proxy_params)
+    end
     let(:config) { OpenStruct.new(http: http) }
 
     context "with `false`" do

data/spec/unit/vagrant-proxyconf/action/is_enabled_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/action/is_enabled'
+
+describe VagrantPlugins::ProxyConf::Action::IsEnabled do
+  let(:app) { lambda { |env| } }
+  let(:env) { { :machine => machine } }
+  let(:machine) do
+    double('machine').tap { |machine| machine.stub(:config).and_return(config) }
+  end
+  let(:config) do
+    double('config').tap { |config| config.stub(:proxy => proxy_config) }
+  end
+  let(:proxy_config) do
+    double('proxy_config').tap { |config| config.stub(:enabled => enabled) }
+  end
+
+  [false, ''].each do |value|
+    context "with `config.proxy.enabled=#{value.inspect}`" do
+      let(:enabled) { value }
+
+      it "results to falsy" do
+        described_class.new(app, {}).call(env)
+        expect(env[:result]).to be_false
+      end
+    end
+  end
+
+  [nil, true, :auto, 'yes please'].each do |value|
+    context "with `config.proxy.enabled=#{value.inspect}`" do
+      let(:enabled) { value }
+
+      it "results to truthy" do
+        described_class.new(app, {}).call(env)
+        expect(env[:result]).to be_true
+      end
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/linux/pear_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Linux::PearProxyConf do
+
+  describe '.pear_proxy_conf' do
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      machine.stub(:communicate => communicator)
+    end
+
+    it "returns true when pear is installed" do
+      expect(communicator).to receive(:test).with("which pear").and_return(true)
+      expect(described_class.pear_proxy_conf(machine)).to be_true
+    end
+
+    it "returns false when pear is not installed" do
+      expect(communicator).to receive(:test).with("which pear").and_return(false)
+      expect(described_class.pear_proxy_conf(machine)).to be_false
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb

@@ -8,10 +8,6 @@ def config_with(options)
   end
 end
 
-def conf_lines(env_var, val)
-  [env_var.upcase, env_var.downcase].map { |var| "export #{var}=#{val}\n" }
-end
-
 RSpec::Matchers.define :match_lines do |expected|
   match do |actual|
     expect(actual.lines.to_a).to match_array(expected)
@@ -38,15 +34,23 @@ describe VagrantPlugins::ProxyConf::Config::EnvProxy do
     let(:proxy)    { 'http://proxy.example.com:8888' }
     subject        { config_with({ http: proxy }) }
     its(:enabled?) { should be_true }
-    its(:to_s)     { should match_lines conf_lines('http_proxy', proxy) }
+    its(:to_s)     { should match_lines [
+      %Q{export HTTP_PROXY=#{proxy}\n},
+      %Q{export http_proxy=#{proxy}\n},
+    ] }
   end
 
   context "with http and no_proxy config" do
     let(:proxy)    { 'http://proxy.example.com:8888' }
-    let(:no_proxy) { 'localhost,127.0.0.1' }
+    let(:no_proxy) { 'localhost, 127.0.0.1' }
     subject        { config_with({ http: proxy, no_proxy: no_proxy }) }
     its(:enabled?) { should be_true }
-    its(:to_s)     { should match_lines conf_lines('http_proxy', proxy) + conf_lines('no_proxy', no_proxy) }
+    its(:to_s)     { should match_lines [
+      %Q{export HTTP_PROXY=#{proxy}\n},
+      %Q{export http_proxy=#{proxy}\n},
+      %Q{export NO_PROXY="#{no_proxy}"\n},
+      %Q{export no_proxy="#{no_proxy}"\n},
+    ] }
   end
 
   context "with VAGRANT_ENV_HTTP_PROXY env var" do
@@ -54,6 +58,9 @@ describe VagrantPlugins::ProxyConf::Config::EnvProxy do
     before(:each)  { ENV['VAGRANT_ENV_HTTP_PROXY'] = proxy }
     subject        { config_with({ http: 'http://default:3128' }) }
     its(:enabled?) { should be_true }
-    its(:to_s)     { should match_lines conf_lines('HTTP_PROXY', proxy) }
+    its(:to_s)     { should match_lines [
+      %Q{export HTTP_PROXY=#{proxy}\n},
+      %Q{export http_proxy=#{proxy}\n},
+    ] }
   end
 end

data/spec/unit/vagrant-proxyconf/plugin_spec.rb

@@ -3,13 +3,36 @@ require 'vagrant-proxyconf/plugin'
 
 describe VagrantPlugins::ProxyConf::Plugin do
 
+  describe '.check_vagrant_version' do
+    before :each do
+      stub_const('Vagrant::VERSION', '1.2.3')
+    end
+
+    it "accepts single String argument" do
+      expect(described_class.check_vagrant_version('~> 1.1')).to be_true
+      expect(described_class.check_vagrant_version('1.2')).to be_false
+    end
+
+    it "accepts an Array argument" do
+      expect(described_class.check_vagrant_version(['>= 1.1', '< 1.3.0.beta'])).to be_true
+      expect(described_class.check_vagrant_version(['>= 1.3'])).to be_false
+    end
+
+    it "accepts multiple arguments" do
+      expect(described_class.check_vagrant_version('>= 1.0', '<= 1.3')).to be_true
+      expect(described_class.check_vagrant_version('~> 1.2', '>= 1.2.5')).to be_false
+    end
+  end
+
   describe '.check_vagrant_version!' do
     subject { described_class.check_vagrant_version! }
-    let(:min_vagrant_verision) { '1.2.3' }
-    let(:err_msg) { /requires Vagrant #{min_vagrant_verision}/ }
+    let(:requirement) { '>= 1.2.3' }
+    let(:err_msg) { /requires Vagrant version #{Regexp.escape(requirement.inspect)}/ }
 
     before :each do
-      stub_const('VagrantPlugins::ProxyConf::Plugin::MIN_VAGRANT_VERSION', min_vagrant_verision)
+      stub_const(
+        'VagrantPlugins::ProxyConf::Plugin::VAGRANT_VERSION_REQUIREMENT',
+        requirement)
       stub_const('Vagrant::VERSION', vagrant_version)
       $stderr.stub(:puts)
     end
@@ -26,7 +49,7 @@ describe VagrantPlugins::ProxyConf::Plugin do
     end
 
     context "on exact required Vagrant version" do
-      let(:vagrant_version) { min_vagrant_verision }
+      let(:vagrant_version) { '1.2.3' }
       it "does not raise" do
         expect { subject }.not_to raise_error
       end
@@ -44,19 +67,35 @@ describe VagrantPlugins::ProxyConf::Plugin do
     subject { described_class.load_optional_dependency(plugin_name) }
     let(:plugin_name) { 'vagrant-foo' }
 
-    it "loads the specified plugin" do
-      expect(Vagrant).to receive(:require_plugin).with(plugin_name)
-      subject
-    end
+    # Vagrant plugin loading API changed in v1.5.0
+    if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('1.5.0.dev')
+      it "loads the specified plugin" do
+        expect(Vagrant).to receive(:require_plugin).with(plugin_name)
+        subject
+      end
 
-    it "ignores PluginLoadError" do
-      expect(Vagrant).to receive(:require_plugin).and_raise(Vagrant::Errors::PluginLoadError, plugin: plugin_name)
-      expect { subject }.not_to raise_error
-    end
+      it "ignores PluginLoadError" do
+        expect(Vagrant).to receive(:require_plugin).
+          and_raise(Vagrant::Errors::PluginLoadError, plugin: plugin_name)
+        expect { subject }.not_to raise_error
+      end
 
-    it "won't ignore other error" do
-      expect(Vagrant).to receive(:require_plugin).and_raise(Vagrant::Errors::PluginLoadFailed, plugin: plugin_name)
-      expect { subject }.to raise_error(Vagrant::Errors::PluginLoadFailed)
+      it "won't ignore other error" do
+        expect(Vagrant).to receive(:require_plugin).
+          and_raise(Vagrant::Errors::PluginLoadFailed, plugin: plugin_name)
+        expect { subject }.to raise_error(Vagrant::Errors::PluginLoadFailed)
+      end
+    else
+      it "loads the specified plugin" do
+        expect(described_class).to receive(:require).with(plugin_name)
+        subject
+      end
+
+      it "ignores errors" do
+        expect(described_class).to receive(:require).
+          and_raise(LoadError, path: plugin_name)
+        expect { subject }.not_to raise_error
+      end
     end
   end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -36,17 +35,23 @@ files:
 - lib/vagrant-proxyconf/action/configure_apt_proxy.rb
 - lib/vagrant-proxyconf/action/configure_chef_proxy.rb
 - lib/vagrant-proxyconf/action/configure_env_proxy.rb
+- lib/vagrant-proxyconf/action/configure_pear_proxy.rb
 - lib/vagrant-proxyconf/action/configure_yum_proxy.rb
+- lib/vagrant-proxyconf/action/is_enabled.rb
 - lib/vagrant-proxyconf/action/only_once.rb
 - lib/vagrant-proxyconf/cap/debian/apt_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/linux/env_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/linux/pear_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb
+- lib/vagrant-proxyconf/capability.rb
+- lib/vagrant-proxyconf/config.rb
 - lib/vagrant-proxyconf/config/apt_proxy.rb
 - lib/vagrant-proxyconf/config/env_proxy.rb
 - lib/vagrant-proxyconf/config/key.rb
 - lib/vagrant-proxyconf/config/key_mixin.rb
 - lib/vagrant-proxyconf/config/proxy.rb
 - lib/vagrant-proxyconf/config/yum_proxy.rb
+- lib/vagrant-proxyconf/hook.rb
 - lib/vagrant-proxyconf/logger.rb
 - lib/vagrant-proxyconf/plugin.rb
 - lib/vagrant-proxyconf/resource.rb
@@ -72,11 +77,14 @@ files:
 - spec/unit/vagrant-proxyconf/action/configure_apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_env_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_pear_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/is_enabled_spec.rb
 - spec/unit/vagrant-proxyconf/action/only_once_spec.rb
 - spec/unit/vagrant-proxyconf/action_spec.rb
 - spec/unit/vagrant-proxyconf/cap/debian/apt_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/env_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb
@@ -93,33 +101,26 @@ files:
 homepage: http://tmatilai.github.io/vagrant-proxyconf/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1237288161997812265
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1237288161997812265
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers
 test_files:
 - spec/spec_helper.rb
@@ -140,11 +141,14 @@ test_files:
 - spec/unit/vagrant-proxyconf/action/configure_apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_chef_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_env_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/configure_pear_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/action/configure_yum_proxy_spec.rb
+- spec/unit/vagrant-proxyconf/action/is_enabled_spec.rb
 - spec/unit/vagrant-proxyconf/action/only_once_spec.rb
 - spec/unit/vagrant-proxyconf/action_spec.rb
 - spec/unit/vagrant-proxyconf/cap/debian/apt_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/env_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb