fastlane_core 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02578f98b483a8ba6920f39779d71ba1ba03774c
-  data.tar.gz: 487cd019f1800b5fcb2725ae2314a7a965323640
+  metadata.gz: 6c4e0e0dfd2c77a1169ff2dcb62cf7f353f71938
+  data.tar.gz: 5c439e39a2d28893b40eee0fde61967d11688783
 SHA512:
-  metadata.gz: 8e62feb2d668f4209197e34000348ec2b2baf1ea98240528e53463d7dafc5e8feebbc251234993feaca37ff6c62a86f1fd1f02f53312c8b0d879ceb7f0bbb2f7
-  data.tar.gz: 7bc72d09706072f4dde1b7990ab8428af297858bc030e580a6bab0a6cec09bebe46358a3aac03eac3298e553efdd0a29a81a0d2c1a3bcaed788fc9d2e365ee9a
+  metadata.gz: f3a670a6ab99b201705a0344cdcc589639050213b301acd6611f674960fe0d8d7b148f0777e31337a6d072c8fe60c61e3ad1ce2c2ecd1ca0131ce018e2451c73
+  data.tar.gz: 56c7324933a6ef4f17312a785f353b33d5388ef0bd58a27bfbc54cfea462c7280d1f6a510942cffd1552e2a97c8c0e543d791d3a023edba4a1f8373bdfdf7a51

data/lib/assets/XMLTemplate.xml.erb

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://apple.com/itunes/importer" version="software5.4">
   <software_assets apple_id="<%= @data[:apple_id] %>" app_platform="<%= @data[:platform] %>">
-    <asset type="bundle">
+    <asset type="<%= @data[:archive_type] %>">
       <data_file>
         <size><%= @data[:file_size] %></size>
         <file_name><%= @data[:ipa_path] %></file_name>

data/lib/fastlane_core.rb

@@ -10,6 +10,8 @@ require 'fastlane_core/cert_checker'
 require 'fastlane_core/ipa_file_analyser'
 require 'fastlane_core/itunes_transporter'
 require 'fastlane_core/provisioning_profile'
+require 'fastlane_core/pkg_file_analyser'
+require 'fastlane_core/pkg_upload_package_builder'
 require 'fastlane_core/command_executor'
 require 'fastlane_core/ipa_upload_package_builder'
 require 'fastlane_core/print_table'

data/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -20,6 +20,7 @@ module FastlaneCore
         file_size: File.size(ipa_path),
         ipa_path: File.basename(ipa_path), # this is only the base name as the ipa is inside the package
         md5: Digest::MD5.hexdigest(File.read(ipa_path)),
+        archive_type: "bundle",
         platform: (platform || "ios") # pass "appletvos" for Apple TV's IPA
       }
 

data/lib/fastlane_core/pkg_file_analyser.rb

@@ -0,0 +1,42 @@
+require 'rexml/document'
+
+module FastlaneCore
+  class PkgFileAnalyser
+    def self.fetch_app_identifier(path)
+      xml = self.fetch_distribution_xml_file(path)
+      return xml.elements['installer-gui-script/product'].attributes['id'] if xml
+      return nil
+    end
+
+    # Fetches the app version from the given pkg file.
+    def self.fetch_app_version(path)
+      xml = self.fetch_distribution_xml_file(path)
+      return xml.elements['installer-gui-script/product'].attributes['version'] if xml
+      return nil
+    end
+
+    def self.fetch_distribution_xml_file(path)
+      Dir.mktmpdir do |dir|
+        Helper.backticks("xar -C #{dir} -xf #{path}")
+
+        Dir.foreach(dir) do |file|
+          next unless file.include? 'Distribution'
+
+          begin
+            content = File.open(File.join(dir, file))
+            xml = REXML::Document.new(content)
+
+            if xml.elements['installer-gui-script/product']
+              return xml
+            end
+          rescue => ex
+            Helper.log.error ex
+            Helper.log.error "Error parsing *.pkg distribution xml #{File.join(dir, file)}".red
+          end
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/fastlane_core/pkg_upload_package_builder.rb

