vagrant-puppet-modules 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c691b79233fe1f8344243c6046b70c96bc6886
-  data.tar.gz: d984b14d6dd35209a3b434d131aec621dd3a8529
+  metadata.gz: c2a37d62581542f0b66be73e39d75cc62a64a352
+  data.tar.gz: a85f7f39c6f9d83be0b16b92a31eb544027eb7eb
 SHA512:
-  metadata.gz: 50ab4a52be71af2aafe8e2cf6afa66ab08bbbcc0d912d29e51c222729f4eb41b30e9dcb8fb6ef6e9163657dbcd85fcd0e667445761bebe9bfa7108bd68bd38a2
-  data.tar.gz: a11f2fe571c456b7f9eb51713e7d204f6157511dbac3ccddfd33a5b00947f5a659374168cd98e1829b9594dfec981c22015a207ca95cf57e43544c96df75334a
+  metadata.gz: c54e65d5ae2d94c748ed3a48831b02272550b39d4884efba299d9964543d9f49fc54d4d9b7b9cd08dc4140633e849ddb2cdd7a22c832b0dc3e0f653a7e42853f
+  data.tar.gz: c9e6685c3f569421c8d121f6b08fc6e080fd5e808bc6d08960032e271542ee702f5467369b4467cd7e5ac627ff2e2e4506aec699e23636dd75d5478cce0bd80d

data/lib/vagrant-puppet-modules/action/install_librarian_puppet.rb

@@ -17,13 +17,14 @@ module VagrantPlugins
                         @machine.config.puppet_modules.validate!
 
                         desired_version = @machine.config.puppet_modules.librarian_version
-                        if desired_version.nil? || installed_version == desired_version
-                            env[:ui].info "Librarian-puppet is installed or not required"
-                            return
+                        if desired_version.nil?
+                            env[:ui].info "Librarian-puppet is not required, skipping installation..."
+                        elsif installed_version == desired_version
+                            env[:ui].info "Librarian-puppet is already installed at version #{desired_version}"
+                        else
+                            fetch_or_create_install_script(env)
+                            install(desired_version, env)
                         end
-
-                        fetch_or_create_install_script(env)
-                        install(desired_version, env)
                     end
 
                     @app.call(env)
@@ -46,12 +47,12 @@ module VagrantPlugins
                     if windows_guest?
                         # todo
                     else
-                        command = 'echo $(librarian-puppet --version)'
+                        command = 'echo $(librarian-puppet version)'
                     end
 
                     @machine.communicate.sudo(command, opts) do |type, data|
                         if [:stderr, :stdout].include?(type)
-                            version_match = data.match(/^(.+)/)
+                            version_match = data.match(/v(.+)$/)
                             version = version_match.captures[0].strip if version_match
                         end
                     end

data/lib/vagrant-puppet-modules/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module PuppetModules
-        VERSION = '0.0.1'
+        VERSION = '0.0.2'
     end
 end

data/shell/librarian_puppet_install.sh

@@ -16,6 +16,7 @@ InstallLibrarianPuppet () {
   echo 'Attempting to install librarian-puppet'
 
   gem install librarian-puppet --version "$version"
+  gem uninstall librarian-puppet -v ">$version" --force
 
   if [ "$?" -ne '0' ]; then
     echo 'Failed to install librarian-puppet'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppet-modules
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anis Safine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler