vagrant-proxyconf 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b50f214b87a8c1d79057bce5f6d1b23b0ae19f
-  data.tar.gz: 4e0448369bd0b1d0661523502f262e401680db90
+  metadata.gz: 3b424b5c07112e6ac773ce1d53b1ffced7dd2360
+  data.tar.gz: 45bed17d7789495f69f6b7da03b1e2c50590f002
 SHA512:
-  metadata.gz: 4b411ae888f87e672a32e08a3d7e6e0cbfb631dc3ae798daae9f738bbe6e096b4e6ad70c0c7164902b64e23daa8d40c38521ffc4f8d42392bad79564d307fc9f
-  data.tar.gz: af7095bc3dd5765871d17c5066a13bfb49406e0012121569abf2c04f63e80923831b45b12c57dd4643aa472576c98ad9904c79cdb960bf3be6583d98e79ff684
+  metadata.gz: 231af2e8b37bbb116e7b5669c63561c990703814d08ed815e2e248a25c102eaf4ffcae6046b84e1a619250c34f640ae50930bed86b65ba205d0ef007f0018f66
+  data.tar.gz: 3f7535f2203faa712e9fd0ba8a5b6ad2486bb526d282f68d00cae5c3f1f2be6777b8456cc909c3a8538c5dd705387eda76f8a530d9096130ef256fc6d5b1b314

data/.travis.yml

@@ -1,15 +1,19 @@
 language: ruby
+cache: bundler
+sudo: false
 
 before_install:
   - rvm @global do gem uninstall bundler --all --executables
+  - 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.6.5
+env: VAGRANT_VERSION=v1.7.2
 matrix:
   include:
+    - env: VAGRANT_VERSION=v1.6.5
     - env: VAGRANT_VERSION=v1.5.4
     - env: VAGRANT_VERSION=v1.4.3
     - env: VAGRANT_VERSION=v1.3.5

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 1.5.0 / 2015-01-15
+
+Features:
+
+  - Ignore specific applications by passing a hash to `config.proxy.enabled` ([GH-93][])
+  - Support the `chef_zero` provisioner in Vagrant 1.7+ ([GH-105][])
+
+Improvements:
+
+  - Add -f option for mv and rm commands to overrides any -i or -n options in shell aliases ([GH-90][])
+  - Use system-wide configuration for NPM ([GH-91][])
+  - Avoid restarting docker when configuration doesn't change ([GH-92][])
+  - Fix Chef provisioner detection compatibility with Vagrant 1.7+ ([GH-103][])
+
+Bug fixes:
+
+  - Don't error if removing non-existing git proxy configuration ([GH-94][])
+
 # 1.4.0 / 2014-09-28
 
 Features:
@@ -181,3 +199,10 @@ Bug fixes:
 [GH-63]: https://github.com/tmatilai/vagrant-proxyconf/issues/63 "Issue 63"
 [GH-67]: https://github.com/tmatilai/vagrant-proxyconf/issues/67 "Issue 67"
 [GH-69]: https://github.com/tmatilai/vagrant-proxyconf/issues/69 "Issue 69"
+[GH-90]: https://github.com/tmatilai/vagrant-proxyconf/issues/90 "Issue 90"
+[GH-91]: https://github.com/tmatilai/vagrant-proxyconf/issues/91 "Issue 91"
+[GH-92]: https://github.com/tmatilai/vagrant-proxyconf/issues/92 "Issue 92"
+[GH-93]: https://github.com/tmatilai/vagrant-proxyconf/issues/93 "Issue 93"
+[GH-94]: https://github.com/tmatilai/vagrant-proxyconf/issues/94 "Issue 94"
+[GH-103]: https://github.com/tmatilai/vagrant-proxyconf/issues/103 "Issue 103"
+[GH-105]: https://github.com/tmatilai/vagrant-proxyconf/issues/105 "Issue 105"

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'vagrant',
   git: 'https://github.com/mitchellh/vagrant.git',
