eyes_universal 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d14fcc9f222523a7fc8c9ed51a9eaf3f7e60e3f3e7f7e35ce9c0b671083fdfe
-  data.tar.gz: 86de887e5cb37029cdfa04a4e63a24edcb017ec87bf65fde2b35907389b7d44e
+  metadata.gz: 1b47ef25f5ea320c7cc2967e59a4dff578e74542c7d5914b706bcd1aeabb3374
+  data.tar.gz: 4e0c68dc7ca91948addf06b9d66773af6026c8e34c56a2a30d70c9aff0f8f504
 SHA512:
-  metadata.gz: 80e175a980e70eb10205f9f8f1403b785010d74784827d33b61bb1c25c4aee89d737be00bf2a83d1ad67bc92ddf7695543bfad7510f9c923fbbd54fa91feaf33
-  data.tar.gz: af3c33d90085ee80ff0117b54c04a5f3ff5fb398c77057fa838745cc6127f3dc9aaa484b3f19614a7d656119d23d469934164865443737bdb57ff73db3db4cfb
+  metadata.gz: f4f6b5bc362ebc5a928ddb5bc9166114563e03cbbadfbab893079b3c3b653ff90e533bee44655d7e9ba2ed4ab82be3b43a048ae3e0efcc6749e15951a7fb62f6
+  data.tar.gz: 7d13e7bacc597269890e3d944e1a8dbf9759cf0bca74f1523840c4be9bbd84c5c1a01a1d85416812e9f050b7529d499a359c5482d519ca80661dc3d89bdd9b6c

data/ext/eyes-universal/Rakefile

@@ -14,7 +14,7 @@ file "get_server" do
   Applitools::UniversalServerDownloader.download(File.dirname(__FILE__))
 end
 
-# build
+# depricated
 file "get_server_compressed" do
   Applitools::UniversalServerDownloader.tar_gz_download(File.dirname(__FILE__))
 end
@@ -23,3 +23,8 @@ end
 file "prepare_server" do
   Applitools::UniversalServerDownloader.prepare_server(File.dirname(__FILE__))
 end
+
+# build
+file "get_compress_all_binaries" do
+  Applitools::UniversalServerDownloader.get_compress_all_binaries(File.dirname(__FILE__))
+end

data/lib/applitools/universal_sdk/universal_server_downloader.rb

@@ -11,12 +11,12 @@ module Applitools
     class << self
 
       EXPECTED_SHA = {
-        'core.tar.gz'      => '52fc92c432c45449afa04f6633cf8f51a4ef15a7137baa359ae3d73b4003bf9d',
-        'core-alpine'      => 'f093ab6d43d417c740dee8f55a43aae0072570016f06517feb6e9464056c4701',
-        'core-linux'       => 'd6968a870a05c2d6d72ad7552e4151a5d6d2d45c2325db0308c46c5a847add3a',
-        'core-linux-arm64' => 'c4792a87970a0c912a71b6fb8b99ad0eaec49819580400ca7277706bd14cdf2f',
-        'core-macos'       => 'ec441758fd0f8a277c6ca5de444cb17142cbe59fc3c2931a6916aa225123024e',
-        'core-win.exe'     => '1701851ed403b5f10b8cb72c482c00c0fafe69b1ea42704b88e17878f41095ab'
+        # 'core.tar.gz'      => '18c85f7aa8800b954847640dfb959cc48794ad05d95dde96c15db42c9154792f',
+        'core-alpine'      => '1312f4d7cdce8fc3e569cfe8cc6892a6b7e2dd7935119468ace077feb56b59e1',
+        'core-linux'       => '5b507e26957b1b1d4145f4f74588d269c48be7c03e4036aa8a3fa74c97a80323',
+        'core-linux-arm64' => 'c0c08c9e1b9a1b23f44953ec4e19cbbd3a7235a5d2c0bdbda4d432e47343851e',
+        'core-macos'       => 'dcec55c6f7cf1cb3bd6b018a75c68a941f630f4c7cf785132522c7ed19621930',
+        'core-win.exe'     => 'b57675e704b39ca149bd192bb3f387404a65e9ebc5ee275fea7d33dc4d34edcb'
       }
 
       def download(to)
@@ -39,7 +39,7 @@ module Applitools
         File.expand_path(tar_gz_filename, to)
       end
 
-      def tar_gz_download(to) # build
+      def tar_gz_download(to) # build - depricated
         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
@@ -74,10 +74,11 @@ module Applitools
 
       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}"
+        # downloaded_sha = Digest::SHA256.file(where).to_s
+        # puts "[eyes-universal] prepare server : #{where} #{downloaded_sha}"
+        puts "[eyes-universal] prepare server : #{where}"
 
-        if downloaded_sha == tar_gz_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)
@@ -90,24 +91,63 @@ module Applitools
               # 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)
+              # 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}"
+              # 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
+
+      def get_compress_all_binaries(to)
+        filenames = EXPECTED_SHA.keys
+
+        target_core = File.expand_path(tar_gz_filename, to)
+        File.open(target_core, "wb") do |file|
+          Zlib::GzipWriter.wrap(file) do |gzip|
+            Gem::Package::TarWriter.new(gzip) do |tar|
+
+              filenames.each do |fname|
+                binary_url = URI.join(base_url, fname)
+                where = File.expand_path(fname, to)
+                # unless File.exist?(where) && Digest::SHA256.file(where).to_s == EXPECTED_SHA[fname] # local dev/debug
+                  binary_url.open {|cloud| File.binwrite(where, cloud.read) }
+                # end
+                # downloaded_sha = Digest::SHA256.file(where).to_s
+                # if downloaded_sha == EXPECTED_SHA[fname]
+                  mode = File.stat(where).mode
+                  tar.add_file_simple(fname, mode, File.size(where)) do |io|
+                    File.open(where, "rb") do |f|
+                      io.write(f.read)
+                    end
+                  end
+                  puts "[eyes-universal] Download complete. Server placed in #{where}"
+                # else
+                #   puts "[eyes-universal] Download broken. (#{fname} mismatch: #{downloaded_sha})"
+                # end
               end
+
             end
           end
+        end
+
+        if File.exist?(target_core)
+          puts "[eyes-universal] Download complete (#{Applitools::UNIVERSAL_CORE_VERSION}). Server placed in #{target_core}"
         else
-          puts "[eyes-universal] Server broken. (mismatch: #{downloaded_sha})"
+          raise "[eyes-universal] ERROR : Download incomplete (#{Applitools::UNIVERSAL_CORE_VERSION}). Server not ready"
         end
       end
 
       private
 
       def base_url
-        "https://github.com/applitools/eyes.sdk.javascript1/releases/download/%40applitools/core%40#{Applitools::UNIVERSAL_CORE_VERSION}/"
+        "https://github.com/applitools/eyes.sdk.javascript1/releases/download/js%2Fcore%40#{Applitools::UNIVERSAL_CORE_VERSION}/"
       end
 
       def full_url

data/lib/applitools/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.6.2'.freeze
-  IMAGES_VERSION = '4.2.2'.freeze
-  UNIVERSAL_VERSION = '3.3.2'.freeze
-  UNIVERSAL_CORE_VERSION = '2.5.8'.freeze
+  VERSION = '4.6.3'.freeze
+  IMAGES_VERSION = '4.2.3'.freeze
+  UNIVERSAL_VERSION = '3.3.3'.freeze
+  UNIVERSAL_CORE_VERSION = '3.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_universal
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri
@@ -20,7 +20,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -37,7 +37,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: