xamarin-test-cloud 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6cc7a61fe226ec7c9e26bd4f65529fcdba4ed12
-  data.tar.gz: 372e167b5ced6a7408aebe3762f40cc634f363c3
+  metadata.gz: f0b91cb57f390a497ed342bae9c3abdc87d35171
+  data.tar.gz: eb044b818687a84523d76d5c7125b9e04bd6014b
 SHA512:
-  metadata.gz: c9f2992ebfcf74ba9bbd075a7dec20b9a541e32d34dac1853e13f061465a7967d29bf353830d9560f82a06dc4cc10d351c81ff5a21e71a94cb51312aab22ab80
-  data.tar.gz: e6528050138788c57a8a2f3420b6678cefd568803d251aeb76369883a45252c19a01e3b7224823df8d5c0e83d10bf78651c72b8f883eb4324818f173213c0123
+  metadata.gz: b6c147623593273e4a8d89b3afe9dc3472f969f65cd4fd05d3c25e9da99a5bc4b66ca33cf096b713f41c25b699bd9ec7c0a7b7dc3f61ce6561f85158fe9d3784
+  data.tar.gz: 379cae750e0ca3cd5804ed63f66684112ee2766dd4a7282bdda023abfa2c0aea41c94d87d50a66e145f9debf943cc7ef6e128e3b32c710db0b75f9a7e08d9ba0

data/lib/xamarin-test-cloud/cli.rb

@@ -413,7 +413,7 @@ module XamarinTestCloud
                        'series' => self.series,
                        'api_key' => api_key,
                        'dsym_file' => dsym_zip,
-                       'dsym_filename' => dsym_zipped_name,
+                       'dsym_filename' => dsym_file_name,
                        'app_filename' => File.basename(app)}
 
         if profile #only if config and profile
@@ -532,9 +532,16 @@ module XamarinTestCloud
         log_header('Negotiating upload')
 
         app_digest = digest(app)
+
         dsym_digest= nil
         if dsym
-          dsym_abs_path= File.join(tmpdir,dsym_zipped_name)
+          FileUtils.cp_r(dsym,tmpdir)
+          files_in_dwarf = Dir.glob(File.join(tmpdir, File.basename(dsym), 'Contents','Resources','DWARF','*'))
+          unless files_in_dwarf.count == 1
+            raise ValidationError, "dSym #{dsym} contains more than one file in Contents/Resources/DWARF: #{files_in_dwarf}"
+          end
+
+          dsym_abs_path= files_in_dwarf.first
           dsym_digest = digest(dsym_abs_path)
         end
         out = {'hashes' => hashes, 'app_hash' => app_digest, 'dsym_hash' => dsym_digest}
@@ -657,16 +664,6 @@ module XamarinTestCloud
             files << config
           end
 
-          if dsym
-            FileUtils.cp_r(dsym,tmpdir)
-            dsym_files = Dir.glob(File.join(tmpdir, File.basename(dsym), '**','*'))
-
-            outfile = File.join(tmpdir,dsym_zipped_name)
-            zip_dsym_files(dsym_files,tmpdir, outfile)
-
-          end
-
-
           files += Dir.glob(File.join(tmpdir,"vendor", 'cache', '*'))
 
           if workspace and workspace.strip != ''
@@ -683,9 +680,9 @@ module XamarinTestCloud
         {:feature_prefix => dir, :workspace_prefix => workspace, :files => files.find_all { |file_or_dir| File.file? file_or_dir }}
       end
 
-      def dsym_zipped_name
+      def dsym_file_name
         if dsym
-          "#{File.basename(self.app)}_dSym.zip"
+          "#{File.basename(self.app)}_dSym"
         end
       end
 
@@ -819,16 +816,6 @@ module XamarinTestCloud
         end
       end
 
-      def zip_dsym_files(files,basedir, out)
-        Zip::ZipFile.open(out, Zip::ZipFile::CREATE) do |zipfile|
-          files.each do |file|
-            zipfile.add(file.sub("#{basedir}#{File::Separator}",''), file)
-          end
-        end
-
-      end
-
-
 
       def verify_dependencies(path)
         if is_android?

data/lib/xamarin-test-cloud/version.rb

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '0.9.31'
+  VERSION = '0.9.32'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.32
 platform: ruby
 authors:
 - Karl Krukow