From 5fc104fb7c96da9ed308ba148c45dd09ff8f590a Mon Sep 17 00:00:00 2001 From: Tomas Doran Date: Tue, 22 Sep 2015 21:04:56 -0700 Subject: [PATCH] Unfuck the Gemfile to do the right thing w docker --- Gemfile | 2 ++ Gemfile.lock | 8 +++++--- synapse.gemspec | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cf1d57e5..b94f21bf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,6 @@ source 'https://rubygems.org' +gem 'docker-api', :require => 'docker' + # Specify your gem's dependencies in synapse.gemspec gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 07b0aba3..1bb63688 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ PATH synapse (0.12.1) aws-sdk (~> 1.39) docker-api (~> 1.7.2) + etcd (~> 0.2.4) zk (~> 1.9.4) GEM @@ -21,6 +22,8 @@ GEM archive-tar-minitar excon (>= 0.28) json + etcd (0.2.4) + mixlib-log excon (0.45.4) ffi (1.9.3-java) json (1.8.3) @@ -30,6 +33,7 @@ GEM multi_json (>= 1.8.4) method_source (0.8.2) mini_portile (0.6.2) + mixlib-log (1.6.0) multi_json (1.11.2) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) @@ -70,11 +74,9 @@ PLATFORMS ruby DEPENDENCIES + docker-api pry pry-nav rake rspec (~> 3.1.0) synapse! - -BUNDLED WITH - 1.10.5 diff --git a/synapse.gemspec b/synapse.gemspec index 4c23cae3..ab3e60d9 100644 --- a/synapse.gemspec +++ b/synapse.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.add_runtime_dependency "aws-sdk", "~> 1.39" - gem.add_runtime_dependency "docker-api", "~> 1.7.2" + gem.add_runtime_dependency 'docker-api', "~> 1.7.2" gem.add_runtime_dependency "zk", "~> 1.9.4" gem.add_runtime_dependency "etcd", "~> 0.2.4"