ETLane 0.1.45 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bea2085117f0a312ee5485a57f8084e893a68fda7c13bd6598127d07b3a30f
-  data.tar.gz: c123c933c13601c920235fb60bc46064318f58b928d95614315ca398023fb197
+  metadata.gz: 6988424af1f01c1dd80171527e3155fb55f2d026d90223e97d7c369f47ac7193
+  data.tar.gz: 2ab7c802fd4083513c5c26f1e286a759b6ba22aae7cbaa51cfee7f6146e0a59c
 SHA512:
-  metadata.gz: d566434ad9022cd22ebad0d8034925e0d1c93f224e8c45751eee829c70f5b40cf420ec013c6a5ae1a839c7a474dcd77fc0b33c47059d7b3cee49960a7d2195d2
-  data.tar.gz: 2469b9225ec0b5d3287e5daa07a364f2eaaa96cb21cb038abda59fd22a33831e6e419c64d51f7a84791bee7e696b1a44b8dbde76e448954ac14895da5296be8e
+  metadata.gz: 020f0e089a0aa90d47a0f7077a2b0daad48e0eaa8aba13ad113867e6c64ba51667d1b75c5f3c13e54eb0cba443c68b7bc9f5add543ce5de09368566e7ebcd5ff
+  data.tar.gz: 8e78979ecde60e8d4127cc17f277bd6c3bf78c44da4c6486f59e4675ad26eccf54f610f3e3b5ee07b7be732c492e4ade3a7d3ac9e6864cab1077027b66a3dfe9

data/Lanes/CommonFastfile

@@ -13,6 +13,7 @@ platform :ios do
 
   desc "Push a new beta build to TestFlight"
   lane :beta do |options|
+    work_branch = options[:branch]|| ENV["ET_BRANCH"] || 'master'
     setup_new_session(options)
     provisioning_profile = "AppStore_#{product_bundle_identifier}"
     username = options[:username]
@@ -43,6 +44,7 @@ platform :ios do
       },
     )
     last_commit = File.read(last_commit_path)
+    last_commit = last_commit.strip! || last_commit if last_commit
     changelog = changelog_from_git_commits(
       quiet: true,
       between: [last_commit, "HEAD"],  # Optional, lets you specify a revision/tag range between which to collect commit info
@@ -52,12 +54,11 @@ platform :ios do
       merge_commit_filtering: "exclude_merges" # Optional, lets you filter out merge commits
     )
     puts changelog
-    build_number = get_build_number()
+    build_number = latest_testflight_build_number()
     version = get_version_number(target: project_name) + " (" + build_number + ")"
     branch_name = "feature/#{build_number}"
     sh("git", "checkout", "-B", branch_name)
     increment_and_push()
-    ENV["FL_CHANGELOG"] = nil
 
     beta_app_review_info = {}
     if ENV["ET_BETA_APP_REVIEW_INFO"]
@@ -66,10 +67,14 @@ platform :ios do
 
     exception = nil
     begin
+      app_store_connect_api_key(
+        duration: 1200, # optional (maximum 1200)
+        in_house: false # optional but may be required if using match/sigh
+      )
       upload_to_testflight(
         username: username,
         beta_app_review_info: beta_app_review_info,
-        changelog: "",
+        changelog: changelog,
         groups: ["#{distribute_group_name}"]
       )
       tag = get_version_number(target: project_name) + "." + build_number
@@ -89,7 +94,6 @@ platform :ios do
         commit_bump(message: "Freeze changelog")
       end
     end
-    work_branch = ENV["ET_BRANCH"] || 'master'
     sh("git", "checkout", work_branch)
     sh("git", "pull", "origin", work_branch)
     sh("git", "merge", branch_name)
@@ -288,31 +292,10 @@ platform :ios do
   end
 
   lane :setup_new_session do |options|
-    if ENV["ET_USE_SESSION"]
-      session = retrieve_fastlane_session(options)
-      ENV["FASTLANE_SESSION"] = session
-    end
-  end
-
-  lane :retrieve_fastlane_session do |options|
-    # runs shell
-    username = options[:username]
-    spaceauth_output = `bundle exec fastlane spaceauth -u #{username}`
-    # regex the output for the value we need
-    fastlane_session_regex = %r{Pass the following via the FASTLANE_SESSION environment variable:\n(?<session>.+)\n\n\nExample:\n.+}
-    new_session = nil
-    if match = spaceauth_output.match(fastlane_session_regex)
-      # Strip out the fancy formatting
-      new_session = match[:session].gsub("\e[4m\e[36m", "").gsub("\e[0m\e[0m", "")
-    end
-
-    # Yell and quit if unable to parse out session from spaceauth output
-    if new_session.nil?
-      puts "Unable to obtain new session via fastlane spaceauth"
-      exit 1
-    else
-      new_session
-    end
+    app_store_connect_api_key(
+      duration: 1200, # optional (maximum 1200)
+      in_house: false # optional but may be required if using match/sigh
+    )
   end
 
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ETLane
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.48
 platform: ruby
 authors:
 - teanet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies: []
 description: 'Xcode helper for upload builds and metadata
 
-'
-email: 
+  '
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -50,7 +50,7 @@ homepage: https://github.com/teanet/ETLane
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,8 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: A short description of ETLane.
 test_files: []