fontist 1.9.0 → 1.11.1

data/lib/fontist/update.rb

@@ -0,0 +1,78 @@
+module Fontist
+  class Update
+    BRANCH = "v2".freeze
+
+    def self.call
+      new(BRANCH).call
+    end
+
+    def initialize(branch = "main")
+      @branch = branch
+    end
+
+    def call
+      update_main_repo
+      update_private_repos
+    ensure
+      rebuild_index
+    end
+
+    private
+
+    def update_main_repo
+      dir = File.dirname(Fontist.formulas_repo_path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
+      unless Dir.exist?(Fontist.formulas_repo_path)
+        return Git.clone(Fontist.formulas_repo_url,
+                         Fontist.formulas_repo_path,
+                         branch: @branch,
+                         depth: 1)
+      end
+
+      git = Git.open(Fontist.formulas_repo_path)
+      return git.pull("origin", @branch) if git.current_branch == @branch
+
+      git.config("remote.origin.fetch",
+                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.fetch
+      git.checkout(@branch)
+      git.pull("origin", @branch)
+    end
+
+    def update_private_repos
+      private_repos.each do |path|
+        update_repo(path)
+      end
+    end
+
+    def update_repo(path)
+      Git.open(path).pull
+    rescue Git::GitExecuteError => e
+      name = repo_name(path)
+      raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
+        Formulas repo '#{name}' could not be updated.
+        Please consider reinitializing it with:
+          fontist remove #{name}
+          fontist setup #{name} REPO_URL
+
+        Git error:
+        #{e.message}
+      MSG
+    end
+
+    def private_repos
+      Dir.glob(Fontist.private_formulas_path.join("*")).select do |path|
+        File.directory?(path)
+      end
+    end
+
+    def repo_name(path)
+      File.basename(path)
+    end
+
+    def rebuild_index
+      Index.rebuild
+    end
+  end
+end

data/lib/fontist/utils/downloader.rb

@@ -24,12 +24,7 @@ module Fontist
           download_file
         end
 
-        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TamperedFileError.new(
-            "The downloaded file from #{@file} doesn't " \
-            "match with the expected sha256 checksum!"
-          ))
-        end
+        raise_if_tampered(file)
 
         file
       end
@@ -38,6 +33,19 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
+      def raise_if_tampered(file)
+        file_checksum = Digest::SHA256.file(file).to_s
+        if !sha.empty? && !sha.include?(file_checksum)
+          raise(
+            Fontist::Errors::TamperedFileError.new(
+              "The downloaded file from #{@file} doesn't " \
+              "match with the expected sha256 checksum (#{file_checksum})!\n" \
+              "Beginning of content: #{File.read(file, 3000)}",
+            ),
+          )
+        end
+      end
+
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -59,6 +67,7 @@ module Fontist
           url,
           open_timeout: 10,
           read_timeout: 10,
+          max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
             @progress_bar.total = content_length if content_length

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.9.0".freeze
+  VERSION = "1.11.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: socksify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -252,6 +266,7 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
+- README.adoc
 - README.md
 - Rakefile
 - exe/fontist
@@ -262,7 +277,6 @@ files:
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
-- lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_paths.rb
 - lib/fontist/helpers.rb
@@ -296,9 +310,11 @@ files:
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
 - lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/default_family_font_index.rb
 - lib/fontist/indexes/filename_index.rb
 - lib/fontist/indexes/font_index.rb
 - lib/fontist/indexes/index_formula.rb
+- lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
@@ -307,6 +323,7 @@ files:
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/system_index.rb
+- lib/fontist/update.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb

data/lib/fontist/fontist_font.rb

@@ -1,24 +0,0 @@
-module Fontist
-  class FontistFont
-    def initialize(font_name:)
-      @font_name = font_name
-    end
-
-    def self.find(name)
-      new(font_name: name).find
-    end
-
-    def find
-      styles = FormulaPaths.new(font_paths).find(@font_name)
-      return unless styles
-
-      styles.map { |x| x[:path] }
-    end
-
-    private
-
-    def font_paths
-      Dir.glob(Fontist.fonts_path.join("**"))
-    end
-  end
-end