vagrant-proxyconf 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd98fb4e2a50743cbb753d23a2f3f40c52ccc901
-  data.tar.gz: 23899ffddd8e8465c4e9a3cfab028218d73bca76
+  metadata.gz: 535eb21da37db3d2eebc8a1f785ae2df92159587
+  data.tar.gz: 09ed302efc15a97f3cee9f2eb89e657d055d40ad
 SHA512:
-  metadata.gz: 9d11fc8b7115f87bf3c593dda1c4c76a9ec2ef228d4993cc40cda00aaea1a4a349b7ddeb320cc67a7978e9cf84443e759ac4954f7ac0f89a536fe4a548880ebb
-  data.tar.gz: 0143d9c0dc746e84d7f4d9fbc781bce9ccfd827a159e1e54f65bfc9382e641df7a52a70bed9224a8479863a12b4bdf4a6a876e2cac2d212d55e1d443c5d59037
+  metadata.gz: b050cb3414bf569dc1938b0cdf631beb2285d00c560621cc93a2a8515240ca2c047e44e74103c1524bfba5e138159cb19a269c4a2f4f63fdea4b4869165152e4
+  data.tar.gz: aea65b32cade44afe71f626c81e8efa7aa165bd2a3a534d47b62b23576fdc52e34b8bf33fc106a8a9996758c06bd9a9126a82ac66a3351d17f88f3174ad53db3

data/.travis.yml

@@ -1,14 +1,16 @@
 language: ruby
 
-before_install: gem install bundler --version '>= 1.5.2'
+before_install:
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem install bundler --version '~> 1.5.2'
+  - bundle --version
 bundler_args: --without=development
 
-rvm:
-  - 2.0.0
-env:
-  - VAGRANT_VERSION=v1.4.3
+rvm: 2.0.0
+env: VAGRANT_VERSION=v1.5.4
 matrix:
   include:
+    - env: VAGRANT_VERSION=v1.4.3
     - env: VAGRANT_VERSION=v1.3.5
       rvm: 1.9.3
     - env: VAGRANT_VERSION=v1.2.7

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.3.0 / 2014-05-02
+
+Features:
+
+  - Support setting proxy environment variables on Windows guests ([GH-63][])
+  - Support setting proxy environment variables on CoreOS guests ([GH-62][])
+    * Requires CoreOS 286.0 or later
+
+Bug fixes:
+
+  - Fix https proxy configuration for npm if different to http ([GH-57][])
+  - Use absolute paths to `git`, `npm`, and `pear` commands when configuring them using sudo to avoid PATH problems ([GH-59][], [GH-60][])
+
 # 1.2.0 / 2014-03-02
 
 Deprecations:
@@ -137,3 +150,8 @@ Bug fixes:
 [GH-49]: https://github.com/tmatilai/vagrant-proxyconf/issues/49 "Issue 49"
 [GH-50]: https://github.com/tmatilai/vagrant-proxyconf/issues/50 "Issue 50"
 [GH-51]: https://github.com/tmatilai/vagrant-proxyconf/issues/51 "Issue 51"
+[GH-57]: https://github.com/tmatilai/vagrant-proxyconf/issues/57 "Issue 57"
+[GH-59]: https://github.com/tmatilai/vagrant-proxyconf/issues/59 "Issue 59"
+[GH-60]: https://github.com/tmatilai/vagrant-proxyconf/issues/60 "Issue 60"
+[GH-62]: https://github.com/tmatilai/vagrant-proxyconf/issues/62 "Issue 62"
+[GH-63]: https://github.com/tmatilai/vagrant-proxyconf/issues/63 "Issue 63"

data/README.md

@@ -24,6 +24,7 @@ The plugin can set:
 * proxy configuration for npm
 * proxy configuration for Yum
 * proxy configuration for PEAR
+* simple proxy configuration for Windows
 
 ## Quick start
 

data/lib/vagrant-proxyconf/action/configure_env_proxy.rb

@@ -12,8 +12,21 @@ module VagrantPlugins
         private
 
         def configure_machine
-          super
-          write_config(sudo_config, path: '/etc/sudoers.d/proxy', mode: '0440')
+          if windows_guest?
+            logger.info('Setting the Windows proxy environment variables')
+            configure_machine_windows
+          else
+            logger.info('Writing the proxy configuration to files')
+            super
+            write_config(sudo_config, path: '/etc/sudoers.d/proxy', mode: '0440')
+          end
+        end
+
+        def configure_machine_windows
+          set_windows_proxy('http_proxy', config.http)
+          set_windows_proxy('https_proxy', config.https)
+          set_windows_proxy('ftp_proxy', config.ftp)
+          set_windows_proxy('no_proxy', config.no_proxy)
         end
 
         def sudo_config
@@ -22,6 +35,21 @@ module VagrantPlugins
             Defaults env_keep += "http_proxy https_proxy ftp_proxy no_proxy"
           CONFIG
         end
+
+        def set_windows_proxy(key, value)
+          if value
+            command = "cmd.exe /c SETX #{key} #{value.inspect} /M"
+            logger.info("Setting #{key} to #{value}")
+            @machine.communicate.sudo(command)
+          else
+            logger.info("Not setting #{key}")
+          end
+        end
+
+        def windows_guest?
+          @machine.config.vm.guest.eql?(:windows)
+        end
+
       end
     end
   end

data/lib/vagrant-proxyconf/action/configure_git_proxy.rb

@@ -21,13 +21,18 @@ module VagrantPlugins
         end
 
         def configure_machine
+          command = "#{git_path} config --system "
           if config.http
-            command = "git config --system http.proxy #{config.http}"
+            command << "http.proxy #{config.http}"
           else
-            command = "git config --system --unset-all http.proxy"
+            command << "--unset-all http.proxy"
           end
           @machine.communicate.sudo(command)
         end
+
+        def git_path
+          @machine.guest.capability(cap_name)
+        end
       end
     end
   end

data/lib/vagrant-proxyconf/action/configure_npm_proxy.rb

@@ -23,13 +23,18 @@ module VagrantPlugins
         end
 
         def set_or_delete_proxy(key, value)
+          command = "#{npm_path} config "
           if value
-            command = "npm config set #{key} #{escape(config.http)}"
+            command << "set #{key} #{escape(value)}"
           else
-            command = "npm config delete #{key}"
+            command << "delete #{key}"
           end
           @machine.communicate.sudo(command)
         end
+
+        def npm_path
+          @machine.guest.capability(cap_name)
+        end
       end
     end
   end

data/lib/vagrant-proxyconf/action/configure_pear_proxy.rb

@@ -21,7 +21,11 @@ module VagrantPlugins
           proxy = config.http || ''
 
           @machine.communicate.sudo(
-            "pear config-set http_proxy #{escape(proxy)} system")
+            "#{pear_path} config-set http_proxy #{escape(proxy)} system")
+        end
+
+        def pear_path
+          @machine.guest.capability(cap_name)
         end
       end
     end

data/lib/vagrant-proxyconf/cap/linux/git_proxy_conf.rb

@@ -1,11 +1,14 @@
+require_relative '../util'
+
 module VagrantPlugins
   module ProxyConf
     module Cap
       module Linux
-        # Capability for Git command
+        # Capability for git proxy configuration
         module GitProxyConf
+          # @return [String, false] the path to git or `false` if not found
           def self.git_proxy_conf(machine)
-            machine.communicate.test('which git')
+            Util.which(machine, 'git')
           end
         end
       end

data/lib/vagrant-proxyconf/cap/linux/npm_proxy_conf.rb

@@ -1,12 +1,14 @@
+require_relative '../util'
+
 module VagrantPlugins
   module ProxyConf
     module Cap
       module Linux
         # Capability for npm proxy configuration
         module NpmProxyConf
-          # @return [Boolean] if npm is installed
+          # @return [String, false] the path to npm or `false` if not found
           def self.npm_proxy_conf(machine)
-            machine.communicate.test('which npm')
+            Util.which(machine, 'npm')
           end
         end
       end

data/lib/vagrant-proxyconf/cap/linux/pear_proxy_conf.rb

@@ -1,12 +1,14 @@
+require_relative '../util'
+
 module VagrantPlugins
   module ProxyConf
     module Cap
       module Linux
         # Capability for PEAR proxy configuration
         module PearProxyConf
-          # @return [Boolean] if PEAR is installed
+          # @return [String, false] the path to pear or `false` if not found
           def self.pear_proxy_conf(machine)
-            machine.communicate.test("which pear")
+            Util.which(machine, 'pear')
           end
         end
       end

data/lib/vagrant-proxyconf/cap/linux/svn_proxy_conf.rb

@@ -1,11 +1,14 @@
+require_relative '../util'
+
 module VagrantPlugins
   module ProxyConf
     module Cap
       module Linux
-        # Capability for Svn command
+        # Capability for svn proxy configuration
         module SvnProxyConf
+          # @return [String, false] the path to svn or `false` if not found
           def self.svn_proxy_conf(machine)
-            machine.communicate.test('which svn')
+            Util.which(machine, 'svn')
           end
         end
       end

data/lib/vagrant-proxyconf/cap/util.rb

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      # Utility methods for capabilities
+      module Util
+        # Returns path to the command on the machine, or false if it's not found
+        def self.which(machine, cmd)
+          path = false
+          status = machine.communicate.execute(
+            "which #{cmd}", error_check: false) do |type, data|
+              # search for the command to work around `ssh.pty = true`
+              path = data.chomp if type == :stdout && data =~ /#{cmd}$/
+            end
+          status == 0 && path
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/cap/windows/env_proxy_conf.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module ProxyConf
+    module Cap
+      module Windows
+        # Capability for windows host proxy configuration
+        module EnvProxyConf
+          # @return [String, false]
+          def self.env_proxy_conf(machine)
+            '/proxy.conf'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-proxyconf/capability.rb

@@ -8,15 +8,16 @@ module VagrantPlugins
         Cap::Debian::AptProxyConf
       end
 
-      guest_capability 'coreos', 'env_proxy_conf' do
-        # disabled on CoreOS
-      end
-
       guest_capability 'linux', 'env_proxy_conf' do
         require_relative 'cap/linux/env_proxy_conf'
         Cap::Linux::EnvProxyConf
       end
 
+      guest_capability 'windows', 'env_proxy_conf' do
+        require_relative 'cap/windows/env_proxy_conf'
+        Cap::Windows::EnvProxyConf
+      end
+
       guest_capability 'linux', 'git_proxy_conf' do
         require_relative 'cap/linux/git_proxy_conf'
         Cap::Linux::GitProxyConf

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

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

@@ -1,24 +1,19 @@
 require 'spec_helper'
 require 'vagrant-proxyconf/cap/linux/git_proxy_conf'
+require 'vagrant-proxyconf/cap/util'
 
 describe VagrantPlugins::ProxyConf::Cap::Linux::GitProxyConf do
 
   describe '.git_proxy_conf' do
-    let(:subject) { described_class.git_proxy_conf(double) }
     let(:machine) { double }
-    let(:communicator) { double }
 
-    before do
-      machine.stub(:communicate => communicator)
+    it "returns the path when git is installed" do
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/git')
+      expect(described_class.git_proxy_conf(machine)).to eq '/path/to/git'
     end
 
-    it "returns true when git is installed" do
-      expect(communicator).to receive(:test).with('which git').and_return(true)
-      expect(described_class.git_proxy_conf(machine)).to be_true
-    end
-
-    it "returns false when pear is not installed" do
-      expect(communicator).to receive(:test).with('which git').and_return(false)
+    it "returns false when git is not installed" do
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
       expect(described_class.git_proxy_conf(machine)).to be_false
     end
   end

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

@@ -1,23 +1,19 @@
 require 'spec_helper'
 require 'vagrant-proxyconf/cap/linux/npm_proxy_conf'
+require 'vagrant-proxyconf/cap/util'
 
 describe VagrantPlugins::ProxyConf::Cap::Linux::NpmProxyConf do
 
   describe '.npm_proxy_conf' do
     let(:machine) { double }
-    let(:communicator) { double }
 
-    before do
-      machine.stub(:communicate => communicator)
-    end
-
-    it "returns true when npm is installed" do
-      expect(communicator).to receive(:test).with('which npm').and_return(true)
-      expect(described_class.npm_proxy_conf(machine)).to be_true
+    it "returns the path when npm is installed" do
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/npm')
+      expect(described_class.npm_proxy_conf(machine)).to eq '/path/to/npm'
     end
 
     it "returns false when npm is not installed" do
-      expect(communicator).to receive(:test).with('which npm').and_return(false)
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
       expect(described_class.npm_proxy_conf(machine)).to be_false
     end
   end

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

@@ -1,23 +1,19 @@
 require 'spec_helper'
 require 'vagrant-proxyconf/cap/linux/pear_proxy_conf'
