tagfish 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ed3de3aea63c3fbb5108caa65a5e4f13fce18b
-  data.tar.gz: 58afb32647d0002ae0af805e7e13812f48b96220
+  metadata.gz: 6fb471e5b081c224d9b4bb912c3ca21df946219a
+  data.tar.gz: 1353e52d8ecbf84bcebfedeb7c3b31b10aa90e78
 SHA512:
-  metadata.gz: cfda8b965954cef8c83dd908ed315a067898a0e5143675a95fe6369c11ab64a83f19495c290a24432482b6179391fb6e673e75f9e1b0a2622f014c8cda42ae71
-  data.tar.gz: 9cf24c63a9a82178dc03a33918264993a5d3bcdfd6e254ef525da9fc5ec3fd16ef9da232e6409236533174a5eb2b2ea19c50b53daeda67a1edac917fb3376cf1
+  metadata.gz: 934cf9b78b229004aea5bb8629b5b2d70590886fe939ef69c1a54dc1916505f10d07f49c140c0b1a53219847c20a67d48c6ff2fd3592b4e4af2a2f82b9b7bf72
+  data.tar.gz: 6ec54816b4cd95d9b58621d705a06c46505fbf99e788e373d5a42f2c2479d3097246cbb38de31ccbb29898a221e19bdab4259a4094a76652915d1c3a9ba33aaf

data/Dockerfile

@@ -1,23 +1,24 @@
-FROM alpine:edge
+FROM alpine:3.3
 MAINTAINER Clement Labbe <clement.labbe@rea-group.com>
 
-RUN apk add --update ruby=2.2.3-r1 \
-    ruby-dev=2.2.3-r1 \
-    ruby-io-console=2.2.3-r1 \
+RUN apk add --update ruby \
+    ruby-dev \
+    ruby-io-console \
     diffutils \
     linux-headers \
     build-base \
-    ca-certificates=20150426-r3 && \
+    ca-certificates && \
     rm /var/cache/apk/* && \
     rm -rf /usr/share/ri
 
 RUN echo -e 'gem: --no-rdoc --no-ri' > /etc/gemrc && \
-    gem update --system 2.4.8 && \
-    gem install bundler -v 1.10.6 && \
+    gem update --system && \
+    gem install bundler && \
     rm -rf /usr/share/ri
 
 COPY pkg/tagfish-latest.gem /cwd/
 WORKDIR /cwd
 RUN gem install tagfish-latest.gem
+RUN mkdir -p /root/.docker
 
 ENTRYPOINT ["tagfish"]

data/README.md

@@ -146,7 +146,7 @@ Tagfish is released as a Docker image as well, and can be run with:
 
 ```
 docker run --rm \
-  -v ~/.docker/config.json:/root/.docker/config.json:ro \
+  -v ~/.docker:/root/.docker:ro \
   -v ${PWD}:/cwd \
   cowbell/tagfish
 ```

data/lib/tagfish/docker_registry_client.rb

@@ -5,7 +5,7 @@ module Tagfish
   module DockerRegistryClient
 
     def self.for(*args)
-      [DockerRegistryV2Client, DockerRegistryV1Client].each do |client_class|
+      [DockerRegistryV1Client, DockerRegistryV2Client].each do |client_class|
         begin 
           return client_class.new(*args)
         rescue APIVersionError

data/lib/tagfish/docker_registry_v1_client.rb

@@ -8,7 +8,11 @@ module Tagfish
     end
     
     def search(keyword)
-      APICall.new(search_uri(keyword)).get_json(http_auth)
+      if not keyword
+        abort("You need to specify a keyword to search a Registry V1")
+      end
+      repos_raw = APICall.new(search_uri(keyword)).get_json(http_auth)
+      repos = repos_raw["results"].map {|result| result["name"]}
     end
     
     def tag_names

data/lib/tagfish/docker_registry_v2_client.rb

@@ -7,8 +7,12 @@ module Tagfish
       'v2'
     end
     
-    def catalog
-      APICall.new(catalog_uri).get_json(http_auth)
+    def search(keyword)
+      repo_list = catalog
+      if keyword
+        repo_list.select! {|repo| repo.include? keyword}
+      end
+      repo_list.map {|repo| "#{docker_uri.registry}/#{repo}"} 
     end
     
     def tag_names
@@ -21,6 +25,10 @@ module Tagfish
 
     private
     
+    def catalog
+      APICall.new(catalog_uri).get_json(http_auth)["repositories"]
+    end
+    
     def tags
       APICall.new(tags_uri).get_json(http_auth)
     end

data/lib/tagfish/search_command.rb

@@ -11,29 +11,8 @@ module Tagfish
       end
       
       docker_uri = DockerURI.parse(registry + "/" + "dummy")
-      docker_api = DockerAPI.new(docker_uri)
-      
-      if docker_api.api_version == 'v2'
-        puts search_v2(keyword, docker_api, docker_uri)
-      else
-        puts search_v1(keyword, docker_api)
-      end
-    end
-    
-    def search_v2(keyword, docker_api, docker_uri)
-      repos = docker_api.catalog_v2["repositories"]
-      if keyword
-        repos.select! {|repo| repo.include? keyword}
-      end
-      repos.map {|repo| "#{docker_uri.registry}/#{repo}"} 
-    end
-    
-    def search_v1(keyword, docker_api)
-      if not keyword
-        abort("You need to specify a keyword to search a Registry V1")
-      end
-      repos_raw = docker_api.search_v1(keyword)
-      repos = repos_raw["results"].map {|result| result["name"]}
+      docker_api = DockerRegistryClient.for(docker_uri)
+      puts docker_api.search(keyword)
     end
   end
 end

data/lib/tagfish/version.rb

@@ -1,3 +1,3 @@
 module Tagfish
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagfish
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Clement Labbe