cdnget 0.1.0 → 1.0.0

data/lib/cdnget.rb

@@ -2,29 +2,97 @@
 # -*- coding: utf-8 -*-
 
 ##
-## Download files from CDN (CDNJS, Google, jsDelivr).
+## Download files from CDN (CDNJS, jsDelivr, UNPKG, Google).
 ##
 ## - CDNJS    (https://cdnjs.com/)
-## - Google   (https://developers.google.com/speed/libraries/)
 ## - jsDelivr (https://www.jsdelivr.com/)
+## - UNPKG    (https://unpkg.com/)
+## - Google   (https://developers.google.com/speed/libraries/)
 ##
 ## Example:
 ##  $ cdnget                                # list public CDN
 ##  $ cdnget [-q] cdnjs                     # list libraries
 ##  $ cdnget [-q] cdnjs jquery              # list versions
-##  $ cdnget [-q] cdnjs jquery 2.2.0        # list files
-##  $ cdnget [-q] cdnjs jquery 2.2.0 /tmp   # download files
+##  $ cdnget [-q] cdnjs jquery latest       # detect latest version
+##  $ cdnget [-q] cdnjs jquery 3.6.0        # list files
+##  $ cdnget [-q] cdnjs jquery 3.6.0 /tmp   # download files
 ##
 
 require 'open-uri'
+require 'uri'
+require 'net/http'
+require 'openssl'
 require 'json'
 require 'fileutils'
+require 'pp'
 
 
 module CDNGet
 
 
-  RELEASE = '$Release: 0.1.0 $'.split()[1]
+  RELEASE = '$Release: 1.0.0 $'.split()[1]
+
+
+  class HttpConnection
+
+    def initialize(uri, headers=nil)
+      http = Net::HTTP.new(uri.host, uri.port)
+      if uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+      http.start()
+      @http = http
+      @headers = headers
+    end
+
+    def self.open(uri, headers=nil)
+      http = self.new(uri, headers)
+      return http unless block_given?()
+      begin
+        return yield http
+      ensure
+        http.close()
+      end
+    end
+
+    def get(uri)
+      resp = @http.send_request('GET', uri.path, nil, @headers)
+      case resp
+      when Net::HTTPSuccess
+        return resp.body
+      #when HTTPInformation, Net::HTTPRedirection, HTTPClientError, HTTPServerError
+      else
+        raise HttpError.new(resp.code.to_i, resp.message)
+      end
+    end
+
+    def post(uri, payload)
+      path = uri.path
+      path += "?"+uri.query if uri.query && !uri.query.empty?
+      resp = @http.send_request('POST', path, payload, @headers)
+      case resp
+      when Net::HTTPSuccess ; return resp.body
+      else                  ; raise HttpError.new(resp.code.to_i, resp.message)
+      end
+    end
+
+    def close()
+      @http.finish()
+    end
+
+  end
+
+
+  class HttpError < StandardError
+    def initialize(code, msgtext)
+      super("#{code} #{msgtext}")
+      @code = code
+      @msgtext = msgtext
+    end
+    attr_reader :code, :msgtext
+  end
+
 
   CLASSES = []
 
@@ -35,10 +103,22 @@ module CDNGet
       CLASSES << klass
     end
 
+    def initialize(debug_mode: false)
+      @debug_mode = debug_mode
+    end
+    attr_reader :debug_mode
+
     def list()
       raise NotImplementedError.new("#{self.class.name}#list(): not implemented yet.")
     end
 
+    def search(pattern)
+      return list().select {|d| File.fnmatch(pattern, d[:name], File::FNM_CASEFOLD) }
+      #rexp_str = pattern.split('*', -1).collect {|x| Regexp.escape(x) }.join('.*')
+      #rexp = Regexp.compile("\\A#{rexp_str}\\z", Regexp::IGNORECASE)
+      #return list().select {|d| d[:name] =~ rexp }
+    end
+
     def find(library)
       raise NotImplementedError.new("#{self.class.name}#find(): not implemented yet.")
     end
@@ -53,14 +133,28 @@ module CDNGet
         raise CommandError.new("#{basedir}: not exist.")
       File.directory?(basedir)  or
         raise CommandError.new("#{basedir}: not a directory.")
-      target_dir = File.join(basedir, library, version)
       d = get(library, version)
+      target_dir = d[:destdir] ? File.join(basedir, d[:destdir]) \
+                               : File.join(basedir, library, version)
+      http = nil
       d[:files].each do |file|
         filepath = File.join(target_dir, file)
+        if filepath.end_with?('/')
+          if File.exist?(filepath)
+            puts "#{filepath} ... Done (Already exists)" unless quiet
+          else
+            print "#{filepath} ..." unless quiet
+            FileUtils.mkdir_p(filepath)
+            puts " Done (Created)" unless quiet
+          end
+          next
+        end
         dirpath  = File.dirname(filepath)
         print "#{filepath} ..." unless quiet
         url = File.join(d[:baseurl], file)   # not use URI.join!
-        content = fetch(url)
+        uri = URI.parse(url)
+        http ||= HttpConnection.new(uri)
+        content = http.get(uri)
         content = content.force_encoding('ascii-8bit')
         print " Done (#{format_integer(content.bytesize)} byte)" unless quiet
         FileUtils.mkdir_p(dirpath) unless File.exist?(dirpath)
@@ -72,17 +166,32 @@ module CDNGet
         end
         puts() unless quiet
       end
+      http.close() if http
       nil
     end
 
     protected
 
+    def http_get(url)
+      ## * `open()` on Ruby 3.X can't open http url
+      ## * `URI.open()` on Ruby <= 2.4 raises NoMethodError (private method `open' called)
+      ## * `URI.__send__(:open)` is a hack to work on both Ruby 2.X and 3.X
+      return URI.__send__(:open, url, 'rb') {|f| f.read() }
+    end
+
     def fetch(url, library=nil)
       begin
-        html = open(url, 'rb') {|f| f.read() }
+        html = http_get(url)
         return html
-      rescue OpenURI::HTTPError => ex
-        raise CommandError.new("GET #{url} : #{ex.message}")
+      rescue OpenURI::HTTPError => exc
+        if ! (exc.message == "404 Not Found" && library)
+          raise CommandError.new("GET #{url} : #{exc.message}")
+        elsif ! library.end_with?('js')
+          raise CommandError.new("#{library}: Library not found.")
+        else
+          maybe = library.end_with?('.js') ? library.sub('.js', 'js') : library.sub(/js$/, '.js')
+          raise CommandError.new("#{library}: Library not found (maybe '#{maybe}'?).")
+        end
       end
     end
 
@@ -101,82 +210,80 @@ module CDNGet
       return value.to_s.reverse.scan(/..?.?/).collect {|s| s.reverse }.reverse.join(',')
     end
 
-  end
-
+    def _debug_print(x)
+      if @debug_mode
+        $stderr.puts "\e[0;35m*** #{PP.pp(x,'')}\e[0m"
+      end
+    end
 
-  class HttpError < StandardError
   end
 
 
-  class CDNJS < Base    # TODO: use jsdelivr api
+  class CDNJS < Base
     CODE = "cdnjs"
     SITE_URL = 'https://cdnjs.com/'
 
     def fetch(url, library=nil)
-      begin
-        html = open(url, 'rb') {|f| f.read() }
-        if library
-          html =~ /<h1\b.*?>(.*?)<\/h1>/  or
-            raise CommandError.new("#{library}: Library not found.")
-          library == $1.strip()  or
-            raise CommandError.new("#{library}: Library not found (maybe '#{$1.strip()}'?).")
+      json_str = super
+      if json_str == "{}" && library
+        if library.end_with?('js')
+          maybe = library.end_with?('.js') \
+                ? library.sub('.js', 'js') \
+                : library.sub(/js$/, '.js')
+          raise CommandError.new("#{library}: Library not found (maybe '#{maybe}'?).")
+        else
+          raise CommandError.new("#{library}: Library not found.")
         end
-        return html
-      rescue OpenURI::HTTPError => ex
-        raise HttpError.new("GET #{url} : #{ex.message}")
       end
+      return json_str
     end
     protected :fetch
 
-    def list
-      libs = []
-      html = fetch("https://cdnjs.com/libraries")
-      html.scan(/<td\b(.*?)<\/td>/m) do |str,|
-        name = desc = nil
-        name = $1 if str =~ /href="\/libraries\/([-.\w]+)">\s*\1\s*<\/a>/
-        desc = $1.strip if str =~ /<div style="display: none;">(.*?)<\/div>/m
-        libs << {name: name, desc: desc} if name
-      end
+    def list()
+      jstr = fetch("https://api.cdnjs.com/libraries?fields=name,description")
+      jdata = JSON.parse(jstr)
+      _debug_print(jdata)
+      libs = jdata['results'].collect {|d| {name: d['name'], desc: d['description']} }
       return libs.sort_by {|d| d[:name] }.uniq
     end
 
     def find(library)
       validate(library, nil)
-      html = fetch("https://cdnjs.com/libraries/#{library}", library)
-      versions = []
-      html.scan(/<option value="([^"]+)" *(?:selected)?>/) do |ver,|
-        versions << ver
-      end
-      desc = tags = nil
-      if html =~ /<p>(.*?)<\/p>\s*<em>(.*?)<\/em>/
-        desc = $1
-        tags = $2
-      end
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
+      _debug_print(jdata)
+      versions = jdata['assets'].collect {|d| d['version'] }\
+                   .sort_by {|v| v.split(/[-.]/).map(&:to_i) }
       return {
         name: library,
-        desc: desc,
-        tags: tags,
-        versions: versions,
+        desc: jdata['description'],
+        tags: (jdata['keywords'] || []).join(", "),
+        site: jdata['homepage'],
+        info: File.join(SITE_URL, "/libraries/#{library}"),
+        license: jdata['license'],
+        versions: versions.reverse(),
       }
     end
 
     def get(library, version)
       validate(library, version)
-      html = fetch("https://cdnjs.com/libraries/#{library}/#{version}", library)
-      baseurl = "https://cdnjs.cloudflare.com/ajax/libs/#{library}/#{version}"
-      urls  = []
-      files = []
-      rexp = %r`>(#{Regexp.escape(baseurl)}/([^<]+))<\/p>`
-      html.scan(%r`>(#{Regexp.escape(baseurl)}/([^<]+))<\/p>`) do |url, file|
-        urls  << url .gsub(/&#x2F;/, '/')
-        files << file.gsub(/&#x2F;/, '/')
-      end
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
+      _debug_print(jdata)
+      d = jdata['assets'].find {|d| d['version'] == version }  or
+        raise CommandError.new("#{library}/#{version}: Library or version not found.")
+      baseurl = "https://cdnjs.cloudflare.com/ajax/libs/#{library}/#{version}/"
       return {
         name:     library,
         version:  version,
-        urls:     urls,
-        files:    files,
+        desc:     jdata['description'],
+        tags:     (jdata['keywords'] || []).join(", "),
+        site:     jdata['homepage'],
+        info:     File.join(SITE_URL, "/libraries/#{library}/#{version}"),
+        urls:     d['files'].collect {|s| baseurl + s },
+        files:    d['files'],
         baseurl:  baseurl,
+        license:  jdata['license'],
       }
     end
 
@@ -186,59 +293,200 @@ module CDNGet
   class JSDelivr < Base
     CODE = "jsdelivr"
     SITE_URL = "https://www.jsdelivr.com/"
-    API_URL  = "https://api.jsdelivr.com/v1/jsdelivr/libraries"
+    #API_URL  = "https://api.jsdelivr.com/v1/jsdelivr/libraries"
+    API_URL  = "https://data.jsdelivr.com/v1"
+    HEADERS = {
+      "x-algo""lia-app""lication-id"=>"OFCNC""OG2CU",
+      "x-algo""lia-api""-key"=>"f54e21fa3a2""a0160595bb05""8179bfb1e",
+    }
 
-    def list
-      json = fetch("#{API_URL}?fields=name,description,homepage")
-      arr = JSON.load(json)
-      return arr.collect {|d|
-        {name: d["name"], desc: d["description"], site: d["homepage"] }
+    def list()
+      return nil    # nil means that this CDN can't list libraries without pattern
+    end
+
+    def search(pattern)
+      form_data = {
+        query:        pattern,
+        page:         "0",
+        hitsPerPage:  "1000",
+        attributesToHighlight: '[]',
+        attributesToRetrieve:  '["name","description","version"]'
+      }
+      payload = JSON.dump({"params"=>URI.encode_www_form(form_data)})
+      url = "https://ofcncog2cu-3.algolianet.com/1/indexes/npm-search/query"
+      uri = URI.parse(url)
+      json = HttpConnection.open(uri, HEADERS) {|http| http.post(uri, payload) }
+      jdata = JSON.load(json)
+      _debug_print(jdata)
+      return jdata["hits"].select {|d|
+        File.fnmatch(pattern, d["name"], File::FNM_CASEFOLD)
+      }.collect {|d|
+        {name: d["name"], desc: d["description"], version: d["version"]}
       }
     end
 
     def find(library)
       validate(library, nil)
-      json = fetch("#{API_URL}?name=#{library}&fields=name,description,homepage,versions")
-      arr = JSON.load(json)
-      d = arr.first  or
-        raise CommandError.new("#{library}: Library not found.")
+      url = "https://ofcncog2cu-dsn.algolia.net/1/indexes/npm-search/#{library}"
+      uri = URI.parse(url)
+      begin
+        json = HttpConnection.open(uri, HEADERS) {|http| http.get(uri) }
+      rescue HttpError
+        raise CommandError, "#{library}: Library not found."
+      end
+      dict1 = JSON.load(json)
+      _debug_print(dict1)
+      #
+      json = fetch("#{API_URL}/package/npm/#{library}")
+      dict2 = JSON.load(json)
+      _debug_print(dict2)
+      #
+      d = dict1
       return {
-        name:     d['name'],
-        desc:     d['description'],
-        site:     d['homepage'],
-        versions: d['versions'],
+        name:      d['name'],
+        desc:      d['description'],
+        #versions: d['versions'].collect {|k,v| k },
+        versions:  dict2['versions'],
+        tags:      (d['keywords'] || []).join(", "),
+        site:      d['homepage'],
+        info:      File.join(SITE_URL, "/package/npm/#{library}"),
+        license:   d['license'],
       }
     end
 
     def get(library, version)
       validate(library, version)
-      baseurl = "https://cdn.jsdelivr.net/#{library}/#{version}"
-      url = "#{API_URL}/#{library}/#{version}"
-      json  = fetch("#{API_URL}/#{library}/#{version}")
-      files = JSON.load(json)
-      ! files.empty?  or
-        raise CommandError.new("#{library}: Library not found.")
-      urls  = files.collect {|x| "#{baseurl}/#{x}" }
+      url = File.join(API_URL, "/package/npm/#{library}@#{version}/flat")
+      begin
+        json = fetch(url, library)
+      rescue CommandError
+        raise CommandError.new("#{library}@#{version}: Library or version not found.")
+      end
+      jdata   = JSON.load(json)
+      files   = jdata["files"].collect {|d| d["name"] }
+      baseurl = "https://cdn.jsdelivr.net/npm/#{library}@#{version}"
+      _debug_print(jdata)
+      #
+      dict = find(library)
+      dict.delete(:versions)
+      dict.update({
+        version: version,
+        info:    File.join(SITE_URL, "/package/npm/#{library}?version=#{version}"),
+        npmpkg:  "https://registry.npmjs.org/#{library}/-/#{library}-#{version}.tgz",
+        urls:    files.collect {|x| baseurl + x },
+        files:   files,
+        baseurl: baseurl,
+        default: jdata["default"],
+        destdir: "#{library}@#{version}",
+      })
+      return dict
+    end
+
+  end
+
+
+  class Unpkg < Base
+    CODE = "unpkg"
+    SITE_URL = "https://unpkg.com/"
+    #API_URL  = "https://www.npmjs.com"
+    API_URL  = "https://api.npms.io/v2"
+
+    protected
+
+    def http_get(url)
+      return URI.__send__(:open, url, 'rb', {"x-spiferack"=>"1"}) {|f| f.read() }
+    end
+
+    public
+
+    def list()
+      return nil    # nil means that this CDN can't list libraries without pattern
+    end
+
+    def search(pattern)
+      #json = fetch("#{API_URL}/search?q=#{pattern}")
+      json = fetch("#{API_URL}/search?q=#{pattern}&size=250")
+      jdata = JSON.load(json)
+      _debug_print(jdata)
+      #arr = jdata["objects"]   # www.npmjs.com
+      arr = jdata["results"]    # api.npms.io
+      return arr.select {|dict|
+        File.fnmatch(pattern, dict["package"]["name"], File::FNM_CASEFOLD)
+      }.collect {|dict|
+        d = dict["package"]
+        {name: d["name"], desc: d["description"], version: d["version"]}
+      }
+    end
+
+    def find(library)
+      validate(library, nil)
+      json = fetch("#{API_URL}/package/#{library}", library)
+      jdata = JSON.load(json)
+      _debug_print(jdata)
+      dict = jdata["collected"]["metadata"]
+      versions = [dict["version"]]
+      #
+      url = File.join(SITE_URL, "/browse/#{library}/")
+      html = fetch(url, library)
+      _debug_print(html)
+      if html =~ /<script>window.__DATA__\s*=\s*(.*?)<\/script>/m
+        jdata2 = JSON.load($1)
+        versions = jdata2["availableVersions"].reverse()
+      end
+      #
       return {
+        name:      dict["name"],
+        desc:      dict["description"],
+        tags:      (dict["keywords"] || []).join(", "),
+        site:      dict["links"] ? dict["links"]["homepage"] : dict["links"]["npm"],
+        info:      File.join(SITE_URL, "/browse/#{library}/"),
+        versions:  versions,
+        license:   dict["license"],
+      }
+    end
+
+    def get(library, version)
+      validate(library, version)
+      dict = find(library)
+      dict.delete(:versions)
+      #
+      url = "https://data.jsdelivr.com/v1/package/npm/#{library}@#{version}/flat"
+      begin
+        json = fetch(url, library)
+      rescue CommandError
+        raise CommandError.new("#{library}@#{version}: Library or version not found.")
+      end
+      jdata   = JSON.load(json)
+      files   = jdata["files"].collect {|d| d["name"] }
+      baseurl = File.join(SITE_URL, "/#{library}@#{version}")
+      _debug_print(jdata)
+      #
+      dict.update({
         name:     library,
         version:  version,
-        urls:     urls,
+        info:     File.join(SITE_URL, "/browse/#{library}@#{version}/"),
+        npmpkg:  "https://registry.npmjs.org/#{library}/-/#{library}-#{version}.tgz",
+        urls:     files.collect {|x| baseurl+x },
         files:    files,
         baseurl:  baseurl,
-      }
+        default:  jdata["default"],
+        destdir:  "#{library}@#{version}",
+      })
+      return dict
     end
 
   end
 
 
-  class GoogleCDN < Base    # TODO: use jsdelivr api
+  class GoogleCDN < Base
     CODE = "google"
     SITE_URL = 'https://developers.google.com/speed/libraries/'
 
-    def list
-      libs = []
+    def list()
       html = fetch("https://developers.google.com/speed/libraries/")
+      _debug_print(html)
       rexp = %r`"https://ajax\.googleapis\.com/ajax/libs/([^/]+)/([^/]+)/([^"]+)"`
+      libs = []
       html.scan(rexp) do |lib, ver, file|
         libs << {name: lib, desc: "latest version: #{ver}" }
       end
@@ -248,6 +496,7 @@ module CDNGet
     def find(library)
       validate(library, nil)
       html = fetch("https://developers.google.com/speed/libraries/")
+      _debug_print(html)
       rexp = %r`"https://ajax\.googleapis\.com/ajax/libs/#{library}/`
       site_url = nil
       versions = []
@@ -258,9 +507,7 @@ module CDNGet
           found = true
           if text =~ /<dt>.*?snippet:<\/dt>\s*<dd>(.*?)<\/dd>/m
             s = $1
-            s.scan(/\b(?:src|href)="([^"]*?)"/) do |href,|
-              urls << href
-            end
+            s.scan(/\b(?:src|href)="([^"]*?)"/) {|href,| urls << href }
           end
           if text =~ /<dt>site:<\/dt>\s*<dd>(.*?)<\/dd>/m
             s = $1
@@ -281,6 +528,7 @@ module CDNGet
       return {
         name: library,
         site: site_url,
+        info: "#{SITE_URL}\##{library}",
         urls: urls,
         versions: versions,
       }
@@ -301,6 +549,7 @@ module CDNGet
       return {
         name:    d[:name],
         site:    d[:site],
+        info:    "#{SITE_URL}\##{library}",
         urls:    urls,
         files:   files,
         baseurl: baseurl,
@@ -333,24 +582,28 @@ module CDNGet
       @script = script || File.basename($0)
     end
 
-    def help_message
+    def help_message()
       script = @script
       return <<END
-#{script}  -- download files from public CDN
+#{script}  -- download files from public CDN (cdnjs/jsdelivr/unpkg/google)
 
-Usage: #{script} [options] [CDN] [library] [version] [directory]
+Usage: #{script} [<options>] [<CDN> [<library> [<version> [<directory>]]]]
 
 Options:
   -h, --help        : help
   -v, --version     : version
   -q, --quiet       : minimal output
+      --debug       : (debug mode)
 
 Example:
-  $ #{script}                                # list public CDN
+  $ #{script}                                # list public CDN names
   $ #{script} [-q] cdnjs                     # list libraries
+  $ #{script} [-q] cdnjs 'jquery*'           # search libraries
   $ #{script} [-q] cdnjs jquery              # list versions
-  $ #{script} [-q] cdnjs jquery 2.2.0        # list files
-  $ #{script} [-q] cdnjs jquery 2.2.0 /tmp   # download files
+  $ #{script} [-q] cdnjs jquery latest       # show latest version
+  $ #{script} [-q] cdnjs jquery 3.6.0        # list files
+  $ #{script} [-q] cdnjs jquery 3.6.0 /tmp   # download files into directory
+
 END
     end
 
@@ -365,10 +618,11 @@ END
     end
 
     def run(*args)
-      cmdopts = parse_cmdopts(args, "hvq", ["help", "version", "quiet"])
+      cmdopts = parse_cmdopts(args, "hvq", ["help", "version", "quiet", "debug"])
       return help_message() if cmdopts['h'] || cmdopts['help']
       return RELEASE + "\n" if cmdopts['v'] || cmdopts['version']
       @quiet = cmdopts['quiet'] || cmdopts['q']
+      @debug_mode = cmdopts['debug']
       #
       validate(args[1], args[2])
       #
@@ -380,11 +634,9 @@ END
         return do_list_libraries(cdn_code)
       when 2
         cdn_code, library = args
-        if library.include?('*')
-          return do_search_libraries(cdn_code, library)
-        else
-          return do_find_library(cdn_code, library)
-        end
+        return library.include?('*') \
+               ? do_search_libraries(cdn_code, library) \
+               : do_find_library(cdn_code, library)
       when 3
         cdn_code, library, version = args
         return do_get_library(cdn_code, library, version)
@@ -438,35 +690,29 @@ END
     def find_cdn(cdn_code)
       klass = CLASSES.find {|c| c::CODE == cdn_code }  or
         raise CommandError.new("#{cdn_code}: no such CDN.")
-      return klass.new
+      return klass.new(debug_mode: @debug_mode)
     end
 
     def render_list(list)
-      if @quiet
-        return list.collect {|d| "#{d[:name]}\n" }.join()
-      else
-        return list.collect {|d| "%-20s  # %s\n" % [d[:name], d[:desc]] }.join()
-      end
+      return list.collect {|d| "#{d[:name]}\n" }.join() if @quiet
+      return list.collect {|d| "%-20s  # %s\n" % [d[:name], d[:desc]] }.join()
     end
 
-    def do_list_cdns
-      if @quiet
-        return CLASSES.map {|c| "#{c::CODE}\n" }.join()
-      else
-        return CLASSES.map {|c| "%-10s  # %s\n" % [c::CODE, c::SITE_URL] }.join()
-      end
+    def do_list_cdns()
+      return CLASSES.map {|c| "#{c::CODE}\n" }.join() if @quiet
+      return CLASSES.map {|c| "%-10s  # %s\n" % [c::CODE, c::SITE_URL] }.join()
     end
 
     def do_list_libraries(cdn_code)
       cdn = find_cdn(cdn_code)
-      return render_list(cdn.list)
+      list = cdn.list()  or
+        raise CommandError.new("#{cdn_code}: cannot list libraries; please specify pattern such as 'jquery*'.")
+      return render_list(list)
     end
 
     def do_search_libraries(cdn_code, pattern)
       cdn = find_cdn(cdn_code)
-      rexp_str = pattern.split('*', -1).collect {|x| Regexp.escape(x) }.join('.*')
-      rexp = Regexp.compile("\\A#{rexp_str}\\z", Regexp::IGNORECASE)
-      return render_list(cdn.list.select {|a| a[:name] =~ rexp })
+      return render_list(cdn.search(pattern))
     end
 
     def do_find_library(cdn_code, library)
@@ -478,10 +724,12 @@ END
           s << "#{ver}\n"
         end if d[:versions]
       else
-        s << "name:  #{d[:name]}\n"
-        s << "desc:  #{d[:desc]}\n" if d[:desc]
-        s << "tags:  #{d[:tags]}\n" if d[:tags]
-        s << "site:  #{d[:site]}\n" if d[:site]
+        s << "name:     #{d[:name]}\n"
+        s << "desc:     #{d[:desc]}\n"    if d[:desc]
+        s << "tags:     #{d[:tags]}\n"    if d[:tags]
+        s << "site:     #{d[:site]}\n"    if d[:site]
+        s << "info:     #{d[:info]}\n"    if d[:info]
+        s << "license:  #{d[:license]}\n" if d[:license]
         s << "snippet: |\n" << d[:snippet].gsub(/^/, '    ') if d[:snippet]
         s << "versions:\n"
         d[:versions].each do |ver|
@@ -493,6 +741,7 @@ END
 
     def do_get_library(cdn_code, library, version)
       cdn = find_cdn(cdn_code)
+      version = _latest_version(cdn, library) if version == 'latest'
       d = cdn.get(library, version)
       s = ""
       if @quiet
@@ -502,8 +751,13 @@ END
       else
         s << "name:     #{d[:name]}\n"
         s << "version:  #{d[:version]}\n"
-        s << "tags:     #{d[:tags]}\n" if d[:tags]
-        s << "site:     #{d[:site]}\n" if d[:site]
+        s << "desc:     #{d[:desc]}\n"    if d[:desc]
+        s << "tags:     #{d[:tags]}\n"    if d[:tags]
+        s << "site:     #{d[:site]}\n"    if d[:site]
+        s << "info:     #{d[:info]}\n"    if d[:info]
+        s << "npmpkg:   #{d[:npmpkg]}\n"  if d[:npmpkg]
+        s << "default:  #{d[:default]}\n" if d[:default]
+        s << "license:  #{d[:license]}\n" if d[:license]
         s << "snippet: |\n" << d[:snippet].gsub(/^/, '    ') if d[:snippet]
         s << "urls:\n"  if d[:urls]
         d[:urls].each do |url|
@@ -515,10 +769,18 @@ END
 
     def do_download_library(cdn_code, library, version, basedir)
       cdn = find_cdn(cdn_code)
+      version = _latest_version(cdn, library) if version == 'latest'
       cdn.download(library, version, basedir, quiet: @quiet)
       return nil
     end
 
+    private
+
+    def _latest_version(cdn, library)
+      d = cdn.find(library)
+      return d[:versions].first
+    end
+
   end