RubyGems - cdnget - Versions diffs - 0.2.0 → 0.3.0 - Mend

cdnget 0.2.0 → 0.3.0

Files changed (9) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a718ec89571144e9875b5a5c56bd3d44fdd81f5
-  data.tar.gz: ea19fd364267826d4228a01caef8a4ebbb394cf1
+  metadata.gz: 055befc004f39cde2638cf0cc31dc01e4cbc3226
+  data.tar.gz: 694c18db9e4128ee93119f985c66c7d4656aee27
 SHA512:
-  metadata.gz: e4e17f3ec24c1d84314890c7f54414e36365a75ee2a5478235be2410a80d97e319617a0e880d851a4acb9ef80282cdb1656ab3cae227304d34d67382a19083d7
-  data.tar.gz: 2e84dda3e1866b128e526e8949555f1ca90ee3a28c5465323140fdb55b40df4542b6189eafce04665ff677b8a995d1707001c80908c86238dceeb4ea3e9e2c2b
+  metadata.gz: 4ab7fed7ebd4a61804930cf168deb89e1b30b2326ed9ca3bd609b755236f14d2c905066a24bb39f65b7a090bb4eeffb36b43996550c651d2c6acefdcf6f28b67
+  data.tar.gz: dea35e5ab6ca166933650c0ff670b0e419ebc5e24b906b31ac45c492c87073cc78abd6840b556574519bacfc7881780cae21296532bca988603727fa684cd1d5

data/CHANGES.md CHANGED

@@ -2,6 +2,12 @@ Changes
 =======
+Release 0.3.0 (2016-09-07)
+---------------------------
+* Change to read data from https://api.cdnjs.com/ .
 Release 0.2.0 (2016-07-11)
 --------------------------

data/README.md CHANGED

@@ -1,7 +1,7 @@
 CDNget
 ======
-($Release: 0.2.0 $)
+($Release: 0.3.0 $)
 CDNget is a utility script to download files from CDNJS, jsDelivr or Google.

data/Rakefile CHANGED

@@ -2,7 +2,7 @@
 ###
-RELEASE   = '$Release: 0.2.0 $'.split()[1]
+RELEASE   = '$Release: 0.3.0 $'.split()[1]
 COPYRIGHT = 'copyright(c) 2016 kuwata-lab.com all rights reserved'
 LICENSE   = 'MIT License'

data/bin/cdnget CHANGED

@@ -24,7 +24,7 @@ require 'fileutils'
 module CDNGet
-  RELEASE = '$Release: 0.2.0 $'.split()[1]
+  RELEASE = '$Release: 0.3.0 $'.split()[1]
   CLASSES = []
@@ -114,14 +114,20 @@ module CDNGet
     def fetch(url, library=nil)
       begin
-        html = open(url, 'rb') {|f| f.read() }
+        json_str = 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()}'?).")
+          if json_str == "{}"
+            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
+          end
         end
-        return html
+        return json_str
       rescue OpenURI::HTTPError => ex
         raise HttpError.new("GET #{url} : #{ex.message}")
       end
@@ -130,53 +136,38 @@ module CDNGet
     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
+      jstr = fetch("https://api.cdnjs.com/libraries?fields=name,description")
+      jdata = JSON.parse(jstr)
+      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)
-      flagment = html.split(/<select class=".*?version-selector.*?"/, 2).last
-      flagment = flagment.split(/<\/select>/, 2).first
-      versions = []
-      flagment.scan(/<option value="([^"]+)" *(?:selected)?>/) do |ver,|
-        versions << ver
-      end
-      desc = tags = nil
-      if html =~ /<\/p>\s*<p>(.*?)<\/p>\s*<em>(.*?)<\/em>/
-        desc = $1
-        tags = $2
-      end
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
       return {
         name: library,
-        desc: desc,
-        tags: tags,
-        versions: versions,
+        desc: jdata['description'],
+        tags: (jdata['keywords'] || []).join(", "),
+        versions: jdata['assets'].collect {|d| d['version'] },
       }
     end
     def get(library, version)
       validate(library, version)
-      html = fetch("https://cdnjs.com/libraries/#{library}/#{version}", library)
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
+      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}/"
-      basepat = Regexp.escape("#{library}/#{version}")
-      files = []
-      html.scan(%r`>#{basepat}/([^<]+)<\/p>`) do |file,|
-        files << file.gsub(/&#x2F;/, '/')
-      end
-      urls = files.collect {|s| baseurl + s }
       return {
         name:     library,
+        desc:     jdata['description'],
+        tags:     (jdata['keywords'] || []).join(", "),
         version:  version,
-        urls:     urls,
-        files:    files,
+        urls:     d['files'].collect {|s| baseurl + s },
+        files:    d['files'],
         baseurl:  baseurl,
       }
     end
@@ -503,6 +494,7 @@ END
       else
         s << "name:     #{d[:name]}\n"
         s << "version:  #{d[:version]}\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 << "snippet: |\n" << d[:snippet].gsub(/^/, '    ') if d[:snippet]

data/cdnget.gemspec CHANGED

@@ -2,7 +2,7 @@
 Gem::Specification.new do |o|
   o.name          = "cdnget"
-  o.version       = '$Release: 0.2.0 $'.split()[1]
+  o.version       = '$Release: 0.3.0 $'.split()[1]
   o.authors       = ["makoto kuwata"]
   o.email         = ["kwa@kuwata-lab.com"]

data/lib/cdnget.rb CHANGED

@@ -24,7 +24,7 @@ require 'fileutils'
 module CDNGet
-  RELEASE = '$Release: 0.2.0 $'.split()[1]
+  RELEASE = '$Release: 0.3.0 $'.split()[1]
   CLASSES = []
@@ -114,14 +114,20 @@ module CDNGet
     def fetch(url, library=nil)
       begin
-        html = open(url, 'rb') {|f| f.read() }
+        json_str = 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()}'?).")
+          if json_str == "{}"
+            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
+          end
         end
-        return html
+        return json_str
       rescue OpenURI::HTTPError => ex
         raise HttpError.new("GET #{url} : #{ex.message}")
       end
@@ -130,53 +136,38 @@ module CDNGet
     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
+      jstr = fetch("https://api.cdnjs.com/libraries?fields=name,description")
+      jdata = JSON.parse(jstr)
+      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)
-      flagment = html.split(/<select class=".*?version-selector.*?"/, 2).last
-      flagment = flagment.split(/<\/select>/, 2).first
-      versions = []
-      flagment.scan(/<option value="([^"]+)" *(?:selected)?>/) do |ver,|
-        versions << ver
-      end
-      desc = tags = nil
-      if html =~ /<\/p>\s*<p>(.*?)<\/p>\s*<em>(.*?)<\/em>/
-        desc = $1
-        tags = $2
-      end
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
       return {
         name: library,
-        desc: desc,
-        tags: tags,
-        versions: versions,
+        desc: jdata['description'],
+        tags: (jdata['keywords'] || []).join(", "),
+        versions: jdata['assets'].collect {|d| d['version'] },
       }
     end
     def get(library, version)
       validate(library, version)
-      html = fetch("https://cdnjs.com/libraries/#{library}/#{version}", library)
+      jstr = fetch("https://api.cdnjs.com/libraries/#{library}", library)
+      jdata = JSON.parse(jstr)
+      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}/"
-      basepat = Regexp.escape("#{library}/#{version}")
-      files = []
-      html.scan(%r`>#{basepat}/([^<]+)<\/p>`) do |file,|
-        files << file.gsub(/&#x2F;/, '/')
-      end
-      urls = files.collect {|s| baseurl + s }
       return {
         name:     library,
+        desc:     jdata['description'],
+        tags:     (jdata['keywords'] || []).join(", "),
         version:  version,
-        urls:     urls,
-        files:    files,
+        urls:     d['files'].collect {|s| baseurl + s },
+        files:    d['files'],
         baseurl:  baseurl,
       }
     end
@@ -503,6 +494,7 @@ END
       else
         s << "name:     #{d[:name]}\n"
         s << "version:  #{d[:version]}\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 << "snippet: |\n" << d[:snippet].gsub(/^/, '    ') if d[:snippet]

data/test/cdnget_test.rb CHANGED

@@ -69,10 +69,9 @@ END
     it "(cdnjs) lists librareis." do
       actual = CDNGet::Main.new().run("cdnjs")
-      ok {actual} =~ /^jquery                # jquery, library, ajax, framework, toolkit, popular$/
-      ok {actual} =~ /^angular\.js            # framework, mvc, AngularJS, angular, angular2, angular\.js$/
-      ok {actual} =~ /^twitter-bootstrap     # css, less, mobile-first, responsive, front-end, framework, web, twitter, bootstrap$/
-      ok {actual} =~ /^ember\.js              # ember, ember.js$/
+      ok {actual} =~ /^jquery                # JavaScript library for DOM operations$/
+      ok {actual} =~ /^angular\.js            # AngularJS is an MVC framework for building web applications\./
+      ok {actual} =~ /^ember\.js              # Ember is a JavaScript framework for creating ambitious web applications that eliminates boilerplate and provides a standard application architecture\./
     end
     it "(google) lists librareis." do
@@ -275,6 +274,7 @@ END
       expected = <<END
 name:     jquery
 version:  2.2.0
+tags:     jquery, library, ajax, framework, toolkit, popular
 urls:
   - https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.js
   - https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js
@@ -313,14 +313,15 @@ END
       expected = <<END
 name:     jquery-jcrop
 version:  0.9.12
+tags:     jquery, crop
 urls:
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/css/Jcrop.gif
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/css/jquery.Jcrop.css
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/css/jquery.Jcrop.min.css
-  - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.js
-  - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.color.js
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.color.min.js
+  - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.js
+  - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js
   - https://cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.min.js
 END
       actual = CDNGet::Main.new().run("cdnjs", "jquery-jcrop", "0.9.12")
@@ -381,10 +382,10 @@ END
 #{tmpdir}/jquery-jcrop/0.9.12/css/Jcrop.gif ... Done (329 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.css ... Done (3,280 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.min.css ... Done (2,102 byte)
-#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js ... Done (42,434 byte)
-#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js ... Done (15,892 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.js ... Done (16,142 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.min.js ... Done (6,845 byte)
+#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js ... Done (42,434 byte)
+#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js ... Done (15,892 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.min.js ... Done (93,068 byte)
 END
       begin
@@ -394,10 +395,10 @@ END
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/css/Jcrop.gif"             }.file_exist?
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.css"      }.file_exist?
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.min.css"  }.file_exist?
-        ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js"        }.file_exist?
-        ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js"    }.file_exist?
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.js"        }.file_exist?
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.min.js"    }.file_exist?
+        ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js"        }.file_exist?
+        ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js"    }.file_exist?
         ok {"#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.min.js"          }.file_exist?
         ok {sout} == expected
       ensure
@@ -428,10 +429,10 @@ END
 #{tmpdir}/jquery-jcrop/0.9.12/css/Jcrop.gif ... Done (329 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.css ... Done (3,280 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/css/jquery.Jcrop.min.css ... Done (2,102 byte)
-#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js ... Done (42,434 byte)
-#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js ... Done (15,892 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.js ... Done (16,142 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.color.min.js ... Done (6,845 byte)
+#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.js ... Done (42,434 byte)
+#{tmpdir}/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js ... Done (15,892 byte)
 #{tmpdir}/jquery-jcrop/0.9.12/js/jquery.min.js ... Done (93,068 byte)
 END
       end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdnget
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest