fastlane 2.86.0.beta.20180310050010 → 2.86.0.beta.20180311050103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367d266272fb392c6fab1bb00b7bea0ad36801f3
-  data.tar.gz: 6c577dd6582a6d077e0944607fd2cb771e74c514
+  metadata.gz: 960fa764acba3c9c3d489f15b09a090d1c57ba11
+  data.tar.gz: 18ea43f13576c3d89bad67ea3ced4a5b27c8420c
 SHA512:
-  metadata.gz: c9eff83f42df80eb5d67290a39747ff430bc31751c03f48656443f2e811e6b0c100671d013f7ed548ba124a270d27bdd97c9fccd36ead90eb51ed0e4e647a433
-  data.tar.gz: 05e09ee70cab704b2746070238a06f21c2d24623ebfa444191880c02bb9ec7929c68d0a9eae5593c64a6f7fb1a2855a4174d8263fdf76eea6acb71564cda51d6
+  metadata.gz: 13d79fd863d21c2d039aae2626f518339969f1f537b18065f0ff79a4de095290b84e9430f887e75c655a1f7b92f349fd8a66ed04757351586990d89cd8cd434f
+  data.tar.gz: 41d86ae2b9c02714000f8ef5c157775be40018acf4bf493e705b7f6fa87c812187505ff851e0687e14b291a339dfa088026c30a640e127840707b4516259000a

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.86.0.beta.20180310050010'.freeze
+  VERSION = '2.86.0.beta.20180311050103'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane_core/lib/fastlane_core.rb

@@ -6,7 +6,6 @@ require_relative 'fastlane_core/env'
 require_relative 'fastlane_core/feature/feature'
 require_relative 'fastlane_core/features'
 require_relative 'fastlane_core/helper'
-require_relative 'fastlane_core/xcodebuild_list_output_parser'
 require_relative 'fastlane_core/configuration/configuration'
 require_relative 'fastlane_core/update_checker/update_checker'
 require_relative 'fastlane_core/languages'

data/fastlane_core/lib/fastlane_core/project.rb

@@ -1,5 +1,5 @@
-require_relative 'xcodebuild_list_output_parser'
 require_relative 'helper'
+require 'xcodeproj'
 
 module FastlaneCore
   # Represents an Xcode project
@@ -100,9 +100,27 @@ module FastlaneCore
       end
     end
 
+    # returns the Xcodeproj::Workspace or nil if it is a project
+    def workspace
+      return nil unless workspace?
+      @workspace ||= Xcodeproj::Workspace.new_from_xcworkspace(path)
+    end
+
+    # returns the Xcodeproj::Project or nil if it is a workspace
+    def project
+      return nil if workspace?
+      @project ||= Xcodeproj::Project.open(path)
+    end
+
     # Get all available schemes in an array
     def schemes
-      parsed_info.schemes
+      @schemes ||= if workspace?
+                     workspace.schemes.reject do |k, v|
+                       v.include?("Pods/Pods.xcodeproj")
+                     end.keys
+                   else
+                     Xcodeproj::Project.schemes(path)
+                   end
     end
 
     # Let the user select a scheme
@@ -155,7 +173,27 @@ module FastlaneCore
 
     # Get all available configurations in an array
     def configurations
-      parsed_info.configurations
+      @configurations ||= if workspace?
+                            workspace
+                              .file_references
+                              .map(&:path)
+                              .reject { |p| p.include?("Pods/Pods.xcodeproj") }
+                              .map do |p|
+                                # To maintain backwards compatibility, we
+                                # silently ignore non-existent projects from
+                                # workspaces.
+                                begin
+                                  Xcodeproj::Project.open(p).build_configurations
+                                rescue
+                                  []
+                                end
+                              end
+                              .flatten
+                              .compact
+                              .map(&:name)
+                          else
+                            project.build_configurations.map(&:name)
+                          end
     end
 
     # Returns bundle_id and sets the scheme for xcrun
@@ -346,73 +384,6 @@ module FastlaneCore
       build_settings(key: key, optional: optional)
     end
 
-    def build_xcodebuild_list_command
-      # Unfortunately since we pass the workspace we also get all the
-      # schemes generated by CocoaPods
-      options = xcodebuild_parameters.delete_if { |a| a.to_s.include?("scheme") }
-      command = "xcodebuild -list #{options.join(' ')}"
-      command += " 2> /dev/null" if xcodebuild_suppress_stderr
-      command
-    end
-
-    def raw_info(silent: false)
-      # Examples:
-
-      # Standard:
-      #
-      # Information about project "Example":
-      #     Targets:
-      #         Example
-      #         ExampleUITests
-      #
-      #     Build Configurations:
-      #         Debug
-      #         Release
-      #
-      #     If no build configuration is specified and -scheme is not passed then "Release" is used.
-      #
-      #     Schemes:
-      #         Example
-      #         ExampleUITests
-
-      # CococaPods
-      #
-      # Example.xcworkspace
-      # Information about workspace "Example":
-      #     Schemes:
-      #         Example
-      #         HexColors
-      #         Pods-Example
-
-      return @raw if @raw
-
-      command = build_xcodebuild_list_command
-
-      # xcode >= 6 might hang here if the user schemes are missing
-      begin
-        timeout = FastlaneCore::Project.xcode_list_timeout
-        retries = FastlaneCore::Project.xcode_list_retries
-        @raw = FastlaneCore::Project.run_command(command, timeout: timeout, retries: retries, print: !silent)
-      rescue Timeout::Error
-        UI.user_error!("xcodebuild -list timed out after #{retries + 1} retries with a base timeout of #{timeout}. You might need to recreate the user schemes." \
-            " You can override the base timeout value with the environment variable FASTLANE_XCODE_LIST_TIMEOUT")
-      end
-
-      UI.user_error!("Error parsing xcode file using `#{command}`") if @raw.length == 0
-
-      return @raw
-    end
-
-    # @internal to module
-    def self.xcode_list_timeout
-      (ENV['FASTLANE_XCODE_LIST_TIMEOUT'] || 3).to_i
-    end
-
-    # @internal to module
-    def self.xcode_list_retries
-      (ENV['FASTLANE_XCODE_LIST_RETRIES'] || 3).to_i
-    end
-
     # @internal to module
     def self.xcode_build_settings_timeout
       (ENV['FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT'] || 3).to_i
@@ -497,13 +468,6 @@ module FastlaneCore
 
     private
 
-    def parsed_info
-      unless @parsed_info
-        @parsed_info = FastlaneCore::XcodebuildListOutputParser.new(raw_info(silent: xcodebuild_list_silent))
-      end
-      @parsed_info
-    end
-
     # If scheme not specified, do we want the scheme
     # matching project name?
     def automated_scheme_selection?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.86.0.beta.20180310050010
+  version: 2.86.0.beta.20180311050103
 platform: ruby
 authors:
 - Maksym Grebenets
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1299,7 +1299,6 @@ files:
 - fastlane_core/lib/fastlane_core/ui/ui.rb
 - fastlane_core/lib/fastlane_core/update_checker/changelog.rb
 - fastlane_core/lib/fastlane_core/update_checker/update_checker.rb
-- fastlane_core/lib/fastlane_core/xcodebuild_list_output_parser.rb
 - frameit/README.md
 - frameit/lib/assets/empty.png
 - frameit/lib/frameit.rb
@@ -1606,24 +1605,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- spaceship/lib
-- pem/lib
-- snapshot/lib
+- gym/lib
 - match/lib
+- fastlane_core/lib
+- deliver/lib
 - sigh/lib
-- gym/lib
+- screengrab/lib
 - supply/lib
-- credentials_manager/lib
-- fastlane/lib
-- produce/lib
-- frameit/lib
 - scan/lib
-- fastlane_core/lib
 - cert/lib
+- spaceship/lib
 - pilot/lib
-- deliver/lib
+- snapshot/lib
+- produce/lib
 - precheck/lib
-- screengrab/lib
+- fastlane/lib
+- frameit/lib
+- pem/lib
+- credentials_manager/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/fastlane_core/lib/fastlane_core/xcodebuild_list_output_parser.rb

@@ -1,28 +0,0 @@
-module FastlaneCore
-  class XcodebuildListOutputParser
-    attr_reader :configurations
-    attr_reader :schemes
-    attr_reader :targets
-
-    def initialize(output)
-      @configurations = []
-      @schemes = []
-      @targets = []
-      current = nil
-      output.split("\n").each do |line|
-        line = line.strip
-        if line.empty?
-          current = nil
-        elsif line == "Targets:"
-          current = @targets
-        elsif line == "Schemes:"
-          current = @schemes
-        elsif line == "Build Configurations:"
-          current = @configurations
-        elsif !current.nil?
-          current << line
-        end
-      end
-    end
-  end
-end