eyes_universal 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd13bc27126ffdca2c161271c87f2fc68d2bed846afa689b65a5693177d4c470
-  data.tar.gz: 1e763e14eb27a5cfeaf101aff0121847eb46284a60abd4b477d242f2c19927e8
+  metadata.gz: eea834af670d09a019f4d74e7814d1b85d268f38e93292a519369ddde6c30de9
+  data.tar.gz: 6083847c1f541f461b29e09d2a1c2a4e3bb062e8a8349e1241e0a5bbd2d54753
 SHA512:
-  metadata.gz: d068dd01fdbf7e29b694357fe43a605160bef3fc4f69b9bd4514ceaa4f3b36d02af4f42d96e91dec9823eb341b780bca2e1b7dead3ac5022da099023fa881052
-  data.tar.gz: '094b1511060c2217cb0fe35142afd90ba5ac9d4ca273dbb045e51faba00f6c7011cb6bf4027774be0b6d0696cdfd0dd4bc199e8039353f7023cae14614cbe29f'
+  metadata.gz: e6747df8170b717900e196e874f099230080e0a6039a7701759a6bec1ab7ac81e31a1113a33d667ed7fa37684109553e0b7c470d34ef0d223ea9131f0e934617
+  data.tar.gz: dfd08c7458e3226ea5f0ab0206f71a2334b1ed65b57072fafa1f1069e0eb2840d46a44852496b38e2d58477114a664f2d6ac760db69fdd5f982f3c2ff9ce075b

data/ext/eyes-universal/Rakefile

@@ -7,8 +7,19 @@ DOWNLOADER_PATH = File.expand_path('../../lib/applitools/universal_sdk/universal
 require DOWNLOADER_PATH
 
 desc "Download universal server binaries"
-task :default => [:get_server]
+task :default => [:prepare_server]
 
+# depricated
 file "get_server" do
   Applitools::UniversalServerDownloader.download(File.dirname(__FILE__))
 end
+
+# build
+file "get_server_compressed" do
+  Applitools::UniversalServerDownloader.tar_gz_download(File.dirname(__FILE__))
+end
+
+# install
+file "prepare_server" do
+  Applitools::UniversalServerDownloader.prepare_server(File.dirname(__FILE__))
+end

data/lib/applitools/universal_sdk/universal_server_downloader.rb

@@ -3,11 +3,22 @@
 require 'open-uri'
 require 'digest'
 require 'fileutils'
+require 'rubygems/package'
+require 'zlib'
 
 module Applitools
   class UniversalServerDownloader
     class << self
 
+      EXPECTED_SHA = {
+        'core.tar.gz'      => '220f932255e3a5045af16b2433e9b96c8774150a47a5d8806e1bd4eedbffa1de',
+        'core-alpine'      => 'f4f9834b0a17c6c81da9177de99ad4618178fe1fcda358a19424651b80d06a2e',
+        'core-linux'       => '05b3c1490d2743a9ffc94edbd13024beaf1491b4d34c9d24cfc63db72157f00e',
+        'core-linux-arm64' => '62d86656a203718f8f92aefe55d7b7419999307f19e2c68f321bbd0b37e1a0b5',
+        'core-macos'       => '1ad02f8fc7fb2b501fd48214af3866999be5a2b7fddabd7fd8bef7272818ed6f',
+        'core-win.exe'     => '74eb7bc0a31b991ac5eac75d3f74b33b751009a1bd54b61b1bece26b5de94f3a'
+      }
+
       def download(to)
         puts "[eyes-universal] Downloading Eyes universal server from #{full_url}"
         where = filepath(to)
@@ -24,6 +35,75 @@ module Applitools
         File.expand_path(filename, to)
       end
 
+      def tar_gz_filepath(to)
+        File.expand_path(tar_gz_filename, to)
+      end
+
+      def tar_gz_download(to) # build
+        puts "[eyes-universal] Downloading Core server from #{tar_gz_full_url}"
+        where = tar_gz_filepath(to)
+        unless File.exist?(where) && Digest::SHA256.file(where).to_s == tar_gz_sha
+          tar_gz_full_url.open {|cloud| File.binwrite(where, cloud.read) }
+        end
+        downloaded_sha = Digest::SHA256.file(where).to_s
+        if downloaded_sha == tar_gz_sha
+          Gem::Package::TarReader.new(Zlib::GzipReader.open(where)) do |tar|
+            tar.each do |entry|
+              binary_filename = File.basename(entry.full_name)
+              dest = File.expand_path(binary_filename, to)
+              dest_dir = File.dirname(dest)
+              FileUtils.mkdir_p(dest_dir) unless Dir.exist?(dest_dir)
+              FileUtils.remove_file(dest) if File.exist?(dest)
+              File.open(dest, 'wb') {|f| f.print entry.read }
+
+              binary_sha = Digest::SHA256.file(dest).to_s
+              if check_binary(binary_filename, binary_sha)
+                FileUtils.chmod('+x', dest)
+                puts "[eyes-universal] Binary check pass #{binary_filename} (#{Applitools::UNIVERSAL_CORE_VERSION}): #{dest}"
+                FileUtils.rm(dest)
+              else
+                raise "[eyes-universal] Binary fail #{binary_filename} (#{Applitools::UNIVERSAL_CORE_VERSION}): #{binary_sha}"
+              end
+            end
+          end
+          puts "[eyes-universal] Download complete (#{Applitools::UNIVERSAL_CORE_VERSION}). Server placed in #{where}"
+        else
+          raise "[eyes-universal] Download broken. (mismatch: #{downloaded_sha})"
+        end
+      end
+
+      def prepare_server(to) # install
+        where = tar_gz_filepath(to)
+        downloaded_sha = Digest::SHA256.file(where).to_s
+        puts "[eyes-universal] prepare server : #{where} #{downloaded_sha}"
+
+        if downloaded_sha == tar_gz_sha
+          Gem::Package::TarReader.new(Zlib::GzipReader.open(where)) do |tar|
+            tar.each do |entry|
+              binary_filename = File.basename(entry.full_name)
+              if filename != binary_filename
+                puts "[eyes-universal] skip #{binary_filename}"
+                next
+              end
+              puts "[eyes-universal] process #{binary_filename}"
+              unpacked_binary = File.expand_path(binary_filename, to)
+              # FileUtils.remove_file(unpacked_binary) if File.exist?(unpacked_binary)
+              File.open(unpacked_binary, 'wb') {|f| f.print entry.read }
+
+              binary_sha = Digest::SHA256.file(unpacked_binary).to_s
+              if check_binary(binary_filename, binary_sha)
+                FileUtils.chmod('+x', unpacked_binary)
+                puts "[eyes-universal] Binary ready #{binary_filename} (#{Applitools::UNIVERSAL_CORE_VERSION}) at #{unpacked_binary}"
+              else
+                puts "[eyes-universal] Binary check fail #{binary_filename} (#{Applitools::UNIVERSAL_CORE_VERSION}): #{binary_sha}"
+              end
+            end
+          end
+        else
+          puts "[eyes-universal] Server broken. (mismatch: #{downloaded_sha})"
+        end
+      end
+
       private
 
       def base_url
@@ -35,18 +115,18 @@ module Applitools
       end
 
       def expected_binary_sha
-        return '9f790b0731e620ddf39f80a7193585ecb99058a86a0eab89de70b5dc34dbcc7b' if Gem.win_platform?
+        return EXPECTED_SHA['core-win.exe'] if Gem.win_platform?
         case RUBY_PLATFORM
           when /darwin/i
-            '5489be902fdc79b2d5c271c5c4a639db829a3f652280ab979759ff4a2d3675a4'
+            EXPECTED_SHA['core-macos']
           when /arm/i
-            '217cd833752547b4fe74e178e8526a87f4020974a4719bf032a0d818587e8651'
+            EXPECTED_SHA['core-linux-arm64']
           when /mswin|windows|mingw/i
-            '9f790b0731e620ddf39f80a7193585ecb99058a86a0eab89de70b5dc34dbcc7b'
+            EXPECTED_SHA['core-win.exe']
           when /musl/i
-            '5408a87369445f0d9a571e55b8e86755710ce59d1f3fac0df7bdcbc5243b11c8'
+            EXPECTED_SHA['core-alpine']
           when /linux|arch/i
-            '7fa0b5ad01e7ac55e0574f40d80400404540f00f5ea92a852bd48299f600b787'
+            EXPECTED_SHA['core-linux']
           else
             raise 'Unsupported platform'
         end
@@ -70,6 +150,23 @@ module Applitools
         end
       end
 
+      def tar_gz_full_url
+        URI.join(base_url, tar_gz_filename)
+      end
+
+      def tar_gz_filename
+        'core.tar.gz'
+      end
+      def tar_gz_sha
+        EXPECTED_SHA[tar_gz_filename]
+      end
+
+      def check_binary(binary_filename, binary_sha)
+        expected_sha = EXPECTED_SHA[binary_filename]
+        raise "Unsupported platform #{binary_filename}" if expected_sha.nil?
+        binary_sha == expected_sha
+      end
+
     end
   end
 end

data/lib/applitools/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.6.0'.freeze
-  IMAGES_VERSION = '4.2.0'.freeze
-  UNIVERSAL_VERSION = '3.3.0'.freeze
-  UNIVERSAL_CORE_VERSION = '2.3.10'.freeze
+  VERSION = '4.6.1'.freeze
+  IMAGES_VERSION = '4.2.1'.freeze
+  UNIVERSAL_VERSION = '3.3.1'.freeze
+  UNIVERSAL_CORE_VERSION = '2.4.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_universal
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri
@@ -53,6 +53,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/eyes-universal/Rakefile
+- ext/eyes-universal/core.tar.gz
 - lib/applitools/universal_sdk/universal_server_downloader.rb
 - lib/applitools/version.rb
 homepage: https://www.applitools.com