tagfish 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb471e5b081c224d9b4bb912c3ca21df946219a
-  data.tar.gz: 1353e52d8ecbf84bcebfedeb7c3b31b10aa90e78
+  metadata.gz: 83601af2f323594eb16a06d92ce666ce94e82580
+  data.tar.gz: 5f79d1303e6bd48a517d0a23b9665d4d7e0b1bae
 SHA512:
-  metadata.gz: 934cf9b78b229004aea5bb8629b5b2d70590886fe939ef69c1a54dc1916505f10d07f49c140c0b1a53219847c20a67d48c6ff2fd3592b4e4af2a2f82b9b7bf72
-  data.tar.gz: 6ec54816b4cd95d9b58621d705a06c46505fbf99e788e373d5a42f2c2479d3097246cbb38de31ccbb29898a221e19bdab4259a4094a76652915d1c3a9ba33aaf
+  metadata.gz: 6f29ea037986d26b33f347c20a1e2780ad95be58bbf180dbf6a19c986f72f5b7362f921fb374fca5eec0e1354b2358f11014342068caca2be0bf0c640b3559ee
+  data.tar.gz: 8e76d79699a7df157669a789c52146197b1e54d7032fd5c2dbdd3ea0137d07ce7c974d5ba985e59f56d4cf939159237afb27dbd223c7d66421ae8f6fc5fde6ed

data/README.md

@@ -9,7 +9,6 @@ Features include:
 - List all the tags of a given Docker repository
 - Return the most recent explicit tag of a repository
 - Update a file with the newest tags
-- Search for a repository
 - Authenticate by reading native Docker config file 
 - Works against hub.docker.com and private registries
 - Supports Docker Registry/Distribution API v1 and v2 
@@ -23,8 +22,6 @@ To use Tagfish against a registry requiring authentication, you first need to au
 - [Usage](#usage)
   - [`tagfish tags`](#tagfish-tags)
     - [Example](#example)
-  - [`tagfish search`](#tagfish-search)
-    - [Example](#example-1)
   - [`tagfish update`](#tagfish-update)
     - [Example](#example-2)
     - [Official repositories](#official-repositories)
@@ -70,33 +67,6 @@ alpine:edge
 alpine:latest
 ```
 
-### `tagfish search`
-The `search` command is used to search for a repository in a given registry.
-
-    Usage:
-        tagfish search [OPTIONS] [KEYWORD]
-
-    Parameters:
-        [KEYWORD]                     object to search
-
-    Options:
-        -r, --registry REGISTRY       Docker registry (default: "index.docker.io")
-        -h, --help                    print help
-
-Note: `search` will not work if the search API is disabled on the registry side. 
-
-#### Example
-```
-$ tagfish search alpine
-alpine
-1science/alpine
-webhippie/alpine
-anapsix/alpine-java
-colstrom/alpine
-appelgriebsch/alpine
-[...]
-```
-
 ### `tagfish update`
 The `update` subcommand is used to update a file with the latest tags available:
 
@@ -148,7 +118,8 @@ Tagfish is released as a Docker image as well, and can be run with:
 docker run --rm \
   -v ~/.docker:/root/.docker:ro \
   -v ${PWD}:/cwd \
-  cowbell/tagfish
+  cowbell/tagfish \
+  <COMMAND>
 ```
 
 ## Contributing

data/bin/tagfish

@@ -5,8 +5,7 @@ $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require 'clamp'
 require 'tagfish/tags_command'
 require 'tagfish/update/update_command'
-require 'tagfish/search_command'
-require "tagfish/version"
+require 'tagfish/version'
 
 module Tagfish
   class MainCommand < Clamp::Command
@@ -24,9 +23,5 @@ module Tagfish
     subcommand "update", "inspect files for outdated dependencies", Update::UpdateCommand
   end
   
-  class MainCommand < Clamp::Command
-    subcommand "search", "search a registry for repositories", SearchCommand
-  end
-  
   MainCommand.run
 end

data/lib/tagfish/api_call.rb

@@ -1,19 +1,33 @@
+require 'tagfish/docker_http_auth'
+
 module Tagfish
   class APICall
     attr_accessor :uri
     attr_accessor :http
     attr_accessor :request
-  
-    def initialize(uri_string) 
+    attr_accessor :http_auth
+    
+    def initialize
+      @auth = nil
+    end
+    
+    def get(uri_string)
       @uri = URI.parse(uri_string)
       @http = Net::HTTP.new(uri.host, uri.port)
       @http.use_ssl = true if uri.port == 443
       @request = Net::HTTP::Get.new(uri.request_uri)
+      if http_auth
+        @request.basic_auth(http_auth.username, http_auth.password)
+      end
+      self
     end
-        
-    def get_json(http_auth=nil)
+    
+    def auth(registry)
+      @http_auth = DockerHttpAuth.new(registry)
+    end
+    
+    def json
       begin
-        auth(http_auth) if http_auth
         response = http.request(request)
         if response.code == "200"
           return JSON.parse(response.body)
@@ -25,8 +39,7 @@ module Tagfish
       end
     end
 
-    def response_code(http_auth=nil)
-      auth(http_auth) if http_auth
+    def response_code
       begin
         http.request(request).code.to_i
       rescue SocketError
@@ -34,8 +47,5 @@ module Tagfish
       end
     end
 
-    def auth(http_auth)
-      @request.basic_auth(http_auth.username, http_auth.password)
-    end
   end
 end

data/lib/tagfish/docker_registry_v1_client.rb

@@ -7,14 +7,6 @@ module Tagfish
       'v1'
     end
     
-    def search(keyword)
-      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
       tag_map.tag_names
     end
@@ -27,7 +19,7 @@ module Tagfish
     private
 
     def tags
-      APICall.new(tags_uri).get_json(http_auth)
+      api_call.get(tags_uri).json
     end
         
     def tags_api(api_response_data)
@@ -47,10 +39,6 @@ module Tagfish
       "#{base_uri}/v1/_ping"
     end
     
-    def search_uri(keyword)
-      "#{base_uri}/v1/search?q=#{keyword}"  
-    end
-    
     def tags_uri
       "#{base_uri}/v1/repositories/#{docker_uri.repository}/tags"
     end

data/lib/tagfish/docker_registry_v2_client.rb

@@ -7,14 +7,6 @@ module Tagfish
       'v2'
     end
     
-    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
       tags["tags"]
     end
@@ -25,16 +17,12 @@ 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)
+      api_call.get(tags_uri).json
     end
     
     def hash(tag)
-      APICall.new(hash_uri(tag)).get_json(http_auth)
+      api_call.get(hash_uri(tag)).json
     end
     
     def tags_logic
@@ -52,10 +40,6 @@ module Tagfish
       "#{base_uri}/v2/"
     end
 
-    def catalog_uri
-      "#{base_uri}/v2/_catalog"
-    end
-    
     def tags_uri
       "#{base_uri}/v2/#{docker_uri.repository}/tags/list"  
     end

data/lib/tagfish/docker_registry_vboth_client.rb

@@ -9,13 +9,15 @@ module Tagfish
 
     attr_accessor :docker_uri
     attr_accessor :http_auth
+    attr_accessor :api_call
 
     def initialize(docker_uri)
+      @api_call = APICall.new
       @docker_uri = docker_uri
-      code = APICall.new(ping_uri).response_code
+      code = api_call.get(ping_uri).response_code
       if code == 401
-        @http_auth = DockerHttpAuth.new(docker_uri.registry)
-        code = APICall.new(ping_uri).response_code(http_auth)
+        api_call.auth(docker_uri.registry)
+        code = api_call.get(ping_uri).response_code
       end
       if code == 401
         raise DockerRegistryClient::AuthenticationError, "Please `docker login <REGISTRY>` and try again"

data/lib/tagfish/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagfish
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Clement Labbe
@@ -116,7 +116,6 @@ files:
 - lib/tagfish/docker_registry_v2_client.rb
 - lib/tagfish/docker_registry_vboth_client.rb
 - lib/tagfish/docker_uri.rb
-- lib/tagfish/search_command.rb
 - lib/tagfish/tags.rb
 - lib/tagfish/tags_command.rb
 - lib/tagfish/tokeniser.rb

data/lib/tagfish/search_command.rb

@@ -1,18 +0,0 @@
-require 'tagfish/docker_uri'
-
-module Tagfish
-  class SearchCommand < Clamp::Command
-    parameter "[KEYWORD]", "object to search"
-    option ["-r", "--registry"], "REGISTRY", "Docker registry", :default => "index.docker.io"
-
-    def execute
-      if not registry and not keyword
-        abort("You need to specify a REGISTRY and/or a KEYWORD")
-      end
-      
-      docker_uri = DockerURI.parse(registry + "/" + "dummy")
-      docker_api = DockerRegistryClient.for(docker_uri)
-      puts docker_api.search(keyword)
-    end
-  end
-end