fontist 1.11.6 → 1.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc9110896000190889a313f291012ebc3b84a7296230398ee61c9822c44ea87
-  data.tar.gz: 9de28427a3a46124e8ded2880de764ad9bb632bc9c919babe15123fc38eebdb3
+  metadata.gz: d3a779a1f127060501e1c69c59986bcd1a616ab699c5cff439cec4aafc27a0a2
+  data.tar.gz: cbcfe4d0a06ccfbcb309b2c59aac6a58ce09d804c6b23cec5970a6d67b697d43
 SHA512:
-  metadata.gz: 005c1c9a434bbfa11da8602be4180e20056798afccf4c302204e6d986c6a288d7ee6cbfb387c597db79fe4ae86e50aa22729d4553813b7f025d27a1033c83f19
-  data.tar.gz: 8584ca32768a87ce2ddfd95275e6f22a9b61074df2db8b407f587931cc2729b444dd257f6435fd564bd0588a2bcf5d6e2634f611cf73a87d76ec517a86de4edf
+  metadata.gz: d17e2fa944c7ddfd142869d1db9df35fae4ae7aa58c6188290529d31be66b9043e300b0cff2e4cb13545fb1bbdc707820fa4c88f557c914cb59ad4b7a1fef46f
+  data.tar.gz: 98db0b18012107e2a39644d9c892a7ef5330543526da993f1b346300bba2bcefa02b2b17ff417a716f7e6f3e84d0b7589eda24d4b154366a290010bbe8f9ad0a

data/.github/workflows/rspec.yml

@@ -33,7 +33,15 @@ jobs:
         env:
           TEST_ENV: CI
 
-      - if: matrix.os != 'macos-latest'
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: curl -O https://curl.se/ca/cacert.pem
+
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: bundle exec rspec --tag ~dev
+        env:
+          SSL_CERT_FILE: cacert.pem
+
+      - if: matrix.os != 'macos-latest' || matrix.os == 'windows-latest' && matrix.ruby == '2.4'
         run: bundle exec rspec --tag ~dev
         env:
           TEST_ENV: CI

data/lib/fontist/font.rb

@@ -62,7 +62,7 @@ module Fontist
     end
 
     def all
-      Fontist::Formula.all.map(&:fonts).flatten
+      all_formulas.map(&:fonts).flatten
     end
 
     private
@@ -99,11 +99,17 @@ module Fontist
     end
 
     def formula
-      @formula ||= Fontist::Formula.find(name)
+      @formula ||= formulas.first
     end
 
     def formulas
       @formulas ||= Fontist::Formula.find_many(name)
+        .select { |f| supported_formula?(f) }
+    end
+
+    def supported_formula?(formula)
+      formula.platforms.nil? ||
+        formula.platforms.include?(Fontist::Utils::System.user_os.to_s)
     end
 
     def downloadable_font
@@ -190,7 +196,7 @@ module Fontist
     end
 
     def all_formulas
-      Fontist::Formula.all
+      Fontist::Formula.all.select { |f| supported_formula?(f) }
     end
 
     def path(style)

data/lib/fontist/formula.rb

@@ -91,6 +91,10 @@ module Fontist
       @data["requires_license_agreement"] ? true : false
     end
 
+    def platforms
+      @data["platforms"]
+    end
+
     def extract
       Helpers.parse_to_object(@data["extract"])
     end

data/lib/fontist/update.rb

@@ -30,7 +30,14 @@ module Fontist
                          depth: 1)
       end
 
-      git = Git.open(Fontist.formulas_repo_path)
+      git = if Dir.exist?(Fontist.formulas_repo_path.join(".git"))
+              Git.open(Fontist.formulas_repo_path)
+            else
+              Git.init(Fontist.formulas_repo_path.to_s).tap do |g|
+                g.add_remote("origin", Fontist.formulas_repo_url)
+              end
+            end
+
       return git.pull("origin", @branch) if git.current_branch == @branch
 
       git.config("remote.origin.fetch",

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.11.6".freeze
+  VERSION = "1.11.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.11.6
+  version: 1.11.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down