+require 'vagrant-proxyconf/cap/util'
 
 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
+    it "returns the path when pear is installed" do
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/pear')
+      expect(described_class.pear_proxy_conf(machine)).to eq '/path/to/pear'
     end
 
     it "returns false when pear is not installed" do
-      expect(communicator).to receive(:test).with("which pear").and_return(false)
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
       expect(described_class.pear_proxy_conf(machine)).to be_false
     end
   end

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

@@ -1,24 +1,19 @@
 require 'spec_helper'
 require 'vagrant-proxyconf/cap/linux/svn_proxy_conf'
+require 'vagrant-proxyconf/cap/util'
 
 describe VagrantPlugins::ProxyConf::Cap::Linux::SvnProxyConf do
 
   describe '.svn_proxy_conf' do
-    let(:subject) { described_class.svn_proxy_conf(double) }
     let(:machine) { double }
-    let(:communicator) { double }
-
-    before do
-      machine.stub(:communicate => communicator)
-    end
 
     it "returns true when svn is installed" do
-      expect(communicator).to receive(:test).with('which svn').and_return(true)
-      expect(described_class.svn_proxy_conf(machine)).to be_true
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: '/path/to/svn')
+      expect(described_class.svn_proxy_conf(machine)).to eq '/path/to/svn'
     end
 
     it "returns false when pear is not installed" do
-      expect(communicator).to receive(:test).with('which svn').and_return(false)
+      VagrantPlugins::ProxyConf::Cap::Util.stub(which: false)
       expect(described_class.svn_proxy_conf(machine)).to be_false
     end
   end

data/spec/unit/vagrant-proxyconf/cap/util_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/util'
+
+describe VagrantPlugins::ProxyConf::Cap::Util do
+
+  describe '.which' do
+    let(:machine) { double }
+    let(:communicator) { double }
+
+    before do
+      machine.stub(:communicate => communicator)
+    end
+
+    it "returns the path when the command is installed" do
+      expect(communicator).to receive(:execute).
+        with('which foo', error_check: false).
+        and_yield(:stdout, "/path/to/foo\n").
+        and_yield(:stdout, "PROMPT\n").
+        and_yield(:stderr, "not foo\n").
+        and_return(0)
+      expect(described_class.which(machine, 'foo')).to eq '/path/to/foo'
+    end
+
+    it "returns false when the command is not installed" do
+      expect(communicator).to receive(:execute).
+        with('which bar', error_check: false).
+        and_return(1)
+      expect(described_class.which(machine, 'bar')).to be_false
+    end
+  end
+
+end

data/spec/unit/vagrant-proxyconf/cap/windows/env_proxy_conf_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'vagrant-proxyconf/cap/windows/env_proxy_conf'
+
+describe VagrantPlugins::ProxyConf::Cap::Windows::EnvProxyConf do
+
+  describe '.env_proxy_conf' do
+    let(:subject) { described_class.env_proxy_conf(double) }
+    it { should eq '/proxy.conf' }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
@@ -17,9 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -49,6 +49,8 @@ files:
 - lib/vagrant-proxyconf/cap/linux/pear_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/linux/svn_proxy_conf.rb
 - lib/vagrant-proxyconf/cap/redhat/yum_proxy_conf.rb
+- lib/vagrant-proxyconf/cap/util.rb
+- lib/vagrant-proxyconf/cap/windows/env_proxy_conf.rb
 - lib/vagrant-proxyconf/capability.rb
 - lib/vagrant-proxyconf/config.rb
 - lib/vagrant-proxyconf/config/apt_proxy.rb
@@ -100,6 +102,8 @@ files:
 - spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/svn_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/util_spec.rb
+- spec/unit/vagrant-proxyconf/cap/windows/env_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/git_proxy_spec.rb
@@ -124,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that configures the virtual machine to use proxy servers
@@ -172,6 +176,8 @@ test_files:
 - spec/unit/vagrant-proxyconf/cap/linux/pear_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/linux/svn_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/cap/redhat/yum_proxy_conf_spec.rb
+- spec/unit/vagrant-proxyconf/cap/util_spec.rb
+- spec/unit/vagrant-proxyconf/cap/windows/env_proxy_conf_spec.rb
 - spec/unit/vagrant-proxyconf/config/apt_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/env_proxy_spec.rb
 - spec/unit/vagrant-proxyconf/config/git_proxy_spec.rb