ventriloquist 0.3.2 → 0.4.0

data/services/redis/Dockerfile

@@ -1,11 +1,15 @@
-# Redis Server 2.4.15
-#
-# VERSION               0.0.1
+# Redis Server
 
 FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
 
-RUN apt-get install -y redis-server
+# 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 && \
+    cd /tmp && \
+    tar xvfz redis.tar.gz && \
+    cd redis-2.8.2 && \
+    make redis-server && \
+    mv src/redis-server /usr/bin && \
+    cd .. && rm -rf redis*
 
-EXPOSE 6379:6379
+EXPOSE 6379
 CMD    ["/usr/bin/redis-server"]

data/services/rethinkdb/Dockerfile

@@ -0,0 +1,17 @@
+# Dockerfile for Rethinkdb
+# Based on https://github.com/crosbymichael/Dockerfiles/blob/master/rethinkdb/Dockerfile
+
+FROM fgrehm/ventriloquist-base
+
+RUN add-apt-repository ppa:rethinkdb/ppa && \
+    apt-get update && \
+    apt-get install -y rethinkdb && \
+    apt-get clean
+
+# create the /rethinkdb_data dir structure
+RUN /usr/bin/rethinkdb create
+
+# Rethinkdb process, cluster, and webui
+EXPOSE 28015 29015 8080
+
+CMD ["/usr/bin/rethinkdb", "--bind", "all"]

data/spec/unit/service_spec.rb

@@ -8,7 +8,7 @@ require 'ventriloquist/service'
 describe VagrantPlugins::Ventriloquist::Service do
   verify_contract(:service)
 
-  fake(:docker_client)
+  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) }
@@ -21,20 +21,30 @@ describe VagrantPlugins::Ventriloquist::Service do
 
   before { subject.provision(machine) }
 
-  it 'runs the configured container' do
-    expect(docker_client).to have_received.run_container(service_conf)
-  end
+  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)
+    end
 
-  it 'creates a directory for keeping container id files' do
-    expect(communicator).to have_received.sudo('mkdir -p /var/lib/ventriloquist/cids')
-  end
+    it 'creates a directory for keeping container id files' do
+      expect(communicator).to have_received.sudo('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})
+    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})
+    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"})
+    end
   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"})
+  context 'given the container has already been created' do
+    let(:docker_client) { fake(:docker_client, container_running?: true) }
+
+    it 'does not attempt to run container' do
+      expect(docker_client).to_not have_received.run_container(any_args)
+    end
   end
 end

data/spec/unit/services_builder_spec.rb

@@ -11,22 +11,36 @@ describe VagrantPlugins::Ventriloquist::ServicesBuilder do
   fake(:docker_client)
 
   let(:pg_cfg)       { {image: 'user/pg', tag: '9.2'} }
-  let(:svcs_configs) { [{pg: pg_cfg}, ['some-service'], 'mysql:1.2'] }
   let(:custom_mapping) { {'mysql' => custom_service} }
   let(:custom_service) { Class.new(Service) }
+  let(:svcs_configs) { [
+    {pg: pg_cfg},
+    ['some-service'],
+    'mysql:1.2',
+    {name: {type: 'mysql'}},
+    {api_db: {vimage: 'mysql'}}
+  ] }
 
-  let(:services) { described_class.new(svcs_configs, custom_mapping).build(docker_client) }
-  let(:pg)       { services[0] }
-  let(:other)    { services[1] }
-  let(:mysql)    { services[2] }
+  let(:services)  { described_class.new(svcs_configs, custom_mapping).build(docker_client) }
+  let(:pg)        { services[0] }
+  let(:other)     { services[1] }
+  let(:mysql)     { services[2] }
+  let(:mysql_2)   { services[3] }
+  let(:vimage_ex) { services[4] }
 
   it 'builds a list of service objects' do
-    expect(services).to have(3).items
-    expect(pg).to be_a(Service)
-    expect(other).to be_a(Service)
+    expect(services).to have(5).items
+    expect(services.all?{|s| s.is_a?(Service)}).to be_true
+  end
+
+  it 'uses container name as type' do
     expect(mysql).to be_a(custom_service)
   end
 
+  it 'looks up service class by type name' do
+    expect(mysql_2).to be_a(custom_service)
+  end
+
   it 'sets the docker client for services' do
     expect(pg.docker_client).to eq(docker_client)
   end
