tagfish 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b88f51ae087cebd100f07fb24e5b2a6a11556f
-  data.tar.gz: e224ae8aab3b783527d409351f6d20d41b62c9f2
+  metadata.gz: 61b692edc09da0bfb2658d80692db107056407de
+  data.tar.gz: 0fe206495bfdaa17ed1ed6b47eee7c639c69ba85
 SHA512:
-  metadata.gz: 2ec7003db64bba1a474aa200c7b1a40f888e134eaf14c7fd10e8dbb25ee30d786f7793ffb11616faf0c58dd44f43901ed23a8d9a2c372a0ce58b9bf4d1acb9dc
-  data.tar.gz: fd83a60351e1f12224990304dbe8995d538a4018dfc51d231be449fad58b8e19efe7c8963c37c108aca3d79dff9d7944aa6169d2767189fb6eb954647549bfe0
+  metadata.gz: 663cb0bc92d55edc245f06e681648231efa7f121e3380ab23df510dcf113459352cdc77a58e9afadf96d33fb818bd5b6185329f4c926b7aa54d79e9c871f1dd3
+  data.tar.gz: 48fc22142825f47500326fb74182455dfe23b95a9e61fb7ce43f36ed8ff5c90c8b23ace40705010d2ea444b264e58907401bb0189ce26f6e0c2fea4a8f6124f2

data/Dockerfile

@@ -1,21 +1,19 @@
-FROM alpine:3.4
+FROM ruby:2.3.1-alpine@sha256:8d5ca285f1a24ed333aad70cfa54157f77ff130f810c91d5664e98a093d751bc
+
 MAINTAINER Clement Labbe <clement.labbe@rea-group.com>
 
 RUN apk add --update \
-    ruby=2.3.1-r0 \
-    ruby-dev=2.3.1-r0 \
-    ruby-io-console=2.3.1-r0 \
+    make \
+    g++ \
     diffutils \
-    linux-headers \
-    build-base \
     ca-certificates && \
     rm /var/cache/apk/* && \
     rm -rf /usr/share/ri
 
-RUN echo -e 'gem: --no-rdoc --no-ri' > /etc/gemrc
-
 COPY pkg/tagfish-latest.gem /cwd/
 WORKDIR /cwd
+
+RUN echo -e 'gem: --no-rdoc --no-ri' > /etc/gemrc
 RUN gem install tagfish-latest.gem
 RUN mkdir -p /root/.docker
 

data/Dockerfile.dev

@@ -1,20 +1,15 @@
-FROM alpine:3.4
+FROM ruby:2.3.1-alpine@sha256:8d5ca285f1a24ed333aad70cfa54157f77ff130f810c91d5664e98a093d751bc
+
 MAINTAINER Clement Labbe <clement.labbe@rea-group.com>
 
 RUN apk add --update \
-    ruby=2.3.1-r0 \
-    ruby-dev=2.3.1-r0 \
-    ruby-io-console=2.3.1-r0 \
-    git \
+    make \
+    g++ \
     diffutils \
-    linux-headers \
-    build-base \
+    git \
     ca-certificates && \
     rm /var/cache/apk/* && \
     rm -rf /usr/share/ri
 
-RUN echo -e 'gem: --no-rdoc --no-ri' > /etc/gemrc && \
-    gem update --system && \
-    gem install bundler && \
-    rm -rf /usr/share/ri
+RUN echo -e 'gem: --no-rdoc --no-ri' > /etc/gemrc
 

data/auto/dev-environment

@@ -7,5 +7,7 @@ cd $(dirname $0)/..
 trap "docker-compose down --volumes" 0
 
 docker volume create --name ruby2.3-bundle-cache > /dev/null
+
+docker-compose build dev
 docker-compose run --rm dev sh -c 'bundle check > /dev/null || bundle install'
 docker-compose run --rm dev bundle exec "${@-sh}"

data/auto/release

@@ -2,9 +2,6 @@
 
 cd $(dirname $0)/..
 
-REPOSITORY=cowbell/tagfish
-VERSION=$(cat lib/tagfish/version.rb | grep VERSION | cut -d'"' -f2)
-
 # Ensure we have no local changes
 git diff HEAD --exit-code
 

data/docker-compose.yml

@@ -5,9 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.dev
-    environment:
-       - GEM_HOME=/usr/local/bundle
-       - GEM_PATH=/usr/lib/ruby/gems/2.3.0:/usr/local/bundle/gems
     volumes:
       - .:/work
       - ruby2.3-bundle-cache:/usr/local/bundle

data/lib/tagfish/api_call.rb

@@ -1,4 +1,4 @@
-require 'tagfish/docker_http_auth'
+require 'tagfish/credential_store'
 require 'tagfish/api_error'
 require 'tagfish/api_response'
 
@@ -38,7 +38,15 @@ module Tagfish
     end
 
     def auth(registry)
-      @http_auth = DockerHttpAuth.for_registry(registry)
+      begin
+        file_path = ENV.fetch('DOCKER_CONFIG', '~/.docker/config.json')
+        docker_config_data = JSON.parse(File.read(File.expand_path(file_path)))
+      rescue Exception => e
+        abort("Tried to get username/password but the file #{file_path} does not exist")
+      end
+
+      cs = CredentialStore.new(docker_config_data)
+      @http_auth = cs.credentials_for(registry)
     end
 
   end

data/lib/tagfish/credential_store.rb

@@ -1,4 +1,5 @@
 require 'tagfish/registry_credentials'
+require 'base64'
 
 module Tagfish
 
@@ -8,6 +9,7 @@ module Tagfish
       @credentials_by_registry = {}
       auths = docker_config_data.fetch("auths", {})
       auths.each do |registry, data|
+        registry = registry_address(registry)
         encoded_credentials = data.fetch("auth")
         username, password = Base64.decode64(encoded_credentials).split(":")
         creds = RegistryCredentials.new(username, password)
@@ -16,9 +18,16 @@ module Tagfish
     end
 
     def credentials_for(registry)
+      registry = registry_address(registry)
       @credentials_by_registry[registry]
     end
 
+    private
+
+    def registry_address(registry)
+      registry.sub(%r{^\w+://}, '').sub(%r{/.*}, '')
+    end
+
   end
 
 end

data/lib/tagfish/version.rb

@@ -1,3 +1,3 @@
 module Tagfish
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/tagfish.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3.0"
-  spec.add_dependency "clamp", "~> 1.0.0"
+  spec.add_dependency "clamp", "~> 1.1.0"
   spec.add_dependency "diffy", "~> 3.0.0"
-  spec.add_dependency "json", "~> 1.8.0"
+
+  # For lack of a better way to say 1.8.*, 1.9.*, 2.0.*
+  spec.add_dependency "json", [ "> 1.8.0", "< 2.1.0" ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagfish
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Clement Labbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Retrieve repository tags, update dockerfiles, and more!
 email:
 - clement.labbe@rea-group.com
@@ -129,7 +135,6 @@ files:
 - lib/tagfish/cli/tags_command.rb
 - lib/tagfish/cli/update_command.rb
 - lib/tagfish/credential_store.rb
-- lib/tagfish/docker_http_auth.rb
 - lib/tagfish/docker_registry_client.rb
 - lib/tagfish/docker_registry_v1_client.rb
 - lib/tagfish/docker_registry_v2_client.rb

data/lib/tagfish/docker_http_auth.rb

@@ -1,31 +0,0 @@
-require 'json'
-require 'base64'
-
-module Tagfish
-
-  module DockerHttpAuth
-
-    Credentials = Struct.new(:username, :password)
-
-    def self.for_registry(registry)
-       file_path = '~/.docker/config.json'
-
-       begin
-         config = File.open(File.expand_path(file_path), 'r')
-       rescue Exception => e
-         abort("Tried to get username/password but the file #{file_path} does not exist")
-       end
-
-       json_config = JSON.parse(config.read())
-       config.close()
-       if json_config['auths'].length == 0
-         Credentials.new(nil, nil)
-       else
-         b64_auth = json_config['auths'][registry]['auth']
-         auth = Base64.decode64(b64_auth)
-         Credentials.new(*auth.split(':'))
-       end
-    end
-
-  end
-end