vagrant-docker-compose 0.0.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254585f0b464de97c3d138b60ef21b63fff9ed45
-  data.tar.gz: 81883d4b6a972a2b6d7833c9793783c8019edb2e
+  metadata.gz: cad20fa21be8f29efe766761fcb709b0cc0216ae
+  data.tar.gz: 309b813b4ac63e7922dc72b72af96b71eeeb6fab
 SHA512:
-  metadata.gz: 61c0d722cdaf596102f40dda174bc6264fc650c6475ab95f010dfaa55253a5f29e1e24a89b83eb47f860af2075a96271a5bc400792909ae1f3c42b06b3a522c4
-  data.tar.gz: ed619049b0f6554e53179191202067c49a11f53cfecfc5022a20e82235f5c382ead638ebb49b70d8d89883bd8f68a012b09b87b175f4dd641ebe0e7fa4a1bfb3
+  metadata.gz: e61c9cb012ea59722303795cb2b73a7970bdbde28332924da8720a387d0983d2c41cd9b240940a941b6501a5b3367c729fa7defa6a37b7cc384c3db42e01fda1
+  data.tar.gz: e61fe2302eef57e8aef3ee0e60710008799d06366b7dd1896c1eb0f8c155b92cb4b0cb2a56bf97f265d722b013013f319f67c0dbb011a7308d546c42c07390fa

data/README.md

@@ -104,9 +104,10 @@ docker-compose --x-networking -f [yml] up -d --timeout 20
 ### Other configs
 
 * `yml` – one or more [Compose files](https://docs.docker.com/compose/compose-file/) (YAML), may be a `String` for a single file, or `Array` for multiple.
-* `compose_version` – defaults to `1.5.0`.
+* `compose_version` – defaults to `1.6.2`.
 * `project_name` – compose will default to naming the project `vagrant`.
-* `executable` – the location the executable will be stored, defaults to `/usr/local/bin/docker-compose`.
+* `executable_symlink_path` – the location the executable will be symlinked to, defaults to `/usr/local/bin/docker-compose`.
+* `executable_install_path` – the location the executable will be stored, defaults to `<executable_symlink_path>-<compose_version>`, i.e. `/usr/local/bin/docker-compose-1.5.0`.
 * `options` - a `String` that's included as the first arguments when calling the docker-compose executable, you can use this to pass arbitrary options/flags to docker-compose, default to `nil`.
 * `command_options` - a `Hash` of docker-compose commands to options, you can use this to pass arbitrary options/flags to the docker-compose commands, defaults to: `{ rm: "--force", up: "-d" }`.
 

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

@@ -5,8 +5,8 @@ module VagrantPlugins
         module DockerComposeInstall
           def self.docker_compose_install(machine, config)
             machine.communicate.tap do |comm|
-              comm.sudo("curl -L https://github.com/docker/compose/releases/download/#{config.compose_version}/docker-compose-`uname -s`-`uname -m` > #{config.executable}
-  chmod +x #{config.executable}")
+              comm.sudo("curl -L https://github.com/docker/compose/releases/download/#{config.compose_version}/docker-compose-`uname -s`-`uname -m` > #{config.executable_install_path}")
+              comm.sudo("chmod +x #{config.executable_install_path}")
             end
           end
         end

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         module DockerComposeInstalled
           def self.docker_compose_installed(machine, config)
             paths = [
-              config.executable
+              config.executable_install_path
             ]
 
             paths.all? do |p|

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module DockerComposeProvisioner
+    module Cap
+      module Linux
+        module DockerComposeSymlink
+          def self.docker_compose_symlink(machine, config)
+            machine.communicate.tap do |comm|
+              comm.sudo("rm -f #{config.executable_symlink_path}")
+              comm.sudo("ln -s #{config.executable_install_path} #{config.executable_symlink_path}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module VagrantPlugins
         up: "-d"
       }
 
-      attr_accessor :yml, :rebuild, :project_name, :executable, :compose_version, :options, :command_options
+      attr_accessor :yml, :rebuild, :project_name, :executable_symlink_path, :executable_install_path, :compose_version, :options, :command_options
 
       def yml=(yml)
         files = yml.is_a?(Array) ? yml : [yml]
@@ -17,17 +17,19 @@ module VagrantPlugins
       end
 
       def initialize
-        @executable = UNSET_VALUE
         @project_name = UNSET_VALUE
         @compose_version = UNSET_VALUE
+        @executable_symlink_path = UNSET_VALUE
+        @executable_install_path = UNSET_VALUE
         @options = UNSET_VALUE
         @command_options = UNSET_VALUE
       end
 
       def finalize!
-        @executable = "/usr/local/bin/docker-compose" if @executable == UNSET_VALUE
         @project_name = nil if @project_name == UNSET_VALUE
         @compose_version = "1.6.2" if @compose_version == UNSET_VALUE
+        @executable_symlink_path = "/usr/local/bin/docker-compose" if @executable_symlink_path == UNSET_VALUE
+        @executable_install_path = "#{@executable_symlink_path}-#{@compose_version}" if @executable_install_path == UNSET_VALUE
         @options = nil if @options == UNSET_VALUE
         @command_options = {} if @command_options == UNSET_VALUE
         @command_options = DEFAULT_COMMAND_OPTIONS.merge(@command_options)

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("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} build #{@config.command_options[:build]}") do |type, data|
+          comm.sudo("#{@config.executable_install_path} #{@config.options} #{cli_options_for_yml_file} build #{@config.command_options[: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("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} rm #{@config.command_options[:rm]}") do |type, data|
+          comm.sudo("#{@config.executable_install_path} #{@config.options} #{cli_options_for_yml_file} rm #{@config.command_options[:rm]}") 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("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} up #{@config.command_options[:up]}") do |type, data|
+          comm.sudo("#{@config.executable_install_path} #{@config.options} #{cli_options_for_yml_file} up #{@config.command_options[:up]}") do |type, data|
             handle_comm(type, data)
           end
         end

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

@@ -10,7 +10,7 @@ module VagrantPlugins
         @machine.ui.detail(I18n.t(:checking_installation))
 
         if !@machine.guest.capability(:docker_compose_installed, @config)
-          @machine.ui.detail(I18n.t(:installing))
+          @machine.ui.detail(I18n.t(:installing, version: @config.compose_version))
           @machine.guest.capability(:docker_compose_install, @config)
 
           if !@machine.guest.capability(:docker_compose_installed, @config)
@@ -18,6 +18,9 @@ module VagrantPlugins
           end
         end
 
+        @machine.ui.detail(I18n.t(:symlinking, version: @config.compose_version))
+        @machine.guest.capability(:docker_compose_symlink, @config)
+
         @machine.guest.capability(:docker_compose_set_project_name, @config)
       end
     end

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

@@ -4,7 +4,8 @@ en:
     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
+  installing: Installing Docker Compose %{version}
+  symlinking: Symlinking Docker Compose %{version}
   docker_compose_up: Running docker-compose up...
   docker_compose_rm: Running docker-compose rm...
   docker_compose_build: Running docker-compose build...

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

@@ -24,6 +24,11 @@ module VagrantPlugins
         Cap::Linux::DockerComposeInstall
       end
 
+      guest_capability("linux", "docker_compose_symlink") do
+        require_relative "cap/linux/docker_compose_symlink"
+        Cap::Linux::DockerComposeSymlink
+      end
+
       guest_capability("linux", "docker_compose_set_project_name") do
         require_relative "cap/linux/docker_compose_set_project_name"
         Cap::Linux::DockerComposeSetProjectName

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerComposeProvisioner
-    VERSION = "0.0.10"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 1.0.0
 platform: ruby
 authors:
 - Leigh McCulloch
@@ -31,6 +31,7 @@ files:
 - lib/vagrant-docker-compose/cap/linux/docker_compose_install.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_installed.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_set_project_name.rb
+- lib/vagrant-docker-compose/cap/linux/docker_compose_symlink.rb
 - lib/vagrant-docker-compose/config.rb
 - lib/vagrant-docker-compose/docker_compose.rb
 - lib/vagrant-docker-compose/errors/docker_compose_error.rb