dockly 1.13.0 → 2.0.0

data/spec/dockly/bash_builder_spec.rb

@@ -17,7 +17,7 @@ describe Dockly::BashBuilder do
       output = subject.get_and_install_deb(s3_url, deb_path)
       expect(output).to include(s3_url)
       expect(output).to include(deb_path)
-      expect(output).to include("s3cmd -f get")
+      expect(output).to include("aws s3 cp --quiet")
       expect(output).to include("dpkg -i")
     end
   end
@@ -56,7 +56,7 @@ describe Dockly::BashBuilder do
       expect(output).to include(base_image)
       expect(output).to include(diff_image)
       expect(output).to include("cat \"#{diff_image}\"")
-      expect(output).to include("s3cmd -f get")
+      expect(output).to include("aws s3 cp --quiet")
       expect(output).to include("docker import -")
     end
   end
@@ -67,7 +67,7 @@ describe Dockly::BashBuilder do
       output = subject.s3_docker_import(s3_url)
       expect(output).to include(s3_url)
       expect(output).to include("gunzip -c")
-      expect(output).to include("s3cmd -f get")
+      expect(output).to include("aws s3 cp --quiet")
       expect(output).to include("docker import -")
     end
   end
@@ -83,7 +83,7 @@ describe Dockly::BashBuilder do
       expect(output).to include("$(($size - 1024))") # compute file size
       expect(output).to include("head -c $head_size")
       expect(output).to include("gunzip")
-      expect(output).to include("s3cmd -f get")
+      expect(output).to include("aws s3 cp --quiet")
       expect(output).to include("docker import -")
     end
   end

data/spec/dockly/build_cache/docker_spec.rb

@@ -7,7 +7,7 @@ describe Dockly::BuildCache::Docker, :docker do
       git_archive '/app'
     end
   end
-  let(:image) { ::Docker::Image.build('from ubuntu:14.04') }
+  let(:image) { ::Docker::Image.build('from base') }
 
   before do
     build_cache.s3_bucket 'lol'
@@ -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(logs: true) { |source,chunk| output += chunk }
+        i.run('ls').attach { |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, logs: true)
-        expect(output.first.grep(/lol/)).to_not be_empty
+        output = i.run('ls /').attach(:stdout => true)
+        output.first.first.lines.map(&:chomp).should include('lol')
       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(logs: true) { |source,chunk| output += chunk }
+        i.run('ls').attach { |source,chunk| output += chunk }
         output.should include('lol')
       end
     end
@@ -100,7 +100,7 @@ describe Dockly::BuildCache::Docker, :docker do
 
   describe '#hash_output' do
     let(:output) {
-      "b458e7b28b9bc2d04bd5a3fd0f8d777e  /etc/vim/vimrc"
+      "682aa2a07693cc27756eee9751db3903  /etc/vim/vimrc"
     }
 
     context "when hash command returns successfully" do
@@ -127,7 +127,7 @@ describe Dockly::BuildCache::Docker, :docker do
   end
 
   describe '#copy_output_dir' do
-    let(:container) { Docker::Container.create('Image' => 'ubuntu:14.04', 'Cmd' => %w[true]) }
+    let(:container) { Docker::Container.create('Image' => 'base', 'Cmd' => %w[true]) }
     let(:file) { build_cache.copy_output_dir(container) }
     let(:hash) { 'this_really_unique_hash' }
     let(:path) { file.path }
@@ -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{1,2}-\w+\Z/)
+        expect(build_cache.parameter_output(command)).to match(/\A3\.\d{2}\.\d-\d-ARCH\Z/)
       end
     end
 

data/spec/dockly/deb_spec.rb

@@ -25,36 +25,23 @@ describe Dockly::Deb do
       end
     end
 
-    context 'when it has foreman exports' do
-      let(:contents) { `dpkg --contents #{filename}` }
-
+    context 'when it has a foreman export' do
       before do
         subject.foreman do
-          name 'systemd-foreman'
-          build_dir 'build/foreman'
+          name 'foreman'
           init_dir '/etc/systemd/system'
-          procfile File.join(File.dirname(__FILE__), '..', 'fixtures', 'Procfile')
-          user 'root'
-          type 'systemd'
-          prefix '/bin/sh'
-        end
-
-        subject.foreman do
-          name 'upstart-foreman'
           build_dir 'build/foreman'
-          init_dir '/etc/systemd/system'
           procfile File.join(File.dirname(__FILE__), '..', 'fixtures', 'Procfile')
           user 'root'
-          type 'upstart'
+          type 'systemd'
           prefix '/bin/sh'
         end
-
-        subject.create_package!
       end
 
-      it 'exports the foreman to the deb', :cur do
-        expect(contents).to match(/upstart-foreman/)
-        expect(contents).to match(/systemd-foreman/)
+      it 'export the foreman to the deb' do
+        subject.create_package!
+        `dpkg --contents #{filename}`
+            .lines.grep(/foreman/).should_not be_empty
       end
     end
 
@@ -64,18 +51,11 @@ describe Dockly::Deb do
           name 'deb_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'RUN touch /deb_worked'
+          build 'touch /deb_worked'
           build_dir 'build/docker'
         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}`
@@ -89,25 +69,18 @@ describe Dockly::Deb do
           name 'deb_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'RUN touch /deb_worked'
+          build 'touch /deb_worked'
           build_dir 'build/docker'
 
           registry :test_docker_registry do
             auth_config_file '/etc/docker/.dockercfg'
-            username ENV['DOCKER_USER']
-            email ENV['DOCKER_EMAIL']
-            password ENV['DOCKER_PASS']
+            username 'tlunter'
+            email 'tlunter@gmail.com'
+            password '******'
           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}`
@@ -166,15 +139,6 @@ describe Dockly::Deb do
       subject.create_package!
       expect(`dpkg --contents #{filename}`).to include("dockly-startup.sh")
     end
-
-    context 'when package_startup_script is false' do
-      before { subject.package_startup_script(false) }
-
-      it 'does not place a startup script in the package' do
-        subject.create_package!
-        expect(`dpkg --contents #{filename}`).to_not include("dockly-startup.sh")
-      end
-    end
   end
 
   describe '#exists?' do

data/spec/dockly/docker_spec.rb

@@ -64,16 +64,7 @@ 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
@@ -81,21 +72,27 @@ describe Dockly::Docker do
       subject.tag 'my-app'
       unless File.exist?(docker_file)
         File.open(docker_file, 'wb') do |file|
-          Excon.get(docker_file_s3, response_block: lambda { |chunk, _, _| file.write(chunk) })
+          Excon.get('https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz',
+                    :response_block => lambda { |chunk, _, _| file.write(chunk) })
         end
       end
-      images << subject.import_base(subject.ensure_tar(docker_file))
-      expect(images.last).to_not be_nil
-      expect(images.last.id).to_not be_nil
+      image = subject.import_base(subject.ensure_tar(docker_file))
+      image.should_not be_nil
+      image.id.should_not be_nil
 
       # it 'builds'
       subject.build "run touch /lol"
-      images << subject.build_image(images.last)
-      expect(output[0].grep(/lol/)).to_not be_empty
+      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)
 
       # it 'exports'
-      subject.export_image(images.last)
-      expect(File.exist?('build/docker/test_docker-image.tgz')).to be_true
+      subject.export_image(image)
+      File.exist?('build/docker/test_docker-image.tgz').should be_true
     end
   end
 
@@ -151,7 +148,7 @@ describe Dockly::Docker do
   end
 
   describe "#export_image", :docker do
-    let(:image) { Docker::Image.create('fromImage' => 'ubuntu:14.04') }
+    let(:image) { Docker::Image.create('fromImage' => 'base') }
 
     context "with a registry export" do
       let(:registry) { double(:registry) }
@@ -228,10 +225,7 @@ 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'
@@ -240,16 +234,11 @@ 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))
-
-      images << subject.import_base(docker_tar)
-      images << subject.build_image(images.last)
+      image = subject.import_base(docker_tar)
+      image = subject.build_image(image)
+      container = image.run('true').tap { |c| c.wait(10) }
       subject.export_image_diff(container, output)
 
       expect(output.string).to include('it_worked')
@@ -261,7 +250,7 @@ describe Dockly::Docker do
     let(:docker_file) { 'build/docker/dockly_test-image.tgz' }
     before { FileUtils.rm_rf(docker_file) }
 
-    context 'with cleaning up' do
+    context 'without cleaning up' do
       before do
         subject.instance_eval do
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
@@ -269,84 +258,78 @@ describe Dockly::Docker do
           build "run touch /it_worked"
           repository 'dockly_test'
           build_dir 'build/docker'
-          cleanup_images true
+          cleanup_images false
         end
       end
 
       it 'builds a docker image' do
-        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')
+        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(3)
       end
     end
 
-    context 'without cleaning up' do
+    context 'with cleaning up' do
       before do
         subject.instance_eval do
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build_env 'TEST_FILE' => 'it_worked'
-          build "run touch $TEST_FILE"
+          build "run touch /it_worked"
           repository 'dockly_test'
           build_dir 'build/docker'
-          cleanup_images false
-        end
-      end
-
-      after do
-        image = ::Docker::Image.all.find do |image|
-          image.info['RepoTags'].include?('dockly_test:latest')
+          cleanup_images true
         end
-        image.remove if image
       end
 
       it 'builds a docker image' do
-        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')
+        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 }
       end
     end
 
     context 'when there is a registry' do
       subject {
         Dockly::Docker.new do
-          registry_import 'tianon/true', :tag => 'latest'
+          registry_import 'nahiluhmot/base', :tag => 'latest'
           git_archive '.'
-          build 'RUN ["/true", ""]'
+          build "run touch /it_worked"
           repository 'dockly_test'
           build_dir 'build/docker'
 
           registry do
-            username ENV['DOCKER_USER']
-            email ENV['DOCKER_EMAIL']
-            password ENV['DOCKER_PASS']
+            username 'tlunter'
+            email 'tlunter@gmail.com'
+            password '******'
           end
         end
       }
 
       it 'pushes the image to the registry instead of exporting it' do
-        image = subject.generate_build
-        expect { ::Docker::Image.build("from #{ENV['DOCKER_USER']}/dockly_test") }.to_not raise_error
-        image.remove unless image.nil?
+        subject.generate!
+        expect { ::Docker::Image.build('from nahiluhmot/dockly_test') }.to_not raise_error
       end
     end
   end

data/spec/dockly/rpm_spec.rb

@@ -51,18 +51,11 @@ describe Dockly::Rpm do
           name 'rpm_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'RUN touch /rpm_worked'
+          build 'touch /rpm_worked'
           build_dir 'build/docker'
         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}`
@@ -76,25 +69,18 @@ describe Dockly::Rpm do
           name 'rpm_test'
           import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
           git_archive '.'
-          build 'RUN touch /rpm_worked'
+          build 'touch /rpm_worked'
           build_dir 'build/docker'
 
           registry :test_docker_registry do
             auth_config_file '/etc/docker/.dockercfg'
-            username ENV['DOCKER_USER']
-            email ENV['DOCKER_EMAIL']
-            password ENV['DOCKER_PASS']
+            username 'tlunter'
+            email 'tlunter@gmail.com'
+            password '******'
           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}`
@@ -153,15 +139,6 @@ describe Dockly::Rpm do
       subject.create_package!
       expect(`rpm -qpl #{filename}`).to include("dockly-startup.sh")
     end
-
-    context 'when package_startup_script is false' do
-      before { subject.package_startup_script(false) }
-
-      it 'does not place a startup script in the package' do
-        subject.create_package!
-        expect(`rpm -qpl #{filename}`).to_not include("dockly-startup.sh")
-      end
-    end
   end
 
   describe '#exists?' do

data/spec/support/vcr.rb

@@ -0,0 +1,11 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -139,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rugged
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +270,6 @@ files:
 - lib/dockly/docker.rb
 - lib/dockly/docker/registry.rb
 - lib/dockly/foreman.rb
-- lib/dockly/history.rb
 - lib/dockly/rake_task.rb
 - lib/dockly/rpm.rb
 - lib/dockly/tar_diff.rb
@@ -316,7 +299,6 @@ files:
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb
-- spec/dockly/history_spec.rb
 - spec/dockly/rpm_spec.rb
 - spec/dockly/tar_diff_spec.rb
 - spec/dockly_spec.rb
@@ -329,6 +311,7 @@ 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
@@ -366,7 +349,6 @@ test_files:
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb
-- spec/dockly/history_spec.rb
 - spec/dockly/rpm_spec.rb
 - spec/dockly/tar_diff_spec.rb
 - spec/dockly_spec.rb
@@ -379,4 +361,4 @@ test_files:
 - spec/fixtures/test-2.tar.gz
 - spec/fixtures/test-3.tar
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/vcr.rb

data/lib/dockly/history.rb

@@ -1,64 +0,0 @@
-# This module contains logic to find matching content hash for a given commit.
-module Dockly::History
-  module_function
-
-  ASCII_FILE_SEP = 28.chr
-  ASCII_RECORD_SEP = 30.chr
-
-  TAG_PREFIX = 'dockly-'
-
-  def push_content_tag!
-    fail 'An SSH agent must be running to push the tag' if ENV['SSH_AGENT_PID'].nil?
-    refs = ["refs/tags/#{content_tag}"]
-    repo.remotes.each do |remote|
-      username = remote.url.split('@').first
-      creds = Rugged::Credentials::SshKeyFromAgent.new(username: username)
-      remote.push(refs, credentials: creds)
-    end
-  end
-
-  def write_content_tag!
-    repo.tags.create(content_tag, repo.head.target_id, true)
-  end
-
-  def duplicate_build?
-    !duplicate_build_sha.nil?
-  end
-
-  def duplicate_build_sha
-    return @duplicate_build_sha if @duplicate_build_sha
-    sha = tags[content_tag]
-    @duplicate_build_sha = sha unless sha == repo.head.target_id
-  end
-
-  def tags
-    @tags ||= Hash.new do |hash, key|
-      tag = repo.tags[key]
-      hash[key] = tag.target_id if tag
-    end
-  end
-
-  def content_tag
-    @content_tag ||= TAG_PREFIX + content_hash_for(ls_files)
-  end
-
-  def ls_files
-    repo.head.target.tree.walk(:preorder)
-      .map { |root, elem| [root, elem[:name]].compact.join }
-      .select(&File.method(:file?))
-  end
-
-  def content_hash_for(paths)
-    paths.sort.each_with_object(Digest::SHA384.new) do |path, hash|
-      next unless File.exist?(path)
-      mode = File::Stat.new(path).mode
-      data = File.read(path)
-      str = [path, mode, data].join(ASCII_RECORD_SEP.chr) + ASCII_FILE_SEP.chr
-      hash.update(str)
-    end.hexdigest
-  end
-
-  def repo
-    @repo ||= Rugged::Repository.discover('.')
-  end
-end