diff --git a/Gemfile b/Gemfile index 4688cf2..fa75df1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,3 @@ source 'https://rubygems.org' -gem 'fog' -gem 'capistrano' - -gem 'json', :platforms => :ruby_18 +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index c5f3bf2..94d5a6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,21 @@ +PATH + remote: . + specs: + conan (0.4.10) + capistrano + fog + GEM remote: https://rubygems.org/ specs: builder (3.2.0) - capistrano (2.9.0) + capistrano (2.14.1) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - excon (0.20.0) + excon (0.20.1) fog (1.10.0) builder excon (~> 0.14) @@ -20,17 +27,16 @@ GEM nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.4) - highline (1.6.11) - json (1.7.5) + highline (1.6.16) mime-types (1.21) multi_json (1.7.1) net-scp (1.1.0) net-ssh (>= 2.6.5) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) + net-sftp (2.1.1) + net-ssh (>= 2.6.5) net-ssh (2.6.6) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) nokogiri (1.5.7) ruby-hmac (0.4.0) @@ -38,6 +44,4 @@ PLATFORMS ruby DEPENDENCIES - capistrano - fog - json + conan! diff --git a/conan.gemspec b/conan.gemspec index 306f7be..6f38e2d 100644 --- a/conan.gemspec +++ b/conan.gemspec @@ -11,8 +11,7 @@ Gem::Specification.new do |s| s.homepage = "http://github.com/madebymany/conan" s.summary = "Conan The Deployer" s.description = "Set up a project to enable the provision of infrastructure through AWS and the configuration of servers using Chef via Capistrano." - s.add_dependency "json", ">= 1.6.1" - s.add_dependency "capistrano", "~> 2.12.0" + s.add_dependency "capistrano" s.add_dependency "fog" s.executables = ["conan"] s.files = Dir["{bin,lib}/**/*"] + %w[README.md]