fastlane-plugin-unity_exporter 1.3.2 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb410cbd88818bbc233fce59e860ea4b1c9843f82ae366f75976cc19992543d
-  data.tar.gz: 7bfc6834d17e4f2b1a689eb674e7fa0deca0d63d336b18e9f73c6869f35eff50
+  metadata.gz: a78f2efa225ab9d6b65a90491bfd7c54a903b52948048e66198971261ab385df
+  data.tar.gz: 5dd1d2122e109ce66f8be30b38946bb42b987c1fec23e2f8010a768ae34f559e
 SHA512:
-  metadata.gz: c291c26afd9a16d71c6e286178077b8136e0651ba158cd503debd75009cd42fdef94107ec210caaca4fc9eff63cdeeb4148bd7fddc00d330e6ce9577cc62feb8
-  data.tar.gz: 1a9488d77b3797ab7d3ea2131a965c4d934be4db2e6a5d773f856334796af17dc0a966b5a10712ea29f60d31b59f321bb8904b3b1b08cc81cf5675dea948df4c
+  metadata.gz: dbd77420b89dd5adcdc724c834ceb3e9b4075e3f3d937dbf1391123e6da51931518f3ab247639c1f00374f69727d5c6849fec2291643575455b52a871b0a425f
+  data.tar.gz: 824171bda6c2a3de02bffd0cc2fc5914c720db4356689ff2d3b3d0257580f07c5a81c26a9b41b9493f3f66a6aac7b96d32f64414c0a3dd04d18951422f47d45e

data/lib/fastlane/plugin/unity_exporter/actions/unity_commit_version_bump.rb

@@ -16,10 +16,13 @@ module Fastlane
 
         log_file = Helper::GenericHelper.instance_variable_get(:@git_log_path)
 
-        # Thank you: https://linuxize.com/post/bash-redirect-stderr-stdout/#redirecting-stderr-to-stdout
-        sh("echo 'UnityCommitVersionBumpAction: created file' > #{log_file} 2>&1")
-        sh("git add '#{Helper::UnityEditorHelper.unity_project_path}ProjectSettings/ProjectSettings.asset' >> #{log_file} 2>&1")
-        sh("git commit -m 'Version Bump' >> #{log_file} 2>&1")
+        # this changes the working directory for the code run between the do/end block
+        Dir.chdir(Helper::UnityEditorHelper.unity_project_path) do
+          # Thank you: https://linuxize.com/post/bash-redirect-stderr-stdout/#redirecting-stderr-to-stdout
+          sh("echo 'UnityCommitVersionBumpAction: created file' > #{log_file} 2>&1")
+          sh("git add 'ProjectSettings/ProjectSettings.asset' >> #{log_file} 2>&1")
+          sh("git commit -m 'Version Bump' >> #{log_file} 2>&1")
+        end
       end
 
       def self.description

data/lib/fastlane/plugin/unity_exporter/actions/unity_export.rb

@@ -8,7 +8,14 @@ module Fastlane
     class UnityExportAction < Action
       def self.run(params)
         if params[:arguments]
+          # UI.message("Passed arguments: '#{params[:arguments]}'")
           if params[:use_default_paths]
+            pp = params[:arguments].scan(/-projectPath ((\w|[[:punct:]])*)/)[0][0]
+            if pp != ""
+              UI.message("Parsed project path from passed arguments: '#{pp}'")
+              Helper::UnityEditorHelper.instance_variable_set(:@project_path, pp)
+            end
+
             invoke_unity(arguments: " #{params[:arguments]}")
           else
             # path to Unity is provided as part of 'arguments'
@@ -26,7 +33,7 @@ module Fastlane
           headless_args << " -batchmode -nographics -quit" # some arguments that are required when running Unity in headless-mode
           headless_args << " -accept-apiupdate -releaseCodeOptimization"
           headless_args << " -projectPath #{Helper::UnityEditorHelper.unity_project_path}"
-          headless_args << " -logFile unity-export-logs/#{DateTime.now.strftime('%Y-%m-%d_%H-%M-%S-%L')}_#{params[:build_target]}_build.log" # logging; not specifying a path will print the log to the console
+          headless_args << " -logFile #{Helper::UnityEditorHelper.unity_project_path}/BuildExporter/#{DateTime.now.strftime('%Y-%m-%d_%H-%M-%S-%L')}_#{params[:build_target]}_build.log" # logging; not specifying a path will print the log to the console
 
           # following are custom arguments defined in 'UnityExporter.BuildUtility'
           # this script is part of the 'fastlane-plugin-unity-exporter-package'
@@ -34,15 +41,18 @@ module Fastlane
           headless_args << " -newVersion #{params[:new_version]}" if params[:new_version]
           headless_args << " -newVersionCode #{params[:new_version_code]}" if params[:new_version_code]
 
+          # NOTE: the different relative paths used in 'projectPath' and 'exportPath'
+          # while 'projectPath' is relative to the 'fastfile',
+          # 'exportPath' is relative to 'projectPath' aka the Unity project's root directory
           if params[:export_path]
             headless_args << " -exportPath #{params[:export_path]}"
           else
             headless_args << " -exportPath fastlane-build-exporter/#{params[:build_target]}/unity-export"
           end
 
-          # NOTE: the different relative paths used in 'projectPath' and 'exportPath'
-          # while 'projectPath' is relative to the 'fastfile',
-          # 'exportPath' is relative to 'projectPath' aka the Unity project's root directory
+          unless Helper::UnityEditorHelper.verify_exporter_package
+            return
+          end
 
           invoke_unity(arguments: headless_args)
 
@@ -62,10 +72,6 @@ module Fastlane
           return
         end
 
-        unless Helper::UnityEditorHelper.verify_exporter_package
-          return
-        end
-
         unity_path = Helper::UnityEditorHelper.unity_editor_path
         if unity_path == ""
           return
@@ -149,7 +155,7 @@ module Fastlane
                                        type: String,
                                        conflicting_options: [:arguments],
                                        verify_block: proc do |value|
-                                         unless value == "major" || value == "minor" || value == "patch" || Gem::Version.new(value).correct?
+                                         unless value == "major" || value == "minor" || value == "patch" || Gem::Version.correct?(value)
                                            UI.user_error!("Please pass a valid version. For options see 'fastlane action unity_exporter'")
                                          end
                                        end),

data/lib/fastlane/plugin/unity_exporter/helper/generic_helper.rb

@@ -6,7 +6,7 @@ module Fastlane
 
   module Helper
     class GenericHelper
-      @git_log_path = "fastlane-unity-exporter/logs/#{DateTime.now.strftime('%Y-%m-%d_%H-%M-%S-%L')}_git.log"
+      @git_log_path = "BuildExporter/#{DateTime.now.strftime('%Y-%m-%d_%H-%M-%S-%L')}_git.log"
 
       def self.shellify(path)
         if FastlaneCore::Helper.is_mac?

data/lib/fastlane/plugin/unity_exporter/helper/unity_editor_helper.rb

@@ -9,12 +9,12 @@ module Fastlane
   module Helper
     class UnityEditorHelper
       # project path relative if following hierarchy is given: "root/{unity-project}/fastlane-build-exporter/{platform}-export/."
-      # p File.expand_path("../../")
-      @project_path_default = "../../"
+      # p File.expand_path("../..")
+      @project_path_default = "../.."
       @project_path = ""
 
       def self.unity_project_path
-        project_path = @project_path == "" ? "../../" : @project_path
+        project_path = @project_path == "" ? @project_path_default : @project_path
 
         # we verify the path to the Unity project by looking for the 'manifest.json' file
         package_manifest_path = "#{project_path}/Packages/manifest.json"

data/lib/fastlane/plugin/unity_exporter/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module UnityExporter
-    VERSION = "1.3.2"
+    VERSION = "1.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-unity_exporter
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.2
 platform: ruby
 authors:
 - ar:met
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler