vagrant-proxyconf 1.5.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57a68635cfc9a1ce7ad88b14d65ff04950f43b7b
-  data.tar.gz: 182af0796244d4b82b6eb6cc9338b2cc3212361b
+  metadata.gz: 89c3334da0f5ca851a92f23dc388327d47dee03a
+  data.tar.gz: 743404cd2300188be2c8fccf0dda4894b2ba8523
 SHA512:
-  metadata.gz: 31c746c218e6f4f65e9b3cbe88c09b7ca4d0e2efe472193d4571c60b531ad0241d76d55579a00673b08d9d543bf5eacfe6a9800e0baa6326408a344eda6b0e0b
-  data.tar.gz: 12fc3b6db9dc5511dcba1f21b0e77d1f796c734613420cd3c4b5672a0b10a6cec7131138c203d839c05a21235b092077ca842465f4bdca1142f8a22b28445209
+  metadata.gz: 2298453a51c191d77e4b927ac5be44d4d15aff00fce6a14a4c532dfb85587f7686966ae374f538583fb3ece529724990e902be06af337979f54b0cf3af5c70af
+  data.tar.gz: 375908939f9f242efcd9d4e3b41a610017be5b9e55680d4e09b71620561f55750d0de9508b257c7c8c271881835f28703d3ecfb6113bdbd9922ffd6f14bec728

data/.gitignore

@@ -1,6 +1,8 @@
 /.bundle
 /.yardoc
+.vagrant
 /Gemfile.lock
 /doc
 /tmp
 vagrant-proxyconf-*.gem
+/vendor

data/.travis.yml

@@ -2,24 +2,21 @@ 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
+before_install: ./travis/before_install
 bundler_args: --without=development
 
-rvm: 2.0.0
-env: VAGRANT_VERSION=v1.7.2
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+rvm: 2.4.4
 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
-      rvm: 1.9.3
-    - env: VAGRANT_VERSION=v1.2.7
-      rvm: 1.9.3
+    - env: VAGRANT_VERSION=v2.2.2
+    - env: VAGRANT_VERSION=v2.1.5
+    - env: VAGRANT_VERSION=v2.0.4
+    - env: VAGRANT_VERSION=v1.9.8
+      rvm: 2.3.4
     - env: VAGRANT_VERSION=master
   allow_failures:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+# 2.0.2 / _Not released yet_
+
+# 2.0.1 / 2019-03-31
+
+Improvements:
+
+  - Check for existence of HTTP_PROXY and HTTPS_PROXY environment variables.
+    If neither are set this plugin is automatically disabled.
+  - Correctly uses the Tempfile pattern now via commit. 8ee2a2bb146aeb9fb1b27c80814e9000eff34aa1
+
+Bug fixes:
+  - Docker proxy conf not set the first time the provisioner is used (trusty64) - #155
+  - Proxy doesn't work for Docker with systemd - #172
+  - Provisioning of docker fails - #180
+  - Docker provider: Guest-specific operations were attempted on a machine that is not ready for guest communication. - #181
+  - Provisioning of docker fails issue 180. - #182
+  - vagrant-proxyconf running on Win10 and provisioning with Docker. - #186
+  - Cannot force to write but without configuration. - #188
+
+# 2.0.0 / 2019-01-03
+
+Improvements:
+
+  - Significant refactor to support disabling a proxy. Now when `config.proxy.enabled = false` all supporting proxies will be uncofigured.
+  - Added new tests for new features.
+  - Updated README.md to reflect new behavior.
+  - Cleaned up travis builds to support newere versions of vagrant.
+
+Features:
+  - Added new configuration parameter for `skipping` configuring a disabled or enabled proxy.
+
+Bug Fixes:
+
+  - Disable proxy settings in provisioned box ([GH-167][])
+  - unable to disable proxy for chef provisioners ([GH-118][])
+  - Proxy remains enabled after updating config ([GH-87][])
+
+
 # 1.5.2 / 2015-10-01
 
 Improvements:

data/Gemfile

@@ -1,22 +1,43 @@
 source 'https://rubygems.org'
 
+#### Added due to https://groups.google.com/forum/#!topic/vagrant-up/J8J6LmhzBqM/discussion
+embedded_locations = %w(/Applications/Vagrant/embedded /opt/vagrant/embedded)
+
+embedded_locations.each do |p|
+    ENV['VAGRANT_INSTALLER_EMBEDDED_DIR'] = p if File.directory?(p)
+end
+
+unless ENV.key?('VAGRANT_INSTALLER_EMBEDDED_DIR')
+    $stderr.puts "Couldn't find a packaged install of vagrant, and we need this"
+    $stderr.puts 'in order to make use of the RubyEncoder libraries.'
+    $stderr.puts 'I looked in:'
+    embedded_locations.each do |p|
+        $stderr.puts "  #{p}"
+    end
+end
+#### End Added due to https://groups.google.com/forum/#!topic/vagrant-up/J8J6LmhzBqM/discussion
+
 gem 'vagrant',
-  git: 'https://github.com/mitchellh/vagrant.git',
-  ref: ENV.fetch('VAGRANT_VERSION', 'v1.7.2')
+    git: 'https://github.com/mitchellh/vagrant.git',
+    ref: ENV.fetch('VAGRANT_VERSION', 'v2.2.2')
 
-gem 'cane', '~> 2.6'
-gem 'coveralls', require: false
 gem 'rake'
 gem 'rspec', '~> 3.1'
 gem 'rspec-its', '~> 1.0'
-gem 'tailor', '~> 1.4'
 
 group :development do
   gem 'guard-rspec'
+  gem 'pry'
+  gem 'rb-readline'
   gem 'redcarpet'
-  gem 'yard', '~> 0.8'
+  gem 'serverspec'
+  gem 'yard', '~> 0.9.11'
 end
 
+# when testing our plugin we need to make sure some vagrant plugins are installed
+# however, the syntax `Vagrant.require_plugin 'vagrant-proxyconf' was deprecated
+# and this is the future for using testing vagrant behind bundler.
+# https://stackoverflow.com/questions/19492738/demand-a-vagrant-plugin-within-the-vagrantfile
 group :plugins do
-  gem 'vagrant-proxyconf', path: '.'
+  gem 'vagrant-proxyconf', path: __dir__
 end

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2015 Teemu Matilainen <teemu.matilainen@iki.fi>
+Copyright (c) 2013-2017 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

@@ -1,18 +1,11 @@
 # Proxy Configuration Plugin for Vagrant
 
 <span class="badges">
-[![Gem Version](https://badge.fury.io/rb/vagrant-proxyconf.png)][gem]
-[![Build Status](https://travis-ci.org/tmatilai/vagrant-proxyconf.png?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/tmatilai/vagrant-proxyconf.png)][gemnasium]
-[![Code Climate](https://codeclimate.com/github/tmatilai/vagrant-proxyconf.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/tmatilai/vagrant-proxyconf/badge.png)][coveralls]
-</span>
 
-[gem]: https://rubygems.org/gems/vagrant-proxyconf
-[travis]: https://travis-ci.org/tmatilai/vagrant-proxyconf
-[gemnasium]: https://gemnasium.com/tmatilai/vagrant-proxyconf
-[codeclimate]: https://codeclimate.com/github/tmatilai/vagrant-proxyconf
-[coveralls]: https://coveralls.io/r/tmatilai/vagrant-proxyconf
+[![Gem Version](https://badge.fury.io/rb/vagrant-proxyconf.png)](https://rubygems.org/gems/vagrant-proxyconf)
+[![Build Status](https://travis-ci.org/tmatilai/vagrant-proxyconf.svg?branch=master)](https://travis-ci.org/tmatilai/vagrant-proxyconf)
+
+</span>
 
 A [Vagrant](http://www.vagrantup.com/) plugin that configures the virtual machine to use specified proxies. This is useful for example in case you are behind a corporate proxy server, or you have a caching proxy (for example [polipo](https://github.com/tmatilai/polipo-box)).
 
@@ -125,12 +118,12 @@ 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.
-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.
+New Behavior Warning: Setting the plugin to disabled now unconfigures all or specific proxies.
+
+The plugin can be disabled by setting `config.proxy.enabled` to `false` or empty string (`""`).
+This can be also be used to disable a proxy for some provider.
+Specific applications can be disabled by setting `config.proxy.enabled` to
+a hash( like `{ svn: false }` or `{ svn: {enabled: false} }`).
 
 ```ruby
 config.proxy.enabled         # => all applications enabled(default)
@@ -141,6 +134,53 @@ config.proxy.enabled = ""    # => all applications disabled
 config.proxy.enabled = false # => all applications disabled
 ```
 
+### Skipping the plugin
+
+The plugin can also be skipped from applying/removing the proxy configuration for a specific provider.
+
+#### When the plugin is disabled as in the following example:
+
+```
+{
+  :apt => {
+    :enabled => false,
+    :skip    => true,
+  },
+  :svn => {
+    :enabled => false,
+    :skip    => true,
+  },
+}
+```
+
+The plugin is disabled, but `skip = true` means that no proxy configuration will be removed so the system
+will remain in it's most recent state. This can be useful if you just want to skip over specific provider
+being configured or unconfigured.
+
+
+#### When the plugin is enabled as in the following example:
+
+```
+{
+  :apt => {
+    :enabled => true,
+    :skip    => false,
+  },
+  :svn => {
+    :enabled => true,
+    :skip    => true,
+  },
+}
+```
+
+The plugin is enabled, but `skip = true` means that no proxy configuration will be applied so the system
+will remain in it's most recent state. This can be useful if you just want to skip over specific provider
+being configured or unconfigured.
+
+In the example above the `apt` proxy will be enabled and proxy configuration will be applied, but the
+`svn` proxy even though it's enabled will be skipped.
+
+
 #### Example Vagrantfile
 
 ```ruby
@@ -186,12 +226,36 @@ end
 #### Environment variables
 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:
+For example to spin up a VM and set the APT proxy to `http://proxy.example.com:8080, run:
 
 ```sh
 VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 ```
 
+|  Provider | Environment Variable         | Descrption                    | Precendence |
+|-----------|------------------------------|-------------------------------|-------------|
+| apt       | `VAGRANT_APT_HTTP_PROXY`     | Configures APT http proxy     | Highest     |
+|           | `VAGRANT_APT_HTTPS_PROXY`    | Configures APT https proxy    | Highest     |
+|           | `VAGRANT_APT_FTP_PROXY`      | Configures APT ftp proxy      | Highest     |
+| chef      | `VAGRANT_CHEF_HTTP_PROXY`    | Configures CHEF http proxy    | Highest     |
+|           | `VAGRANT_CHEF_HTTPS_PROXY`   | Configures CHEF https proxy   | Highest     |
+|           | `VAGRANT_CHEF_NO_PROXY`      | Configures CHEF no proxy      | Highest     |
+| docker    | `VAGRANT_DOCKER_HTTP_PROXY`  | Configuers DOCKER http proxy  | Highest     |
+|           | `VAGRANT_DOCKER_HTTPS_PROXY` | Configures DOCKER https proxy | Highest     |
+|           | `VAGRANT_DOCKER_NO_PROXY`    | Configures DOCKER no proxy    | Highest     |
+| env       | `VAGRANT_ENV_HTTP_PROXY`     | Configures ENV http proxy     | Highest     |
+|           | `VAGRANT_ENV_HTTPS_PROXY`    | Configures ENV https proxy    | Highest     |
+|           | `VAGRANT_ENV_FTP_PROXY`      | Configures ENV FTP proxy      | Highest     |
+|           | `VAGRANT_ENV_NO_PROXY`       | Configures ENV no proxy       | Highest     |
+| git       | `VAGRANT_GIT_HTTP_PROXY`     | Configures GIT http proxy     | Highest     |
+|           | `VAGRANT_GIT_HTTPS_PROXY`    | Configures GIT https proxy    | Highest     |
+| npm       | `VAGRANT_NPM_HTTP_PROXY`     | Configures NPM http proxy     | Highest     |
+|           | `VAGRANT_NPM_HTTPS_PROXY`    | Configures NPM https proxy    | Highest     |
+|           | `VAGRANT_NPM_NO_PROXY`       | Configures NPM no proxy       | Highest     |
+| pear      | `VAGRANT_PEAR_HTTP_PROXY`    | Configures PEAR http proxy    | Highest     |
+| svn       | `VAGRANT_SVN_HTTP_PROXY`     | Configures SVN http proxy     | Highest     |
+|           | `VAGRANT_SVN_NO_PROXY`       | Configures SVN no proxy       | Highest     |
+| yum       | `VAGRANT_YUM_HTTP_PROXY`     | Configures YUM http proxy     | Highest     |
 
 ## Related plugins and projects
 
@@ -201,3 +265,68 @@ VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
   a Vagrant setup for [polipo](http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/) caching web proxy.
 * [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier)<br/>
   An excellent Vagrant plugin that shares various cache directories among similar VM instances. Should work fine together with vagrant-proxyconf.
+
+
+## Installing a pre-release version
+
+* A [released](https://rubygems.org/gems/vagrant-proxyconf) pre-release version:
+
+  ```
+  vagrant plugin install --plugin-source https://rubygems.org/ --plugin-prerelease vagrant-proxyconf
+  ```
+
+* Development version from git repository:
+
+  ```
+  git clone https://github.com/tmatilai/vagrant-proxyconf.git
+  cd vagrant-proxyconf
+
+  # Optionally check out other than the master branch
+  git checkout <branch>
+
+  # If you don't have Ruby installed, you can use <path/to/vagrant>/embedded/bin/gem>.
+  # If you have Docker you can use the Ruby image:
+  # docker run -it --rm -v ${PWD}:/usr/src/myapp -w /usr/src/myapp ruby:2.6 gem build vagrant-proxyconf.gemspec
+  gem build vagrant-proxyconf.gemspec
+
+  vagrant plugin install vagrant-proxyconf-*.gem
+  ```
+
+  Paths to Vagrant's embedded gem:
+  * Linux: `/opt/vagrant/embedded/bin/gem`
+  * OS X: `/Applications/Vagrant/embedded/bin/gem`
+
+
+## Development Known Issues
+
+
+### When running `bundle exec vagrant status` I get `Encoded files can't be read outside of the Vagrant installer.`
+
+```
+$ bundle exec vagrant status
+Vagrant failed to initialize at a very early stage:
+
+The plugins failed to load properly. The error message given is
+shown below.
+
+Encoded files can't be read outside of the Vagrant installer.
+```
+
+The solution is to add this to the Gemfile
+
+```
+embedded_locations = %w(/Applications/Vagrant/embedded /opt/vagrant/embedded)
+
+embedded_locations.each do |p|
+    ENV['VAGRANT_INSTALLER_EMBEDDED_DIR'] = p if File.directory?(p)
+end
+
+unless ENV.key?('VAGRANT_INSTALLER_EMBEDDED_DIR')
+    $stderr.puts "Couldn't find a packaged install of vagrant, and we need this"
+    $stderr.puts 'in order to make use of the RubyEncoder libraries.'
+    $stderr.puts 'I looked in:'
+    embedded_locations.each do |p|
+        $stderr.puts "  #{p}"
+    end
+end
+```

data/Rakefile

@@ -1,9 +1,7 @@
 require 'bundler/gem_tasks'
-require 'cane/rake_task'
 require 'rspec/core/rake_task'
-require 'tailor/rake_task'
 
-task :default => [:test, :quality]
+task :default => :test
 
 # Remove 'install' task as the gem is installed to Vagrant, not to system
 Rake::Task[:install].clear
@@ -17,30 +15,6 @@ desc "Run all tests"
 task :test => ['test:unit']
 task :spec => :test
 
-Tailor::RakeTask.new do |task|
-  task.file_set('lib/**/*.rb', 'code') do |style|
-    style.allow_unnecessary_double_quotes false, level: :off
-    style.max_line_length 100, level: :warn
-    style.max_line_length 140, level: :error
-  end
-  task.file_set('spec/**/*.rb', 'tests') do |style|
-    style.allow_unnecessary_double_quotes false, level: :off
-    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
-
-Cane::RakeTask.new(:cane) do |task|
-  task.abc_max = 16
-  task.style_measure = 140
-  task.options[:color] = true
-end
-
-desc 'Run all quality tasks'
-task :quality => [:cane, :tailor]
-
 desc "Update gh-pages"
 task 'gh-pages' do
   require 'tmpdir'

data/development/Dockerfile

@@ -0,0 +1,45 @@
+# https://gist.github.com/codylane/6ebee3595a02f57d35c325db4e102c55
+FROM centos:7
+
+EXPOSE 22
+
+RUN yum clean all && \
+    yum makecache fast && \
+    yum -y install \
+      curl \
+      device-mapper-persistent-data \
+      git \
+      initscripts \
+      lvm2 \
+      openssh-clients \ 
+      openssh-server \ 
+      rsync \ 
+      sudo \
+      wget \
+      yum-utils \ 
+      xfsprogs && \
+    yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
+    yum clean expire-cache && \
+    yum install -y docker-ce && \
+    /usr/sbin/sshd-keygen && \
+    getent passwd vagrant || useradd -m -d /home/vagrant -s /bin/bash vagrant && \
+    echo "vagrant:vagrant" | chpasswd && \
+    mkdir -p /etc/sudoers.d && \
+    echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant && \
+    echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/vagrant && \
+    chmod 0440 /etc/sudoers.d/vagrant && \
+    visudo -cf /etc/sudoers.d/vagrant && \
+    mkdir -p /var/run/sshd && \
+    mkdir -p /home/vagrant/.ssh && \
+    touch /home/vagrant/.ssh/authorized_keys
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+RUN grep -q 'OHlnVYCzRdK8jlqm8tehUc9c9WhQ==' /home/vagrant/.ssh/authorized_keys || echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==" >> /home/vagrant/.ssh/authorized_keys && \
+    chmod 0600 /home/vagrant/.ssh/authorized_keys && \
+    chown vagrant:vagrant /home/vagrant/.ssh/authorized_keys
+
+# -e write logs to stderr
+# -D run in foreground
+# CMD ["/usr/sbin/sshd", "-e", "-D"]
+CMD ["/usr/sbin/init"]