fontist 1.3.0 → 1.7.0

data/lib/fontist/utils/system.rb

@@ -0,0 +1,23 @@
+module Fontist
+  module Utils
+    module System
+      def self.user_os # rubocop:disable Metrics/MethodLength
+        @user_os ||= begin
+          host_os = RbConfig::CONFIG["host_os"]
+          case host_os
+          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            :windows
+          when /darwin|mac os/
+            :macos
+          when /linux/
+            :linux
+          when /solaris|bsd/
+            :unix
+          else
+            raise Fontist::Error, "unknown os: #{host_os.inspect}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/ui.rb

@@ -3,6 +3,14 @@ require "thor"
 module Fontist
   module Utils
     class UI < Thor
+      def self.success(message)
+        new.say(message, :green)
+      end
+
+      def self.error(message)
+        new.say(message, :red)
+      end
+
       def self.say(message)
         new.say(message)
       end
@@ -10,6 +18,10 @@ module Fontist
       def self.ask(message, options = {})
         new.ask(message, options)
       end
+
+      def self.print(message)
+        super
+      end
     end
   end
 end

data/lib/fontist/utils/zip_extractor.rb

@@ -4,10 +4,11 @@ require "pathname"
 module Fontist
   module Utils
     module ZipExtractor
-      def zip_extract(resource, download: true, fonts_sub_dir: "")
+      def zip_extract(resource, download: true, fonts_sub_dir: nil)
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
+        Fontist.ui.say(%(Installing font "#{key}".))
         fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
         block_given? ? yield(fonts_paths) : fonts_paths
       end
@@ -16,23 +17,36 @@ module Fontist
 
       private
 
-      def unzip_fonts(file, fonts_sub_dir = "")
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def unzip_fonts(file, subdir)
         Zip.on_exists_proc = true
-        Array.new.tap do |fonts|
 
+        Array.new.tap do |fonts|
           Zip::File.open(file) do |zip_file|
-            zip_file.glob("#{fonts_sub_dir}*.{ttf,ttc,otf}").each do |entry|
+            zip_file.each do |entry|
               if entry.name
-                filename = Pathname.new(entry.name).basename
-                font_path = fonts_path.join(filename.to_s)
-                fonts.push(font_path.to_s)
+                filename = Pathname.new(entry.name).basename.to_s
+                if font_directory?(entry.name, subdir) && font_file?(filename)
+                  target_filename = target_filename(filename)
+                  font_path = fonts_path.join(target_filename)
+                  fonts.push(font_path.to_s)
 
-                entry.extract(font_path)
+                  entry.extract(font_path)
+                end
               end
             end
           end
         end
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      def font_directory?(path, subdir)
+        return true unless subdir
+
+        dirname = File.dirname(path)
+        normalized_pattern = subdir.chomp("/")
+        File.fnmatch?(normalized_pattern, dirname)
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.3.0".freeze
+  VERSION = "1.7.0".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -53,6 +53,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: seven_zip_ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-ole
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +95,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: extract_ttc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,85 +179,153 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.75.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.75.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-protocol-buffers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A libarary find or download fonts
 email:
 - operations@ribose.com
 - abunashir@gmail.com
-executables: []
+executables:
+- fontist
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/check_google.yml"
 - ".github/workflows/macosx.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/check_google
 - bin/console
+- bin/convert_formulas
+- bin/fontist
+- bin/generate_otfinfo
+- bin/import_google
 - bin/rspec
 - bin/setup
 - fontist.gemspec
 - lib/fontist.rb
+- lib/fontist/cli.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_formula.rb
+- lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
+- lib/fontist/formula_template.rb
 - lib/fontist/formulas.rb
-- lib/fontist/formulas/andale_font.rb
-- lib/fontist/formulas/arial_black_font.rb
-- lib/fontist/formulas/cleartype_fonts.rb
-- lib/fontist/formulas/comic_font.rb
-- lib/fontist/formulas/courier_font.rb
-- lib/fontist/formulas/euphemia_font.rb
-- lib/fontist/formulas/georgia_font.rb
-- lib/fontist/formulas/impact_font.rb
-- lib/fontist/formulas/montserrat_font.rb
-- lib/fontist/formulas/ms_truetype_fonts.rb
-- lib/fontist/formulas/open_sans_fonts.rb
-- lib/fontist/formulas/overpass_font.rb
-- lib/fontist/formulas/source_fonts.rb
-- lib/fontist/formulas/stix_fonts.rb
-- lib/fontist/formulas/tahoma_font.rb
-- lib/fontist/formulas/webding_font.rb
+- lib/fontist/import.rb
+- lib/fontist/import/convert_formulas.rb
+- lib/fontist/import/create_formula.rb
+- lib/fontist/import/extractors.rb
+- lib/fontist/import/extractors/cab_extractor.rb
+- lib/fontist/import/extractors/extractor.rb
+- lib/fontist/import/extractors/ole_extractor.rb
+- lib/fontist/import/extractors/seven_zip_extractor.rb
+- lib/fontist/import/extractors/zip_extractor.rb
+- lib/fontist/import/files/collection_file.rb
+- lib/fontist/import/files/file_requirement.rb
+- lib/fontist/import/files/font_detector.rb
+- lib/fontist/import/formula_builder.rb
+- lib/fontist/import/formula_serializer.rb
+- lib/fontist/import/google.rb
+- lib/fontist/import/google/fonts_public.md
+- lib/fontist/import/google/fonts_public.pb.rb
+- lib/fontist/import/google/fonts_public.proto
+- lib/fontist/import/google/new_fonts_fetcher.rb
+- lib/fontist/import/google/skiplist.yml
+- lib/fontist/import/google_check.rb
+- lib/fontist/import/google_import.rb
+- lib/fontist/import/helpers/hash_helper.rb
+- lib/fontist/import/helpers/system_helper.rb
+- lib/fontist/import/otf/font_file.rb
+- lib/fontist/import/otf_parser.rb
+- lib/fontist/import/otf_style.rb
+- lib/fontist/import/otfinfo/otfinfo_requirement.rb
+- lib/fontist/import/otfinfo/template.erb
+- lib/fontist/import/otfinfo_generate.rb
+- lib/fontist/import/recursive_extraction.rb
+- lib/fontist/import/template_helper.rb
+- lib/fontist/import/text_helper.rb
+- lib/fontist/manifest.rb
+- lib/fontist/manifest/install.rb
+- lib/fontist/manifest/locations.rb
 - lib/fontist/registry.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/utils.rb
+- lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
+- lib/fontist/utils/dsl/collection_font.rb
+- lib/fontist/utils/dsl/font.rb
 - lib/fontist/utils/exe_extractor.rb
+- lib/fontist/utils/msi_extractor.rb
+- lib/fontist/utils/seven_zip_extractor.rb
+- lib/fontist/utils/system.rb
 - lib/fontist/utils/ui.rb
 - lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
-- spec/fixtures/fonts/DejaVuSerif.ttf
-- spec/fontist/font_formula_spec.rb
-- spec/fontist/font_spec.rb
-- spec/fontist/formula_spec.rb
-- spec/fontist/formulas/andale_font_spec.rb
-- spec/fontist/formulas/arial_black_font_spec.rb
-- spec/fontist/formulas/cleartype_fonts_spec.rb
-- spec/fontist/formulas/comic_font_spec.rb
-- spec/fontist/formulas/courier_font_spec.rb
-- spec/fontist/formulas/euphemia_font_spec.rb
-- spec/fontist/formulas/georgia_font_spec.rb
-- spec/fontist/formulas/impact_font_spec.rb
-- spec/fontist/formulas/montserrat_font_spec.rb
-- spec/fontist/formulas/ms_truetype_fonts_spec.rb
-- spec/fontist/formulas/open_sans_fonts_spec.rb
-- spec/fontist/formulas/overpass_font_spec.rb
-- spec/fontist/formulas/source_fonts_spec.rb
-- spec/fontist/formulas/stix_fonts_spec.rb
-- spec/fontist/formulas/tahoma_font_spec.rb
-- spec/fontist/formulas/webding_font_spec.rb
-- spec/fontist/registry_spec.rb
-- spec/fontist/system_font_spec.rb
-- spec/fontist/utils/downloader_spec.rb
-- spec/fontist_spec.rb
-- spec/spec_helper.rb
-- spec/support/fontist_helper.rb
 homepage: https://github.com/fontist/fontist
 licenses:
 - BSD-2-Clause
@@ -209,7 +333,7 @@ metadata:
   homepage_uri: https://github.com/fontist/fontist
   source_code_uri: https://github.com/fontist/fontist
   changelog_uri: https://github.com/fontist/fontist
-post_install_message: 
+post_install_message: Please run `fontist update` to fetch formulas
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +348,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A libarary find or download fonts
 test_files: []

data/lib/fontist/formulas/andale_font.rb

@@ -1,80 +0,0 @@
-module Fontist
-  module Formulas
-    class AndaleFont < FontFormula
-      key :andale_font
-      desc "Microsoft TrueType Core fonts for the Web"
-      homepage "https://www.microsoft.com"
-
-      resource "andale32.exe" do
-        urls [
-          "https://gitlab.com/fontmirror/archive/-/raw/master/andale32.exe",
-          "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/andale32.exe",
-          "http://sft.if.usp.br/msttcorefonts/andale32.exe"
-        ]
-        sha256 "0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970"
-      end
-
-      provides_font("Andale Mono", match_styles_from_file: {
-        "Regular" => "AndaleMo.TTF"
-      })
-
-      def extract
-        resource "andale32.exe" do |resource|
-          cab_extract(resource) do |dir|
-            match_fonts(dir, "Andale Mono")
-          end
-        end
-
-      end
-
-      def install
-        case platform
-        when :macos
-          install_matched_fonts "$HOME/Library/Fonts/Microsoft"
-        when :linux
-          install_matched_fonts "/usr/share/fonts/truetype/vista"
-        end
-      end
-
-      test do
-        case platform
-        when :macos
-          assert_predicate "$HOME/Library/Fonts/Microsoft/AndaleMo.ttf", :exist?
-        when :linux
-          assert_predicate "/usr/share/fonts/truetype/vista/AndaleMo.ttf", :exist?
-        end
-      end
-
-      requires_license_agreement <<~EOS
-  (from http://web.archive.org/web/20011222020409/http://www.microsoft.com/typography/fontpack/eula.htm)
-  TrueType core fonts for the Web EULA
-  END-USER LICENSE AGREEMENT FOR
-  MICROSOFT SOFTWARE
-  IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software accompanying this EULA, which includes computer software and may include associated media, printed materials, and "on-line" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By exercising your rights to make and use copies of the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, you may not use the SOFTWARE PRODUCT.
-  SOFTWARE PRODUCT LICENSE
-  The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.
-  1. GRANT OF LICENSE. This EULA grants you the following rights:
-  * Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT.
-  * Reproduction and Distribution. You may reproduce and distribute an unlimited number of copies of the SOFTWARE PRODUCT; provided that each copy shall be a true and complete copy, including all copyright and trademark notices, and shall be accompanied by a copy of this EULA. Copies of the SOFTWARE PRODUCT may not be distributed for profit either on a standalone basis or included as part of your own product.
-  2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS.
-  * Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation.
-  * Restrictions on Alteration. You may not rename, edit or create any derivative works from the SOFTWARE PRODUCT, other than subsetting when embedding them in documents.
-  * Software Transfer. You may permanently transfer all of your rights under this EULA, provided the recipient agrees to the terms of this EULA.
-  * Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts.
-  3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, text, and "applets" incorporated into the SOFTWARE PRODUCT), the accompanying printed materials, and any copies of the SOFTWARE PRODUCT are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material.
-  4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software - Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399.
-  LIMITED WARRANTY
-  NO WARRANTIES. Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or noninfringement. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you.
-  NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you.
-  MISCELLANEOUS
-  If you acquired this product in the United States, this EULA is governed by the laws of the State of Washington.
-  If this product was acquired outside the United States, then local laws may apply.
-  Should you have any questions concerning this EULA, or if you desire to contact Microsoft for any reason, please contact the Microsoft subsidiary serving your country, or write: Microsoft Sales Information Center/One Microsoft Way/Redmond, WA 98052-6399.
-  this page was last updated 28 July 1998
-  © 1997 Microsoft Corporation. All rights reserved. Terms of use.
-  comments to the MST group: ttwsite@microsoft.com
-      EOS
-    end
-  end
-
-end