dockly 2.7.2 → 3.0.0

data/spec/dockly/util/git_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Dockly::Util::Git do
+  describe '#repo' do
+    it 'returns the repo for the current directory' do
+      expect(subject.repo.workdir).to eq(File.expand_path('.') + '/')
+    end
+  end
+
+  describe '#sha' do
+    it 'returns a shortened sha for the head object' do
+      expect(subject.sha).to eq(`git rev-parse --short HEAD`[0..6])
+    end
+  end
+
+  describe '#ls_files' do
+    it 'returns an Array of the files for the given OID' do
+      expect(subject.ls_files(subject.sha).map { |hash| hash[:name] }.sort)
+        .to eq(`git ls-files`.split("\n").sort)
+    end
+  end
+
+  describe '#archive' do
+    let(:io) { StringIO.new }
+    let(:prefix) { '/gem/dockly' }
+    let(:reader) { Gem::Package::TarReader.new(io.tap(&:rewind)) }
+
+    it 'archives the current directory into the given IO' do
+      subject.archive(subject.sha, prefix, io)
+      reader.each do |entry|
+        expect(entry.full_name).to start_with(prefix)
+        orig = entry.full_name.gsub(/\A#{prefix}\//, '')
+        expect(File.exist?(orig)).to be_true
+        expect(entry.read).to eq(File.read(orig)) if orig.end_with?('.rb')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,10 +5,6 @@ require 'rspec'
 require 'dockly'
 require 'pry'
 
-Fog.mock!
-
-Dockly::AWS.aws_access_key_id = 'MOCK_KEY'
-Dockly::AWS.aws_secret_access_key = 'MOCK_SECRET'
 Dockly::Util::Logger.disable! unless ENV['ENABLE_LOGGER'] == 'true'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: grit
-  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: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -274,8 +258,6 @@ files:
 - dockly.gemspec
 - 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
@@ -289,6 +271,7 @@ files:
 - lib/dockly/history.rb
 - lib/dockly/rake_task.rb
 - lib/dockly/rpm.rb
+- lib/dockly/s3_writer.rb
 - lib/dockly/tar_diff.rb
 - lib/dockly/util/git.rb
 - lib/dockly/util/tar.rb
@@ -305,8 +288,6 @@ files:
 - 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
@@ -318,7 +299,9 @@ files:
 - spec/dockly/foreman_spec.rb
 - spec/dockly/history_spec.rb
 - spec/dockly/rpm_spec.rb
+- spec/dockly/s3_writer_spec.rb
 - spec/dockly/tar_diff_spec.rb
+- spec/dockly/util/git_spec.rb
 - spec/dockly_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/Rakefile
@@ -355,8 +338,6 @@ 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
@@ -368,7 +349,9 @@ test_files:
 - spec/dockly/foreman_spec.rb
 - spec/dockly/history_spec.rb
 - spec/dockly/rpm_spec.rb
+- spec/dockly/s3_writer_spec.rb
 - spec/dockly/tar_diff_spec.rb
+- spec/dockly/util/git_spec.rb
 - spec/dockly_spec.rb
 - spec/fixtures/Procfile
 - spec/fixtures/Rakefile

data/lib/dockly/aws.rb

@@ -1,62 +0,0 @@
-require 'fog/aws'
-
-# This module holds the connections for all AWS services used by the gem.
-module Dockly::AWS
-  extend self
-
-  autoload :S3Writer, 'dockly/aws/s3_writer'
-
-  def service(name, klass)
-    define_method name do
-      if val = instance_variable_get(:"@#{name}")
-        val
-      else
-        instance = klass.new(creds)
-        instance_variable_set(:"@#{name}", instance)
-      end
-    end
-    services << name
-  end
-
-  def services
-    @services ||= []
-  end
-
-  def env_attr(*names)
-    names.each do |name|
-      define_method name do
-        instance_variable_get(:"@#{name}") || ENV[name.to_s.upcase]
-      end
-
-      define_method :"#{name}=" do |val|
-        reset_cache!
-        instance_variable_set(:"@#{name}", val)
-      end
-
-      env_attrs << name
-    end
-  end
-
-  def env_attrs
-    @env_attrs ||= []
-  end
-
-  def creds
-    attrs = Hash[env_attrs.map { |attr| [attr, public_send(attr)] }].reject { |k, v| v.nil? }
-    if attrs.empty?
-      if ENV['FOG_CREDENTIAL']
-        attrs = {} # let Fog use the env var
-      else
-        attrs = { :use_iam_profile => true }
-      end
-    end
-    attrs
-  end
-
-  def reset_cache!
-    services.each { |service| instance_variable_set(:"@#{service}", nil) }
-  end
-
-  service :s3, Fog::Storage::AWS
-  env_attr :aws_access_key_id, :aws_secret_access_key
-end

data/lib/dockly/aws/s3_writer.rb

@@ -1,59 +0,0 @@
-module Dockly
-  module AWS
-    class S3Writer
-      include Dockly::Util::Logger::Mixin
-
-      logger_prefix '[dockly s3writer]'
-
-      attr_accessor :buffer
-      attr_reader :connection, :s3_bucket, :s3_object, :upload_id
-
-      def initialize(connection, s3_bucket, s3_object)
-        @connection = connection
-        @s3_bucket = s3_bucket
-        @s3_object = s3_object
-        @parts = []
-        @closed = false
-        @buffer = ""
-
-        init_upload_res = connection.initiate_multipart_upload(s3_bucket, s3_object)
-        @upload_id = init_upload_res.body['UploadId']
-      end
-
-      def upload_buffer
-        res = connection.upload_part(s3_bucket, s3_object, upload_id, @parts.size + 1, buffer)
-        @parts << res.headers["ETag"]
-        debug "Writing a chunk"
-        @buffer = ""
-      end
-
-      def write(chunk)
-        self.buffer << chunk
-
-        upload_buffer if buffer.bytesize > 5242880
-
-        chunk.length
-      end
-
-      def close
-        return if @closed
-        upload_buffer unless buffer.empty?
-
-        res = connection.complete_multipart_upload(s3_bucket, s3_object, upload_id, @parts)
-        if res.body['Code'] || res.body['Message']
-          raise "Failed to upload to S3: #{res.body['Code']}: #{res.body['Message']}"
-        end
-        @closed = true
-      end
-
-      def abort
-        connection.abort_multipart_upload(s3_bucket, s3_object, upload_id)
-      end
-
-      def abort_unless_closed
-        abort unless @closed
-        @closed = true
-      end
-    end
-  end
-end

data/spec/dockly/aws/s3_writer_spec.rb

@@ -1,154 +0,0 @@
-require 'spec_helper'
-
-describe Dockly::AWS::S3Writer do
-  let(:connection) { double(:connection) }
-  let(:bucket) { 'test_bucket' }
-  let(:object) { 'object_name.tar' }
-  let(:initiate_response) { double(:initiate_response) }
-  let(:upload_id) { 'test_id' }
-
-  subject { described_class.new(connection, bucket, object) }
-
-  before do
-    connection.should_receive(:initiate_multipart_upload) { initiate_response }
-    initiate_response.stub(:body) { { 'UploadId' => upload_id } }
-  end
-
-  describe ".new" do
-
-    it "sets the connection, s3_bucket, s3_object, and upload_id" do
-      expect(subject.connection).to eq(connection)
-      expect(subject.s3_bucket).to eq(bucket)
-      expect(subject.s3_object).to eq(object)
-      expect(subject.upload_id).to eq(upload_id)
-    end
-  end
-
-  describe "#upload_buffer" do
-    let(:message) { "message" }
-    let(:upload_response) { double(:upload_response) }
-    let(:etag) { "test" }
-
-    before do
-      connection.should_receive(:upload_part).with(bucket, object, upload_id, 1, message) do
-        upload_response
-      end
-      upload_response.stub(:headers) { { "ETag" => etag } }
-      subject.instance_variable_set(:"@buffer", message)
-    end
-
-    it "connects to S3" do
-      subject.upload_buffer
-      expect(subject.instance_variable_get(:"@parts")).to include(etag)
-    end
-  end
-
-  describe "#write" do
-    let(:message) { "a" * chunk_length }
-
-    context "with a buffer of less than 5 MB" do
-      let(:chunk_length) { 100 }
-
-      before do
-        subject.should_not_receive(:upload_buffer)
-      end
-
-      it "adds it to the buffer and returns the chunk length" do
-        expect(subject.write(message)).to eq(chunk_length)
-        expect(subject.instance_variable_get(:"@buffer")).to eq(message)
-      end
-    end
-
-    context "with a buffer of greater than 5 MB"  do
-      let(:chunk_length) { 1 + 5 * 1024 * 1024 }
-
-      before do
-        subject.should_receive(:upload_buffer)
-      end
-
-      it "adds it to the buffer, writes to S3 and returns the chunk length" do
-        expect(subject.write(message)).to eq(chunk_length)
-      end
-    end
-  end
-
-  describe "#close" do
-    let(:complete_response) { double(:complete_response) }
-
-    before do
-      connection.should_receive(:complete_multipart_upload).with(bucket, object, upload_id, []) do
-        complete_response
-      end
-    end
-
-    context "when it passes" do
-      before do
-        complete_response.stub(:body) { {} }
-      end
-
-      context "when the buffer is not empty" do
-        before do
-          subject.instance_variable_set(:"@buffer", "text")
-          subject.should_receive(:upload_buffer)
-        end
-
-        it "uploads the rest of the buffer and closes the connection" do
-          expect(subject.close).to be_true
-        end
-      end
-
-      context "when the buffer is empty" do
-        before do
-          subject.should_not_receive(:upload_buffer)
-        end
-
-        it "closes the connection" do
-          expect(subject.close).to be_true
-        end
-      end
-    end
-
-    context "when it fails" do
-      before do
-        complete_response.stub(:body) { { 'Code' => 20, 'Message' => 'Msggg' } }
-      end
-
-      it "raises an error" do
-        expect { subject.close }.to raise_error("Failed to upload to S3: 20: Msggg")
-      end
-    end
-  end
-
-  describe "#abort" do
-    before do
-      connection.should_receive(:abort_multipart_upload).with(bucket, object, upload_id)
-    end
-
-    it "aborts the upload" do
-      subject.abort
-    end
-  end
-
-  describe "#abort_unless_closed" do
-    context "when the upload is closed" do
-      before do
-        subject.should_not_receive(:abort)
-        subject.instance_variable_set(:"@closed", true)
-      end
-
-      it "does not abort" do
-        subject.abort_unless_closed
-      end
-    end
-
-    context "when the upload is open" do
-      before do
-        subject.should_receive(:abort)
-      end
-
-      it "aborts the upload" do
-        subject.abort_unless_closed
-      end
-    end
-  end
-end

data/spec/dockly/aws_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Dockly::AWS do
-  subject { Dockly::AWS }
-
-  describe '#reset_cache!' do
-    before do
-      subject.instance_variable_set(:@s3, double)
-    end
-
-    it 'sets @s3 to nil' do
-      expect { subject.reset_cache! }
-          .to change { subject.instance_variable_get(:@s3) }
-          .to(nil)
-    end
-  end
-end