vagrant-proxyconf 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzI4MTE4NzRhOTYzYWY1MDVkZThkM2Y5MTNjZmQ0ODY2ZTM0YmZjMg==
+  data.tar.gz: !binary |-
+    Mzg5Y2U5MWU3MmM2ZDQyOTQ3NGE1ODVmZGFhNmRlNTZkMGQxZWUxNg==
+SHA512:
+  metadata.gz: !binary |-
+    Mzk2YzM2ZjlhYTkwMmE2NTg4ZGI5YTIzMjU4OTE3YTM3YjFkOWU3MWUyOTRi
+    NWY1YjIxZjY2ZmNiOTQwMzAxNjRiNjVhOTM2ODkxYWMyMjM1YWY0YWFhNTVm
+    OWEwNDgyMmZkOTg5OTE3N2NlMWI0Mzc2YmQ2NGJiN2ZkMmY4N2M=
+  data.tar.gz: !binary |-
+    NDE4YTdlNjNlOTY1NDQ5ZTMxYzIzOTFiMDM2NWNkYTdlMjAyOWNlMzI1MDM1
+    MGFiNDIwOTRiMTk2YjFlZWUzNDM4ODQ3OWI5MDU2ZGNlODYzZWJjMzc4NTA3
+    MmFiMmVmNWM2YjA0MWYxNzFiNDczMzkxYjJiODM2ZDFlNWUyYWU=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.5.2 / 2013-09-27
+
+- Fix sudo configuration on old Ubuntu 10.04 "lucid" guests ([GH-26][])
+    * Ubuntu bug [\#553786](https://bugs.launchpad.net/ubuntu/+source/sudo/+bug/553786)
+- Always set correct permissions on generated configuration files ([GH-27][], [GH-26][])
+
 # 0.5.1 / 2013-09-17
 
 - Configure sudo to preserve the `*_proxy` environment variables ([GH-23][], [GH-25][])
@@ -61,3 +67,5 @@
 [GH-23]: https://github.com/tmatilai/vagrant-proxyconf/issues/23 "Issue 23"
 [GH-24]: https://github.com/tmatilai/vagrant-proxyconf/issues/24 "Issue 24"
 [GH-25]: https://github.com/tmatilai/vagrant-proxyconf/issues/25 "Issue 25"
+[GH-26]: https://github.com/tmatilai/vagrant-proxyconf/issues/26 "Issue 26"
+[GH-27]: https://github.com/tmatilai/vagrant-proxyconf/issues/27 "Issue 27"

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rake'
 gem 'rspec', '~> 2.11'
 gem 'simplecov', '~> 0.7', :require => false
 gem 'tailor', '~> 1.2'
-gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v1.3.1'
+gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v1.3.3'
 
 group :development do
   gem 'guard-rspec'

data/README.md

@@ -12,7 +12,7 @@
 [gemnasium]: https://gemnasium.com/tmatilai/vagrant-proxyconf
 [codeclimate]: https://codeclimate.com/github/tmatilai/vagrant-proxyconf
 
-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.
+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)).
 
 At this state we support:
 
@@ -195,15 +195,13 @@ VAGRANT_APT_HTTP_PROXY="proxy.example.com:8080" vagrant up
 
 #### 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.
+[apt-cacher-box](https://github.com/tmatilai/apt-cacher-box) gives an example for setting up apt-cacher proxy server in a Vagrant VM.
 
 ## Related plugins and projects
 
 * [apt-cacher-box](https://github.com/tmatilai/apt-cacher-box)<br/>
   a Vagrant setup for apt-cacher-ng.
+* [polipo-box](https://github.com/tmatilai/polipo-box)<br/>
+  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.
-* [vagrant-httpproxy](https://github.com/juliandunn/vagrant-httpproxy)<br/>
-  A Chef cookbook for configuring Chef resources to use the specified proxy (while offline).
-* [vagrant-proxy](https://github.com/clintoncwolfe/vagrant-proxy)<br/>
-  A Vagrant plugin that uses iptables rules to force the VM to use a proxy.

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

@@ -67,22 +67,28 @@ module VagrantPlugins
         #
         # @param opts [Hash] optional file options
         # @option opts [String] :path (#config_path) the path of the configuration file
-        # @option opts [String] :mode the mode of the file
+        # @option opts [String] :mode ("0644") the mode of the file
+        # @option opts [String] :owner ("root:root") the owner (and group) of the file
         def write_config(machine, config, opts = {})
+          tmp = "/tmp/vagrant-proxyconf"
           path = opts[:path] || config_path(machine)
-          logger.debug "Configuration (#{path}):\n#{config}"
-
-          temp = Tempfile.new("vagrant")
-          temp.binmode
-          temp.write(config)
-          temp.close
 
+          logger.debug "Configuration (#{path}):\n#{config}"
           machine.communicate.tap do |comm|
-            comm.upload(temp.path, "/tmp/vagrant-proxyconf")
+            comm.upload(tempfile(config).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("cat /tmp/vagrant-proxyconf > #{path}")
-            comm.sudo("chmod #{opts[:mode]} #{path}") if opts[:mode]
-            comm.sudo("rm /tmp/vagrant-proxyconf")
+            comm.sudo("mv #{tmp} #{path}")
+          end
+        end
+
+        # @return [Tempfile] a temporary file with the specified content
+        def tempfile(content)
+          Tempfile.new("vagrant").tap do |temp|
+            temp.binmode
+            temp.write(content)
+            temp.close
           end
         end
 

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

data/vagrant-proxyconf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = VagrantPlugins::ProxyConf::VERSION
   spec.authors       = ["Teemu Matilainen"]
   spec.email         = ["teemu.matilainen@iki.fi"]
-  spec.description   = "A Vagrant plugin that configures the virtual machine to use proxies"
+  spec.description   = "A Vagrant plugin that configures the virtual machine to use proxy servers"
   spec.summary       = spec.description
   spec.homepage      = "http://tmatilai.github.io/vagrant-proxyconf/"
   spec.license       = "MIT"

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyconf
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies: []
-description: A Vagrant plugin that configures the virtual machine to use proxies
+description: A Vagrant plugin that configures the virtual machine to use proxy servers
 email:
 - teemu.matilainen@iki.fi
 executables: []
@@ -62,34 +61,27 @@ 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: -968959479372815338
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -968959479372815338
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
-summary: A Vagrant plugin that configures the virtual machine to use proxies
+specification_version: 4
+summary: A Vagrant plugin that configures the virtual machine to use proxy servers
 test_files:
 - spec/spec_helper.rb
 - spec/unit/support/shared/apt_proxy_config.rb