fig-lock 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4453dbec342b8d6c9cb86dbb7e340b83f44744c5
-  data.tar.gz: 7785f5c0d8a99c4b15f9e66559859db006583d73
+  metadata.gz: 5725237716eb5ccde18daf104f0192aab5735553
+  data.tar.gz: 6443d0bf27f86d65fa7102583c8cad1bf5f7775e
 SHA512:
-  metadata.gz: 2d4f8ce39f1e4b620523d36987d0cce5b17e343acdbf980d305557f7c5ffba1c2ee481821b11d9792ced5de6a352149f980ca2738fe80b050355830e35c73903
-  data.tar.gz: b39672201de01be9cdc7658ac9074069ed6f8b9273df04c2b8f7946c1a38224b810e1dcbbe9b1d3d517107b61722096dd654d3906bef4f405a888240997af3d2
+  metadata.gz: cb4e45b27431019a26068972b4773e423477285a726b9ef5655c6c6ae08b336d4f55e79667317bb7a8d13f49c2380a0e5a09c0e6b588acd7d59ba491255c4c51
+  data.tar.gz: 93f73a8de32e927eadf0b69113c69cba07fd449227804524d1b9973476c7c841c1c0fc165ab2b14d39f279686dd1337d28aa4f44cd056225fdd7c3c32c674b56

data/fig-lock.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rest-client"
   spec.add_dependency "slop"
-
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
-
 end

data/lib/fig/lock.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'fig/lock/docker_client'
 require 'fig/lock/log'
 require 'fig/lock/version'
 
@@ -46,10 +47,7 @@ module Fig
     def update
       log.info "Generating lock file for #{file} ..."
       hash = YAML.load(File.read(file))
-
-      fetch_images(hash)
       select_latest(hash)
-
       File.write(lock_file, hash.to_yaml)
     end
 
@@ -67,13 +65,23 @@ module Fig
       log.info "Selecting latest tags:"
       hash.each do |k,v|
         image = v['image']
+        image = "#{image}:latest" unless image.index(':')
+        log.info "Selecting latest tag for #{image} ..."
         unless image.nil?
-          output = `sudo docker images #{image}`
-          fail "Unable to list image: #{image}.\n\tExit code:#{$?.exitstatus}\n\tOutput:#{output}" unless $?.exitstatus.zero?
-          tag = output.split("\n")[1].split(' ')[1]
-          tagged_image = "#{image}:#{tag}"
-          log.info "Resolved: #{tagged_image}"
-          v['image'] = tagged_image
+          # Fetch tags
+          tags = docker_client.tags(image)
+          latest = tags['latest']
+          fail "Image #{image} has no latest tag" if latest.nil?
+
+          # Figure out which one corresponds to "latest"
+          version = tags.detect{|k,v|
+            v == latest && k != 'latest'
+          }
+          version = version[0] if version
+          fail "No matching version found for hash #{latest}" unless version
+
+          # Update hash
+          v['image'] = "#{image[0..image.rindex(':')-1]}:#{version}"
         end
       end
     end
@@ -84,7 +92,6 @@ module Fig
       hash.each do |k,v|
         image = v['image']
         if image
-          image = "#{image}:latest" unless image.index(':')
           log.info "Fetching #{image} ..."
           system "sudo docker pull #{image}"
           fail "Unable to fetch image: #{image}.\n\tExit code:#{$?.exitstatus}" unless $?.exitstatus.zero?
@@ -98,6 +105,10 @@ module Fig
         fail("file must be specified") unless hash[:file]
       end
     end
+
+    def docker_client
+      @docker_client ||= DockerClient.new
+    end
   end
 
   # Default values for parameters
@@ -114,4 +125,6 @@ module Fig
       end
     end
   end
+
+
 end

data/lib/fig/lock/docker_client.rb

@@ -0,0 +1,39 @@
+require 'base64'
+require 'json'
+require 'rest-client'
+require 'fig/lock/version'
+
+module Fig
+  class Lock::DockerClient
+
+    attr_reader :cfg
+
+    def initialize(file="#{ENV['HOME']}/.dockercfg")
+      @cfg = JSON.parse(File.read(file))
+    end
+
+    def tags(repo)
+      array = repo.split('/')
+      registry = array[0]
+      repo = array[1]
+      name = array[2]
+      if name.index(':')
+        name = name.split(':')[0]
+      end
+
+      resource = base(registry)['v1']['repositories'][repo][name]['tags']
+      JSON.parse(resource.get.body)
+    end
+
+    def base(registry)
+      config = cfg[registry]
+      if config
+        auth = Base64.decode64(config['auth'])
+        RestClient::Resource.new("https://#{auth}@#{registry}")
+      else
+        RestClient::Resource.new("https://#{registry}")
+      end
+    end
+
+  end
+end

data/lib/fig/lock/version.rb

@@ -1,5 +1,5 @@
 module Fig
   class Lock
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/fig/lock/docker_client_spec.rb

@@ -0,0 +1,52 @@
+$:.unshift(File.join(__dir__, '..', '..', '..', 'spec'))
+require 'json'
+require 'fig/spec_helper'
+
+class Fig::Lock
+  describe DockerClient do
+
+    context 'with basic auth' do
+      let (:auth) {
+        {'some.repo.com' => {'auth'=> Base64.encode64('user:password')}}
+      }
+
+      it 'should retrieve tags' do
+        expect(ENV).to receive(:[]).with('HOME'){'/path/to/home'}
+        expect(File).to receive(:read).with('/path/to/home/.dockercfg'){auth.to_json}
+        expect(RestClient::Resource).to receive(:new).with('https://user:password@some.repo.com'){resource}
+        client = DockerClient.new
+        expect(client.tags('some.repo.com/repo/name:latest')).to eq tags
+      end
+    end
+
+    context 'without basic auth' do
+      let (:auth) { {} }
+
+      it 'should retrieve tags' do
+        expect(ENV).to receive(:[]).with('HOME'){'/path/to/home'}
+        expect(File).to receive(:read).with('/path/to/home/.dockercfg'){auth.to_json}
+        expect(RestClient::Resource).to receive(:new).with('https://some.repo.com'){resource}
+        client = DockerClient.new
+        expect(client.tags('some.repo.com/repo/name:latest')).to eq tags
+      end
+
+    end
+
+    private
+
+    def resource
+      @resource ||= double('resource').tap do |r|
+        allow(r).to receive_message_chain(:[], :[], :[], :[], :[], :get, :body){tags.to_json}
+      end
+    end
+
+    def tags
+      {
+        'latest' => 'some_hash',
+        'some_other_tag' => 'some_hash'
+      }
+    end
+
+  end
+end
+

data/spec/fig/lock_spec.rb

@@ -1,14 +1,4 @@
-$:.unshift(File.join(__dir__, '..', '..', 'lib'))
-
-RSpec.configure do |config|
-  require 'simplecov'
-  SimpleCov.add_filter 'vendor'
-  SimpleCov.add_filter 'spec'
-  SimpleCov.start
-end
-
-
-require 'fig/lock'
+require 'spec_helper'
 
 module Fig
 
@@ -45,6 +35,7 @@ module Fig
         allow(File).to receive(:directory?).with('fig.yml'){false}
         allow(File).to receive(:read).with('fig.yml'){yaml}
         allow(File).to receive(:read).with('fig.lock'){yaml}
+        allow(Lock::DockerClient).to receive(:new){docker_client}
       end
 
       it 'should install' do
@@ -65,11 +56,7 @@ module Fig
 
       it 'should update' do
         lock = Fig::Lock.new(registry: 'some.docker.com', file:'fig.yml')
-
-        expect(lock).to receive(:system).with('sudo docker pull some.docker.com/atlas/api'){true}
-        expect(lock).to receive(:`).with('sudo docker images some.docker.com/atlas/api'){docker_image_output}
         expect(File).to receive(:write).with('fig.lock', expected_fig_lock)
-
         lock.update
       end
 
@@ -95,6 +82,14 @@ web:
   image: some.docker.com/atlas/api
         eos
       end
+
+      def docker_client
+        @docker_client ||= double('docker-client', tags: tags)
+      end
+
+      def tags
+        @tags ||= {'latest'=>'hash', '20140611142604'=>'hash'}
+      end
     end
   end
 end

data/spec/fig/spec_helper.rb

@@ -0,0 +1,13 @@
+$:.unshift(File.join(__dir__), '..', '..', 'lib')
+$:.unshift(File.join(__dir__), '..', '..', 'spec')
+
+require 'rspec'
+
+RSpec.configure do |config|
+  require 'simplecov'
+  SimpleCov.add_filter 'vendor'
+  SimpleCov.add_filter 'spec'
+  SimpleCov.start
+end
+
+require 'fig/lock'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fig-lock
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Shea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +111,12 @@ files:
 - fig-lock.gemspec
 - lib/fig/lock.rb
 - lib/fig/lock/cli.rb
+- lib/fig/lock/docker_client.rb
 - lib/fig/lock/log.rb
 - lib/fig/lock/version.rb
+- spec/fig/lock/docker_client_spec.rb
 - spec/fig/lock_spec.rb
+- spec/fig/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -125,4 +142,6 @@ signing_key:
 specification_version: 4
 summary: Generates fig.lock files from fig.yml files
 test_files:
+- spec/fig/lock/docker_client_spec.rb
 - spec/fig/lock_spec.rb
+- spec/fig/spec_helper.rb