vagrant-proxyconf 0.1.0 → 0.1.1

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
+bundler_args: --without=development
 rvm:
   - 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
+# 0.1.1 / 2013-06-27
+
+- Don't crash if there is no configuration for us in the Vagrantfiles ([GH-2])
+    * Related [Vagrant issue](https://github.com/mitchellh/vagrant/issues/1877)
+
 # 0.1.0 / 2013-06-27
 
 - Initial release
 - Support for Apt proxy configuration
 - Based heavily on [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) plugin
+
+
+[GH-2]:  https://github.com/tmatilai/vagrant-proxyconf/issues/2  "Issue 2"

data/README.md

@@ -27,7 +27,9 @@ vagrant plugin install vagrant-proxyconf
 
 ### Apt
 
-The proxy for Apt can be specified in the Vagrantfile:
+The proxy for Apt can be specified in the Vagrantfile. You might want to set it to all boxes, in which case use _$HOME/.vagrant.d/Vagrantfile_. The configuration only triggers on Debian based machines, so there is no harm in setting it globally.
+
+Example configuration:
 ```ruby
 Vagrant.configure("2") do |config|
 
@@ -39,11 +41,20 @@ end
 
 The proxy can be specified as an IP address, name or full URL, with optional port (defaults to 3142).
 
-You can also use `APT_PROXY_HTTP` and `APT_PROXY_HTTPS` environment variables. These override the Vagrantfile configuration. To disable or remove the proxy use "DIRECT" or an empty value.
+You can also use `APT_PROXY_HTTP` and `APT_PROXY_HTTPS` environment variables. These override the Vagrantfile configuration. To disable or remove the proxy use "DIRECT" or an empty value. For example to spin up a VM while overriding a globally configured proxy, run:
+```sh
+APT_PROXY_HTTP="10.5.5.200:8080" vagrant up
+```
 
 Proxy settings will be written to _/etc/apt/apt.conf.d/01proxy_ on the guest.
 
+#### Running apt-cacher-ng on a Vagrant box
+
+[Here](https://github.com/tmatilai/apt-cacher-box) is an example for setting up apt-cacher proxy server in a Vagrant VM.
+
 ## Related plugins and projects
 
-- [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier)
-- [vagrant-proxy](https://github.com/clintoncwolfe/vagrant-proxy)
+- [apt-cacher-box](https://github.com/tmatilai/apt-cacher-box) (Vagrant setup for apt-cacher-ng)
+- [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) (Vagrant plugin)
+- [vagrant-httpproxy](https://github.com/juliandunn/vagrant-httpproxy) (Chef cookbook)
+- [vagrant-proxy](https://github.com/clintoncwolfe/vagrant-proxy) (Vagrant plugin)

data/development/.gitignore

@@ -0,0 +1,2 @@
+/.vagrant
+/Vagrantfile

data/development/README.md

@@ -0,0 +1,17 @@
+## Testing the plugin
+
+1. Copy _Vagrantfile_ from the template:
+
+        cp Vagrantfile.example Vagrantfile
+
+2. Spin up the machine:
+
+        bundle exec vagrant up
+
+3. Test, hack, edit _Vagrantfile_ and test again:
+
+        VAGRANT_LOG=debug bundle exec vagrant reload
+        APT_PROXY_HTTP="foo:8080" bundle exec vagrant reload
+        # ...
+
+4. Goto 3.

data/development/Vagrantfile.example

@@ -0,0 +1,20 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+BOX = ENV.fetch('BOX', 'ubuntu-12.04')
+
+Vagrant.require_plugin 'vagrant-proxyconf'
+
+Vagrant.configure('2') do |config|
+  # Apt proxy
+  config.apt_proxy.http  = '192.168.33.200'
+  config.apt_proxy.https = 'DIRECT'
+
+  # Disable the default share
+  config.vm.synced_folder '.', '/vagrant', id: 'vagrant-root', disabled: true
+
+  config.vm.box = BOX
+  if BOX == 'ubuntu-12.04'
+    ubuntu.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box'
+  end
+end

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

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'tempfile'
 
 module VagrantPlugins
@@ -15,6 +16,12 @@ module VagrantPlugins
           @app.call env
 
           proxy_config = env[:machine].config.apt_proxy
+
+          # Vagrant does not seem to call `finalize!` if the configuration
+          # key is not used in Vagrantfiles.
+          # https://github.com/tmatilai/vagrant-proxyconf/issues/2
+          proxy_config.finalize!
+
           if !proxy_config.enabled?
             logger.debug "apt_proxy not enabled or configured"
           elsif !proxy_conf_capability?(env[:machine])

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/vagrant-proxyconf.rb

@@ -1,4 +1,2 @@
-require 'vagrant'
-
 require_relative 'vagrant-proxyconf/version'
 require_relative 'vagrant-proxyconf/plugin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -26,6 +26,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- development/.gitignore
+- development/README.md
+- development/Vagrantfile.example
 - lib/vagrant-proxyconf.rb
 - lib/vagrant-proxyconf/action.rb
 - lib/vagrant-proxyconf/action/configure_apt_proxy.rb
@@ -52,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4265757349911692365
+      hash: 4594869159718557476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -61,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4265757349911692365
+      hash: 4594869159718557476
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23