vagrant-docker-compose 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8ba0c93bda9be46839f18d7cf5924d2577e395
-  data.tar.gz: 8401fba5f9a5ac7610bb2113813d707d06e61439
+  metadata.gz: 8d913fc6f78fc86bba2124d632ae3849eda30780
+  data.tar.gz: b0aaeed03cbbbcf11179e7cb2782196dfb374978
 SHA512:
-  metadata.gz: 2b9af03300b64975dac1c44d987015ee609a37d88fc8b4f81cf941fa84f23c8fb07985980fd72b782a1116849631926ee89695154996f4490059d629817d71d3
-  data.tar.gz: d35123277d106baa4baa87123c8113351ec421602b40326ae08a2105edfd6ec25c194a328bfd0da1caeff42930b9b52b98179a50d9c46fd558ed90f7783991a3
+  metadata.gz: 1e4f9714ce4d46b7d179b423ee4c186e11b8a66d4c50f4d66c14407acf9b4abfe743b3838df88bc7b3ac429e7f7b5b4f4bb11d4c61978bc6c3eb9bede0f5d5a4
+  data.tar.gz: 8e7186461ac9b06c284c3362240584b6161fb80c119f4732d713a8360c1c8935db9bd60a59ebb4fc4386f7347e5b6debe014b7df5f56af6d3015e17f779f43c8

data/lib/vagrant-docker-compose/cap/linux/docker_compose_install.rb

@@ -3,10 +3,10 @@ module VagrantPlugins
     module Cap
       module Linux
         module DockerComposeInstall
-          def self.docker_compose_install(machine)
+          def self.docker_compose_install(machine, config)
             machine.communicate.tap do |comm|
-              comm.sudo("curl -L https://github.com/docker/compose/releases/download/1.2.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-  chmod +x /usr/local/bin/docker-compose")
+              comm.sudo("curl -L https://github.com/docker/compose/releases/download/1.2.0/docker-compose-`uname -s`-`uname -m` > #{config.executable}
+  chmod +x #{config.executable}")
             end
           end
         end

data/lib/vagrant-docker-compose/cap/linux/docker_compose_installed.rb

@@ -3,9 +3,9 @@ module VagrantPlugins
     module Cap
       module Linux
         module DockerComposeInstalled
-          def self.docker_compose_installed(machine)
+          def self.docker_compose_installed(machine, config)
             paths = [
-              "/usr/local/bin/docker-compose"
+              config.executable
             ]
 
             paths.all? do |p|

data/lib/vagrant-docker-compose/config.rb

@@ -1,12 +1,21 @@
 module VagrantPlugins
   module DockerComposeProvisioner
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :yml, :rebuild
+      attr_accessor :yml, :rebuild, :executable
 
       def yml=(yml)
         raise DockerComposeError, :yml_must_be_absolute if !Pathname.new(yml).absolute?
         @yml = yml
       end
+
+      def initialize
+        @executable = UNSET_VALUE
+      end
+
+      def finalize!
+        @executable = "/usr/local/bin/docker-compose" if @executable == UNSET_VALUE
+      end
+
     end
   end
 end

data/lib/vagrant-docker-compose/docker_compose.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
       def build
         @machine.ui.detail(I18n.t(:docker_compose_build))
         @machine.communicate.tap do |comm|
-          comm.sudo("docker-compose -f \"#{@config.yml}\" build") do |type, data|
+          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" build") do |type, data|
             handle_comm(type, data)
           end
         end
@@ -20,7 +20,7 @@ module VagrantPlugins
       def rm
         @machine.ui.detail(I18n.t(:docker_compose_rm))
         @machine.communicate.tap do |comm|
-          comm.sudo("docker-compose -f \"#{@config.yml}\" rm --force") do |type, data|
+          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" rm --force") do |type, data|
             handle_comm(type, data)
           end
         end
@@ -29,7 +29,7 @@ module VagrantPlugins
       def up
         @machine.ui.detail(I18n.t(:docker_compose_up))
         @machine.communicate.tap do |comm|
-          comm.sudo("docker-compose -f \"#{@config.yml}\" up -d") do |type, data|
+          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" up -d") do |type, data|
             handle_comm(type, data)
           end
         end

data/lib/vagrant-docker-compose/installer.rb

@@ -1,18 +1,19 @@
 module VagrantPlugins
   module DockerComposeProvisioner
     class Installer
-      def initialize(machine)
+      def initialize(machine, config)
         @machine = machine
+        @config = config
       end
 
       def ensure_installed
         @machine.ui.detail(I18n.t(:checking_installation))
 
-        if !@machine.guest.capability(:docker_compose_installed)
+        if !@machine.guest.capability(:docker_compose_installed, @config)
           @machine.ui.detail(I18n.t(:installing))
-          @machine.guest.capability(:docker_compose_install)
+          @machine.guest.capability(:docker_compose_install, @config)
 
-          if !@machine.guest.capability(:docker_compose_installed)
+          if !@machine.guest.capability(:docker_compose_installed, @config)
             raise DockerComposeError, :install_failed
           end
         end

data/lib/vagrant-docker-compose/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   errors:
     yml_must_be_absolute: Docker Compose YML path must be absolute!
+    install_failed: Docker Compose installation failed
   not_supported_on_guest: Not supported on the guest operating system
   checking_installation: Checking for Docker Compose installation...
   installing: Installing Docker Compose

data/lib/vagrant-docker-compose/provisioner.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       def initialize(machine, config, installer = nil, docker_compose = nil)
         super(machine, config)
 
-        @installer = installer || Installer.new(@machine)
+        @installer = installer || Installer.new(@machine, @config)
         @docker_compose = docker_compose || DockerCompose.new(@machine, @config)
       end
 

data/lib/vagrant-docker-compose/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerComposeProvisioner
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: