ventriloquist 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82064f44e25d2e9a5ee7ea37eabb54ad37c6c2d1
-  data.tar.gz: 6935426176d13de57a75f25f657a000da4b702aa
+  metadata.gz: cd4971f545c453a892142ee6178266d29df7e453
+  data.tar.gz: 23399080896e6e30558ee28697fa16c0bf3b51ee
 SHA512:
-  metadata.gz: 5811c24a91a30e7f14c409e7f9aeccc91a68ea619e865d815194676397e131330ecb2c86d4b8ef0b33e5dde71b6d24880d63e0f8519a0d08b909b2347a62ef8c
-  data.tar.gz: 0d68175655d58a09e2a38d69a1f98aa3a75f0cc80780c47a60cdf8e231b7c551f3ae8530398539e96706e8f5b9ed32f124e163220a269ab69c00761d77fc5160
+  metadata.gz: 61ce67a1d4dd042faae1cd421aaedef5155e9497a5d9997a16cce463efab44eb8d4e5d2c663b670c19ca73d1c4de91823a3b16abc677416bd46af7919974a3e2
+  data.tar.gz: 595f5e34bf1fa1a7c6d57d2412910157b53192bd09963747c930f85868e44b5daeaf832ccc2615770bdc36227feb38df69d04c20423c53c4647dd66cae9277ff

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 .vagrant
+.DS_Store

data/CHANGELOG.md

@@ -1,9 +1,15 @@
+## [0.2.1](https://github.com/fgrehm/ventriloquist/compare/v0.2.0...v0.2.1) (October 12, 2013)
+
+FEATURES:
+
+  - Make use of nvm for when installing nodejs, allowing installation of any nodejs version
+    instead of what's available at https://launchpad.net/~chris-lea/+archive/node.js [[GH-22]]
+
 ## [0.2.0](https://github.com/fgrehm/ventriloquist/compare/v0.1.0...v0.2.0) (October 3, 2013)
 
 FEATURES:
 
   - Erlang support [[GH-12]]
-  - Solr service [[GH-13]]
   - MailCatcher service [[GH-8]]
 
 BUG FIXES:
@@ -17,6 +23,6 @@ BUG FIXES:
 
 
 
+[GH-22]: https://github.com/fgrehm/ventriloquist/issues/22
 [GH-12]: https://github.com/fgrehm/ventriloquist/issues/12
-[GH-13]: https://github.com/fgrehm/ventriloquist/issues/13
 [GH-8]: https://github.com/fgrehm/ventriloquist/issues/8

data/Gemfile.lock

@@ -38,7 +38,7 @@ GIT
 PATH
   remote: .
   specs:
-    ventriloquist (0.2.0)
+    ventriloquist (0.2.1)
       vocker (~> 0.3.1)
 
 GEM

data/README.md

@@ -146,8 +146,9 @@ Request with the scripts required to set things for other platforms:
 | --------- | ---------------- |
 | ruby      | rvm + Ruby 2.0.0 |
 | go        | 1.1.2            |
-| nodejs    | Currently limited to the latest version available at https://launchpad.net/~chris-lea/+archive/node.js (0.10.17 as of this writing) |
+| nodejs    | nvm + Nodejs     |
 | phantomjs | 1.9.1            |
+| erlang    | Currently limited to the latest version available at https://packages.erlang-solutions.com/erlang/ (currently R16B02) |
 
 
 ## Ideas for improvements

data/lib/ventriloquist/cap/linux/nvm_install.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Cap
+      module Linux
+        module NvmInstall
+          def self.nvm_install(machine)
+            if ! machine.communicate.test('test -d $HOME/.nvm')
+              machine.env.ui.info('Installing NVM')
+              machine.communicate.execute('\curl https://raw.github.com/creationix/nvm/master/install.sh | sh')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/cap/linux/nvm_install_nodejs.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Cap
+      module Linux
+        module NvmInstallNodeJS
+          def self.nvm_install_nodejs(machine, version)
+            if ! machine.communicate.test("nvm ls | grep #{version}")
+              machine.env.ui.info("Installing NodeJS #{version}")
+              machine.communicate.execute("nvm install #{version}")
+              machine.communicate.execute("nvm alias default #{version}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/platforms/nodejs.rb

@@ -3,7 +3,11 @@ module VagrantPlugins
     module Platforms
       class NodeJS < Platform
         def provision(machine)
-          machine.guest.capability(:nodejs_install)
+          @config[:version] = '0.10' if @config[:version] == 'latest'
+          machine.guest.tap do |guest|
+            guest.capability(:nvm_install)
+            guest.capability(:nvm_install_nodejs, @config[:version])
+          end
         end
       end
     end

data/lib/ventriloquist/plugin.rb

@@ -90,9 +90,14 @@ module VagrantPlugins
         Cap::Linux::Untar
       end
 
-      guest_capability("debian", "nodejs_install") do
-        require_relative "cap/debian/nodejs_install"
-        Cap::Debian::NodejsInstall
+      guest_capability("linux", "nvm_install") do
+        require_relative "cap/linux/nvm_install"
+        Cap::Linux::NvmInstall
+      end
+
+      guest_capability("linux", "nvm_install_nodejs") do
+        require_relative "cap/linux/nvm_install_nodejs"
+        Cap::Linux::NvmInstallNodeJS
       end
 
       guest_capability("linux", "rvm_install") do

data/lib/ventriloquist/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ventriloquist
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ventriloquist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vocker
@@ -50,7 +50,6 @@ files:
 - lib/ventriloquist/cap/debian/mercurial_install.rb
 - lib/ventriloquist/cap/debian/mysql_install_client.rb
 - lib/ventriloquist/cap/debian/mysql_install_headers.rb
-- lib/ventriloquist/cap/debian/nodejs_install.rb
 - lib/ventriloquist/cap/debian/pg_install_client.rb
 - lib/ventriloquist/cap/debian/pg_install_headers.rb
 - lib/ventriloquist/cap/debian/phantomjs_install.rb
@@ -58,6 +57,8 @@ files:
 - lib/ventriloquist/cap/linux/download.rb
 - lib/ventriloquist/cap/linux/make.rb
 - lib/ventriloquist/cap/linux/mysql_configure_client.rb
+- lib/ventriloquist/cap/linux/nvm_install.rb
+- lib/ventriloquist/cap/linux/nvm_install_nodejs.rb
 - lib/ventriloquist/cap/linux/pg_export_pghost.rb
 - lib/ventriloquist/cap/linux/rvm_install.rb
 - lib/ventriloquist/cap/linux/rvm_install_ruby.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Vagrant development environments made easy

data/lib/ventriloquist/cap/debian/nodejs_install.rb

@@ -1,21 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Debian
-        module NodejsInstall
-          def self.nodejs_install(machine)
-            return if machine.communicate.test('which nodejs > /dev/null')
-
-            machine.env.ui.info('Installing nodejs')
-            machine.communicate.tap do |comm|
-              comm.sudo('apt-get install -y software-properties-common')
-              comm.sudo('add-apt-repository -y ppa:chris-lea/node.js')
-              comm.sudo('apt-get update')
-              comm.sudo("apt-get install -y nodejs")
-            end
-          end
-        end
-      end
-    end
-  end
-end