ventriloquist 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622451e1fa3cb26754ad42f9aebbc3951dbca561
-  data.tar.gz: 0932280472ea91d43f57ce5a187c3f92bf80710d
+  metadata.gz: 82064f44e25d2e9a5ee7ea37eabb54ad37c6c2d1
+  data.tar.gz: 6935426176d13de57a75f25f657a000da4b702aa
 SHA512:
-  metadata.gz: caeb20bb176e52a457af45a10807b2c9be4d25ce4dd45bba81fb150264b8e4d367b9558f07592aaabb36156a5a7e8525aac3f3e4f5205ae1f12a2055b29b9ec6
-  data.tar.gz: 190dac27b55fb95cc50a2f4aea6faf48cc7452b72827da819dfcfc2f72e18c1af48aaddd92347b667f407938a3c1bd1059d224736e5cd66e3c410e728b7bc550
+  metadata.gz: 5811c24a91a30e7f14c409e7f9aeccc91a68ea619e865d815194676397e131330ecb2c86d4b8ef0b33e5dde71b6d24880d63e0f8519a0d08b909b2347a62ef8c
+  data.tar.gz: 0d68175655d58a09e2a38d69a1f98aa3a75f0cc80780c47a60cdf8e231b7c551f3ae8530398539e96706e8f5b9ed32f124e163220a269ab69c00761d77fc5160

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,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:
+
+  - Bump dependency on Vocker to ~> 0.3.1 in order to fix errors when trying to
+    provision a machine that already have a service / container running.
+
 ## 0.1.0 (September 10, 2013)
 
   - Initial public release.
+
+
+
+[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,8 +38,8 @@ GIT
 PATH
   remote: .
   specs:
-    ventriloquist (0.1.0)
-      vocker (~> 0.3.0)
+    ventriloquist (0.2.0)
+      vocker (~> 0.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -99,7 +99,7 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.6)
     thor (0.18.1)
-    vocker (0.3.0)
+    vocker (0.3.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -23,8 +23,8 @@ for development on [Discourse](http://www.discourse.org/):
 Vagrant.configure("2") do |config|
   config.vm.box = "quantal64"
   config.vm.provision :ventriloquist do |env|
-    env.services  = %w( redis pg:9.1 )
-    env.platforms = %w( nodejs ruby:1.9.3 )
+    env.services  << %w( redis pg:9.1 mailcatcher )
+    env.platforms << %w( nodejs ruby:1.9.3 )
   end
 end
 ```
@@ -40,6 +40,7 @@ end
   languages / tools.
 
 
+
 ## Status
 
 Early development, the feature set and configuration format might change rapidly
@@ -52,10 +53,11 @@ and has only been tested on the following Ubuntu 13.04 Vagrant VMs using Docker
 _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 "somewhat stable experiment" as I've been using a setup with the
+On its current state is an "stable experiment", I've been using a setup with the
 plugin without issues for more than a week now.
 
 
+
 ## Installation
 
 Make sure you have Vagrant 1.2+ and run:
@@ -95,7 +97,7 @@ PostgreSQL will involve installing the `postgresql-client` package and adding an
 `export PGHOST=localhost` to the guest's `/etc/profiles.d/ventriloquist.sh` so that
 the `psql` client works without any extra params.
 
-Please note that all of the builtin images are available on the Docker registry
+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 |
@@ -106,6 +108,7 @@ with the `fgrehm/ventriloquist-` prefix that is ommited on the table below:
 | 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 |
 
 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

data/development/Vagrantfile

@@ -45,6 +45,6 @@ STR
     env.services << ['pg:9.1', 'mysql']
 
     env.platforms << { ruby: { version: '2.0.0' } }
-    env.platforms << %w( nodejs phantomjs go:1.1.2 )
+    env.platforms << %w( nodejs phantomjs go:1.1.2 erlang)
   end
 end

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

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Cap
+      module Debian
+        module ErlangInstall
+          ERLANG_SOLUTIONS_PKG = "https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb"
+
+          def self.erlang_install(machine)
+            machine.communicate.tap do |comm|
+              if ! comm.test('which erl > /dev/null')
+                machine.env.ui.info('Installing Erlang')
+
+                path = download_path(comm)
+                unless comm.test("test -f #{path}")
+                  machine.guest.capability(:download, ERLANG_SOLUTIONS_PKG, path)
+                end
+                comm.sudo("dpkg -i #{path}")
+
+                comm.sudo('apt-get update')
+                comm.sudo('apt-get -y install erlang')
+              end
+            end
+          end
+
+          private
+
+          def self.download_path(comm)
+            # If vagrant-cachier apt cache bucket is available, drop it there
+            if comm.test("test -d /tmp/vagrant-cache/apt")
+              "/tmp/vagrant-cache/apt/erlang-solutions_1.0_all.deb"
+            else
+              "/tmp/erlang-solutions_1.0_all.deb"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/platforms/erlang.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module Ventriloquist
+    module Platforms
+      class Erlang < Platform
+        def provision(machine)
+          machine.guest.capability(:erlang_install)
+        end
+      end
+    end
+  end
+end

data/lib/ventriloquist/platforms_builder.rb

@@ -3,6 +3,7 @@ require_relative 'platforms/ruby'
 require_relative 'platforms/nodejs'
 require_relative 'platforms/phantomjs'
 require_relative 'platforms/go'
+require_relative 'platforms/erlang'
 
 module VagrantPlugins
   module Ventriloquist
@@ -12,6 +13,7 @@ module VagrantPlugins
         'nodejs'    => Platforms::NodeJS,
         'phantomjs' => Platforms::PhantomJS,
         'go'        => Platforms::Go,
+        'erlang'    => Platforms::Erlang
       }
 
       def initialize(platforms, mapping = MAPPING)

data/lib/ventriloquist/plugin.rb

@@ -114,6 +114,11 @@ module VagrantPlugins
         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
     end
   end
 end

data/lib/ventriloquist/version.rb

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

data/services/build-all.sh

@@ -18,3 +18,5 @@ docker build -t ${PREFIX}-elasticsearch elasticsearch
 docker build -t ${PREFIX}-memcached memcached
 
 docker build -t ${PREFIX}-redis redis
+
+docker build -t ${PREFIX}-mailcatcher mailcatcher

data/services/mailcatcher/Dockerfile

@@ -0,0 +1,13 @@
+# MailCatcher X.X.X
+#
+# VERSION               0.0.1
+
+FROM fgrehm/ventriloquist-base
+MAINTAINER Fabio Rehm "fgrehm@gmail.com"
+
+RUN apt-get install -y ruby ruby-dev sqlite3 libsqlite3-dev && apt-get clean
+RUN gem install mailcatcher --no-ri --no-rdoc
+
+EXPOSE 1025:1025
+EXPOSE 1080:1080
+CMD    ["/usr/local/bin/mailcatcher", "-f", "--ip", "0.0.0.0"]

data/spec/unit/service_spec.rb

@@ -10,7 +10,9 @@ describe VagrantPlugins::Ventriloquist::Service do
 
   fake(:docker_client)
   fake(:communicator) { VagrantPlugins::CommunicatorSSH::Communicator }
-  let(:machine)       { fake(:machine, communicate: communicator) }
+  fake(:ui)           { Vagrant::UI::Interface }
+  let(:env)           { fake(:environment, ui: ui) }
+  let(:machine)       { fake(:machine, communicate: communicator, env: env) }
 
   let(:service_name) { 'dbserver' }
   let(:service_conf) { { image: 'user/dbserver', tag: 'latest' } }

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.0'
+  spec.add_dependency 'vocker', '~> 0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ventriloquist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-03 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.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 description: Vagrant development environments made easy
 email:
 - fgrehm@gmail.com
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -42,6 +43,7 @@ files:
 - Rakefile
 - development/Vagrantfile
 - lib/ventriloquist.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
@@ -63,6 +65,7 @@ files:
 - lib/ventriloquist/config.rb
 - lib/ventriloquist/errors.rb
 - lib/ventriloquist/platform.rb
+- lib/ventriloquist/platforms/erlang.rb
 - lib/ventriloquist/platforms/go.rb
 - lib/ventriloquist/platforms/nodejs.rb
 - lib/ventriloquist/platforms/phantomjs.rb
@@ -80,6 +83,7 @@ files:
 - services/base/Dockerfile
 - services/build-all.sh
 - services/elasticsearch/Dockerfile
+- services/mailcatcher/Dockerfile
 - services/memcached/Dockerfile
 - services/mysql/Dockerfile
 - services/mysql/config/bin/add-mysql-user