fastlane 2.60.0.beta.20170927010003 → 2.60.0.beta.20170928010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240d6f335bc793443030d8da6482205dc36493ea
-  data.tar.gz: dadae5c4e4b4e151fe46f875299b12ce53084769
+  metadata.gz: a117dfadb97e085078b4d4e3ba30f5ee7798cd7c
+  data.tar.gz: bf439ccb3619b512a582552e6d416eb38f51c28d
 SHA512:
-  metadata.gz: b62bb0495a0f546a0886e1b8a29fe9c8189efedfb7db4d045d99b49885766721609f2dea96d9330bd126e2de4c48b9ba53fd7231df579f63e2555ba326788342
-  data.tar.gz: 14734bcfb750b8a5f2fa79e05a81e6444d73d0708519d9aadb070912d2a1602c28b586e8414e2344b896a06575bcd5a1f3a2855d1a5d83499b13dd618c8e7281
+  metadata.gz: 0d2c4f64c34ea4009750ed2527695ef0d4084ad898b9caaf518f406798c801ab5dc5635172755aac205bbe3b3d37b2991fd4e0f7142665b9780b76ab7b13eb57
+  data.tar.gz: 412909c21d02b981eed2189b1db21b59158ad081a66ac7ee13b2685e08e95238c79dfbdcb8c1e0d8da215facfc51c330e8938400c2b24101d3965d5cd964e9ae

data/fastlane/lib/fastlane/actions/setup_circle_ci.rb

@@ -0,0 +1,102 @@
+module Fastlane
+  module Actions
+    class SetupCircleCiAction < Action
+      def self.run(params)
+        unless should_run?(params)
+          UI.message "Not running on CI, skipping `setup_circle_ci`"
+          return
+        end
+
+        setup_keychain
+        setup_output_paths(params)
+      end
+
+      def self.setup_output_paths(params)
+        unless ENV["FL_OUTPUT_DIR"]
+          UI.message "Skipping Log Path setup as FL_OUTPUT_DIR is unset"
+          return
+        end
+
+        root = Pathname.new(ENV["FL_OUTPUT_DIR"])
+        ENV["SCAN_OUTPUT_DIRECTORY"] = (root + "scan").to_s
+        ENV["GYM_OUTPUT_DIRECTORY"] = (root + "gym").to_s
+        ENV["FL_BUILDLOG_PATH"] = (root + "buildlogs").to_s
+        ENV["SCAN_INCLUDE_SIMULATOR_LOGS"] = true.to_s
+      end
+
+      def self.setup_keychain
+        unless ENV["MATCH_KEYCHAIN_NAME"].nil?
+          UI.message "Skipping Keychain setup as a keychain was already specified"
+          return
+        end
+
+        keychain_name = "fastlane_tmp_keychain"
+        ENV["MATCH_KEYCHAIN_NAME"] = keychain_name
+        ENV["MATCH_KEYCHAIN_PASSWORD"] = ""
+
+        UI.message "Creating temporary keychain: \"#{keychain_name}\"."
+        Actions::CreateKeychainAction.run(
+          name: keychain_name,
+          default_keychain: true,
+          unlock: true,
+          timeout: 3600,
+          lock_when_sleeps: true,
+          password: ""
+        )
+
+        UI.message("Enabling match readonly mode.")
+        ENV["MATCH_READONLY"] = true.to_s
+      end
+
+      def self.should_run?(params)
+        Helper.is_ci? || params[:force]
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Setup the keychain and match to work with CircleCI"
+      end
+
+      def self.details
+        [
+          "- Creates a new temporary keychain for use with match",
+          "- Switches match to `readonly` mode to not create new profiles/cert on CI",
+          "- Sets up log and test result paths to be easily collectible",
+          "",
+          "This action helps with CircleCI integration, add this to the top of your Fastfile if you use CircleCI"
+        ].join("\n")
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :force,
+                                       env_name: "FL_SETUP_CIRCLECI_FORCE",
+                                       description: "Force setup, even if not executed by CircleCI",
+                                       is_string: false,
+                                       default_value: false)
+        ]
+      end
+
+      def self.authors
+        ["dantoml"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+
+      def self.example_code
+        [
+          'setup_circle_ci'
+        ]
+      end
+
+      def self.category
+        :misc
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/setup/setup_ios.rb

@@ -276,8 +276,8 @@ module Fastlane
       end
 
       template.gsub!('snapshot', '# snapshot') unless self.tools[:snapshot]
-      template.gsub!('cocoapods', '') unless self.tools[:cocoapods]
-      template.gsub!('carthage', '') unless self.tools[:carthage]
+      template.gsub!('cocoapods', '# cocoapods') unless self.tools[:cocoapods]
+      template.gsub!('carthage', '# carthage') unless self.tools[:carthage]
       template.gsub!('[[FASTLANE_VERSION]]', Fastlane::VERSION)
 
       self.tools.each do |key, value|

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.60.0.beta.20170927010003'.freeze
+  VERSION = '2.60.0.beta.20170928010003'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/spaceship/lib/spaceship/client.rb

@@ -202,15 +202,19 @@ module Spaceship
       #     invalid content provider id
       #
       available_teams = teams.collect do |team|
-        (team["contentProvider"] || {})["contentProviderId"]
+        {
+          team_id: (team["contentProvider"] || {})["contentProviderId"],
+          team_name: (team["contentProvider"] || {})["name"]
+        }
       end
 
-      result = available_teams.find do |available_team_id|
-        team_id.to_s == available_team_id.to_s
+      result = available_teams.find do |available_team|
+        team_id.to_s == available_team[:team_id].to_s
       end
 
       unless result
-        raise TunesClient::ITunesConnectError.new, "Could not set team ID to '#{team_id}', only found the following available teams: #{available_teams.join(', ')}"
+        error_string = "Could not set team ID to '#{team_id}', only found the following available teams:\n\n#{available_teams.map { |team| "- #{team[:team_id]} (#{team[:team_name]})" }.join("\n")}\n"
+        raise TunesClient::ITunesConnectError.new, error_string
       end
 
       response = request(:post) do |req|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.60.0.beta.20170927010003
+  version: 2.60.0.beta.20170928010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -998,6 +998,7 @@ files:
 - fastlane/lib/fastlane/actions/set_github_release.rb
 - fastlane/lib/fastlane/actions/set_info_plist_value.rb
 - fastlane/lib/fastlane/actions/set_pod_key.rb
+- fastlane/lib/fastlane/actions/setup_circle_ci.rb
 - fastlane/lib/fastlane/actions/setup_jenkins.rb
 - fastlane/lib/fastlane/actions/setup_travis.rb
 - fastlane/lib/fastlane/actions/sh.rb