fontist 1.3.0 → 1.4.0

data/lib/fontist/utils.rb

@@ -1,8 +1,12 @@
 require "fontist/utils/ui"
+require "fontist/utils/system"
 require "fontist/utils/dsl"
+require "fontist/utils/dsl/font"
 require "fontist/utils/downloader"
 require "fontist/utils/zip_extractor"
 require "fontist/utils/exe_extractor"
+require "fontist/utils/msi_extractor"
+require "fontist/utils/seven_zip_extractor"
 
 module Fontist
   module Utils

data/lib/fontist/utils/cache.rb

@@ -0,0 +1,69 @@
+module Fontist
+  module Utils
+    class Cache
+      def fetch(key)
+        map = load_cache
+        return downloaded_path(map[key]) if cache_exist?(map[key])
+
+        generated_file = yield
+        path = save_cache(generated_file, key, map)
+
+        downloaded_path(path)
+      end
+
+      private
+
+      def cache_map_path
+        Fontist.downloads_path.join("map.yml")
+      end
+
+      def load_cache
+        cache_map_path.exist? ? YAML.load_file(cache_map_path) : {}
+      end
+
+      def downloaded_path(path)
+        File.new(Fontist.downloads_path.join(path))
+      end
+
+      def cache_exist?(path)
+        path && File.exist?(Fontist.downloads_path.join(path))
+      end
+
+      def save_cache(generated_file, key, map)
+        path = move_to_downloads(generated_file)
+        map[key] = path
+        File.write(cache_map_path, YAML.dump(map))
+        path
+      end
+
+      def move_to_downloads(source)
+        create_downloads_directory
+        path = generate_file_path(source)
+        move(source, path)
+        relative_to_downloads(path)
+      end
+
+      def create_downloads_directory
+        unless Fontist.downloads_path.exist?
+          FileUtils.mkdir_p(Fontist.downloads_path)
+        end
+      end
+
+      def generate_file_path(source)
+        dir = Dir.mktmpdir(nil, Fontist.downloads_path)
+        filename = source.original_filename
+        File.join(dir, filename)
+      end
+
+      def move(source_file, target_path)
+        # Windows requires file descriptors to be closed before files are moved
+        source_file.close
+        FileUtils.mv(source_file.path, target_path)
+      end
+
+      def relative_to_downloads(path)
+        Pathname.new(path).relative_path_from(Fontist.downloads_path).to_s
+      end
+    end
+  end
+end

data/lib/fontist/utils/downloader.rb

@@ -1,3 +1,5 @@
+require_relative "cache"
+
 module Fontist
   module Utils
     class Downloader
@@ -7,10 +9,11 @@ module Fontist
         @sha = [sha].flatten.compact
         @progress_bar = set_progress_bar(progress_bar)
         @file_size = (file_size || default_file_size).to_i
+        @cache = Cache.new
       end
 
       def download
-        file = download_file
+        file = @cache.fetch(@file) { download_file }
 
         if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
           raise(Fontist::Errors::TamperedFileError.new(
@@ -49,15 +52,21 @@ module Fontist
       def download_file
         bar = ProgressBar.new(file_size / byte_to_megabyte)
 
-        Down.download(
+        file = Down.download(
           @file,
           open_timeout: 10,
           read_timeout: 10,
+          content_length_proc: ->(content_length) {
+            bar.total = content_length / byte_to_megabyte if content_length
+          },
           progress_proc: -> (progress) {
             bar.increment(progress / byte_to_megabyte) if @progress_bar === true
           }
         )
 
+        puts if @progress_bar === true
+
+        file
       rescue Down::NotFound
         raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
@@ -69,6 +78,10 @@ module Fontist
         @total  = total
       end
 
+      def total=(total)
+        @total = total
+      end
+
       def increment(progress)
         complete = sprintf("%#.2f%%", ((@counter.to_f / @total.to_f) * 100))
         print "\r\e[0KDownloads: #{@counter}MB/#{@total}MB (#{complete})"

data/lib/fontist/utils/dsl.rb

@@ -65,6 +65,10 @@ module Fontist
         instance.license_required = false
       end
 
+      def copyright(copyright)
+        instance.copyright = copyright
+      end
+
       def license_url(url)
         instance.license_url = url
       end

data/lib/fontist/utils/dsl/font.rb

@@ -0,0 +1,37 @@
+module Fontist
+  module Utils
+    module Dsl
+      class Font
+        REQUIRED_ATTRIBUTES = %i[family_name
+                                 style
+                                 full_name
+                                 filename].freeze
+
+        attr_reader :attributes
+
+        def initialize(attributes)
+          REQUIRED_ATTRIBUTES.each do |required_attribute|
+            unless attributes[required_attribute]
+              raise(Fontist::Errors::MissingAttributeError.new(
+                      "Missing attribute: #{required_attribute}"
+                    ))
+            end
+          end
+
+          self.attributes = attributes
+        end
+
+        def attributes=(attrs)
+          @attributes = { family_name: attrs[:family_name],
+                          type: attrs[:style],
+                          full_name: attrs[:full_name],
+                          post_script_name: attrs[:post_script_name],
+                          version: attrs[:version],
+                          description: attrs[:description],
+                          copyright: attrs[:copyright],
+                          font: attrs[:filename] }
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/exe_extractor.rb

@@ -1,7 +1,7 @@
 module Fontist
   module Utils
     module ExeExtractor
-      def cab_extract(exe_file, download: true,  font_ext: /.tt|.ttc/i)
+      def cab_extract(exe_file, download: true, font_ext: /.ttf|.otf|.ttc/i)
         download = @downloaded === true ? false : download
 
         exe_file = download_file(exe_file).path if download
@@ -9,12 +9,13 @@ module Fontist
         cabbed_fonts = grep_fonts(cab_file.files, font_ext) || []
         fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)
 
-        yield(fonts_paths) if block_given?
+        block_given? ? yield(fonts_paths) : fonts_paths
       end
 
       def exe_extract(source)
         cab_file = decompressor.search(download_file(source).path)
-        yield(build_cab_file_hash(cab_file.files)) if block_given?
+        fonts_paths = build_cab_file_hash(cab_file.files)
+        block_given? ? yield(fonts_paths) : fonts_paths
       end
 
       private
@@ -47,25 +48,17 @@ module Fontist
       end
 
       def build_cab_file_hash(file)
-        Hash.new.tap do |cab_files|
-          while file
-            filename = file.filename
-            if filename.include?("cab")
-              file_path = temp_dir.join(filename).to_s
-
-              decompressor.extract(file, file_path)
-              cab_files[filename.to_s] = file_path
-            end
+        while file
+          filename = file.filename
+          if filename.include?("cab") || filename.include?("msi")
+            file_path = File.join(Dir.mktmpdir, filename)
+            decompressor.extract(file, file_path)
 
-            file = file.next
+            return file_path
           end
-        end
-      end
 
-      def temp_dir
-        @temp_dir ||= raise(
-          NotImplementedError.new("You must implement this method"),
-        )
+          file = file.next
+        end
       end
     end
   end

data/lib/fontist/utils/msi_extractor.rb

@@ -0,0 +1,31 @@
+module Fontist
+  module Utils
+    module MsiExtractor
+      def msi_extract(resource)
+        file = @downloaded ? resource : download_file(resource)
+
+        cab_content = read_the_largest_file(file)
+
+        cab_file = Tempfile.new(["data", ".cab"], mode: File::BINARY)
+        cab_file.write(cab_content)
+
+        block_given? ? yield(cab_file.path) : cab_file.path
+      end
+
+      private
+
+      def read_the_largest_file(file)
+        ole = storage.open(file)
+        the_largest_file = ole.dir.entries(".").max_by { |x| ole.file.size(x) }
+        ole.file.read(the_largest_file)
+      end
+
+      def storage
+        @storage ||= begin
+                       require "ole/storage"
+                       Ole::Storage
+                     end
+      end
+    end
+  end
+end

data/lib/fontist/utils/seven_zip_extractor.rb

@@ -0,0 +1,41 @@
+module Fontist
+  module Utils
+    module SevenZipExtractor
+      def seven_zip_extract(resource, extension: /\.cab$/)
+        file = download_file(resource)
+
+        extract_seven_zip_file(file, extension)
+      end
+
+      private
+
+      def extract_seven_zip_file(file, extension)
+        File.open(file, "rb") do |zip_file|
+          reader.open(zip_file) do |szr|
+            path = extract_by_extension(szr, extension)
+
+            return block_given? ? yield(path) : path
+          end
+        end
+      end
+
+      def reader
+        @reader ||= begin
+                      require "seven_zip_ruby"
+                      SevenZipRuby::Reader
+                    end
+      end
+
+      def extract_by_extension(szr, extension)
+        cab_entry = szr.entries.detect do |entry|
+          entry.file? && entry.path.match(extension)
+        end
+
+        tmp_dir = Dir.mktmpdir
+        szr.extract(cab_entry, tmp_dir)
+        filename = Pathname.new(cab_entry.path).basename
+        File.join(tmp_dir, filename)
+      end
+    end
+  end
+end

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

data/lib/fontist/utils/zip_extractor.rb

@@ -4,24 +4,28 @@ require "pathname"
 module Fontist
   module Utils
     module ZipExtractor
+      # fonts_sub_dir is unused now, but formulas have this option
+      # rubocop:disable Lint/UnusedMethodArgument
       def zip_extract(resource, download: true, fonts_sub_dir: "")
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
-        fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
+        fonts_paths = unzip_fonts(zip_file)
         block_given? ? yield(fonts_paths) : fonts_paths
       end
+      # rubocop:enable Lint/UnusedMethodArgument
 
       alias_method :unzip, :zip_extract
 
       private
 
-      def unzip_fonts(file, fonts_sub_dir = "")
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def unzip_fonts(file)
         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.glob("**/*.{ttf,ttc,otf}").each do |entry|
               if entry.name
                 filename = Pathname.new(entry.name).basename
                 font_path = fonts_path.join(filename.to_s)
@@ -33,6 +37,7 @@ module Fontist
           end
         end
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.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.4.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-10-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,20 @@ 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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,85 +165,148 @@ 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
+- bin/stripttc
 - 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/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/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/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 +314,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 +329,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: []