ventriloquist 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc7105f3470aecd479dfc4b912e772afb998b6f
-  data.tar.gz: 519f9aa61feb5a38f59861df91adbdbc42aec070
+  metadata.gz: 5c799387674e146e0396a38b5422e26a4dcfb073
+  data.tar.gz: 2b0e29b91d5e21013fec771db8c3e6662db998da
 SHA512:
-  metadata.gz: 718473cc0199a8b11e3aa8a0d60d02dd5bf361c4a85a2938c4191d1b0d5818343c67f66e5ebad0f438745e0dea15aeec65bf8568fad18679380364cf45434594
-  data.tar.gz: 7f29c4358b8c8d977da91239df25d4ea17cd1c9a161dd4d2d80ca1be63b23383ead91e640101eefdbe50ac0b824225d3f05e99978cf5b9bb92680f08c6be09fe
+  metadata.gz: e32700321ef1eeb72aa9d128cd39cacb2276ebc8c142e9f959694aa54d90ce4b8d323f509bbb61fbe0fd597d84a3bc186bae1557a78360daa65336af10acf90c
+  data.tar.gz: e04b3481a587aa7f2b8047aa3b69dfdb0a173ac2f8e9da6a809968264986bbdbfbead51bdb476ec2a84d1905d10b79ab2b2c9876fac0d0f77ac923be3ed827b0

data/.gitignore

@@ -13,6 +13,6 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+/tmp
 .vagrant
 .DS_Store

data/CHANGELOG.md

@@ -1,4 +1,46 @@
-## [0.3.2](https://github.com/fgrehm/ventriloquist/compare/v0.3.1...master) (October 28, 2013)
+## [0.4.0](https://github.com/fgrehm/ventriloquist/compare/v0.3.2...v0.4.0) (December 3, 2013)
+
+FEATURES:
+
+  - Added support for RethinkDB [[GH-4]]
+  - Support for installing guest specific packages (aka `apt-get install`)
+  - Introduce `:type` and `:vimage` parameters for services allowing us to provision
+    multiple containers of the same kind with less pain.
+  - Docker containers are now named after the services configured on the Vagrantfile
+
+BACKWARDS INCOMPATIBILITY:
+
+  - _All_ of the services images have been rebuilt from scratch. The reason behind
+    it is that we inlined `RUN` instructions in order to reduce the amount of AUFS
+    layers and disk space taken by images.
+  - From now on we'll lock Docker installation to a "known to work version"
+    by default (currently 0.7.0). Things are moving pretty fast over there and it
+    is pretty hard to keep up with all the changes and to ensure things are
+    running smooth. You can still specify the version on your `Vagrantfile` but
+    by default it will be a specific version.
+  - The Docker images that make up for services no longer exposes host ports by
+    default in order to aling with Docker's [recent changes](http://blog.docker.io/2013/10/docker-0-6-5-links-container-naming-advanced-port-redirects-host-integration)
+    related to the way exposed ports work.
+
+IMPROVEMENTS:
+
+  - core: Bumped [vocker] dependency to 0.4.0
+  - core: Provide feedback during provisioning whether a service is already running
+  - platforms/go: Bumped to 1.2
+  - platforms/elixir: Bumped to 0.11.2 [[GH-34]]
+  - platforms/phantomjs: Bumped to 1.9.2
+  - platforms/rvm: Install globally [[GH-24]]
+  - services: Most images had the `RUN` instructions inlined in order to reduce the amount
+    of AUFS layers
+  - services/elasticsearch: Bumped to 0.90.7
+  - services/memcached: Bumped to 1.4.15
+  - services/redis: Bumped to 2.8.2
+  - services/mysql: Support for 5.6
+  - services/postgresql: Support for 9.3
+  - services/postgresql: Make use of packages from http://apt.postgresql.org/pub/repos/apt
+    instead of the deprecated `ppa:pitti/postgresql`
+
+## [0.3.2](https://github.com/fgrehm/ventriloquist/compare/v0.3.1...v0.3.2) (October 28, 2013)
 
 BUG FIXES:
 
@@ -21,7 +63,7 @@ FEATURES:
 
 IMPROVEMENTS:
 
-  - Bump [vocker] dependency to 0.3.3
+  - Bump [vocker] dependency to 0.3.2
 
 ## [0.2.1](https://github.com/fgrehm/ventriloquist/compare/v0.2.0...v0.2.1) (October 12, 2013)
 
@@ -48,6 +90,9 @@ BUG FIXES:
 
 
 
+[GH-4]: https://github.com/fgrehm/ventriloquist/issues/4
+[GH-34]: https://github.com/fgrehm/ventriloquist/issues/24
+[GH-24]: https://github.com/fgrehm/ventriloquist/issues/24
 [GH-9]: https://github.com/fgrehm/ventriloquist/issues/9
 [GH-19]: https://github.com/fgrehm/ventriloquist/issues/19
 [GH-3]: https://github.com/fgrehm/ventriloquist/issues/3

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 group :development, :test do
   gem 'rake'
-  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.2.7'
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.3.5'
   gem 'rspec'
   gem 'simplecov', require: false
   gem 'bogus'
@@ -16,5 +16,6 @@ group :development do
   gem 'vagrant-pristine',      github: 'fgrehm/vagrant-pristine'
   gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
   gem 'vagrant-cachier',       github: 'fgrehm/vagrant-cachier'
+  gem 'vocker',                github: 'fgrehm/vocker'
   gem 'guard-rspec'
 end

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: 8e40d0c0603d3ae4b47aa5a06ec328b8be07df33
+  revision: 56b86a0debd6c899e92c10e403c4623b0d304fc1
   specs:
-    vagrant-cachier (0.4.1.dev)
+    vagrant-cachier (0.5.1.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-global-status.git
-  revision: a0295400a0e47756cbcb8f97ed9f4449b1fb6b56
+  revision: 2f1eb13b35567e04f3b5ee51996960199fc0c3e2
   specs:
-    vagrant-global-status (0.1.1)
+    vagrant-global-status (0.1.3.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: 9e3b371e11da3ad5ad29c9364b204bca4e7f3c1f
+  revision: c7fff4d9354b8c8fc4d75625dca3dfc411729032
   specs:
-    vagrant-lxc (0.6.4.dev)
+    vagrant-lxc (0.7.1.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
@@ -22,12 +22,18 @@ GIT
   specs:
     vagrant-pristine (0.3.0)
 
+GIT
+  remote: git://github.com/fgrehm/vocker.git
+  revision: d9539e7d6c2f377957bf7be3cf2184a5400de79b
+  specs:
+    vocker (0.4.1.dev)
+
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 7ec0ee1d00a916f80b109a298bab08e391945243
-  tag: v1.2.7
+  revision: a40522f5fabccb9ddabad03d836e120ff5d14093
+  tag: v1.3.5
   specs:
-    vagrant (1.2.7)
+    vagrant (1.3.5)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -38,8 +44,8 @@ GIT
 PATH
   remote: .
   specs:
-    ventriloquist (0.3.2)
-      vocker (~> 0.3.3)
+    ventriloquist (0.4.0)
+      vocker (~> 0.4.0)
 
 GEM
   remote: https://rubygems.org/
@@ -50,23 +56,24 @@ GEM
       timers (~> 1.1.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.9)
+    coderay (1.1.0)
     dependor (1.0.1)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
     erubis (2.7.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.2.2)
+    guard (2.2.4)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.0.3)
+    guard-rspec (4.1.0)
       guard (>= 2.1.1)
       rspec (~> 2.14)
-    i18n (0.6.5)
-    listen (2.1.1)
+    i18n (0.6.9)
+    listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -77,8 +84,8 @@ GEM
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.1.0)
@@ -89,18 +96,18 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
-    vocker (0.3.3)
 
 PLATFORMS
   ruby
@@ -117,3 +124,4 @@ DEPENDENCIES
   vagrant-lxc!
   vagrant-pristine!
   ventriloquist!
+  vocker!

data/README.md

@@ -6,14 +6,14 @@
 
 Ventriloquist combines [Vagrant](http://www.vagrantup.com/) and [Docker](http://www.docker.io/)
 to give **developers** the ability to configure portable and disposable development
-VMs with ease. It lowers the entry barrier of building a sane working environment without
-the need to learn tools like [Puppet](http://puppetlabs.com/puppet/what-is-puppet)
+environments with ease. It lowers the entry barrier of building a sane working environment
+without the need to learn tools like [Puppet](http://puppetlabs.com/puppet/what-is-puppet)
 or [Chef](http://www.opscode.com/chef/).
 
 Its core is made of a Vagrant plugin that uses a set of opinionated Docker
 images + some [guest capabilities](http://docs.vagrantup.com/v2/plugins/guest-capabilities.html)
-to provision VMs with services and programming language environments, think of
-it as a "Heroku for Vagrant" where a Dyno is your Vagrant machine and Docker
+to provision VMs with services, programming language environments and OS packages,
+think of it as a "Heroku for Vagrant" where a Dyno is your Vagrant machine and Docker
 services are its addons.
 
 To give you an idea, this is what it takes to configure a Vagrant VM ready
@@ -40,23 +40,17 @@ end
   to legacy projects.
 
 
-
 ## Status
 
-Early development, the feature set and configuration format might change rapidly
-and it is known to work with the following Ubuntu 13.04 Vagrant VMs using Docker
-0.6.1+ and Vagrant 1.2.0+:
+Basically a "stable experiment", I've been using VMs configured with the plugin
+for the last 3 months and I tested it against the following Ubuntu VMs using
+Docker 0.6.5+ and Vagrant 1.3.0+:
 
+* http://bit.ly/vagrant-lxc-raring64-2013-10-23 (yes! LXC inception :)
 * http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box
-* http://bit.ly/vagrant-lxc-raring64-2013-07-12 (yes! LXC inception :)
 
 _Please note that in order to use the plugin on [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
-containers you need some extra steps described below_
-
-On its current state is a "stable experiment", I've been using a setup with the
-plugin without hitting [major issues](https://github.com/fgrehm/ventriloquist/issues?labels=bug&page=1&state=open)
-for a while now.
-
+containers you need some [extra steps](#usage-with-vagrant-lxc) described below_
 
 
 ## Installation
@@ -70,15 +64,35 @@ vagrant plugin install ventriloquist
 
 ## Usage
 
-Just add the provisioner block to your Vagrantfile and `vagrant up` it:
+Add the provisioner block to your Vagrantfile and `vagrant up` it:
 
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.provision :ventriloquist do |env|
+    # Pick the Docker version you want to use (defaults to 0.7.0)
+    # or use :latest to install the latest version available
+    env.docker_version = '0.6.7'
+
     # Pick the services you need to have around
     env.services << %w( redis pg:9.1 memcached elasticsearch )
+
     # Configure your development environment
     env.platforms << %w( nodejs ruby:2.0.0 go )
+
+    # Install random packages
+    env.packages << %w( imagemagick htop sqlite3 )
+  end
+end
+```
+
+If you are using the plugin on a VirtualBox machine, you need to make sure the
+VM has at least 1gb of RAM, so make sure you have something similar to the code
+below on your `Vagrantfile`:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider "virtualbox" do |vb|
+    vb.customize ["modifyvm", :id, "--memory", 1024]
   end
 end
 ```
@@ -86,11 +100,24 @@ end
 
 ## Available services
 
+| Name          | Provides       | Notes |
+| ------------- | -------------- | ----- |
+| elasticsearch | 0.90.7         | Runs on port 9200 |
+| memcached     | 1.4.15         | Runs on port 11211 |
+| pg            | PostgreSQL 9.3 | Runs on port 5432 and adds an `export PGHOST=localhost` to the guest's `/etc/profile.d/ventriloquist`. It will also install the `postgresql-client` and `libpq-dev` packages on the guest. |
+| pg:9.2        | PostgreSQL 9.2 | Same as above |
+| pg:9.1        | PostgreSQL 9.1 | Same as above |
+| mysql         | 5.6            | Runs on port 3306 and creates a `/home/vagrant/.my.conf`. It will also install the `mysql-client` and `libmysqlclient-dev` packages on the guest. |
+| mysql:5.5     | 5.5            | Same as above |
+| redis         | 2.8.2          | Runs on port 6379 and installs / compiles the `redis-cli` excutable |
+| mailcatcher   | 0.5.12         | SMPT server runs on 1025 and web interface on 1080 |
+| rethinkdb     | 1.11.0         | Uses the 28015 port for the client driver, 29015 for the intracluster connections and 8080 for the administrative web UI |
+
 The `services` parameter passed in on the Vagrantfile are the ones built with the
 Dockerfiles available under [_/services_](services) that are configured to require
 no additional configuration for usage with the default `vagrant` user that usually
-comes with Vagrant boxes and will always be available from `localhost` using the
-default service port (like 5432 for PostgreSQL).
+comes with Vagrant boxes. Apart from that they'll always be available from `localhost`
+using the default service port (like 5432 for PostgreSQL).
 
 Some extra steps might be required to simplify the connection with the configured
 services. As an example, besides running the associated Docker image, setting up
@@ -99,17 +126,7 @@ PostgreSQL will involve installing the `postgresql-client` package and adding an
 the `psql` client works without any extra params.
 
 Please note that all of the builtin images are available on the [Docker index](https://index.docker.io/)
-with the `fgrehm/ventriloquist-` prefix that is ommited on the table below:
-
-| Name          | Provides       | Notes |
-| ------------- | -------------- | ----- |
-| elasticsearch | 0.90.3         | Runs on port 9200 |
-| memcached     | 1.4.14         | Runs on port 11211 |
-| pg            | PostgreSQL 9.2 | Runs on port 5432 and adds an `export PGHOST=localhost` to the guest's `/etc/profile.d/ventriloquist`. It will also install the `postgresql-client` and `libpq-dev` packages on the guest. |
-| pg:9.1        | PostgreSQL 9.1 | Same as above |
-| mysql         | 5.5            | Runs on port 3306 and creates a `/home/vagrant/.my.conf`. It will also install the `mysql-client` and `libmysqlclient-dev` packages on the guest. |
-| redis         | 2.4.15         | Runs on port 6379 and installs / compiles the `redis-cli` excutable |
-| mailcatcher   | 0.5.12         | SMPT server runs on 1025 and web interface on 1080 |
+with the `fgrehm/ventriloquist-` prefix that is ommited on the table above.
 
 Since services are just Docker images, you can build your own image, push to the
 registry and use it on your Vagrantfile, you'll just need to specify its fully
@@ -122,16 +139,46 @@ Vagrant.configure("2") do |config|
       redis: { image: 'username/redis' },
       pg:    { image: 'otheruser/pg', tag: 'latest' }
     }
+
+    # If you need more instances of a service, you'll need to give it a unique
+    # name and fine tune it at will, for example:
+    env.services << {
+      # This is basically a Vocker container definition
+      api_db: { image: 'otheruser/pg', ports: [':5432'] },
+
+      # The 'vimage' saves you from typing in `image: 'fgrehm/ventriloquist-redis'`
+      worker_redis: { vimage: 'redis' },
+
+      # The 'type' parameter tells Ventriloquist to configure the service with
+      # its defaults and does some extra work (like installing additional packages)
+      # if the service requires it
+      worker_db: { image: 'your-user/your-pg', type: 'pg' },
+    }
   end
 end
 ```
 
-If for more information on creating / running Docker containers please have a look
+For more information on creating / running Docker containers please have a look
 at [Vocker](https://github.com/fgrehm/vocker)'s documentation.
 
+If you want to build your own service and don't have plans to deploy your
+containers to production, make sure you "[inherit](services/redis/Dockerfile#L5)"
+your services from the [`fgrehm/ventriloquist-base`](services/base/Dockerfile)
+image in order to save on some disk space.
+
 
 ## Available platforms
 
+| Name      | Provides          |
+| --------- | ----------------- |
+| ruby      | rvm + Ruby 2.0.0  |
+| go        | 1.2               |
+| nodejs    | nvm + Nodejs 0.10 |
+| phantomjs | 1.9.2             |
+| erlang    | The latest version available at https://packages.erlang-solutions.com/erlang/ (currently R16B02) |
+| elixir    | 0.11.2            |
+| python    | pyenv + 3.3.2     |
+
 In order to configure the VM for usage with the programming language that your
 app is written on, the plugin leverages Vagrant's [guest capabilities](http://docs.vagrantup.com/v2/plugins/guest-capabilities.html)
 to deal with distribution specifics. Right now things should work just fine on
@@ -143,19 +190,37 @@ example above), the latest version of the available platforms will be installed.
 For example, if you omit the Ruby version you want to use, Ventriloquist will
 install 2.0.0 with the latest path level.
 
-So far I've only set up the stuff I need to work but feel free to submit a Pull
-Request with the scripts required to set things for other platforms:
 
-| Name      | Provides          |
-| --------- | ----------------- |
-| ruby      | rvm + Ruby 2.0.0  |
-| go        | 1.1.2             |
-| nodejs    | nvm + Nodejs 0.10 |
-| phantomjs | 1.9.1             |
-| erlang    | Currently limited to the latest version available at https://packages.erlang-solutions.com/erlang/ (currently R16B02) |
-| elixir    | 0.10.3            |
-| python    | pyenv + 3.3.2     |
+## System packages
+
+There are times that you just want to install some random set of packages on the guest
+machine and frequently you end up writing lots of inline shell scripts with
+`apt-get update && apt-get install ...`s all over the place. In order to avoid those
+long strings polluting your Vagrantfile you can use the `packages` parameter to save
+you a few keystrokes.
+
+In other words:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # This:
+  config.vm.provision :shell, inline: %[
+    apt-get update
+    apt-get install -y --force-yes -q \
+                    -o Dpkg::Options::='--force-confdef' \
+                    -o Dpkg::Options::='--force-confold' \
+                    htop sqlite3 curl lxc
+  ]
+
+  # Becomes this:
+  config.vm.provision :ventriloquist do |env|
+    env.packages << %w( htop sqlite3 curl lxc )
+  end
+end
+```
 
+Please note that once the package is instaled it won't ever be upgraded unless
+you run a `apt-get upgrade` or the equivalent.
 
 ## Ideas for improvements
 
@@ -219,6 +284,14 @@ if you don't do that the vagrant-lxc container will end up crashing as it
 will collide with the host's `lxcbr0`.
 
 
+## Support
+
+Support this project and [others by fgrehm](https://github.com/fgrehm)
+via [gittip](https://www.gittip.com/fgrehm/).
+
+[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png)](https://www.gittip.com/fgrehm/)
+
+
 ## Contributing
 
 1. Fork it
@@ -226,3 +299,5 @@ will collide with the host's `lxcbr0`.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/ventriloquist/trend.png)](https://bitdeli.com/free "Bitdeli Badge")