-  ref: ENV.fetch('VAGRANT_VERSION', 'v1.6.5')
+  ref: ENV.fetch('VAGRANT_VERSION', 'v1.7.2')
 
 gem 'cane', '~> 2.6'
 gem 'coveralls', require: false

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2014 Teemu Matilainen <teemu.matilainen@iki.fi>
+Copyright (c) 2013-2015 Teemu Matilainen <teemu.matilainen@iki.fi>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -21,10 +21,12 @@ The plugin can set:
 * generic `http_proxy` etc. environment variables that many programs support
 * default proxy configuration for all Chef provisioners
 * proxy configuration for Apt
-* proxy configuration for docker
+* proxy configuration for Docker
+* proxy configuration for Git
 * proxy configuration for npm
-* proxy configuration for Yum
 * proxy configuration for PEAR
+* proxy configuration for Subversion
+* proxy configuration for Yum
 * simple proxy configuration for Windows
 
 ## Quick start
@@ -123,7 +125,21 @@ VAGRANT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 
 ### Disabling the plugin
 
-The plugin can be totally skipped by setting `config.proxy.enabled` to `false` or empty string (`""`). This can be useful to for example disable it for some provider.
+The plugin can be totally skipped by setting `config.proxy.enabled` to `false` or empty string (`""`).
+This can be useful to for example disable it for some provider.
+Specific applications can be skipped by setting `config.proxy.enabled` to
+a hash( like `{ svn: false }`).
+This disabling keeps proxy configurations for applications on the guest.
+The configurations must be cleared before disabling if needed.
+
+```ruby
+config.proxy.enabled         # => all applications enabled(default)
+config.proxy.enabled = true  # => all applications enabled
+config.proxy.enabled = { svn: false, docker: false }
+                             # => specific applications disabled
+config.proxy.enabled = ""    # => all applications disabled
+config.proxy.enabled = false # => all applications disabled
+```
 
 #### Example Vagrantfile
 
@@ -138,40 +154,36 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Apt
+### Configuration for applications
+Configures applications to use proxy settings. The configurations will be written to
+configuration files for each application.
+
+#### Configurable applications
+Following applications can be configured.
+Configurations are based on default configuration(`config.proxy.*`) and
+can be overridden except SVN.
+SVN configuration is not set if no SVN specific configuration.
 
-Configures Apt to use the specified proxy settings. The configuration will be written to _/etc/apt/apt.conf.d/01proxy_ on the guest.
+|  Application           | Base conf.     | Specific conf.      | Env. var.     |
+| -----------------------|----------------|---------------------|---------------|
+| configure_apt_proxy    | config.proxy.* | config.apt_proxy.*  | VAGRANT_APT_* |
+| configure_git_proxy    | N/A            | config.git_proxy.*  | VAGRANT_GIT_* |
+| configure_svn_proxy    | N/A            | config.svn_proxy.*  | VAGRANT_SVN_* |
+| configure_yum_proxy    | config.proxy.* | config.yum_proxy.*  | VAGRANT_YUM_* |
 
 #### Example Vagrantfile
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.apt_proxy.http  = "http://192.168.33.1:3142"
+  config.proxy.http     = "http://192.168.0.2:3128/"
+  config.proxy.https    = "http://192.168.0.2:3128/"
+  config.proxy.no_proxy = "localhost,127.0.0.1,.example.com"
+  config.apt_proxy.http = "http://192.168.33.1:3142"
   config.apt_proxy.https = "DIRECT"
   # ... other stuff
 end
 ```
-
-#### Configuration keys
-
-* `config.apt_proxy.http`  - The proxy for HTTP URIs
-* `config.apt_proxy.https` - The proxy for HTTPS URIs
-* `config.apt_proxy.ftp`   - The proxy for FTP URIs
-
-#### Possible values
-
-* If all keys are unset or `nil`, no configuration is written or modified.
-* A proxy can be specified in the form of _http://[user:pass@]host:port_.
-* Empty string (`""`) or `false` in any key also force the configuration file to be written, but without configuration for that scheme. Can be used to clear the old configuration and/or override a global setting.
-* `"DIRECT"` can be used to specify that no proxy should be used. This is mostly useful for disabling proxy for HTTPS URIs when HTTP proxy is set (as Apt defaults to the latter).
-* Please refer to [apt.conf(5)](http://manpages.debian.net/man/5/apt.conf) manual for more information.
-
 #### Environment variables
-
-* `VAGRANT_APT_HTTP_PROXY`
-* `VAGRANT_APT_HTTPS_PROXY`
-* `VAGRANT_APT_FTP_PROXY`
-
 These also override the Vagrantfile configuration. To disable or remove the proxy use "DIRECT" or an empty value.
 
 For example to spin up a VM, run:
@@ -180,44 +192,6 @@ For example to spin up a VM, run:
 VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 ```
 
