relaton-index 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21befc44c8bd8f0d88e60fe51d5aa5be78e12b8a5857a27ce618bd561ee1aa88
-  data.tar.gz: c527ce0b9894779d32ccb355f435c8d22b0c7d34355bd8f65bffce58c9512859
+  metadata.gz: 505b5d0118ee9844e1486dff3fbd57c1ceec35d609ca022dcb5ba4f121e3c7db
+  data.tar.gz: d9c7dd287a036fd2d939cf5d9a5ec6193408fc2c1de24aaa465aa38e2d8ed876
 SHA512:
-  metadata.gz: c6984ef1228e1ac5c862c0ed68ba6a8e8c841b9c758fc37d0b32178d8c63bfee6423f169b12c2f80bdb438bbc33596559c980fb8267887aa4f7ccab6d1e87357
-  data.tar.gz: cda24cb6adef4dab6a51f16b78ed54d239cc76daa41e8ae76a4d2f442b0ec5d430be5da4fd0e8141f21860126f0ebce630d5e828c768b46320e7eb621885a98d
+  metadata.gz: fb4cd48d2db8361dbcd8414ce8512e3dc1fe618d16e1d82ac1da53b05b3a505980d691a5a0f0f8cc09856ab38029256bd5e0ca413f7d26f7a8897ca89b9aba17
+  data.tar.gz: 9155e1925e674e35a7ee889bb8467c5cb21dcbf7394ba87650ed70f856725431784b6ad90e2433b8250cc61362c742acae9d5523b40d99865a7a3af5f771ed76

data/lib/relaton/index/file_io.rb

@@ -81,13 +81,15 @@ module Relaton
 
       def cehck_basic_format(index)
         keys = %i[file id]
-        index.none? { |item| item.keys.sort != keys }
+        index.all? { |item| item.respond_to?(:keys) && item.keys.sort == keys }
       end
 
       def check_id_format(index)
         return true if @id_keys.empty?
 
-        keys = index.reduce(Set.new) { |acc, item| acc + item[:id].keys }
+        keys = index.each_with_object(Set.new) do |item, acc|
+          acc.merge item[:id].keys if item[:id].is_a?(Hash)
+        end
         keys == @id_keys.to_set
       end
 
@@ -102,7 +104,20 @@ module Relaton
 
         index = YAML.safe_load yaml, permitted_classes: [Symbol]
         return index if check_format index
+
+        warn_local_index_error "Wrong structure of the"
       rescue Psych::SyntaxError
+        warn_local_index_error "YAML parsing error when reading"
+      end
+
+      def warn_local_index_error(reason)
+        warn "[relaton] #{reason} file #{file}"
+        if url.is_a? String
+          warn "[relaton] Considering #{file} file corrupt, re-downloading from #{url}"
+        else
+          warn "[relaton] Considering #{file} file corrupt, removing it."
+          remove
+        end
       end
 
       #
@@ -116,7 +131,18 @@ module Relaton
         entry = zip.get_next_entry
         index = YAML.safe_load(entry.get_input_stream.read, permitted_classes: [Symbol])
         save index
-        index
+        warn "[relaton] Downloaded index from #{url}"
+        return index if check_format index
+
+        warn_remote_index_error "Wrong structure of"
+      rescue Psych::SyntaxError
+        warn_remote_index_error "YAML parsing error when reading"
+      end
+
+      def warn_remote_index_error(reason)
+        warn "[relaton] #{reason} newly downloaded file " \
+             "at #{file} #{url}, the remote index seems to be invalid." \
+             "Please report this issue at https://github.com/relaton/relaton-cli."
       end
 
       #

data/lib/relaton/index/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Index
-    VERSION = "0.2.3"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-index
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip