dockly 3.0.5 → 3.1.0

data/.travis.yml

@@ -8,6 +8,7 @@ script:
   - git fetch --tags
   - CI=true bundle exec rake
 before_install:
- - sudo apt-get update -qq
- - sudo apt-get install -qq rpm
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq rpm
+  - gem install bundler
 

data/dockly.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'aws-sdk', '~> 2.0'
   gem.add_dependency 'foreman'
   gem.add_dependency 'fpm', '~> 1.2.0'
-  gem.add_dependency 'rugged'
+  gem.add_dependency 'minigit', '~> 0.0.4'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'

data/lib/dockly.rb

@@ -3,7 +3,7 @@ require 'dockly/util/tar'
 require 'dockly/util/git'
 require 'foreman/cli_fix'
 require 'foreman/export/base_fix'
-require 'rugged'
+require 'minigit'
 require 'aws-sdk'
 require 'open3'
 

data/lib/dockly/docker.rb

@@ -67,7 +67,8 @@ class Dockly::Docker
   end
 
   def generate_build
-    Docker.options = { :read_timeout => timeout, :write_timeout => timeout }
+    Docker.options.merge!(:read_timeout => timeout, :write_timeout => timeout)
+    Docker.reset_connection!
     images = {}
 
     if registry_import.nil?

data/lib/dockly/history.rb

@@ -10,15 +10,14 @@ module Dockly::History
   def push_content_tag!
     fail 'An SSH agent must be running to push the tag' if ENV['SSH_AUTH_SOCK'].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)
+    remotes = repo.capturing.remote(:v => true).split(/\n/).map{ |r| r.split.first }.uniq
+    remotes.each do |remote|
+      repo.push(remote, refs)
     end
   end
 
   def write_content_tag!
-    repo.tags.create(content_tag, repo.head.target_id, true)
+    repo.tag(content_tag, repo.capturing.rev_parse('HEAD').chomp)
   end
 
   def duplicate_build?
@@ -28,13 +27,13 @@ module Dockly::History
   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
+    @duplicate_build_sha = sha unless sha == repo.capturing.rev_parse('HEAD').chomp
   end
 
   def tags
     @tags ||= Hash.new do |hash, key|
-      tag = repo.tags[key]
-      hash[key] = tag.target_id if tag
+      tag = repo.capturing.show_ref({ :tags => true }, key).chomp rescue nil
+      hash[key] = repo.capturing.rev_parse(key).chomp if tag
     end
   end
 
@@ -43,9 +42,7 @@ module Dockly::History
   end
 
   def ls_files
-    repo.head.target.tree.walk(:preorder)
-      .map { |root, elem| [root, elem[:name]].compact.join }
-      .select(&File.method(:file?))
+    repo.capturing.ls_tree({ :name_only => true, :r => true }, 'HEAD').split
   end
 
   def content_hash_for(paths)
@@ -59,6 +56,6 @@ module Dockly::History
   end
 
   def repo
-    @repo ||= Rugged::Repository.discover('.')
+    @repo ||= MiniGit.new('.')
   end
 end

data/lib/dockly/rake_task.rb

@@ -55,7 +55,7 @@ namespace :dockly do
     task :copy, [:name] => 'dockly:init' do |t, args|
       Dockly::RakeHelper
         .find_deb!(args[:name])
-        .copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
+        .copy_from_s3(Dockly::History.duplicate_build_sha)
     end
 
     task :build, [:name] => 'dockly:init' do |t, args|
@@ -76,7 +76,7 @@ namespace :dockly do
     task :copy, [:name] => 'dockly:init' do |t, args|
       Dockly::RakeHelper
         .find_rpm!(args[:name])
-        .copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
+        .copy_from_s3(Dockly::History.duplicate_build_sha)
     end
 
     task :build, [:name] => 'dockly:init' do |t, args|
@@ -98,7 +98,7 @@ namespace :dockly do
     task :copy, [:name] => 'dockly:init' do |t, args|
       Dockly::RakeHelper
         .find_docker!(args[:name])
-        .copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
+        .copy_from_s3(Dockly::History.duplicate_build_sha)
     end
 
     task :build, [:name] => 'dockly:init' do |t, args|

data/lib/dockly/util/git.rb

@@ -2,28 +2,16 @@ module Dockly::Util::Git
   module_function
 
   def repo
-    @repo ||= Rugged::Repository.discover('.')
+    @repo ||= MiniGit.new('.')
   end
 
   def sha
     return @sha if @sha
-    @sha = repo.head.target.oid[0..6]
+    @sha = repo.capturing.rev_parse('HEAD').chomp
   rescue
     @sha = 'unknown'
   end
 
-  def ls_files(oid)
-    target = repo.lookup(oid)
-    target = target.target until target.type == :commit
-    ary = []
-    target.tree.walk(:postorder) do |root, entry|
-      next unless entry[:type] == :blob
-      name = File.join(root, entry[:name]).gsub(/\A\//, '')
-      ary << entry.merge(name: name)
-    end
-    ary
-  end
-
   def archive(oid, prefix, output)
     prefix = prefix.dup
     unless prefix[-1] == '/'; prefix << '/'; end

data/lib/dockly/version.rb

@@ -1,7 +1,7 @@
 module Dockly
   MAJOR = 3
-  MINOR = 0
-  PATCH = 5
+  MINOR = 1
+  PATCH = 0
   RELEASE = nil
 
   VERSION = [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')

data/spec/dockly/util/git_spec.rb

@@ -3,20 +3,13 @@ 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('.') + '/')
+      expect(subject.repo.git_work_tree).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)
+    it 'returns a sha for the head object' do
+      expect(subject.sha).to eq(`git rev-parse HEAD`.chomp)
     end
   end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -61,6 +68,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,6 +76,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -75,6 +84,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,6 +92,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,6 +100,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,6 +108,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,6 +116,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,27 +124,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: minigit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -138,6 +156,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,6 +164,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,6 +172,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -159,6 +180,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,6 +188,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,6 +196,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -180,6 +204,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -187,6 +212,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,6 +220,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -201,6 +228,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -208,6 +236,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -293,26 +322,27 @@ files:
 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: 2.4.6
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Packaging made easy
 test_files:
 - spec/dockly/bash_builder_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzY4MzVhN2RiNzU5NWE1ODk1OGExNDZkZTBjNTU1YWRmYTkzMTU5Mg==
-  data.tar.gz: !binary |-
-    Mjc4NDA2MjBkNDlmZWFmYjI0NDg1MWY5MjFiYjVkZTk3Zjc3YzhmZA==
-SHA512:
-  metadata.gz: !binary |-
-    MmZjYjkzNmZiOTE3OTk4YTVjYWVjNzFiNzBiMWU5Y2I1MzYzODNhMWI2ZDE3
-    NTE2MTcyMWMxYmJkMzRiZTNlNzFjZmU4YTM0NGJiYjkwNDRkNmI2OTYxOWI1
-    OWQwOTVhNTFhM2VkMzNiZTVlZmQ4MWRjOTExYzE0MjY1M2IwOWU=
-  data.tar.gz: !binary |-
-    YmE0NDhiNTBhYTU3N2RhNzk3NDMyYzExOTVlZjdmYjk3NmNjM2E1OTQ2NTFl
-    MDRlZjQxZDZjOGEyMzk1ODIwZDUyNTdkMTM5NTk3ZjllOTUzM2IzODVkZjY5
-    NWE2ODU5NmIxOTgwYTVlMmZkZTViM2I3N2ZlNzVkYmE3MDJkMTE=