@@ -47,6 +61,10 @@ describe VagrantPlugins::Ventriloquist::ServicesBuilder do
     expect(mysql.config[:image]).to eq('fgrehm/ventriloquist-mysql:1.2')
   end
 
+  it 'expands vimage' do
+    expect(vimage_ex.config[:image]).to eq('fgrehm/ventriloquist-mysql:latest')
+  end
+
   it 'sets the service name' do
     expect(pg.name).to eq('pg')
     expect(mysql.name).to eq('mysql')

data/ventriloquist.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'vocker', '~> 0.3.3'
+  spec.add_dependency 'vocker', '~> 0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ventriloquist
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vocker
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 description: Vagrant development environments made easy
 email:
 - fgrehm@gmail.com
@@ -41,30 +41,36 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- base_box/README.md
+- base_box/Vagrantfile
 - development/Vagrantfile
 - lib/ventriloquist.rb
-- lib/ventriloquist/cap/debian/elixir_install.rb
-- lib/ventriloquist/cap/debian/erlang_install.rb
-- lib/ventriloquist/cap/debian/git_install.rb
-- lib/ventriloquist/cap/debian/go_install.rb
-- lib/ventriloquist/cap/debian/install_build_tools.rb
-- 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/pg_install_client.rb
-- lib/ventriloquist/cap/debian/pg_install_headers.rb
-- lib/ventriloquist/cap/debian/phantomjs_install.rb
-- lib/ventriloquist/cap/debian/python.rb
-- lib/ventriloquist/cap/debian/ventriloquist_containers_upstart.rb
-- 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
-- lib/ventriloquist/cap/linux/untar.rb
+- lib/ventriloquist/cap/platforms.rb
+- lib/ventriloquist/cap/platforms/debian/elixir_install.rb
+- lib/ventriloquist/cap/platforms/debian/erlang_install.rb
+- lib/ventriloquist/cap/platforms/debian/go_install.rb
+- lib/ventriloquist/cap/platforms/debian/phantomjs_install.rb
+- lib/ventriloquist/cap/platforms/debian/python.rb
+- lib/ventriloquist/cap/platforms/linux/nvm_install.rb
+- lib/ventriloquist/cap/platforms/linux/nvm_install_nodejs.rb
+- lib/ventriloquist/cap/platforms/linux/rvm_install.rb
+- lib/ventriloquist/cap/platforms/linux/rvm_install_ruby.rb
+- lib/ventriloquist/cap/services.rb
+- lib/ventriloquist/cap/services/debian/mysql_install_client.rb
+- lib/ventriloquist/cap/services/debian/mysql_install_headers.rb
+- lib/ventriloquist/cap/services/debian/pg_install_client.rb
+- lib/ventriloquist/cap/services/debian/pg_install_headers.rb
+- lib/ventriloquist/cap/services/debian/ventriloquist_containers_upstart.rb
+- lib/ventriloquist/cap/services/linux/mysql_configure_client.rb
+- lib/ventriloquist/cap/services/linux/pg_export_pghost.rb
+- lib/ventriloquist/cap/utils.rb
+- lib/ventriloquist/cap/utils/debian/git_install.rb
+- lib/ventriloquist/cap/utils/debian/install_build_tools.rb
+- lib/ventriloquist/cap/utils/debian/install_packages.rb
+- lib/ventriloquist/cap/utils/debian/mercurial_install.rb
+- lib/ventriloquist/cap/utils/linux/download.rb
+- lib/ventriloquist/cap/utils/linux/make.rb
+- lib/ventriloquist/cap/utils/linux/untar.rb
 - lib/ventriloquist/config.rb
 - lib/ventriloquist/errors.rb
 - lib/ventriloquist/platform.rb
@@ -79,9 +85,13 @@ files:
 - lib/ventriloquist/plugin.rb
 - lib/ventriloquist/provisioner.rb
 - lib/ventriloquist/service.rb
+- lib/ventriloquist/services/elastic_search.rb
+- lib/ventriloquist/services/mail_catcher.rb
+- lib/ventriloquist/services/memcached.rb
 - lib/ventriloquist/services/mysql.rb
 - lib/ventriloquist/services/postgresql.rb
 - lib/ventriloquist/services/redis.rb
+- lib/ventriloquist/services/rethink_db.rb
 - lib/ventriloquist/services_builder.rb
 - lib/ventriloquist/version.rb
 - locales/en.yml
@@ -90,8 +100,11 @@ files:
 - services/elasticsearch/Dockerfile
 - services/mailcatcher/Dockerfile
 - services/memcached/Dockerfile
-- services/mysql/Dockerfile
-- services/mysql/config/bin/add-mysql-user
+- services/mysql/5.5/Dockerfile
+- services/mysql/5.5/config/bin/add-mysql-user
+- services/mysql/5.6/Dockerfile
+- services/mysql/5.6/config/bin/add-mysql-user
+- services/mysql/5.6/config/etc/my.cnf
 - services/openjdk7/Dockerfile
 - services/postgresql/9.1/Dockerfile
 - services/postgresql/9.1/config/bin/prepare-postgres
@@ -101,7 +114,12 @@ files:
 - services/postgresql/9.2/config/bin/prepare-postgres
 - services/postgresql/9.2/config/bin/start-postgres
 - services/postgresql/9.2/config/etc/postgresql/9.2/main/postgresql.conf
+- services/postgresql/9.3/Dockerfile
+- services/postgresql/9.3/config/bin/prepare-postgres
+- services/postgresql/9.3/config/bin/start-postgres
+- services/postgresql/9.3/config/etc/postgresql/9.3/main/postgresql.conf
 - services/redis/Dockerfile
+- services/rethinkdb/Dockerfile
 - spec/spec_helper.rb
 - spec/unit/platforms_builder_spec.rb
 - spec/unit/service_spec.rb

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

@@ -1,18 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Debian
-        module GitInstall
-          def self.git_install(machine)
-            machine.communicate.tap do |comm|
-              if ! comm.test('which git > /dev/null')
-                machine.env.ui.info('Installing git')
-                comm.sudo('apt-get install -y git')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Debian
-        module InstallBuildTools
-          def self.install_build_tools(machine)
-            machine.communicate.tap do |comm|
-              if ! comm.test('dpkg -l | grep build-essential')
-                machine.env.ui.info('Installing build tools')
-                comm.sudo('apt-get install -y build-essential')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Debian
-        module MercurialInstall
-          def self.mercurial_install(machine)
-            machine.communicate.tap do |comm|
-              if ! comm.test('which hg > /dev/null')
-                machine.env.ui.info('Installing mercurial')
-                comm.sudo('apt-get install -y mercurial')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Linux
-        module Download
-          # FIXME: Use vagrant downloader and upload to guest machine
-          def self.download(machine, src, destination)
-            machine.communicate.tap do |comm|
-              if comm.test('which wget')
-                machine.env.ui.info("Downloading #{src} to #{destination}")
-                comm.execute("wget #{src} -O #{destination}")
-
-              elsif comm.test('which curl')
-                machine.env.ui.info("Downloading #{src} to #{destination}")
-                comm.execute("curl #{src} -o #{destination}")
-
-              else
-                raise 'Unable to download file for guest VM!'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-module VagrantPlugins
-  module Ventriloquist
-    module Cap
-      module Linux
-        module RvmInstall
-          def self.rvm_install(machine)
-            if ! machine.communicate.test('test -d $HOME/.rvm')
-              machine.env.ui.info('Installing RVM')
-              machine.communicate.execute('\curl -L https://get.rvm.io | bash -s stable --autolibs=enabled --ignore-dotfiles')
-              machine.communicate.execute("echo 'source $HOME/.rvm/scripts/rvm' >> ~/.profile")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/services/mysql/Dockerfile

@@ -1,20 +0,0 @@
-# MySQL 5.5
-#
-# VERSION               0.0.1
-
-FROM fgrehm/ventriloquist-base
-MAINTAINER Fabio Rehm "fgrehm@gmail.com"
-
-# 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
-
-RUN apt-get -q -y install mysql-server-5.5 && apt-get clean
-
-# allow autostart again
-RUN rm /usr/sbin/policy-rc.d
-
-ADD config /
-RUN /bin/add-mysql-user vagrant vagrant
-
-EXPOSE  3306:3306
-CMD     ["/usr/sbin/mysqld"]