ventriloquist 0.4.1 → 0.5.0

data/lib/ventriloquist/services/elastic_search.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class ElasticSearch < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['9292:9292']
+          @config[:args] ||= '-p 9292:9292'
         end
       end
     end

data/lib/ventriloquist/services/mail_catcher.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class MailCatcher < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['1025:1025', '1080:1080']
+          @config[:args] ||= '-p 1025:1025 -p 1080:1080'
         end
       end
     end

data/lib/ventriloquist/services/memcached.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Memcached < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['11211:11211']
+          @config[:args] ||= '-p 11211:11211'
         end
       end
     end

data/lib/ventriloquist/services/mysql.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class MySql < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['3306:3306']
+          @config[:args] ||= '-p 3306:3306'
         end
 
         def provision(machine)

data/lib/ventriloquist/services/postgresql.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class PostgreSQL < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['5432:5432']
+          @config[:args] ||= '-p 5432:5432'
         end
 
         def provision(machine)

data/lib/ventriloquist/services/redis.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Redis < Service
         def initialize(*args)
           super
-          @config[:ports] ||= ['6379:6379']
+          @config[:args] ||= '-p 6379:6379'
         end
 
         def provision(machine)
@@ -17,7 +17,7 @@ module VagrantPlugins
         def install_client(machine)
           return if machine.communicate.test('which redis-cli > /dev/null')
 
-          redis_version = '2.8.2'
+          redis_version = '2.8.8'
           machine.guest.tap do |guest|
             guest.capability(:install_build_tools)
             # TODO: Use the same version specified on the Vagrantfile

data/lib/ventriloquist/services/rethink_db.rb

@@ -4,11 +4,7 @@ module VagrantPlugins
       class RethinkDB < Service
         def initialize(*args)
           super
-          @config[:ports] ||= [
-            '28015:28015',
-            '29015:29015',
-            '8080:8080'
-          ]
+          @config[:args] ||= '-p 28015:28015 -p 29015:29015 -p 8080:8080'
         end
       end
     end

data/lib/ventriloquist/services_builder.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
   module Ventriloquist
     class ServicesBuilder
       MAPPING = {
-        'pg'            => Services::PostgreSQL,
+        'postgres'      => Services::PostgreSQL,
         'elasticsearch' => Services::ElasticSearch,
         'mailcatcher'   => Services::MailCatcher,
         'mysql'         => Services::MySql,
@@ -51,25 +51,28 @@ module VagrantPlugins
       end
 
       def create_service_provisioner(name, config, docker_client)
-        name, tag = name.to_s.split(':')
-        type      = config.delete(:type) || name
+        type = extract_service_type(config.delete(:type) || name)
 
-        # REFACTOR: This is a bit confusing...
-        config[:tag]   ||= (tag || 'latest')
         config[:image] ||= extract_image_name(config.delete(:vimage) || name)
-        config[:image] << ":#{config[:tag]}"
 
         klass = @mapping.fetch(type, Service)
-        klass.new(name, config, docker_client)
+        klass.new(name.to_s, config, docker_client)
       end
 
       def extract_image_name(name)
         if name =~ /(\w+\/\w+)/
           $1
+        # HACK: This should be noted on the README
+        elsif name =~ /^elasticsearch-(\d+\.\d+)$/
+          "fgrehm/ventriloquist-es-#{$1}"
         else
           "fgrehm/ventriloquist-#{name}"
         end
       end
+
+      def extract_service_type(type)
+        type.to_s.split('-').first
+      end
     end
   end
 end

data/lib/ventriloquist/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ventriloquist
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/services/base/Dockerfile

@@ -1,16 +1,24 @@
 # Base image for creating Ventriloquist services
 
-FROM ubuntu:quantal
+FROM debian:jessie
 MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
-ENV LC_ALL C
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN echo "deb http://archive.ubuntu.com/ubuntu quantal main universe" > /etc/apt/sources.list && \
-    apt-get update && \
-    apt-get -y upgrade && \
-    apt-get install -y wget curl vim language-pack-en build-essential software-properties-common && \
+RUN apt-get update && apt-get install -y \
+      git \
+      libxml2-dev \
+      build-essential \
+      make \
+      gcc \
+      locales \
+      curl \
+      psmisc \
+      vim \
+      cron \
+      python \
+      logrotate \
+      lsb-release \
+      wget && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
     apt-get autoremove && \
-    apt-get clean && \
-    locale-gen en_US && \
-    echo 'LANG="en_US.UTF-8"' >> /etc/default/locale
+    apt-get clean

data/services/build-all.sh

@@ -4,22 +4,22 @@ set -e
 
 PREFIX='fgrehm/ventriloquist'
 
-docker build -t ${PREFIX}-base base
+docker build --rm -t ${PREFIX}-base base
 
-docker build -t ${PREFIX}-pg postgresql/9.3
-docker build -t ${PREFIX}-pg:9.2 postgresql/9.2
-docker build -t ${PREFIX}-pg:9.1 postgresql/9.1
+docker build --rm -t ${PREFIX}-postgres-9.3 postgresql/9.3
+docker build --rm -t ${PREFIX}-postgres-9.2 postgresql/9.2
+docker build --rm -t ${PREFIX}-postgres-9.1 postgresql/9.1
 
-docker build -t ${PREFIX}-mysql mysql/5.6
-docker build -t ${PREFIX}-mysql:5.5 mysql/5.5
+docker build -t ${PREFIX}-mysql-5.6 mysql/5.6
+docker build -t ${PREFIX}-mysql-5.5 mysql/5.5
 
-docker build -t ${PREFIX}-rethinkdb rethinkdb
+docker build -t ${PREFIX}-rethinkdb-1.12 rethinkdb
 
 docker build -t ${PREFIX}-openjdk7 openjdk7
-docker build -t ${PREFIX}-elasticsearch elasticsearch
+docker build -t ${PREFIX}-elasticsearch-1.1 elasticsearch
 
-docker build -t ${PREFIX}-memcached memcached
+docker build -t ${PREFIX}-memcached-1.4 memcached
 
-docker build -t ${PREFIX}-redis redis
+docker build -t ${PREFIX}-redis-2.8 redis
 
-docker build -t ${PREFIX}-mailcatcher mailcatcher
+docker build -t ${PREFIX}-mailcatcher-0.5 mailcatcher

data/services/elasticsearch/Dockerfile

@@ -2,9 +2,12 @@
 
 FROM fgrehm/ventriloquist-openjdk7
 
-RUN wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.7.deb -O /tmp/elasticsearch.deb -q --no-check-certificate && \
+RUN wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.1.0.deb -O /tmp/elasticsearch.deb -q --no-check-certificate && \
     dpkg -i /tmp/elasticsearch.deb && \
     rm /tmp/elasticsearch.deb && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
     apt-get clean
 
 EXPOSE 9200

data/services/mailcatcher/Dockerfile

@@ -2,7 +2,17 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN apt-get install -y ruby ruby-dev sqlite3 libsqlite3-dev && apt-get clean
+RUN apt-get update && \
+    apt-get install -y \
+      ruby \
+      ruby-dev \
+      sqlite3 \
+      libsqlite3-dev && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean
+
 RUN gem install mailcatcher --no-ri --no-rdoc
 
 EXPOSE 1025

data/services/memcached/Dockerfile

@@ -2,15 +2,20 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN wget -q http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz -O /tmp/memcached.tar.gz && \
+RUN wget -q http://www.memcached.org/files/memcached-1.4.17.tar.gz -O /tmp/memcached.tar.gz && \
     cd /tmp && \
     tar xvfz memcached.tar.gz && \
-    cd memcached-1.4.15 && \
-    apt-get install libevent1-dev -y && \
+    cd memcached-1.4.17 && \
+    apt-get update && \
+    apt-get install libevent-dev -y && \
     ./configure --prefix=/usr/local/memcached && \
     make && \
     make install && \
-    cd .. && rm -rf memcached* && apt-get clean
+    cd .. && rm -rf memcached* && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean
 
 EXPOSE 11211
 CMD    ["/usr/local/memcached/bin/memcached", "-u", "daemon"]

data/services/mysql/5.5/Dockerfile

@@ -4,6 +4,7 @@ FROM fgrehm/ventriloquist-base
 
 # prevent apt from starting mysql right after the installation
 RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d && \
+    apt-get update && \
     apt-get -q -y install mysql-server-5.5 && \
     apt-get clean && \
     sed -i 's/127.0.0.1/0.0.0.0/' /etc/mysql/my.cnf && \

data/services/mysql/5.6/Dockerfile

@@ -3,8 +3,9 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN apt-get install libaio-dev -y && \
-    wget -q http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb -O /tmp/mysql.deb && \
+RUN apt-get update && \
+    apt-get install libaio-dev -y && \
+    wget -q http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.17-debian6.0-x86_64.deb -O /tmp/mysql.deb && \
     dpkg -i /tmp/mysql.deb && \
     rm /tmp/mysql.deb && \
     groupadd mysql && \
@@ -17,12 +18,15 @@ RUN apt-get install libaio-dev -y && \
     /opt/mysql/server-5.6/scripts/mysql_install_db --user=mysql --datadir=/var/lib/mysql && \
     rm /opt/mysql/server-5.6/my*.cnf && \
     echo 'export PATH="/opt/mysql/server-5.6/bin:$PATH"' > /etc/profile.d/mysql.sh && \
-    apt-get clean && \
     rm /opt/mysql/server-5.6/bin/mysqld-debug && \
     rm /opt/mysql/server-5.6/bin/mysqltest_* && \
     rm /opt/mysql/server-5.6/bin/mysql_client_test* && \
     rm /opt/mysql/server-5.6/lib/libmysqld-debug.a && \
-    rm -rf /opt/mysql/server-5.6/mysql-test # Save some disk space
+    rm -rf /opt/mysql/server-5.6/mysql-test && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean
 
 ADD config /
 

data/services/openjdk7/Dockerfile

@@ -2,4 +2,9 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN apt-get install -y openjdk-7-jre-headless && apt-get clean
+RUN apt-get update && \
+    apt-get install -y openjdk-7-jre-headless && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean

data/services/postgresql/9.1/Dockerfile

@@ -2,11 +2,14 @@
 
 FROM fgrehm/ventriloquist-base
 
-# prevent apt from starting postgres right after the installation
-RUN echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d; chmod +x /usr/sbin/policy-rc.d && \
-    apt-get install -y -q postgresql-9.1 postgresql-contrib-9.1 && \
-    apt-get clean && \
-    rm /usr/sbin/policy-rc.d # allow autostart again
+RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt sid-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    apt-get update && \
+    apt-get install -y postgresql-9.1 postgresql-contrib-9.1 && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean
 
 ADD config /
 RUN /bin/prepare-postgres vagrant vagrant

data/services/postgresql/9.1/config/bin/prepare-postgres

@@ -5,6 +5,8 @@ set -e
 user=$1
 password=$2
 
+sed -i 's/^\(lc_.*\)$/# \1/g' /etc/postgresql/9.1/main/postgresql.conf
+
 /etc/init.d/postgresql start
 
 su postgres -c "createuser --superuser ${user}"

data/services/postgresql/9.2/Dockerfile

@@ -2,11 +2,13 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - && \
-    echo "deb http://apt.postgresql.org/pub/repos/apt precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    apt-get update
-
-RUN apt-get install -y postgresql-9.2 postgresql-contrib-9.2 && \
+RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt sid-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    apt-get update && \
+    apt-get install -y postgresql-9.2 postgresql-contrib-9.2 && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
     apt-get clean
 
 ADD config /

data/services/postgresql/9.2/config/bin/prepare-postgres

@@ -5,6 +5,8 @@ set -e
 user=$1
 password=$2
 
+sed -i 's/^\(lc_.*\)$/# \1/g' /etc/postgresql/9.2/main/postgresql.conf
+
 /etc/init.d/postgresql start
 
 su postgres -c "createuser --superuser ${user}"

data/services/postgresql/9.3/Dockerfile

@@ -2,11 +2,11 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - && \
-    echo "deb http://apt.postgresql.org/pub/repos/apt precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    apt-get update
-
-RUN apt-get install -y postgresql-9.3 postgresql-contrib-9.3 && \
+RUN apt-get update && \
+    apt-get install -y postgresql-9.3 postgresql-contrib-9.3 && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
     apt-get clean
 
 ADD config /

data/services/postgresql/9.3/config/bin/prepare-postgres

@@ -5,6 +5,8 @@ set -e
 user=$1
 password=$2
 
+sed -i 's/^\(lc_.*\)$/# \1/g' /etc/postgresql/9.3/main/postgresql.conf
+
 /etc/init.d/postgresql start
 
 su postgres -c "createuser --superuser ${user}"

data/services/redis/Dockerfile

@@ -2,14 +2,17 @@
 
 FROM fgrehm/ventriloquist-base
 
-# Make sure to update lib/ventriloquist/services/redis.rb if the version gets bumped
-RUN wget -q http://download.redis.io/releases/redis-2.8.2.tar.gz -O /tmp/redis.tar.gz && \
+RUN wget -q http://download.redis.io/releases/redis-2.8.8.tar.gz -O /tmp/redis.tar.gz && \
     cd /tmp && \
     tar xvfz redis.tar.gz && \
-    cd redis-2.8.2 && \
+    cd redis-2.8.8 && \
     make redis-server && \
     mv src/redis-server /usr/bin && \
-    cd .. && rm -rf redis*
+    cd .. && rm -rf redis* && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
+    apt-get clean
 
 EXPOSE 6379
 CMD    ["/usr/bin/redis-server"]

data/services/rethinkdb/Dockerfile

@@ -3,9 +3,16 @@
 
 FROM fgrehm/ventriloquist-base
 
-RUN add-apt-repository ppa:rethinkdb/ppa && \
+RUN wget http://blog.anantshri.info/content/uploads/2010/09/add-apt-repository.sh.txt -O /tmp/add-apt-repository.sh.txt && \
+    mv /tmp/add-apt-repository.sh.txt /usr/sbin/add-apt-repository && \
+    chmod o+x /usr/sbin/add-apt-repository && \
+    chown root:root /usr/sbin/add-apt-repository && \
+    add-apt-repository ppa:rethinkdb/ppa && \
     apt-get update && \
     apt-get install -y rethinkdb && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    apt-get autoremove && \
     apt-get clean
 
 # create the /rethinkdb_data dir structure

data/spec/spec_helper.rb

@@ -3,18 +3,16 @@ if ENV['COVERAGE'] == 'true'
   SimpleCov.start
 end
 
-require 'bogus/rspec'
-
+require 'vagrant'
 require 'ventriloquist'
 
-Bogus.configure do |c|
-  c.search_modules << VagrantPlugins::Ventriloquist
-  c.search_modules << VagrantPlugins::Vocker
-  c.search_modules << Vagrant
-end
-
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
+    mocks.verify_doubled_constant_names = true
+  end
+
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/unit/platforms_builder_spec.rb

@@ -5,12 +5,8 @@ require 'ventriloquist/platforms_builder'
 describe VagrantPlugins::Ventriloquist::PlatformsBuilder do
   Platform = VagrantPlugins::Ventriloquist::Platform
 
-  verify_contract(:platforms_builder)
-
-  fake(:docker_client)
-
-  let(:cfg)               { {version: '13.0'} }
-  let(:platforms_configs) { [{my_lang: cfg}, :your_lang, ['my_plat:version']] }
+  let(:cfg)               { {versions: '13.0'} }
+  let(:platforms_configs) { [{my_lang: cfg}, 'your_lang-1.2', ['my_plat-version']] }
   let(:custom_mapping)    { {'my_lang' => my_lang_class, 'your_lang' => your_lang_class, 'my_plat' => my_plat_class} }
 
   let(:my_lang_class) do
@@ -30,18 +26,18 @@ describe VagrantPlugins::Ventriloquist::PlatformsBuilder do
   let(:my_plat)   { platforms[2] }
 
   it 'builds a list of platform objects' do
-    expect(platforms).to have(3).items
+    expect(platforms.size).to eq(3)
     expect(my_lang).to   be_a(my_lang_class)
     expect(your_lang).to be_a(your_lang_class)
     expect(my_plat).to   be_a(my_plat_class)
   end
 
   it 'extracts version from platform name' do
-    expect(my_plat.config[:version]).to eq('version')
+    expect(my_plat.config[:versions]).to eq(['version'])
   end
 
   it 'defaults configured version to latest' do
-    expect(your_lang.config[:version]).to eq('latest')
+    expect(your_lang.config[:versions]).to eq(['1.2'])
   end
 
   it 'configures services using defined configs' do

data/spec/unit/service_spec.rb

@@ -1,21 +1,19 @@
 require 'spec_helper'
 
-require 'vocker/docker_client'
 require Vagrant.source_root.join('plugins/communicators/ssh/communicator')
+require Vagrant.source_root.join('plugins/provisioners/docker/client')
 
 require 'ventriloquist/service'
 
 describe VagrantPlugins::Ventriloquist::Service do
-  verify_contract(:service)
-
-  let(:docker_client) { fake(:docker_client, container_running?: false) }
-  fake(:communicator) { VagrantPlugins::CommunicatorSSH::Communicator }
-  fake(:ui)           { Vagrant::UI::Interface }
-  let(:env)           { fake(:environment, ui: ui) }
-  let(:machine)       { fake(:machine, communicate: communicator, env: env) }
+  let(:docker_client) { instance_double(VagrantPlugins::Docker::Client, container_running?: false, run_container: false) }
+  let(:communicator)  { instance_double(VagrantPlugins::CommunicatorSSH::Communicator, sudo: true) }
+  let(:ui)            { instance_double(Vagrant::UI::Interface, info: true) }
+  let(:env)           { instance_double(Vagrant::Environment, ui: ui) }
+  let(:machine)       { instance_double(Vagrant::Machine, communicate: communicator, env: env) }
 
   let(:service_name) { 'dbserver' }
-  let(:service_conf) { { image: 'user/dbserver', tag: 'latest' } }
+  let(:service_conf) { { image: 'user/dbserver', args: '--dns 127.0.0.1' } }
 
   subject { described_class.new(service_name, service_conf, docker_client) }
 
@@ -23,28 +21,28 @@ describe VagrantPlugins::Ventriloquist::Service do
 
   context 'given the container has not been created' do
     it 'runs the configured container' do
-      expect(docker_client).to have_received.run_container(service_conf)
+      expect(docker_client).to have_received(:run_container).with(service_conf)
     end
 
     it 'creates a directory for keeping container id files' do
-      expect(communicator).to have_received.sudo('mkdir -p /var/lib/ventriloquist/cids')
+      expect(communicator).to have_received(:sudo).with('mkdir -p /var/lib/ventriloquist/cids')
     end
 
     it 'assigns a cidfile based on the service name' do
       expected_cidfile = "#{described_class::CONTAINER_IDS_PATH}/#{service_name}"
-      expect(docker_client).to have_received.run_container(with{|c| c[:cidfile] == expected_cidfile})
+      expect(docker_client).to have_received(:run_container).with(hash_including(cidfile: expected_cidfile))
     end
 
-    it 'sets dns to 127.0.0.1 to reduce latency' do
-      expect(docker_client).to have_received.run_container(with{|c| c[:dns] == "127.0.0.1"})
+    it 'passes on additional args' do
+      expect(docker_client).to have_received(:run_container).with(hash_including(args: "--dns 127.0.0.1"))
     end
   end
 
   context 'given the container has already been created' do
-    let(:docker_client) { fake(:docker_client, container_running?: true) }
+    let(:docker_client) { double(VagrantPlugins::Docker::Client, container_running?: true, run_container: true) }
 
     it 'does not attempt to run container' do
-      expect(docker_client).to_not have_received.run_container(any_args)
+      expect(docker_client).to_not have_received(:run_container)
     end
   end
 end