@@ -0,0 +1,46 @@
+require 'digest/md5'
+
+module FastlaneCore
+  # Builds a package for the pkg ready to be uploaded with the iTunes Transporter
+  class PkgUploadPackageBuilder
+    METADATA_FILE_NAME = 'metadata.xml'
+
+    attr_accessor :package_path
+
+    def generate(app_id: nil, pkg_path: nil, package_path: nil)
+      self.package_path = File.join(package_path, "#{app_id}.itmsp")
+      FileUtils.rm_rf(self.package_path) if File.directory?(self.package_path)
+      FileUtils.mkdir_p self.package_path
+
+      lib_path = Helper.gem_path('fastlane_core')
+
+      pkg_path = copy_pkg(pkg_path)
+      @data = {
+        apple_id: app_id,
+        file_size: File.size(pkg_path),
+        ipa_path: File.basename(pkg_path), # this is only the base name as the ipa is inside the package
+        md5: Digest::MD5.hexdigest(File.read(pkg_path)),
+        archive_type: 'product-archive',
+        platform: 'osx'
+      }
+
+      xml_path = File.join(lib_path, 'lib/assets/XMLTemplate.xml.erb')
+      xml = ERB.new(File.read(xml_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
+
+      File.write(File.join(self.package_path, METADATA_FILE_NAME), xml)
+      Helper.log.info "Wrote XML data to '#{self.package_path}'".green if $verbose
+
+      package_path
+    end
+
+    private
+
+    def copy_pkg(pkg_path)
+      ipa_file_name = Digest::MD5.hexdigest(pkg_path)
+      resulting_path = File.join(self.package_path, "#{ipa_file_name}.pkg")
+      FileUtils.cp(pkg_path, resulting_path)
+
+      resulting_path
+    end
+  end
+end

data/lib/fastlane_core/project.rb

@@ -121,6 +121,20 @@ module FastlaneCore
       parsed_info.configurations
     end
 
+    # Returns bundle_id and sets the scheme for xcrun
+    def default_app_identifier
+      default_build_settings(key: "PRODUCT_BUNDLE_IDENTIFIER")
+    end
+
+    # Returns app name and sets the scheme for xcrun
+    def default_app_name
+      if is_workspace
+        return default_build_settings(key: "PRODUCT_NAME")
+      else
+        return app_name
+      end
+    end
+
     def app_name
       # WRAPPER_NAME: Example.app
       # WRAPPER_SUFFIX: .app
@@ -163,12 +177,11 @@ module FastlaneCore
     # Get the build settings for our project
     # this is used to properly get the DerivedData folder
     # @param [String] The key of which we want the value for (e.g. "PRODUCT_NAME")
-    def build_settings(key: nil, optional: true, silent: false)
+    def build_settings(key: nil, optional: true)
       unless @build_settings
         # We also need to pass the workspace and scheme to this command
         command = "xcrun xcodebuild -showBuildSettings #{xcodebuild_parameters.join(' ')}"
-        Helper.log.info command.yellow unless silent
-        @build_settings = `#{command}`
+        @build_settings = Helper.backticks(command, print: false)
       end
 
       begin
@@ -184,6 +197,12 @@ module FastlaneCore
       nil
     end
 
+    # Returns the build settings and sets the default scheme to the options hash
+    def default_build_settings(key: nil, optional: true, silent: false)
+      options[:scheme] = schemes.first if is_workspace
+      build_settings(key: key, optional: optional, silent: silent)
+    end
+
     def raw_info(silent: false)
       # Examples:
 

data/lib/fastlane_core/provisioning_profile.rb

@@ -24,7 +24,7 @@ module FastlaneCore
       def parse(path)
         require 'plist'
 
-        plist = Plist.parse_xml(`security cms -D -i '#{path}'`)
+        plist = Plist.parse_xml(`security cms -D -i "#{path}"`)
         if (plist || []).count > 5
           plist
         else

data/lib/fastlane_core/ui/interface.rb

@@ -106,6 +106,8 @@ module FastlaneCore
 
     # Pass an exception to this method to exit the program
     #   using the given exception
+    # Use this method instead of user_error! if this error is
+    # unexpected, e.g. an invalid server response that shouldn't happen
     def crash!(_exception)
       not_implemented(__method__)
     end
@@ -115,6 +117,8 @@ module FastlaneCore
     #        or invalid user credentials
     # This will show the error message, but doesn't show the full
     #   stack trace
+    # Basically this should be used when you actively catch the error
+    # and want to show a nice error message to the user
     def user_error!(_error_message)
       not_implemented(__method__)
     end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -349,6 +349,8 @@ files:
 - lib/fastlane_core/itunes_search_api.rb
 - lib/fastlane_core/itunes_transporter.rb
 - lib/fastlane_core/languages.rb
+- lib/fastlane_core/pkg_file_analyser.rb
+- lib/fastlane_core/pkg_upload_package_builder.rb
 - lib/fastlane_core/print_table.rb
 - lib/fastlane_core/project.rb
 - lib/fastlane_core/provisioning_profile.rb
@@ -381,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools