vocker 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a844c870a820f565be23e2d3a34a949e5e60e3
-  data.tar.gz: 42043288ffa6271f3072be1050551eafaf2f769c
+  metadata.gz: c85ef7c68884d8019894cc7d582743749470350b
+  data.tar.gz: 8afc3a12d801e8a57b6906cf2033b70bd5df232c
 SHA512:
-  metadata.gz: 403e7e1b1e34b03daf10e6c98955954af31a9bf8ffc4f305361910d8501ac1589e2281c213839f5a9cbc3f89ffadc86cc244483e540fa84d2604f61fc8eb5f62
-  data.tar.gz: b23c38a0b8b55f7277938e82b5d3aa19d2af3fcac36305eae3c8d3d46c89b0903aa6fc20b81c02288f6231725f7025776e887f198c2ebead2628d054bdf23e16
+  metadata.gz: 60c268d5a0c91851e414f6eda5c88a057169288a3f90d312836ad5fea4868ea7d19cd8655ac25db35646839babd6585e115303dfee6adec9c507e7c909110c8d
+  data.tar.gz: d8dda39a64b9b09e2ee38534ee36259516825413cb3b9810b010300efb7adc08f8a8c8bac0a4c342be6f7c9eed1a980e974b2c63a12ee8499733f29b377ce7aa

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.3.1](https://github.com/fgrehm/vocker/compare/v0.3.0...v0.3.1) (October 3, 2013)
+
+  - Check if container is running before trying to restart
+  - Configure automatic restart of containers regardless of Vagrant version
+
 ## [0.3.0](https://github.com/fgrehm/vocker/compare/v0.2.1...v0.3.0) (September 7, 2013)
 
   - Add support for Docker's `-dns` parameter

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    vocker (0.3.0)
+    vocker (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -26,8 +26,7 @@ vagrant plugin install vocker
 
 ## Status
 
-Early development. It can be useful for trying out Docker and it's growing "ecossystem"
-but the feature set and configuration format might change rapidly.
+Early development. It can be useful for trying out Docker and its growing "ecosystem" but the feature set and configuration format might change rapidly.
 
 Apart from that I've only used the plugin on the following Ubuntu 13.04 VMs:
 
@@ -40,8 +39,7 @@ containers you need some extra steps described below_
 
 ## Usage
 
-Currently Vocker can be used in three different ways: as a provisioner, as a command
-and as a foundation for other Vagrant plugins.
+Currently Vocker can be used in three different ways: as a provisioner, as a command and as a foundation for other Vagrant plugins.
 
 ### Provisioner
 

data/lib/vocker/docker_client.rb

@@ -46,7 +46,13 @@ module VagrantPlugins
       end
 
       def start_container(id)
-        @machine.communicate.sudo("docker start #{id}")
+        unless container_running?(id)
+          @machine.communicate.sudo("docker start #{id}")
+        end
+      end
+
+      def container_running?(id)
+        @machine.communicate.test("sudo docker ps -q | grep #{id}")
       end
 
       def create_container(config)

data/lib/vocker/docker_installer.rb

@@ -25,8 +25,10 @@ module VagrantPlugins
           end
         end
 
-        if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.3.0')
+        if @machine.guest.capability?(:docker_configure_auto_start)
           @machine.guest.capability(:docker_configure_auto_start)
+        else
+          @machine.env.ui.warn I18n.t('vagrant.docker_auto_start_not_available')
         end
       end
     end

data/lib/vocker/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vocker
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/locales/en.yml

@@ -6,3 +6,6 @@ en:
       Pulling Docker images...
     docker_starting_containers:
       Starting Docker containers...
+    docker_auto_start_not_available: |-
+      Unable to configure automatic restart of Docker containers on
+      the guest machine

data/spec/unit/docker_client_spec.rb

@@ -58,13 +58,20 @@ describe VagrantPlugins::Vocker::DockerClient do
 
     context 'when the container already exists' do
       before do
-        stub(communicator).test(with{|cmd| cmd =~ /docker ps/}) { true }
-        subject.run containers
+        stub(communicator).test(with{|cmd| cmd =~ /docker ps -a -q/}) { true }
       end
 
-      it 'starts the container' do
+      it 'starts the container if it is stopped' do
+        stub(communicator).test(with{|cmd| cmd =~ /docker ps -q/}) { false }
+        subject.run containers
         expect(communicator).to have_received.sudo(with{|cmd| cmd =~ /docker start/})
       end
+
+      it 'noops if container is already running' do
+        stub(communicator).test(with{|cmd| cmd =~ /docker ps -q/}) { true }
+        subject.run containers
+        expect(communicator).to_not have_received.sudo(with{|cmd| cmd =~ /docker start/})
+      end
     end
 
     context 'when the container does not exist' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vocker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler