ventriloquist 0.4.1 → 0.5.0

data/spec/unit/services_builder_spec.rb

@@ -1,24 +1,22 @@
 require 'spec_helper'
 
-require 'vocker/docker_client'
+require Vagrant.source_root.join('plugins/provisioners/docker/client')
 require 'ventriloquist/services_builder'
 
 describe VagrantPlugins::Ventriloquist::ServicesBuilder do
   Service = VagrantPlugins::Ventriloquist::Service
 
-  verify_contract(:services_builder)
+  let(:docker_client) { instance_double(VagrantPlugins::Docker::Client, container_running?: false, run_container: false) }
 
-  fake(:docker_client)
-
-  let(:pg_cfg)       { {image: 'user/pg', tag: '9.2'} }
+  let(:pg_cfg)       { {image: 'user/pg-9.2'} }
   let(:custom_mapping) { {'mysql' => custom_service} }
   let(:custom_service) { Class.new(Service) }
   let(:svcs_configs) { [
     {pg: pg_cfg},
     ['some-service'],
-    'mysql:1.2',
+    'mysql-1.2',
     {name: {type: 'mysql'}},
-    {api_db: {vimage: 'mysql'}}
+    {api_db: {vimage: 'mysql-2.1'}}
   ] }
 
   let(:services)  { described_class.new(svcs_configs, custom_mapping).build(docker_client) }
@@ -29,8 +27,8 @@ describe VagrantPlugins::Ventriloquist::ServicesBuilder do
   let(:vimage_ex) { services[4] }
 
   it 'builds a list of service objects' do
-    expect(services).to have(5).items
-    expect(services.all?{|s| s.is_a?(Service)}).to be_true
+    expect(services.size).to eq(5)
+    expect(services.all?{|s| s.is_a?(Service)}).to be_truthy
   end
 
   it 'uses container name as type' do
@@ -49,24 +47,16 @@ describe VagrantPlugins::Ventriloquist::ServicesBuilder do
     expect(pg.config).to eq(pg_cfg)
   end
 
-  it 'extracts tag from image name' do
-    expect(mysql.config[:tag]).to eq('1.2')
-  end
-
-  it 'defaults tag to "latest"' do
-    expect(other.config[:tag]).to eq('latest')
-  end
-
   it 'prepends "fgrehm/ventriloquist-" to image names if image config is not provided' do
-    expect(mysql.config[:image]).to eq('fgrehm/ventriloquist-mysql:1.2')
+    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')
+    expect(vimage_ex.config[:image]).to eq('fgrehm/ventriloquist-mysql-2.1')
   end
 
   it 'sets the service name' do
     expect(pg.name).to eq('pg')
-    expect(mysql.name).to eq('mysql')
+    expect(mysql.name).to eq('mysql-1.2')
   end
 end

data/ventriloquist.gemspec

@@ -17,6 +17,4 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
-  spec.add_dependency 'vocker', '~> 0.4.1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ventriloquist
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: vocker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+date: 2014-04-07 00:00:00.000000000 Z
+dependencies: []
 description: Vagrant development environments made easy
 email:
 - fgrehm@gmail.com
@@ -31,10 +17,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
+- DEVELOPMENT.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -68,6 +55,7 @@ files:
 - 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/debian/prepare_container_for_docker.rb
 - lib/ventriloquist/cap/utils/linux/download.rb
 - lib/ventriloquist/cap/utils/linux/make.rb
 - lib/ventriloquist/cap/utils/linux/untar.rb
@@ -136,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant development environments made easy