dockly 2.2.0 → 2.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzU2YTdjMzNkOTQ4ZGYzNWI4MWZlMjY1MTFlYWUwMTQwOGI4NTdmZA==
+  data.tar.gz: !binary |-
+    MmI0ZjY4NTFlMDQxYzJmNmVlYjViZjk1MTAxNWM5ODY1ZjNlZmUzOQ==
+SHA512:
+  metadata.gz: !binary |-
+    YjllNDAyZjM1ODQ1MWEwZjlhYWQwMWM0ZTAzMzI4ZGEzNTk3OTI1ZDI2OTFl
+    ODkzNjhkZTk0MzNhN2Q2NjdjZjNlODRhZjMwMzJhYTU1ZmY5ODkxNTdjYTFh
+    MTU5ZGNhYzhjNDFjODU0Yjk2ZWI3MmNhZWZkYjVjNGJjNzBhZjU=
+  data.tar.gz: !binary |-
+    NDM3MjNhZDMyZGFmY2VkYWNhMTQ3NzliMWIxMjRiMWM2ZjNmMWJhYThkNjEy
+    ODBlNTc4YzM2MTNiOTQ4YTc3YzExMzA0ZGE4OTMzODFkZjgyZGM5NDFjMmYx
+    ZmY2NWI1ZWNkMmIzNjBjNWM0MDdlMWY3MWQ4YmZkYmVjNGRjYTk=

data/lib/dockly/deb.rb

@@ -26,6 +26,7 @@ class Dockly::Deb
   end
 
   def create_package!
+    info "creating package"
     ensure_present! :build_dir, :deb_build_dir
     FileUtils.mkdir_p(File.join(build_dir, deb_build_dir))
     FileUtils.rm(build_path) if File.exist?(build_path)
@@ -41,9 +42,7 @@ class Dockly::Deb
   end
 
   def build
-    info "creating package"
     create_package!
-    info "uploading to s3"
     upload_to_s3
   end
 
@@ -64,6 +63,7 @@ class Dockly::Deb
   end
 
   def upload_to_s3
+    info "uploading to s3"
     return if s3_bucket.nil?
     raise "Package wasn't created!" unless File.exist?(build_path)
     info "uploading package to s3"

data/lib/dockly/docker.rb

@@ -39,6 +39,21 @@ class Dockly::Docker
     cleanup([image]) if cleanup_images
   end
 
+  def export_only
+    if image = find_image_by_repotag
+      info "Found image by repo:tag: #{repo}:#{tag} - #{image.inspect}"
+      export_image(image)
+    else
+      raise "Could not find image"
+    end
+  end
+
+  def find_image_by_repotag
+    Docker::Image.all.find do |image|
+      image.info["RepoTags"].include?("#{repo}:#{tag}")
+    end
+  end
+
   def generate_build
     Docker.options = { :read_timeout => timeout, :write_timeout => timeout }
     images = {}
@@ -179,7 +194,7 @@ class Dockly::Docker
     info "running custom build steps, starting with id: #{image.id}"
     out_image = ::Docker::Image.build("from #{image.id}\n#{build}")
     info "finished running custom build steps, result id: #{out_image.id}"
-    out_image.tap { |img| img.tag(:repo => repo, :tag => tag) }
+    out_image.tap { |img| img.tag(repo: repo, tag: tag, force: true) }
   end
 
   def repo
@@ -227,6 +242,7 @@ class Dockly::Docker
     end
     raise
   ensure
+    container.tap(&:wait).remove if container
     gzip_output.close if gzip_output
   end
 

data/lib/dockly/rake_task.rb

@@ -53,48 +53,97 @@ namespace :dockly do
     raise "No dockly.rb found!" unless File.exist?('dockly.rb')
   end
 
+  prepare_targets = []
+  upload_targets = []
   build_targets = []
 
   namespace :deb do
     Dockly.debs.values.each do |inst|
-      deb inst.name => 'dockly:load' do |name|
-        Thread.current[:rake_task] = name
-        inst.build
+      namespace :prepare do
+        task inst.name => 'dockly:load' do |name|
+          inst.create_package!
+        end
       end
+
+      namespace :upload do
+        deb inst.name => 'dockly:load' do |name|
+          inst.upload_to_s3
+        end
+      end
+
+      deb inst.name => [
+        'dockly:load',
+        "dockly:deb:prepare:#{inst.name}",
+        "dockly:deb:upload:#{inst.name}"
+      ]
+      prepare_targets << "dockly:deb:prepare:#{inst.name}"
+      upload_targets << "dockly:deb:upload:#{inst.name}"
       build_targets << "dockly:deb:#{inst.name}"
     end
   end
 
   namespace :rpm do
     Dockly.rpms.values.each do |inst|
-      rpm inst.name => 'dockly:load' do |name|
-        Thread.current[:rake_task] = name
-        inst.build
+      namespace :prepare do
+        task inst.name => 'dockly:load' do |name|
+          inst.create_package!
+        end
+      end
+
+      namespace :upload do
+        rpm inst.name => 'dockly:load' do |name|
+          inst.upload_to_s3
+        end
       end
+
+      rpm inst.name => [
+        'dockly:load',
+        "dockly:rpm:prepare:#{inst.name}",
+        "dockly:rpm:upload:#{inst.name}"
+      ]
+      prepare_targets << "dockly:rpm:prepare:#{inst.name}"
+      upload_targets << "dockly:rpm:upload:#{inst.name}"
       build_targets << "dockly:rpm:#{inst.name}"
     end
   end
 
   namespace :docker do
     Dockly.dockers.values.each do |inst|
-      docker inst.name => 'dockly:load' do
-        Thread.current[:rake_task] = inst.name
-        inst.generate!
+      # For backwards compatibility
+      namespace :noexport do
+        task inst.name => "dockly:docker:prepare:#{inst.name}"
       end
 
-      namespace :noexport do
+      namespace :prepare do
         task inst.name => 'dockly:load' do
           Thread.current[:rake_task] = inst.name
           inst.generate_build
         end
       end
 
+      namespace :upload do
+        task inst.name => 'dockly:load' do
+          Thread.current[:rake_task] = inst.name
+          inst.export_only
+        end
+      end
+
+      docker inst.name => [
+        'dockly:load',
+        "dockly:docker:prepare:#{inst.name}",
+        "dockly:docker:upload:#{inst.name}"
+      ]
+
       # Docker image will be generated by 'dockly:deb:package'
       unless inst.s3_bucket.nil?
+        prepare_targets << "dockly:docker:prepare:#{inst.name}"
+        upload_targets << "dockly:docker:upload:#{inst.name}"
         build_targets << "dockly:docker:#{inst.name}"
       end
     end
   end
 
+  multitask :prepare_all => prepare_targets
+  multitask :upload_all => upload_targets
   multitask :build_all => build_targets
 end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/dockly/build_cache/docker_spec.rb

@@ -46,7 +46,7 @@ describe Dockly::BuildCache::Docker, :docker do
       it "does not have the file lol" do
         i = build_cache.execute!
         output = ""
-        i.run('ls').attach { |source,chunk| output += chunk }
+        i.run('ls').attach(logs: true) { |source,chunk| output += chunk }
         output.should_not include('lol')
       end
     end
@@ -60,8 +60,8 @@ describe Dockly::BuildCache::Docker, :docker do
 
       it "does have the file lol" do
         i = build_cache.execute!
-        output = i.run('ls /').attach(:stdout => true)
-        output.first.first.lines.map(&:chomp).should include('lol')
+        output = i.run('ls /').attach(stdout: true, logs: true)
+        expect(output.first.grep(/lol/)).to_not be_empty
       end
     end
   end
@@ -75,7 +75,7 @@ describe Dockly::BuildCache::Docker, :docker do
       it "does have the file lol" do
         i = build_cache.run_build
         output = ""
-        i.run('ls').attach { |source,chunk| output += chunk }
+        i.run('ls').attach(logs: true) { |source,chunk| output += chunk }
         output.should include('lol')
       end
     end
@@ -156,7 +156,7 @@ describe Dockly::BuildCache::Docker, :docker do
     context "when parameter command returns successfully" do
       let(:command) { "uname -r" }
       it 'returns the output of the parameter_command' do
-        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d{2}-generic\Z/)
+        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d{1,2}-\w+\Z/)
       end
     end
 

data/spec/dockly/deb_spec.rb

@@ -69,6 +69,13 @@ describe Dockly::Deb do
         end
       end
 
+      after do
+        image = ::Docker::Image.all.find do |image|
+          image.info['RepoTags'].include?('deb_test:latest')
+        end
+        image.remove if image
+      end
+
       it 'builds the docker image and adds it to the deb' do
         subject.create_package!
         `dpkg --contents #{filename}`
@@ -87,13 +94,20 @@ describe Dockly::Deb do
 
           registry :test_docker_registry do
             auth_config_file '/etc/docker/.dockercfg'
-            username 'tlunter'
-            email 'tlunter@gmail.com'
-            password '******'
+            username ENV['DOCKER_USER']
+            email ENV['DOCKER_EMAIL']
+            password ENV['DOCKER_PASS']
           end
         end
       end
 
+      after do
+        image = ::Docker::Image.all.find do |image|
+          image.info['RepoTags'].include?("#{ENV['DOCKER_USER']}/deb_test:latest")
+        end
+        image.remove if image
+      end
+
       it 'builds the docker image and adds it to the deb' do
         subject.create_package!
         `dpkg --contents #{filename}`

data/spec/dockly/docker_spec.rb

@@ -64,7 +64,16 @@ describe Dockly::Docker do
   end
 
   describe '#import_base', :docker do
+    let(:images) { [] }
+    let(:docker_file_s3) { 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz' }
     let(:docker_file) { 'docker-export-ubuntu-latest.tar.gz' }
+    let(:container) { Docker::Container.create('Image' => images.last.id, 'Cmd' => ['ls', '-1', '/']) }
+    let(:output) { container.tap(&:start).attach(logs: true) }
+
+    after do
+      container.tap(&:wait).remove
+      images.last.remove
+    end
 
     # TODO: since we used to run this w/ Vagrant, we put it all together; break it up
     it 'works' do
@@ -72,27 +81,21 @@ describe Dockly::Docker do
       subject.tag 'my-app'
       unless File.exist?(docker_file)
         File.open(docker_file, 'wb') do |file|
-          Excon.get('https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz',
-                    :response_block => lambda { |chunk, _, _| file.write(chunk) })
+          Excon.get(docker_file_s3, response_block: lambda { |chunk, _, _| file.write(chunk) })
         end
       end
-      image = subject.import_base(subject.ensure_tar(docker_file))
-      image.should_not be_nil
-      image.id.should_not be_nil
+      images << subject.import_base(subject.ensure_tar(docker_file))
+      expect(images.last).to_not be_nil
+      expect(images.last.id).to_not be_nil
 
       # it 'builds'
       subject.build "run touch /lol"
-      image = subject.build_image(image)
-      container = Docker::Container.create('Image' => image.id, 'Cmd' => ['ls', '-1', '/'])
-      output = container.tap(&:start).attach(logs: true)
-      output[0].grep(/lol/).should_not be_empty
-      # TODO: stop resetting the connection, once no longer necessary after attach
-      Docker.reset_connection!
-      subject.instance_variable_set(:@connection, Docker.connection)
+      images << subject.build_image(images.last)
+      expect(output[0].grep(/lol/)).to_not be_empty
 
       # it 'exports'
-      subject.export_image(image)
-      File.exist?('build/docker/test_docker-image.tgz').should be_true
+      subject.export_image(images.last)
+      expect(File.exist?('build/docker/test_docker-image.tgz')).to be_true
     end
   end
 
@@ -225,7 +228,10 @@ describe Dockly::Docker do
   end
 
   describe '#export_image_diff', :docker do
+    let(:images) { [] }
     let(:output) { StringIO.new }
+    let(:container) { images.last.run('true').tap { |c| c.wait(10) } }
+
     before do
       subject.instance_eval do
         import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-test.tgz'
@@ -234,11 +240,16 @@ describe Dockly::Docker do
       end
     end
 
+    after do
+      container.remove
+      images.last.remove
+    end
+
     it "should export only the tar with the new file" do
       docker_tar = File.absolute_path(subject.ensure_tar(subject.fetch_import))
-      image = subject.import_base(docker_tar)
-      image = subject.build_image(image)
-      container = image.run('true').tap { |c| c.wait(10) }
+
+      images << subject.import_base(docker_tar)
+      images << subject.build_image(images.last)
       subject.export_image_diff(container, output)
 
       expect(output.string).to include('it_worked')
@@ -263,20 +274,18 @@ describe Dockly::Docker do
       end
 
       it 'builds a docker image' do
-        expect {
-          subject.generate!
-          File.exist?(docker_file).should be_true
-          Dockly::Util::Tar.is_gzip?(docker_file).should be_true
-          File.size(docker_file).should be > (1024 * 1024)
-          paths = []
-          Gem::Package::TarReader.new(gz = Zlib::GzipReader.new(File.new(docker_file))).each do |entry|
-            paths << entry.header.name
-          end
-          paths.size.should be > 1000
-          paths.should include('sbin/init')
-          paths.should include('lib/dockly.rb')
-          paths.should include('it_worked')
-        }.to_not change { ::Docker::Image.all(:all => true).length }
+        expect { subject.generate! }.to_not change { ::Docker::Image.all(:all => true).length }
+        expect(File.exist?(docker_file)).to be_true
+        expect(Dockly::Util::Tar.is_gzip?(docker_file)).to be_true
+        expect(File.size(docker_file)).to be > (1024 * 1024)
+        paths = []
+        Gem::Package::TarReader.new(Zlib::GzipReader.new(File.new(docker_file))).each do |entry|
+          paths << entry.header.name
+        end
+        expect(paths.size).to be > 1000
+        expect(paths).to include('sbin/init')
+        expect(paths).to include('lib/dockly.rb')
+        expect(paths).to include('it_worked')
       end
     end
 
@@ -293,44 +302,51 @@ describe Dockly::Docker do
         end
       end
 
+      after do
+        image = ::Docker::Image.all.find do |image|
+          image.info['RepoTags'].include?('dockly_test:latest')
+        end
+        image.remove if image
+      end
+
       it 'builds a docker image' do
-        expect {
-          subject.generate!
-          File.exist?(docker_file).should be_true
-          Dockly::Util::Tar.is_gzip?(docker_file).should be_true
-          File.size(docker_file).should be > (1024 * 1024)
-          paths = []
-          Gem::Package::TarReader.new(gz = Zlib::GzipReader.new(File.new(docker_file))).each do |entry|
-            paths << entry.header.name
-          end
-          paths.size.should be > 1000
-          paths.should include('sbin/init')
-          paths.should include('lib/dockly.rb')
-          paths.should include('it_worked')
-        }.to change { ::Docker::Image.all(:all => true).length }.by(4)
+        expect { subject.generate! }.to change { ::Docker::Image.all(:all => true).length }.by(4)
+
+        expect(File.exist?(docker_file)).to be_true
+        expect(Dockly::Util::Tar.is_gzip?(docker_file)).to be_true
+        expect(File.size(docker_file)).to be > (1024 * 1024)
+        paths = []
+        Gem::Package::TarReader.new(Zlib::GzipReader.new(File.new(docker_file))).each do |entry|
+          paths << entry.header.name
+        end
+        expect(paths.size).to be > 1000
+        expect(paths).to include('sbin/init')
+        expect(paths).to include('lib/dockly.rb')
+        expect(paths).to include('it_worked')
       end
     end
 
     context 'when there is a registry' do
       subject {
         Dockly::Docker.new do
-          registry_import 'nahiluhmot/base', :tag => 'latest'
+          registry_import 'tianon/true', :tag => 'latest'
           git_archive '.'
-          build "run touch /it_worked"
+          build 'RUN ["/true", ""]'
           repository 'dockly_test'
           build_dir 'build/docker'
 
           registry do
-            username 'tlunter'
-            email 'tlunter@gmail.com'
-            password '******'
+            username ENV['DOCKER_USER']
+            email ENV['DOCKER_EMAIL']
+            password ENV['DOCKER_PASS']
           end
         end
       }
 
       it 'pushes the image to the registry instead of exporting it' do
-        subject.generate!
-        expect { ::Docker::Image.build('from nahiluhmot/dockly_test') }.to_not raise_error
+        image = subject.generate_build
+        expect { ::Docker::Image.build("from #{ENV['DOCKER_USER']}/dockly_test") }.to_not raise_error
+        image.remove unless image.nil?
       end
     end
   end

data/spec/dockly/rpm_spec.rb

@@ -56,6 +56,13 @@ describe Dockly::Rpm do
         end
       end
 
+      after do
+        image = ::Docker::Image.all.find do |image|
+          image.info['RepoTags'].include?('rpm_test:latest')
+        end
+        image.remove if image
+      end
+
       it 'builds the docker image and adds it to the rpm' do
         subject.create_package!
         `rpm -qpl #{filename}`
@@ -74,13 +81,20 @@ describe Dockly::Rpm do
 
           registry :test_docker_registry do
             auth_config_file '/etc/docker/.dockercfg'
-            username 'tlunter'
-            email 'tlunter@gmail.com'
-            password '******'
+            username ENV['DOCKER_USER']
+            email ENV['DOCKER_EMAIL']
+            password ENV['DOCKER_PASS']
           end
         end
       end
 
+      after do
+        image = ::Docker::Image.all.find do |image|
+          image.info['RepoTags'].include?("#{ENV['DOCKER_USER']}/rpm_test:latest")
+        end
+        image.remove if image
+      end
+
       it 'builds the docker image and adds it to the rpm' do
         subject.create_package!
         `rpm -qpl #{filename}`

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -311,31 +282,29 @@ files:
 - spec/fixtures/test-2.tar.gz
 - spec/fixtures/test-3.tar
 - spec/spec_helper.rb
-- spec/support/vcr.rb
 homepage: https://github.com/swipely/dockly
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Packaging made easy
 test_files:
 - spec/dockly/aws/s3_writer_spec.rb
@@ -361,4 +330,3 @@ test_files:
 - spec/fixtures/test-2.tar.gz
 - spec/fixtures/test-3.tar
 - spec/spec_helper.rb
-- spec/support/vcr.rb

data/spec/support/vcr.rb

@@ -1,11 +0,0 @@
-require 'webmock'
-require 'vcr'
-
-WebMock.disable_net_connect!
-
-VCR.configure do |c|
-  c.allow_http_connections_when_no_cassette = true
-  c.hook_into :webmock
-  c.cassette_library_dir = File.join(File.dirname(File.dirname(__FILE__)), 'vcr')
-  c.configure_rspec_metadata!
-end