vocker 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c785f4c29b6d9c5582b89d6ced1f5650c48e6818
-  data.tar.gz: dfca0bc2e02c1d62ee815e7c991cffed85167137
+  metadata.gz: eaf5ac0735450fedcd7c62184b010a7ce9fd5eb5
+  data.tar.gz: 60bb3abc9bf4383eefd53998531d649f229affdc
 SHA512:
-  metadata.gz: 1f4e352b6ac9f5451c6e6ba22e95bcb4aa1b61783d1ed881b78fd6cffedc981df4d8e8d4c8badf4963cea19ba95161f15cd9ac04e74ec4d4f477cfe1f2ecf6e3
-  data.tar.gz: e647a3667479df5d40b9f3729a668066e9308bba9554f16a0f06b680abed7a0d293aebb601e5d71c50a4f7407a72542e7b251239d16b16ef78e48695119cb9d5
+  metadata.gz: 8d853bb3ea5a0042a9f7957060f1e8e071343992cdb6f53723634c638c8638e8fea4d40fd3fb8b66ba01fb9c2865deed803b4a07176a7b796c657bd16d43ee52
+  data.tar.gz: b5454b97d98f84826717b1d8074b9627a4b0ec74e3a1ca763b046baa9ba281892fffbcaf22a4ae9c0abe94a1213b0babbac216905e69ae1b8901ac77ca444e3c

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.4.1](https://github.com/fgrehm/vocker/compare/v0.4.0...v0.4.1) (December 13, 2013)
+
+IMPROVEMENTS:
+
+  - Make use of `https` when downloading Docker's gpg key [GH-19]
+
+BUG FIXES:
+
+  - Check for whether containers exists / are running now work across
+    multiple Docker versions [GH-20]
+
 ## [0.4.0](https://github.com/fgrehm/vocker/compare/v0.3.3...v0.4.0) (November 8, 2013)
 
 IMPROVEMENTS:

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 group :development do
   gem 'vagrant', github: 'mitchellh/vagrant'
   gem 'vagrant-lxc', github:'fgrehm/vagrant-lxc'
-  gem 'vagrant-cachier', github:'fgrehm/vagrant-cachier', branch: 'release-0.5.0'
+  gem 'vagrant-cachier', github:'fgrehm/vagrant-cachier'
   gem 'vagrant-pristine', github:'fgrehm/vagrant-pristine'
   gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
 

data/Gemfile.lock

@@ -1,9 +1,8 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: 4d01bff390f036bf76b74f96a3f569e8308cf7b0
-  branch: release-0.5.0
+  revision: 354c9ca2b553e212db0f004103bc2c3b32d74a57
   specs:
-    vagrant-cachier (0.5.0)
+    vagrant-cachier (0.5.1.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-global-status.git
@@ -38,7 +37,7 @@ GIT
 PATH
   remote: .
   specs:
-    vocker (0.4.0)
+    vocker (0.4.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,11 +1,17 @@
 # Vocker
 
-An experimental plugin that introduces [Docker](http://docker.io) to [Vagrant](http://www.vagrantup.com/)
+A plugin that introduces [Docker](http://docker.io) to [Vagrant](http://www.vagrantup.com/)
 as a [provisioner](http://docs.vagrantup.com/v2/plugins/provisioners.html) and
 as a command that allows you to interact with the guest machine Docker
 installation. It can also be used for building other Vagrant plugins that
 needs interaction with a Docker instance.
 
+## DEPRECATION NOTICE
+
+The plugin has been merged back into Vagrant core and will be deprecated once Vagrant 
+1.4 is out. I'll ship just one more version with the updates to align with the
+changes introduced on the corresponding [pull request](https://github.com/mitchellh/vagrant/pull/2549).
+
 
 ## Installation
 
@@ -108,7 +114,7 @@ without leaving lots of unused containers behind. If you are interested on
 understanding how it works, have a look at [_DockerClient#run_](https://github.com/fgrehm/vocker/blob/master/lib/vocker/docker_client.rb#L22)
 
 
-### `vagrant docker` command
+### `vagrant docker` command (DEPRECATED)
 
 The command is basically a wrapper over `vagrant ssh -c` that allows you
 to run `docker` commands on the guest VM:
@@ -123,6 +129,8 @@ pull, push, restart, rm, rmi, run, search, start, stop, tag, version, wait
     -h, --help                       Print this help
 ```
 
+_Please note that the support for the command will be dropped on the next version of the plugin_
+
 
 ### _your-awesome-vagrant-plugin™_
 

data/lib/vocker/cap/debian/docker_install.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
                 comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`")
               end
               comm.sudo("apt-get install -y --force-yes -q curl")
-              comm.sudo("curl http://get.docker.io/gpg | apt-key add -")
+              comm.sudo("curl https://get.docker.io/gpg | apt-key add -")
               comm.sudo("echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
               comm.sudo("apt-get update")
               comm.sudo("apt-get install -y --force-yes -q xz-utils #{package} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'")

data/lib/vocker/docker_client.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
       end
 
       def container_exist?(id)
-        @machine.communicate.test("sudo docker ps -a -q | grep -q #{id}")
+        lookup_container(id, true)
       end
 
       def start_container(id)
@@ -58,7 +58,7 @@ module VagrantPlugins
       end
 
       def container_running?(id)
-        @machine.communicate.test("sudo docker ps -q | grep #{id}")
+        lookup_container(id)
       end
 
       def create_container(config)
@@ -97,6 +97,18 @@ module VagrantPlugins
 
         args.compact.flatten.join ' '
       end
+
+      def lookup_container(id, list_all = false)
+        docker_ps = "sudo docker ps -q"
+        docker_ps << " -a" if list_all
+        @machine.communicate.tap do |comm|
+          # Docker < 0.7.0 stores container IDs using its short version while
+          # recent versions use the full container ID
+          # See https://github.com/dotcloud/docker/pull/2140 for more information
+          return comm.test("#{docker_ps} | grep -wFq #{id}") ||
+                   comm.test("#{docker_ps} -notrunc | grep -wFq #{id}")
+        end
+      end
     end
   end
 end

data/lib/vocker/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vocker
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/unit/docker_client_spec.rb

@@ -89,7 +89,7 @@ describe VagrantPlugins::Vocker::DockerClient do
       end
     end
 
-    context 'when the container already exists' do
+    pending 'when the container already exists' do
       before do
         stub(communicator).test(with{|cmd| cmd =~ /docker ps -a -q/}) { true }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vocker
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler