fastlane_core 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1f200961aa7037ab4a7d53386add926b8f1f3c
-  data.tar.gz: 34547cfac38a492d9c6f662884b529b659e45940
+  metadata.gz: 0f4d931254827f7fd47490f587921cf1c418f2b5
+  data.tar.gz: 7a190cfb592c3e434f20ca3ac12403f4b3bd848a
 SHA512:
-  metadata.gz: aa615defbe30ed5a611d1396bf03ad1243c6d21d836b4839b40ea23044b3f6836412ddbf92f9987a8a29ed4540479d85233ec961b6c03a5cdb3bbf9e7255640d
-  data.tar.gz: ccd09159dedaadd8f91421d1e4810a7497d30074e2d414763b92ea21265c4b7cd361fec81dce276c62bb6741afe57e81f29a586bcd9b11fb934a1952bb8fea2b
+  metadata.gz: e3e95b7de20c1e6336a4c38b124350218cc5c0f5a0b35a4963eaaca735c2af4eac079ce6670ef8603f86655fe0149faec4f094029f07b74af34b2090fdf6ca3d
+  data.tar.gz: a3f4fe5f1d39f3485c60bd6196987ae24187d46bdf7812e8a4712f61483fe59003ffb5b080a3ff32ae52be9f8888d61922c60d6c249e05cda6f1723820545f74

data/lib/fastlane_core.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'fastlane_core/version'
 require 'fastlane_core/helper'
+require 'fastlane_core/xcodebuild_list_output_parser'
 require 'fastlane_core/configuration/configuration'
 require 'fastlane_core/update_checker/update_checker'
 require 'fastlane_core/languages'

data/lib/fastlane_core/ipa_file_analyser.rb

@@ -1,4 +1,5 @@
 require 'zip'
+require 'plist'
 
 module FastlaneCore
   class IpaFileAnalyser
@@ -19,6 +20,7 @@ module FastlaneCore
     def self.fetch_info_plist_file(path)
       Zip::File.open(path) do |zipfile|
         zipfile.each do |file|
+          next if file.name.match(%r{\.app/.+\.app/Info.plist$})
           next unless file.name.include? '.plist' and !['.bundle', '.framework'].any? { |a| file.name.include? a }
 
           # We can not be completely sure, that's the correct plist file, so we have to try

data/lib/fastlane_core/project.rb

@@ -82,21 +82,7 @@ module FastlaneCore
 
     # Get all available schemes in an array
     def schemes
-      results = []
-      output = raw_info.split("Schemes:").last.split(":").first
-
-      if raw_info.include?("There are no schemes in workspace") or raw_info.include?("This project contains no schemes")
-        return results
-      end
-
-      output.split("\n").each do |current|
-        current = current.strip
-
-        next if current.length == 0
-        results << current
-      end
-
-      results
+      parsed_info.schemes
     end
 
     # Let the user select a scheme
@@ -132,23 +118,7 @@ module FastlaneCore
 
     # Get all available configurations in an array
     def configurations
-      results = []
-      splitted = raw_info.split("Configurations:")
-      return [] if splitted.count != 2 # probably a CocoaPods project
-
-      output = splitted.last.split(":").first
-      output.split("\n").each_with_index do |current, index|
-        current = current.strip
-
-        if current.length == 0
-          next if index == 0
-          break # as we want to break on the empty line
-        end
-
-        results << current
-      end
-
-      results
+      parsed_info.configurations
     end
 
     def app_name
@@ -252,11 +222,26 @@ module FastlaneCore
       command = "xcrun xcodebuild -list #{options.join(' ')}"
       Helper.log.info command.yellow unless silent
 
-      @raw = `#{command}`.to_s
+      # xcode >= 6 might hang here if the user schemes are missing
+      begin
+        require 'timeout'
+        @raw = Timeout.timeout(10) { `#{command}`.to_s }
+      rescue Timeout::Error
+        raise "xcodebuild -list timed-out. You might need to recreate the user schemes. See https://github.com/fastlane/gym/issues/143".red
+      end
 
       raise "Error parsing xcode file using `#{command}`".red if @raw.length == 0
 
       return @raw
     end
+
+    private
+
+    def parsed_info
+      unless @parsed_info
+        @parsed_info = FastlaneCore::XcodebuildListOutputParser.new(raw_info)
+      end
+      @parsed_info
+    end
   end
 end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.32.0"
+  VERSION = "0.32.1"
 end

data/lib/fastlane_core/xcodebuild_list_output_parser.rb

@@ -0,0 +1,28 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -310,6 +310,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: danger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Contains all shared code/dependencies of the fastlane.tools
 email:
 - fastlanecore@krausefx.com
@@ -346,6 +360,7 @@ files:
 - lib/fastlane_core/update_checker/changelog.rb
 - lib/fastlane_core/update_checker/update_checker.rb
 - lib/fastlane_core/version.rb
+- lib/fastlane_core/xcodebuild_list_output_parser.rb
 homepage: https://fastlane.tools
 licenses:
 - MIT