vagrant-converge 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0791e9918556cb99c21678dc8d5f08cf0bde128e
-  data.tar.gz: 824f759ab8c2cfe8fb2c64a96219797ac8b1a47c
+  metadata.gz: bb9f21d721269233c90e894ba9912eeffb1199bc
+  data.tar.gz: 4b895c95ae6f1bbe3455becf5b411fc194daa87a
 SHA512:
-  metadata.gz: 4a54988de6a3be5df4dd7e5ea59484162af4b12fa7c160d897e4ec4f768695d0b206a7579c48efee49fcabbb02d64af440fcf522f4774b8ec307cef25d3eb112
-  data.tar.gz: e669531fa5d948cd9295b065d4a0bd567eaf13fc2db72e4b5eb9cbe56d112966247ebfb647eecbf7671a66a966ea03e4227ed9ee03fa45650597976a52412e2a
+  metadata.gz: acb83c433cd24bfa3fcb8f075593b7cb2e1ff2ce2e3a9959ae6de684931102170e895a512e890aae8a7aa6531503f3738427debe83960e4d559f75dbbf6c9db6
+  data.tar.gz: 03448a8084fa8bdfe5063b603ec9ae776ec89083fa10042a36fdae06bea8bd70bd76e27896da1dd63670682e3eef537f85bccddc6a678ef5dffa53af4fedd31a

data/README.md

@@ -31,6 +31,7 @@ Update the plugin with:
 * `rpc_addr` (optional) - Address for server RPC connection. Overrides `local`
 * `rpc_token` (optional) - Token to use for RPC
 * `verbose` (optional) - Run the Converge plugin in verbose mode
+* `version` (optional) - Specify the version of Converge. Default is the latest version.
 
 ## Example
 
@@ -38,7 +39,7 @@ Update the plugin with:
         cfg.params = {
             "message" = "Not the default message"
         }
-        cfg.bikeshed = [
+        cfg.hcl = [
             "https://bintray.com/chrisaubuchon/generic/download_file?file_path=test.hcl"
         ]
         cfg.install = true

data/lib/vagrant-converge/cap/guest/posix/converge_install.rb

@@ -0,0 +1,21 @@
+require_relative "../../../errors"
+
+module VagrantConverge
+  module Cap
+    module Guest
+      module POSIX
+        module ConvergeInstall
+          def self.converge_install(machine, version)
+	    url="https://dl.bintray.com/chrisaubuchon/converge/install.sh"
+	    command = "curl -sL #{url} | sh -s --"
+
+	    if version != :latest
+		command << " -v \"#{version}\""
+	    end
+	    machine.communicate.sudo(command)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-converge/cap/guest/{linux → posix}/converge_installed.rb

@@ -1,12 +1,12 @@
 module VagrantConverge
   module Cap
     module Guest
-      module Linux
+      module POSIX
         module ConvergeInstalled
           def self.converge_installed(machine, version)
             command = 'text -x "$(command -v converge)"'
 
-            if !version.empty?
+            if version != :latest
               command << "&& converge version | grep 'converge #{version}'"
             end
 

data/lib/vagrant-converge/config/guest.rb

@@ -6,7 +6,6 @@ module VagrantConverge
       attr_accessor :ca_file
       attr_accessor :cert_file
       attr_accessor :install
-      attr_accessor :install_mode
       attr_accessor :key_file
       attr_accessor :local
       attr_accessor :local_addr
@@ -26,7 +25,6 @@ module VagrantConverge
 	@ca_file	= UNSET_VALUE
 	@cert_file	= UNSET_VALUE
 	@install	= UNSET_VALUE
-	@install_mode	= UNSET_VALUE
 	@key_file	= UNSET_VALUE
 	@local		= UNSET_VALUE
 	@local_addr	= UNSET_VALUE
@@ -45,7 +43,6 @@ module VagrantConverge
 	@ca_file	= nil		if @ca_file		== UNSET_VALUE
 	@cert_file	= nil		if @cert_file		== UNSET_VALUE
 	@install	= true		if @install		== UNSET_VALUE
-	@install_mode	= :default	if @install_mode	== UNSET_VALUE
 	@key_file	= nil		if @key_file		== UNSET_VALUE
 	@local		= true		if @local		== UNSET_VALUE
 	@local_addr	= nil		if @local_addr		== UNSET_VALUE
@@ -56,7 +53,7 @@ module VagrantConverge
 	@rpc_token	= nil		if @rpc_token		== UNSET_VALUE
 	@use_ssl	= false		if @use_ssl		== UNSET_VALUE
 	@verbose	= false		if @verbose		== UNSET_VALUE
-        @version	= ""		if @version		== UNSET_VALUE
+        @version	= :latest	if @version		== UNSET_VALUE
 
 	# RPC connection takes precedence over local
 	if @rpc_addr

data/lib/vagrant-converge/plugin.rb

@@ -19,13 +19,24 @@ module VagrantConverge
     end
 
     guest_capability(:linux, :converge_installed) do
-      require_relative "cap/guest/linux/converge_installed"
-      Cap::Guest::Linux::ConvergeInstalled
+      require_relative "cap/guest/posix/converge_installed"
+      Cap::Guest::POSIX::ConvergeInstalled
     end
 
     guest_capability(:linux, :converge_install) do
-      require_relative "cap/guest/linux/converge_install"
-      Cap::Guest::Linux::ConvergeInstall
+      require_relative "cap/guest/posix/converge_install"
+      Cap::Guest::POSIX::ConvergeInstall
+    end
+
+
+    guest_capability(:freebsd, :converge_installed) do
+      require_relative "cap/guest/posix/converge_installed"
+      Cap::Guest::POSIX::ConvergeInstalled
+    end
+
+    guest_capability(:freebsd, :converge_install) do
+      require_relative "cap/guest/posix/converge_install"
+      Cap::Guest::POSIX::ConvergeInstall
     end
   end
 end

data/lib/vagrant-converge/provisioner/guest.rb

@@ -25,7 +25,7 @@ module VagrantConverge
         end
 
         if config.install && !machine.guest.capability(:converge_installed, config.version)
-          @machine.guest.capability(:converge_install, config.install_mode, config.version)
+          @machine.guest.capability(:converge_install, config.version)
         end
 
         @machine.communicate.execute(

data/lib/vagrant-converge/version.rb

@@ -1,3 +1,3 @@
 module VagrantConverge
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-converge
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Aubuchon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,8 +52,8 @@ files:
 - bin/console
 - bin/setup
 - lib/vagrant-converge.rb
-- lib/vagrant-converge/cap/guest/linux/converge_install.rb
-- lib/vagrant-converge/cap/guest/linux/converge_installed.rb
+- lib/vagrant-converge/cap/guest/posix/converge_install.rb
+- lib/vagrant-converge/cap/guest/posix/converge_installed.rb
 - lib/vagrant-converge/config/guest.rb
 - lib/vagrant-converge/errors.rb
 - lib/vagrant-converge/plugin.rb

data/lib/vagrant-converge/cap/guest/linux/converge_install.rb

@@ -1,20 +0,0 @@
-require_relative "../../../errors"
-
-module VagrantConverge
-  module Cap
-    module Guest
-      module Linux
-        module ConvergeInstall
-          def self.converge_install(machine, install_mode, version)
-            if install_mode == :pip
-              raise Converge::Errors::ConvergePipInstallIsNotSupported
-            else
-              machine.communicate.sudo "curl -L -o /usr/bin/converge https://bintray.com/chrisaubuchon/generic/download_file?file_path=converge"
-	      machine.communicate.sudo "chmod 0755 /usr/bin/converge"
-            end
-          end
-        end
-      end
-    end
-  end
-end