release 0.1.1

yandexmobile · Sep 30, 2019 · de993d1 · de993d1
1 parent 0c149be
commit de993d1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,2 @@
 os: osx
 language: ruby
-rvm:
-  - 2.2.2
diff --git a/fastlane-plugin-appmetrica.gemspec b/fastlane-plugin-appmetrica.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Upload dSYM symbolication files to AppMetrica'
   spec.homepage      = 'https://github.com/yandexmobile/metrica-plugin-fastlane'
-  spec.license       = 'Proprietary'
+  spec.license       = 'Nonstandard'
 
   spec.files         = Dir["lib/**/*"] + %w(README.md LICENSE)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

diff --git a/lib/fastlane/plugin/appmetrica/actions/upload_symbols_to_appmetrica.rb b/lib/fastlane/plugin/appmetrica/actions/upload_symbols_to_appmetrica.rb
@@ -16,7 +16,11 @@ def self.run_helper(temp_dir, params)
           package_output_path = File.absolute_path(params[:package_output_path])
         end
 
-        files = params[:files] || [Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]] || []
+        files = []
+        files += params[:files] if params[:files]
+        files << Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] if Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]
+        files += Actions.lane_context[SharedValues::DSYM_PATHS] if Actions.lane_context[SharedValues::DSYM_PATHS]
+
         files = files.map do |file|
           self.process_file(file, temp_dir) unless file.nil?
         end
@@ -32,8 +36,10 @@ def self.run_helper(temp_dir, params)
 
       def self.process_file(file_path, temp_dir)
         if File.extname(file_path) == ".zip"
-          Actions.sh("unzip -o #{file_path.shellescape} -d #{temp_dir.shellescape} 2>/dev/null")
-          return temp_dir
+          output_path = File.join(temp_dir, SecureRandom.uuid)
+          Dir.mkdir(output_path)
+          Actions.sh("unzip -o #{file_path.shellescape} -d #{output_path.shellescape} 2>/dev/null")
+          return output_path
         end
         return File.absolute_path(file_path)
       end

diff --git a/lib/fastlane/plugin/appmetrica/version.rb b/lib/fastlane/plugin/appmetrica/version.rb
@@ -1,6 +1,6 @@
 module Fastlane
   module Appmetrica
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
     CLI_VERSION = "~> 0.0"
   end
 end