arvados 0.1.20150609141135 → 0.1.20150614013129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b54fda44375a23270192e441289a7bbb8ed1514
-  data.tar.gz: b177aec846d07c5780a90f6b8bb69a25314baac7
+  metadata.gz: 4e88a98ecf81a0992ac43e751b78eb89abf1e78f
+  data.tar.gz: 64d1b0e574cbcb44c6722d9f2ccde1a4f88b1d8a
 SHA512:
-  metadata.gz: 0ed6d5fc6c1cdc4f0b7ad77a94052b6eddced3343454bbac40ffcc5b47ea4db4fcaa70605358c79d51bc1cdb0cef9bed3f10c4c60e90489f946f609bb7f3272b
-  data.tar.gz: 54ef0f24ed623edb0a01cfe428c3c2f1888235102745420e634720b7478eeecaa70c72e03fa303ed0215e127417e66776808fbb124f9964dab98d824009759fc
+  metadata.gz: a546031d80c6c08133e7a2987fe5abdc61644c88dbc7515d8d6d50a47fabd4382a4cceedd69418f0a27707621614a3d985e38819d13b184a83c3b726f3496172
+  data.tar.gz: 0c7a3631101f1ec8f5b3607b0c076094a8eb2be9ff6bb4f2b7c391137feb8df92c32cb89a470ad23010a1a7275ae896df7e50dd431bd97fe2c739fecefb599fc

data/lib/arvados/keep.rb

@@ -97,6 +97,9 @@ module Keep
   end
 
   class Manifest
+    STRICT_STREAM_TOKEN_REGEXP = /^(\.)(\/[^\/\s]+)*$/
+    STRICT_FILE_TOKEN_REGEXP = /^[[:digit:]]+:[[:digit:]]+:([^\s\/]+(\/[^\s\/]+)*)$/
+
     # Class to parse a manifest text and provide common views of that data.
     def initialize(manifest_text)
       @text = manifest_text
@@ -224,5 +227,59 @@ module Keep
       end
       false
     end
+
+    # Verify that a given manifest is valid according to
+    # https://arvados.org/projects/arvados/wiki/Keep_manifest_format
+    def self.validate! manifest
+      raise ArgumentError.new "Invalid manifest: does not end with newline" if !manifest.end_with?("\n")
+      line_count = 0
+      manifest.each_line do |line|
+        line_count += 1
+
+        words = line[0..-2].split(/ /)
+        raise ArgumentError.new "Manifest invalid for stream #{line_count}: missing stream name" if words.empty?
+
+        count = 0
+
+        word = words.shift
+        count += 1 if word =~ STRICT_STREAM_TOKEN_REGEXP and word !~ /\/\.\.?(\/|$)/
+        raise ArgumentError.new "Manifest invalid for stream #{line_count}: missing or invalid stream name #{word.inspect if word}" if count != 1
+
+        count = 0
+        word = words.shift
+        while word =~ Locator::LOCATOR_REGEXP
+          word = words.shift
+          count += 1
+        end
+        raise ArgumentError.new "Manifest invalid for stream #{line_count}: missing or invalid locator #{word.inspect if word}" if count == 0
+
+        count = 0
+        while word =~ STRICT_FILE_TOKEN_REGEXP and ($~[1].split('/') & ['..','.']).empty?
+          word = words.shift
+          count += 1
+        end
+
+        if word
+          raise ArgumentError.new "Manifest invalid for stream #{line_count}: invalid file token #{word.inspect}"
+        elsif count == 0
+          raise ArgumentError.new "Manifest invalid for stream #{line_count}: no file tokens"
+        end
+
+        # Ruby's split() method silently drops trailing empty tokens
+        # (which are not allowed by the manifest format) so we have to
+        # check trailing spaces manually.
+        raise ArgumentError.new "Manifest invalid for stream #{line_count}: trailing space" if line.end_with? " \n"
+      end
+      true
+    end
+
+    def self.valid? manifest
+      begin
+        validate! manifest
+        true
+      rescue ArgumentError
+        false
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 0.1.20150609141135
+  version: 0.1.20150614013129
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -104,7 +104,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados client library, git commit bed1ec60de09b319fccd37e7452280736a7c5a8a
+description: Arvados client library, git commit 4617a33da4f02639db5a63d925abdf1eaa01145c
 email: gem-dev@curoverse.com
 executables: []
 extensions: []