-#### Running apt-cacher-ng on a Vagrant box
-
-[apt-cacher-box](https://github.com/tmatilai/apt-cacher-box) gives an example for setting up apt-cacher proxy server in a Vagrant VM.
-
-### Yum
-
-Configures Yum to use the specified proxy settings. The configuration will be inserted to _/etc/yum.conf_ on the guest.
-
-#### Example Vagrantfile
-
-```ruby
-Vagrant.configure("2") do |config|
-  config.yum_proxy.http  = "http://192.168.33.1:3142"
-  # ... other stuff
-end
-```
-
-#### Configuration keys
-
-* `config.yum_proxy.http` - The proxy for yum
-
-#### Possible values
-
-* If the keys is unset or `nil`, the current configuration is not modified.
-* A proxy can be specified in the form of _http://[user:pass@]host:port_.
-* Empty string (`""`) or `false` disables the proxy from the configuration.
-
-#### Environment variables
-
-* `VAGRANT_YUM_HTTP_PROXY`
-
-This also overrides the Vagrantfile configuration. To disable or remove the proxy use an empty value.
-
-For example to spin up a VM, run:
-
-```sh
-VAGRANT_YUM_HTTP_PROXY="http://proxy.example.com:8123" vagrant up
-```
 
 ## Related plugins and projects
 

data/Rakefile

@@ -28,6 +28,7 @@ Tailor::RakeTask.new do |task|
     style.max_line_length 120, level: :warn
     # allow vertical alignment of `let(:foo) { block }` blocks
     style.spaces_before_lbrace 1, level: :off
+    style.indentation_spaces 2, level: :off
   end
 end
 

data/lib/vagrant-proxyconf/action.rb

@@ -33,6 +33,7 @@ module VagrantPlugins
           b.use Builtin::Call, IsEnabled do |env, b2|
             next if !env[:result]
 
+            b2.use ConfigureDockerProxy
             b2.use ConfigureGitProxy
             b2.use ConfigureNpmProxy
             b2.use ConfigurePearProxy

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

@@ -14,7 +14,7 @@ module VagrantPlugins
         def call(env)
           @machine = env[:machine]
 
-          if !config.enabled?
+          if disabled? || !config.enabled?
             logger.info I18n.t("vagrant_proxyconf.#{config_name}.not_enabled")
           elsif !supported?
             logger.info I18n.t("vagrant_proxyconf.#{config_name}.not_supported")
@@ -79,12 +79,12 @@ module VagrantPlugins
 
           logger.debug "Configuration (#{path}):\n#{config}"
           @machine.communicate.tap do |comm|
-            comm.sudo("rm #{tmp}", error_check: false)
+            comm.sudo("rm -f #{tmp}", error_check: false)
             comm.upload(local_tmp.path, tmp)
             comm.sudo("chmod #{opts[:mode] || '0644'} #{tmp}")
             comm.sudo("chown #{opts[:owner] || 'root:root'} #{tmp}")
             comm.sudo("mkdir -p #{File.dirname(path)}")
-            comm.sudo("mv #{tmp} #{path}")
+            comm.sudo("mv -f #{tmp} #{path}")
           end
         end
 
@@ -106,6 +106,16 @@ module VagrantPlugins
           "#{config_name}_conf".to_sym
         end
 
+        def disabled?
+          enabled = @machine.config.proxy.enabled
+          return true if enabled == false || enabled == ''
+
+          app_name = config_name.gsub(/_proxy/, '').to_sym
+          return enabled[app_name] == false if enabled.respond_to?(:key)
+
+          false
+        end
+
         def supported?
           @machine.guest.capability?(cap_name) &&
             @machine.guest.capability(cap_name)

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

@@ -6,6 +6,10 @@ module VagrantPlugins
     class Action
       # Action for configuring Chef provisioners
       class ConfigureChefProxy
+
+        # Array of Chef provisioner types which include proxy configuration
+        CHEF_PROVISIONER_TYPES = [:chef_client, :chef_solo, :chef_zero]
+
         def initialize(app, env)
           @app = app
         end
@@ -44,7 +48,13 @@ module VagrantPlugins
         # @return [Array] all Chef provisioners
         def chef_provisioners
           @machine.config.vm.provisioners.select do |prov|
-            [:chef_solo, :chef_client].include?(prov.name)
+            # Vagrant 1.7+ uses #type, earlier versions #name
+            if prov.respond_to?(:type)
+              type = prov.type
+            else
+              type = prov.name
+            end
+            CHEF_PROVISIONER_TYPES.include?(type)
           end
         end
 

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

@@ -40,19 +40,26 @@ module VagrantPlugins
             sed_script = docker_sed_script
             local_tmp = tempfile(docker_config)
 
-            comm.sudo("rm #{tmp}", error_check: false)
+            comm.sudo("rm -f #{tmp}", error_check: false)
             comm.upload(local_tmp.path, tmp)
             comm.sudo("touch #{path}")
             comm.sudo("sed -e '#{sed_script}' #{path} > #{path}.new")
             comm.sudo("cat #{tmp} >> #{path}.new")
-            comm.sudo("chmod 0644 #{path}.new")
-            comm.sudo("chown root:root #{path}.new")
-            comm.sudo("mv #{path}.new #{path}")
-            comm.sudo("rm #{tmp}")
-            comm.sudo(service_restart_command)
+            update_config(comm, path)
+            comm.sudo("rm -f #{tmp} #{path}.new")
           end
         end
 
+        def update_config(comm, path)
+          return if comm.test("diff #{path}.new #{path}")
+
+          # update config and restart docker when config changed
+          comm.sudo("chmod 0644 #{path}.new")
+          comm.sudo("chown root:root #{path}.new")
+          comm.sudo("mv -f #{path}.new #{path}")
+          comm.sudo(service_restart_command)
+        end
+
         def detect_export
           @machine.communicate.tap do |comm|
             comm.test('which systemctl') ? @export = '' : @export = 'export '

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

@@ -59,15 +59,15 @@ module VagrantPlugins
           local_tmp = tempfile(environment_config)
 
           @machine.communicate.tap do |comm|
-            comm.sudo("rm #{tmp}", error_check: false)
+            comm.sudo("rm -f #{tmp}", error_check: false)
             comm.upload(local_tmp.path, tmp)
             comm.sudo("touch #{path}")
             comm.sudo("sed -e '#{sed_script}' #{path} > #{path}.new")
             comm.sudo("cat #{tmp} >> #{path}.new")
             comm.sudo("chmod 0644 #{path}.new")
             comm.sudo("chown root:root #{path}.new")
-            comm.sudo("mv #{path}.new #{path}")
-            comm.sudo("rm #{tmp}")
+            comm.sudo("mv -f #{path}.new #{path}")
+            comm.sudo("rm -f #{tmp}")
           end
         end
 

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

@@ -21,13 +21,14 @@ module VagrantPlugins
         end
 
         def configure_machine
-          command = "#{git_path} config --system "
           if config.http
-            command << "http.proxy #{config.http}"
+            @machine.communicate.sudo(
+              "#{git_path} config --system http.proxy #{config.http}")
           else
-            command << "--unset-all http.proxy"
+            @machine.communicate.sudo(
+              "#{git_path} config --system --unset-all http.proxy",
+              error_check: false)
           end
-          @machine.communicate.sudo(command)
         end
 
         def git_path

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

@@ -23,15 +23,15 @@ module VagrantPlugins
         end
 
         def set_or_delete_proxy(key, value)
-          command = "#{npm_path} config "
+          command = "#{npm_path} config --global "
           if value
             command << "set #{key} #{escape(value)}"
           else
             command << "delete #{key}"
 
-            # ensure that the .npmrc file exists to work around
+            # ensure that the npmrc file exists to work around
             # https://github.com/npm/npm/issues/5065
-            @machine.communicate.sudo("touch ~/.npmrc")
+            @machine.communicate.sudo("#{npm_path} config --global set #{key} foo")
           end
           @machine.communicate.sudo(command)
         end

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

@@ -18,14 +18,14 @@ module VagrantPlugins
           path = config_path
 
           @machine.communicate.tap do |comm|
-            comm.sudo("rm #{tmp}", error_check: false)
+            comm.sudo("rm -f #{tmp}", error_check: false)
             comm.upload(ProxyConf.resource("yum_config.awk"), tmp)
             comm.sudo("touch #{path}")
             comm.sudo("gawk -f #{tmp} #{proxy_params} #{path} > #{path}.new")
             comm.sudo("chmod 0644 #{path}.new")
             comm.sudo("chown root:root #{path}.new")
-            comm.sudo("mv #{path}.new #{path}")
-            comm.sudo("rm #{tmp}")
+            comm.sudo("mv -f #{path}.new #{path}")
+            comm.sudo("rm -f #{tmp}")
           end
         end
 

data/lib/vagrant-proxyconf/cap/coreos/docker_proxy_conf.rb

@@ -11,13 +11,17 @@ module VagrantPlugins
             return false unless Util.which(machine, 'docker')
 
             machine.communicate.tap do |comm|
-              src_file='/usr/lib/systemd/system/docker.service'
-              tmp_file='/tmp/docker.service'
-              env_file='EnvironmentFile=-\/etc\/default\/docker'
+              src_file = '/usr/lib/systemd/system/docker.service'
+              dst_file = '/etc/systemd/system/docker.service'
+              tmp_file = '/tmp/docker.service'
+              env_file = 'EnvironmentFile=-\/etc\/default\/docker'
               comm.sudo("sed -e 's/\\[Service\\]/[Service]\\n#{env_file}/g' #{src_file} > #{tmp_file}")
-
-              comm.sudo('mv /tmp/docker.service /etc/systemd/system/')
-              comm.sudo('systemctl daemon-reload')
+              unless comm.test("diff #{tmp_file} #{dst_file}")
+                # update config and restart docker when config changed
+                comm.sudo("mv -f #{tmp_file} #{dst_file}")
+                comm.sudo('systemctl daemon-reload')
+              end
+              comm.sudo("rm -f #{tmp}")
             end
             '/etc/default/docker'
           end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

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

@@ -8,4 +8,63 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureEnvProxy do
     it      { is_expected.to eq 'env_proxy' }
   end
 
+  describe '#disabled?' do
+    subject do
+      conf = described_class.new(double, double)
+      machine = double('machine')
+      allow(machine).to receive_message_chain(:config, :proxy, :enabled)
+        .and_return(@config_proxy_enabled)
+      conf.instance_variable_set(:@machine, machine)
+      conf.send(:disabled?)
+    end
+
+    context 'when config proxy is enabled' do
+      it do
+        @config_proxy_enabled = true
+        is_expected.to eq false
+      end
+    end
+    context 'when config proxy is not enabled' do
+      it do
+        @config_proxy_enabled = false
+        is_expected.to eq true
+      end
+    end
+    context 'when config proxy is empty string' do
+      it do
+        @config_proxy_enabled = ''
+        is_expected.to eq true
+      end
+    end
+
+    context 'when target config proxy is enabled' do
+      it do
+        @config_proxy_enabled = { env: true }
+        is_expected.to eq false
+      end
+    end
+    context 'when target config proxy target is not enabled' do
+      it do
+        @config_proxy_enabled = { env: false }
+        is_expected.to eq true
+      end
+    end
+    context 'when other config proxy are not enabled' do
+      it do
+        @config_proxy_enabled = {
+          svn: false,
+          apt: false,
+          chef: false,
+          docker: false,
+          git: false,
+          npm: false,
+          pear: false,
+          svn: false,
+          yum: false
+        }
+        is_expected.to eq false
+      end
+
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email: