dockly 1.5.8 → 1.5.9

data/spec/dockly/bash_builder_spec.rb

@@ -0,0 +1,138 @@
+require 'spec_helper'
+
+describe Dockly::BashBuilder do
+  describe "#normalize_for_dockly" do
+    it "sets up log and fatal and makes /opt/dockly" do
+      output = subject.normalize_for_dockly
+      expect(output).to include("function log")
+      expect(output).to include("function fatal")
+      expect(output).to include("mkdir -p /opt/dockly")
+    end
+  end
+
+  describe "#get_from_s3" do
+    let(:s3_url) { "s3://url-for-s3/file.tar.gz" }
+    context "uses the default output" do
+      it "polls from s3 and sets the s3_path" do
+        output = subject.get_from_s3(s3_url)
+        expect(output).to include("s3cmd -f get $s3_path $output_path")
+        expect(output).to include("s3_path=\"#{s3_url}\"")
+        expect(output).to include("output_path=\"-\"")
+      end
+    end
+    context "uses a specific output directory" do
+      let(:output_dir) { "test" }
+      it "polls from s3 and sets the s3_path and output_path" do
+        output = subject.get_from_s3(s3_url, output_dir)
+        expect(output).to include("s3cmd -f get $s3_path $output_path")
+        expect(output).to include("s3_path=\"#{s3_url}\"")
+        expect(output).to include("output_path=\"#{output_dir}\"")
+      end
+    end
+  end
+
+  describe "#install_package" do
+    let(:path) { "/opt/dockly/deb.deb" }
+    it "installs from the given path" do
+      output = subject.install_package(path)
+      expect(output.strip).to eq("dpkg -i \"#{path}\"")
+    end
+  end
+
+  describe "#get_and_install_deb" do
+    let(:s3_url) { "s3://bucket/path-to-deb.deb" }
+    let(:deb_path) { "/opt/dockly/deb_path.deb" }
+    it "gets from s3 and installs the package" do
+      expect(subject).to receive(:get_from_s3).with(s3_url, deb_path)
+      expect(subject).to receive(:install_package).with(deb_path)
+      subject.get_and_install_deb(s3_url, deb_path)
+    end
+  end
+
+  describe "#docker_import" do
+    context "when not given a repo" do
+      it "imports with no tagging" do
+        output = subject.docker_import
+        expect(output).to include("docker import -")
+      end
+    end
+
+    context "when given a repo" do
+      let(:repo) { "aRepo" }
+      it "imports with repo and latest" do
+        output = subject.docker_import(repo)
+        expect(output).to include("docker import - #{repo}:latest")
+      end
+
+      context "and a non-default tag" do
+        let(:tag) { "aTag" }
+        it "imports with repo and the tag" do
+          output = subject.docker_import(repo, tag)
+          expect(output).to include("docker import - #{repo}:#{tag}")
+        end
+      end
+    end
+  end
+
+  describe "#file_docker_import" do
+    let(:path) { "/opt/dockly/file.tar.gz" }
+    it "cats, gunzips and passes to docker import" do
+      expect(subject).to receive(:docker_import)
+      output = subject.file_docker_import(path)
+      expect(output).to include("cat")
+      expect(output).to include("gunzip -c")
+    end
+  end
+
+  describe "#file_diff_docker_import" do
+    let(:base_image) { "s3://bucket/base_image.tar.gz" }
+    let(:diff_image) { "/opt/dockly/diff_image.tar.gz" }
+    it "gets the base file from S3 and cats that with the diff image and imports to docker" do
+      expect(subject).to receive(:get_from_s3).with(base_image)
+      expect(subject).to receive(:docker_import)
+      expect(subject.file_diff_docker_import(base_image, diff_image)).to include("cat \"#{diff_image}\"")
+    end
+  end
+
+  describe "#s3_docker_import" do
+    let(:s3_url) { "s3://bucket/image.tar.gz" }
+    it "pulls, gunzips and passes to docker import" do
+      expect(subject).to receive(:get_from_s3)
+      expect(subject).to receive(:docker_import)
+      output = subject.s3_docker_import(s3_url)
+      expect(output).to include("gunzip -c")
+    end
+  end
+
+  describe "#s3_diff_docker_import" do
+    let(:base_image) { "s3://bucket/base_image.tar.gz" }
+    let(:diff_image) { "s3://bucket/diff_image.tar.gz" }
+    it "makes two functions for getting from s3, finds the size, and imports both to docker" do
+      expect(subject).to receive(:get_from_s3).twice
+      expect(subject).to receive(:docker_import)
+      output = subject.s3_diff_docker_import(base_image, diff_image)
+      expect(output).to include("stat --format \"%s\"")    # get file size
+      expect(output).to include("$(($size - 1024))") # compute file size
+      expect(output).to include("head -c $head_size")
+      expect(output).to include("gunzip")
+    end
+  end
+
+  describe "#registry_import" do
+    let(:repo) { "aRepo" }
+    context "not given a tag" do
+      it "pulls the latest" do
+        output = subject.registry_import(repo)
+        expect(output).to include("docker pull #{repo}:latest")
+      end
+    end
+
+    context "given a tag" do
+      let(:tag) { "aTag" }
+      it "pulls to specified tag" do
+        output = subject.registry_import(repo, tag)
+        expect(output).to include("docker pull #{repo}:#{tag}")
+      end
+    end
+  end
+end

data/spec/dockly/build_cache/local_spec.rb

@@ -83,7 +83,7 @@ describe Dockly::BuildCache::Local do
 
   describe '#hash_output' do
     let(:output) {
-      "f683463a09482287c33959ab71a87189"
+      "5ebe2fbf321fa1008833574649e986a3"
     }
 
     context "when hash command returns successfully" do

data/spec/dockly/deb_spec.rb

@@ -10,7 +10,7 @@ describe Dockly::Deb do
         release '8'
         pre_install "ls"
         post_install "rd /s /q C:\*"
-        build_dir 'build/deb'
+        build_dir 'build'
       end
     end
     let(:filename) { "build/deb/my-sweet-deb_77.0.8_x86_64.deb" }
@@ -71,11 +71,12 @@ describe Dockly::Deb do
           git_archive '.'
           build 'touch /deb_worked'
           build_dir 'build/docker'
-          auth_config_file '/etc/docker/.dockercfg'
 
           registry :test_docker_registry do
-            username 'nahiluhmot'
-            email 'hulihan.tom159@gmail.com'
+            auth_config_file '/etc/docker/.dockercfg'
+            username 'tlunter'
+            email 'tlunter@gmail.com'
+            password '******'
           end
         end
       end
@@ -119,10 +120,13 @@ describe Dockly::Deb do
     end
 
     context 'when there is no docker or foreman export' do
+      let(:output) { `dpkg --contents #{filename}` }
       it 'does nothing with docker or foreman' do
-        subject.docker.should_not_receive(:generate!)
         subject.foreman.should_not_receive(:create!)
         subject.create_package!
+        expect(output).to_not include("deb_test-image.tgz")
+        expect(output).to_not include("/etc/systemd")
+        expect(output).to_not include("/etc/init")
       end
 
       it 'creates a deb package' do
@@ -130,6 +134,11 @@ describe Dockly::Deb do
         File.exist?(subject.build_path).should be_true
       end
     end
+
+    it "places a startup script in the package" do
+      subject.create_package!
+      expect(`dpkg --contents #{filename}`).to include("dockly-startup.sh")
+    end
   end
 
   describe '#exists?' do
@@ -191,9 +200,8 @@ describe Dockly::Deb do
       context 'when the package has yet to be created' do
         before { FileUtils.rm(subject.build_path) rescue nil }
 
-        it 'creates it' do
-          subject.should_receive(:create_package!).and_call_original
-          subject.upload_to_s3
+        it 'raises an error' do
+          expect { subject.upload_to_s3 }.to raise_error
         end
       end
 

data/spec/dockly/docker_spec.rb

@@ -84,7 +84,7 @@ describe Dockly::Docker do
       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
+      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!
@@ -147,6 +147,105 @@ describe Dockly::Docker do
     end
   end
 
+  describe "#export_image", :docker do
+    let(:image) { Docker::Image.create('fromImage' => 'base') }
+
+    context "with a registry export" do
+      let(:registry) { double(:registry) }
+      before do
+        subject.instance_variable_set(:"@registry", registry)
+        expect(subject).to receive(:push_to_registry)
+      end
+
+      it "pushes the image to the registry" do
+        subject.export_image(image)
+      end
+    end
+
+    context "with an S3 export" do
+      let(:export) { double(:export) }
+      before do
+        expect(Dockly::AWS::S3Writer).to receive(:new).and_return(export)
+        expect(export).to receive(:write).once
+        expect(export).to receive(:close).once
+        subject.s3_bucket "test-bucket"
+      end
+
+      context "and a whole export" do
+        before do
+          expect(subject).to receive(:export_image_whole)
+        end
+
+        it "exports the whole image" do
+          subject.export_image(image)
+        end
+      end
+
+      context "and a diff export" do
+        before do
+          subject.tar_diff true
+          expect(subject).to receive(:export_image_diff)
+        end
+
+        it "exports the diff image" do
+          subject.export_image(image)
+        end
+      end
+    end
+
+    context "with a file export" do
+      let(:export) { double(:export) }
+      before do
+        expect(File).to receive(:open).and_return(export)
+        expect(export).to receive(:write).once
+        expect(export).to receive(:close)
+      end
+
+      context "and a whole export" do
+        before do
+          expect(subject).to receive(:export_image_whole)
+        end
+
+        it "exports the whole image" do
+          subject.export_image(image)
+        end
+      end
+
+      context "and a diff export" do
+        before do
+          subject.tar_diff true
+          expect(subject).to receive(:export_image_diff)
+        end
+
+        it "exports the diff image" do
+          subject.export_image(image)
+        end
+      end
+    end
+  end
+
+  describe '#export_image_diff', :docker do
+    let(:output) { StringIO.new }
+    before do
+      subject.instance_eval do
+        import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-test.tgz'
+        build "run touch /it_worked"
+        repository "dockly_export_image_diff"
+      end
+    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) }
+      subject.export_image_diff(container, output)
+
+      expect(output.string).to include('it_worked')
+      expect(output.string).to_not include('bin')
+    end
+  end
+
   describe '#generate!', :docker do
     let(:docker_file) { 'build/docker/dockly_test-image.tgz' }
     before { FileUtils.rm_rf(docker_file) }
@@ -162,6 +261,7 @@ describe Dockly::Docker do
           cleanup_images false
         end
       end
+
       it 'builds a docker image' do
         expect {
           subject.generate!
@@ -220,8 +320,9 @@ describe Dockly::Docker do
           build_dir 'build/docker'
 
           registry do
-            username 'nahiluhmot'
-            email 'tomhulihan@swipely.com'
+            username 'tlunter'
+            email 'tlunter@gmail.com'
+            password '******'
           end
         end
       }

data/spec/dockly/tar_diff_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Dockly::TarDiff do
+  let(:base) { StringIO.new }
+  let(:input) { StringIO.new }
+  let(:output) { StringIO.new }
+  subject { described_class.new(base, input, output) }
+
+  describe "#quick_write" do
+    let(:input) { StringIO.new(message) }
+
+    context "for a message under 4096 bytes" do
+      let(:message) { "\0" * 100 }
+
+      it "reads and writes only once" do
+        input.should_receive(:read).once.and_call_original
+        subject.quick_write(message.size)
+      end
+    end
+
+    context "for a message over 4096 bytes" do
+      let(:message) { "\0" * 4097 }
+
+      it "reads and writes only once" do
+        input.should_receive(:read).twice.and_call_original
+        subject.quick_write(message.size)
+      end
+    end
+  end
+
+  describe "#write_tar_section" do
+    let(:header) { "ab" }
+    let(:message) { "cd" }
+    let(:input) { StringIO.new(message) }
+    let(:size) { message.size }
+    let(:remainder) { 3 }
+    let(:output_message) { "abcd\0\0\0" }
+
+    it "it writes the header, size length message and remainder to the output" do
+      subject.write_tar_section(header, message, remainder)
+      expect(output.string).to be == output_message
+    end
+  end
+
+  describe "#read_header" do
+    let(:input) { File.open("spec/fixtures/test-3.tar") }
+
+    it "with a tar with 2 files should yield exactly four times; 2 files + 2 512 byte null blocks" do
+      expect do |b|
+        block = b.to_proc
+        subject.read_header(input) do |*args|
+          block.call(*args)
+
+          data, name, prefix, mtime, typeflag, size, remainder, empty = args
+
+          case b.num_yields
+          when 1
+            expect(name).to be == "Rakefile"
+          when 2
+            expect(name).to be == "Procfile"
+          when 3
+            expect(empty).to be_true
+          when 4
+            expect(empty).to be_true
+          else
+            raise "Failed"
+          end
+
+          input.read(size)
+        end
+      end.to yield_control.exactly(4).times
+    end
+  end
+
+  describe "#process" do
+    let(:base) { File.open('spec/fixtures/test-1.tar') }
+    let(:input) { File.open('spec/fixtures/test-3.tar') }
+
+    it "only adds the new file to the output" do
+      subject.process
+      expect(output.string).to include("Procfile")
+      expect(output.string).to_not include("Rakefile")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,8 @@ files:
 - img/dockly.png
 - lib/dockly.rb
 - lib/dockly/aws.rb
+- lib/dockly/aws/s3_writer.rb
+- lib/dockly/bash_builder.rb
 - lib/dockly/build_cache.rb
 - lib/dockly/build_cache/base.rb
 - lib/dockly/build_cache/docker.rb
@@ -269,12 +271,25 @@ files:
 - lib/dockly/docker/registry.rb
 - lib/dockly/foreman.rb
 - lib/dockly/rake_task.rb
+- lib/dockly/tar_diff.rb
 - lib/dockly/util/git.rb
 - lib/dockly/util/tar.rb
 - lib/dockly/version.rb
 - lib/foreman/cli_fix.rb
 - lib/foreman/export/base_fix.rb
+- snippets/docker_import.erb
+- snippets/file_diff_docker_import.erb
+- snippets/file_docker_import.erb
+- snippets/get_and_install_deb.erb
+- snippets/get_from_s3.erb
+- snippets/install_package.erb
+- snippets/normalize_for_dockly.erb
+- snippets/registry_import.erb
+- snippets/s3_diff_docker_import.erb
+- snippets/s3_docker_import.erb
+- spec/dockly/aws/s3_writer_spec.rb
 - spec/dockly/aws_spec.rb
+- spec/dockly/bash_builder_spec.rb
 - spec/dockly/build_cache/base_spec.rb
 - spec/dockly/build_cache/docker_spec.rb
 - spec/dockly/build_cache/local_spec.rb
@@ -283,6 +298,7 @@ files:
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb
+- spec/dockly/tar_diff_spec.rb
 - spec/dockly_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/Rakefile
@@ -291,6 +307,7 @@ files:
 - spec/fixtures/tar-2.tar
 - spec/fixtures/test-1.tar
 - 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
@@ -319,7 +336,9 @@ signing_key:
 specification_version: 3
 summary: Packaging made easy
 test_files:
+- spec/dockly/aws/s3_writer_spec.rb
 - spec/dockly/aws_spec.rb
+- spec/dockly/bash_builder_spec.rb
 - spec/dockly/build_cache/base_spec.rb
 - spec/dockly/build_cache/docker_spec.rb
 - spec/dockly/build_cache/local_spec.rb
@@ -328,6 +347,7 @@ test_files:
 - spec/dockly/docker/registry_spec.rb
 - spec/dockly/docker_spec.rb
 - spec/dockly/foreman_spec.rb
+- spec/dockly/tar_diff_spec.rb
 - spec/dockly_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/Rakefile
@@ -336,5 +356,6 @@ test_files:
 - spec/fixtures/tar-2.tar
 - spec/fixtures/test-1.tar
 - spec/fixtures/test-2.tar.gz
+- spec/fixtures/test-3.tar
 - spec/spec_helper.rb
 - spec/support/vcr.rb