ventriloquist 0.3.2 → 0.4.0

data/lib/ventriloquist/cap/utils/debian/mercurial_install.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Cap
+      module Debian
+        module MercurialInstall
+          def self.mercurial_install(machine)
+            machine.guest.capability(:install_packages, 'mercurial')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/cap/utils/linux/download.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Cap
+      module Linux
+        module Download
+          def self.download(machine, src, destination)
+            machine.communicate.tap do |comm|
+              if comm.test('which wget')
+                download_with_wget(machine, src, destination)
+
+              elsif comm.test('which curl')
+                download_with_curl(machine, src, destination)
+
+              # If neither wget or curl could be found, try installing
+              # curl
+              elsif machine.capability?(:install_packages)
+                machine.guest.capability(:install_packages, 'curl')
+                download_with_curl(machine, src, destination)
+
+              else
+                raise 'Unable to download file for guest VM!'
+              end
+            end
+          end
+
+          def self.download_with_wget(machine, src, destination)
+            machine.env.ui.info("Downloading #{src} to #{destination}")
+            machine.communicate.execute("wget #{src} -O #{destination}")
+          end
+
+          def self.download_with_curl(machine, src, destination)
+            machine.env.ui.info("Downloading #{src} to #{destination}")
+            machine.communicate.execute("curl #{src} -o #{destination}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/config.rb

@@ -1,11 +1,14 @@
 module VagrantPlugins
   module Ventriloquist
     class Config < Vagrant.plugin("2", :config)
-      attr_reader :services, :platforms
+      attr_reader :services, :platforms, :packages
+      attr_accessor :docker_version
 
       def initialize
-        @services  = []
-        @platforms = []
+        @services       = []
+        @platforms      = []
+        @packages       = []
+        @docker_version = '0.7.0'
       end
     end
   end

data/lib/ventriloquist/platforms/elixir.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     module Platforms
       class Elixir < Platform
         def provision(machine)
-          @config[:version] = '0.10.3' if @config[:version] == 'latest'
+          @config[:version] = '0.11.2' if @config[:version] == 'latest'
           machine.guest.tap do |guest|
             guest.capability(:erlang_install)
             guest.capability(:elixir_install, @config[:version])

data/lib/ventriloquist/platforms/go.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     module Platforms
       class Go < Platform
         def provision(machine)
-          @config[:version] = '1.1.2' if @config[:version] == 'latest'
+          @config[:version] = '1.2' if @config[:version] == 'latest'
           machine.guest.capability(:mercurial_install)
           machine.guest.capability(:go_install, @config[:version])
         end

data/lib/ventriloquist/platforms/nodejs.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
         def provision(machine)
           @config[:version] = '0.10' if @config[:version] == 'latest'
           machine.guest.tap do |guest|
+            guest.capability(:install_packages, 'curl', silent: true)
             guest.capability(:nvm_install)
             guest.capability(:nvm_install_nodejs, @config[:version])
           end

data/lib/ventriloquist/platforms/phantomjs.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     module Platforms
       class PhantomJS < Platform
         def provision(machine)
-          @config[:version] = '1.9.1' if config[:version] == 'latest'
+          @config[:version] = '1.9.2' if config[:version] == 'latest'
           machine.guest.capability(:phantomjs_install, @config[:version])
         end
       end

data/lib/ventriloquist/platforms/ruby.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
         def provision(machine)
           @config[:version] = '2.0.0' if @config[:version] == 'latest'
           machine.guest.tap do |guest|
+            guest.capability(:install_packages, 'curl', silent: true)
             guest.capability(:rvm_install)
             guest.capability(:rvm_install_ruby, @config[:version])
           end

data/lib/ventriloquist/plugin.rb

@@ -25,120 +25,9 @@ module VagrantPlugins
         Config
       end
 
-      guest_capability("debian", "pg_install_client") do
-        require_relative "cap/debian/pg_install_client"
-        Cap::Debian::PgInstallClient
-      end
-
-      guest_capability("debian", "pg_install_headers") do
-        require_relative "cap/debian/pg_install_headers"
-        Cap::Debian::PgInstallHeaders
-      end
-
-      guest_capability("linux", "pg_export_pghost") do
-        require_relative "cap/linux/pg_export_pghost"
-        Cap::Linux::PgExportPghost
-      end
-
-      guest_capability("debian", "mysql_install_client") do
-        require_relative "cap/debian/mysql_install_client"
-        Cap::Debian::MySqlInstallClient
-      end
-
-      guest_capability("debian", "mysql_install_headers") do
-        require_relative "cap/debian/mysql_install_headers"
-        Cap::Debian::MySqlInstallHeaders
-      end
-
-      guest_capability("linux", "mysql_configure_client") do
-        require_relative "cap/linux/mysql_configure_client"
-        Cap::Linux::MySqlConfigureClient
-      end
-
-      guest_capability("debian", "git_install") do
-        require_relative "cap/debian/git_install"
-        Cap::Debian::GitInstall
-      end
-
-      guest_capability("debian", "mercurial_install") do
-        require_relative "cap/debian/mercurial_install"
-        Cap::Debian::MercurialInstall
-      end
-
-      guest_capability("linux", "make") do
-        require_relative "cap/linux/make"
-        Cap::Linux::Make
-      end
-
-      guest_capability("debian", "install_build_tools") do
-        require_relative "cap/debian/install_build_tools"
-        Cap::Debian::InstallBuildTools
-      end
-
-      guest_capability("debian", "ventriloquist_containers_upstart") do
-        require_relative "cap/debian/ventriloquist_containers_upstart"
-        Cap::Debian::VentriloquistContainersUpstart
-      end
-
-      guest_capability("linux", "download") do
-        require_relative "cap/linux/download"
-        Cap::Linux::Download
-      end
-
-      guest_capability("linux", "untar") do
-        require_relative "cap/linux/untar"
-        Cap::Linux::Untar
-      end
-
-      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
-        require_relative "cap/linux/rvm_install"
-        Cap::Linux::RvmInstall
-      end
-
-      guest_capability("debian", "phantomjs_install") do
-        require_relative "cap/debian/phantomjs_install"
-        Cap::Debian::PhantomjsInstall
-      end
-
-      guest_capability("debian", "go_install") do
-        require_relative "cap/debian/go_install"
-        Cap::Debian::GoInstall
-      end
-
-      guest_capability("linux", "rvm_install_ruby") do
-        require_relative "cap/linux/rvm_install_ruby"
-        Cap::Linux::RvmInstallRuby
-      end
-
-      guest_capability("debian", "erlang_install") do
-        require_relative "cap/debian/erlang_install"
-        Cap::Debian::ErlangInstall
-      end
-
-      guest_capability("debian", "elixir_install") do
-        require_relative "cap/debian/elixir_install"
-        Cap::Debian::ElixirInstall
-      end
-
-      guest_capability("debian", "pyenv_install") do
-        require_relative "cap/debian/python"
-        Cap::Debian::Python
-      end
-
-      guest_capability("debian", "pyenv_install_python") do
-        require_relative "cap/debian/python"
-        Cap::Debian::Python
-      end
+      require_relative 'cap/platforms'
+      require_relative 'cap/utils'
+      require_relative 'cap/services'
     end
   end
 end

data/lib/ventriloquist/provisioner.rb

@@ -12,19 +12,30 @@ module VagrantPlugins
     class Provisioner < Vagrant.plugin("2", :provisioner)
       def initialize(machine, config, installer = nil, client = nil)
         super(machine, config)
-        @installer = installer || Vocker::DockerInstaller.new(@machine)
+        @installer = installer || Vocker::DockerInstaller.new(@machine, config.docker_version)
         @client    = client    || Vocker::DockerClient.new(@machine)
       end
 
       def provision
         @logger = Log4r::Logger.new("vagrant::provisioners::ventriloquist")
 
+        provision_packages
         provision_services
         provision_platforms
       end
 
       protected
 
+      def provision_packages
+        return if config.packages.empty?
+
+        if @machine.guest.capability?(:install_packages)
+          @machine.guest.capability(:install_packages, config.packages)
+        else
+          @machine.env.ui.warn(I18n.t 'ventriloquist.install_packages_unsupported')
+        end
+      end
+
       def provision_services
         return if config.services.empty?
 

data/lib/ventriloquist/service.rb

@@ -10,13 +10,20 @@ module VagrantPlugins
       end
 
       def provision(machine)
-        machine.env.ui.info("Starting #{@name} service")
-        machine.communicate.sudo("mkdir -p #{CONTAINER_IDS_PATH}")
-        # Reduce network latency, see https://groups.google.com/d/msg/docker-user/Z3zQuRawIsE/2AEkl30WpTQJ
-        # for more info
-        @config[:dns]     = '127.0.0.1'
-        @config[:cidfile] = "#{CONTAINER_IDS_PATH}/#{@name}"
-        @docker_client.run_container(@config)
+        cidfile = "#{CONTAINER_IDS_PATH}/#{@name}"
+
+        if @docker_client.container_running?("$(cat #{cidfile})")
+          machine.env.ui.info("Service '#{@name}' already running")
+        else
+          machine.env.ui.info("Starting '#{@name}' service")
+          machine.communicate.sudo("mkdir -p #{CONTAINER_IDS_PATH}")
+          # Reduce network latency, see https://groups.google.com/d/msg/docker-user/Z3zQuRawIsE/2AEkl30WpTQJ
+          # for more info
+          @config[:dns]     = '127.0.0.1'
+          @config[:name]    = @name
+          @config[:cidfile] = cidfile
+          @docker_client.run_container(@config)
+        end
       end
     end
   end

data/lib/ventriloquist/services/elastic_search.rb

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Services
+      class ElasticSearch < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['9292:9292']
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/services/mail_catcher.rb

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Services
+      class MailCatcher < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['1025:1025', '1080:1080']
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/services/memcached.rb

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Services
+      class Memcached < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['11211:11211']
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/services/mysql.rb

@@ -2,6 +2,11 @@ module VagrantPlugins
   module Ventriloquist
     module Services
       class MySql < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['3306:3306']
+        end
+
         def provision(machine)
           super
 

data/lib/ventriloquist/services/postgresql.rb

@@ -2,6 +2,11 @@ module VagrantPlugins
   module Ventriloquist
     module Services
       class PostgreSQL < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['5432:5432']
+        end
+
         def provision(machine)
           super
 

data/lib/ventriloquist/services/redis.rb

@@ -2,6 +2,11 @@ module VagrantPlugins
   module Ventriloquist
     module Services
       class Redis < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= ['6379:6379']
+        end
+
         def provision(machine)
           super
           install_client(machine)
@@ -9,20 +14,21 @@ module VagrantPlugins
 
         protected
 
-        # TODO: Use the same version as the configured service
         def install_client(machine)
           return if machine.communicate.test('which redis-cli > /dev/null')
 
+          redis_version = '2.8.2'
           machine.guest.tap do |guest|
             guest.capability(:install_build_tools)
-            guest.capability(:download, 'http://download.redis.io/redis-stable.tar.gz', '/tmp/redis-stable.tar.gz')
-            guest.capability(:untar, '/tmp/redis-stable.tar.gz', '/tmp')
-            guest.capability(:make, '/tmp/redis-stable', 'redis-cli')
+            # TODO: Use the same version specified on the Vagrantfile
+            guest.capability(:download, "http://download.redis.io/releases/redis-#{redis_version}.tar.gz", "/tmp/redis-#{redis_version}.tar.gz")
+            guest.capability(:untar, "/tmp/redis-#{redis_version}.tar.gz", '/tmp')
+            guest.capability(:make, "/tmp/redis-#{redis_version}", 'redis-cli')
           end
 
           machine.communicate.tap do |comm|
-            comm.sudo('cp /tmp/redis-stable/src/redis-cli /usr/local/bin')
-            comm.execute('rm -rf /tmp/redis-stable*')
+            comm.sudo("cp /tmp/redis-#{redis_version}/src/redis-cli /usr/local/bin")
+            comm.execute('rm -rf /tmp/redis-*')
           end
         end
       end

data/lib/ventriloquist/services/rethink_db.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Services
+      class RethinkDB < Service
+        def initialize(*args)
+          super
+          @config[:ports] ||= [
+            '28015:28015',
+            '29015:29015',
+            '8080:8080'
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/services_builder.rb

@@ -1,15 +1,23 @@
 require_relative 'service'
 require_relative 'services/postgresql'
 require_relative 'services/redis'
+require_relative 'services/mail_catcher'
+require_relative 'services/memcached'
 require_relative 'services/mysql'
+require_relative 'services/elastic_search'
+require_relative 'services/rethink_db'
 
 module VagrantPlugins
   module Ventriloquist
     class ServicesBuilder
       MAPPING = {
-        'pg'    => Services::PostgreSQL,
-        'mysql' => Services::MySql,
-        'redis' => Services::Redis
+        'pg'            => Services::PostgreSQL,
+        'elasticsearch' => Services::ElasticSearch,
+        'mailcatcher'   => Services::MailCatcher,
+        'mysql'         => Services::MySql,
+        'redis'         => Services::Redis,
+        'memcached'     => Services::Memcached,
+        'rethinkdb'     => Services::RethinkDB,
       }
 
       def initialize(services, mapping = MAPPING)
@@ -44,13 +52,14 @@ module VagrantPlugins
 
       def create_service_provisioner(name, config, docker_client)
         name, tag = name.to_s.split(':')
+        type      = config.delete(:type) || name
 
         # REFACTOR: This is a bit confusing...
         config[:tag]   ||= (tag || 'latest')
-        config[:image] ||= extract_image_name(name)
+        config[:image] ||= extract_image_name(config.delete(:vimage) || name)
         config[:image] << ":#{config[:tag]}"
 
-        klass = @mapping.fetch(name, Service)
+        klass = @mapping.fetch(type, Service)
         klass.new(name, config, docker_client)
       end