vocker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834fa1d18bf8e23e1faa503aa702833f1bcd4b31
-  data.tar.gz: bb7ab7702c172a3288187936928e449a35f0e22a
+  metadata.gz: 315ab3e764686000c69f9d0cb24bf5893fddad0f
+  data.tar.gz: 402042dff0ed768ace0fc49032ed043e666e8393
 SHA512:
-  metadata.gz: 7ff4f1feb914ce2a7c664a4773b7459adcdbb5b0a5db8b7758542a3f63281344c1358d2c99c2e1bea44fc525a19edee2d63c23826e4dc474ba8d5179900aed74
-  data.tar.gz: 1016810d2ea2364b09b245bfc2ac260fb3ca705b01a82b7ed9792b29834bca931398b47fc6adf4f041bf34ee79a25425284a5cde3e19fc3a4ace90bfd2b38b5f
+  metadata.gz: c7136d70584226624f2b1e90748807dbee4a8af868d215b7afb3d04ba6ea7d35192c709a595b277d080c8848f380234eec872908db99e510fc6a2126200b1e42
+  data.tar.gz: 42723e0cae99b1ae6026fd357d106a95ce8a1985fea5b950ed62bee437693cd580549ddb542910013a08bb418efa4cb3687be1ac2a2fafce09cd2527628264ca

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: 2.0.0

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## [0.2.0](https://github.com/fgrehm/vocker/compare/v0.1.0...master) (unreleased)
+
+  - Update installer for Docker 0.6 [GH-1]
+
+## 0.1.0 (August 15, 2013)
+
+  - Initial public release.

data/Gemfile.lock

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

data/development/Vagrantfile

@@ -10,7 +10,6 @@ Vagrant.require_plugin 'vocker'
 Vagrant.configure("2") do |config|
   config.vm.box = "raring64"
   config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'#, nfs: true
-  config.vm.synced_folder "~/projetos/oss/ventriloquist", "/home/vagrant/ventriloquist"
   config.vm.network :private_network, ip: "192.168.123.123"
 
   config.cache.auto_detect = true

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

@@ -4,15 +4,15 @@ module VagrantPlugins
       module Debian
         module DockerInstall
           def self.docker_install(machine)
-            # Inspired on https://github.com/progrium/dokku/blob/master/Makefile#L33-L40
             machine.communicate.tap do |comm|
-              # TODO: Try to not depend on installing software-properties-common
-              comm.sudo("apt-get install -y -q software-properties-common")
-              comm.sudo("apt-add-repository -y ppa:dotcloud/lxc-docker")
+              # TODO: Perform check on the host machine if aufs is installed and using LXC
+              if machine.provider_name != :lxc
+                comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`")
+              end
+              comm.sudo("curl http://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 -q xz-utils lxc-docker -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'")
-              # TODO: Error out if provider is lxc
-              # comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`")
             end
           end
         end

data/lib/vocker/docker_client.rb

@@ -24,14 +24,20 @@ module VagrantPlugins
           cids_dir = "/var/lib/vocker/cids"
           config[:cidfile] ||= "#{cids_dir}/#{Digest::SHA1.hexdigest name}"
 
-          id = "$(cat #{config[:cidfile]})"
-
           @machine.communicate.sudo("mkdir -p #{cids_dir}")
-          if container_exist?(id)
-            start_container(id)
-          else
-            create_container(config)
-          end
+          run_container(config)
+        end
+      end
+
+      def run_container(config)
+        raise "Container's cidfile was not provided!" unless config[:cidfile]
+
+        id = "$(cat #{config[:cidfile]})"
+
+        if container_exist?(id)
+          start_container(id)
+        else
+          create_container(config)
         end
       end
 

data/lib/vocker/provisioner.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
       end
 
       def provision
-        @logger = Log4r::Logger.new("vagrant::plugins::docker-provisioner")
+        @logger = Log4r::Logger.new("vagrant::provisioners::vocker")
 
         @logger.info("Checking for Docker installation...")
         @installer.ensure_installed

data/lib/vocker/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vocker
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/unit/docker_client_spec.rb

@@ -32,7 +32,7 @@ describe VagrantPlugins::Vocker::DockerClient do
 
     it 'ensures container ids folder exists' do
       subject.run containers
-      expect(communicator).to have_received.sudo(with{|cmd| cmd == 'mkdir -p /var/lib/vocker/cids'})
+      expect(communicator).to have_received.sudo('mkdir -p /var/lib/vocker/cids')
     end
 
     it 'automatically assigns a digest of the command as the cidfile if not specified' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vocker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile