fastlane 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3ec507f543216ab6994a08261f77f0ec8a1769
-  data.tar.gz: 4aacd9764499f99369fdc58cafa1573880804c83
+  metadata.gz: cac5549eaf49e5cf8e11a96dbf3e2ffc7114d33c
+  data.tar.gz: dc206f2c9fc9256cbbcb41659f0c20e15609de31
 SHA512:
-  metadata.gz: ff91b97fe644ef9c89145b6f514a6496f4b4391ab4dbcf84db3ed3739f863027ef9c5f29b3610d3597e8c864af63a13110a1cd3cff5e4b3270c09def262f7a59
-  data.tar.gz: eaa790d5bf39b9592fc377842d2d8c2b3afc50998bd9d2965d0d9522e2db8a33d0e92d0a920908177de055ff6389c83263e9a24a0aeb9e3c7a30f317658cc60e
+  metadata.gz: fa3692f494fd08521731dde9533a3130010a7a32a39862dd345e50ab656f5bf6e6d5ae762cc968c69929d6a708d41685839a95ede9913a12e371c226e650ccdf
+  data.tar.gz: 15454ec54ca8062dbe512a908a675ce592872b212f7a357005899c92be30710c8c0d7a6592dccd17e6234effb15a9ef9ab1289cced12893ce8920bf8a0e50b5a

data/lib/assets/FastfileTemplate

@@ -30,9 +30,9 @@ platform :ios do
 
     # increment_build_number
 
-    ipa
+    ipa[[SCHEME]] # Build your app - more options available
 
-    xctool
+    xctool # run the tests of your app
   end
 
   desc "Runs all the tests"

data/lib/assets/custom_action_template.rb

@@ -53,7 +53,7 @@ module Fastlane
 
       def self.author
         # So no one will ever forget your contribution to fastlane :) You are awesome btw!
-        '[Your GitHub Name]'
+        '[Your GitHub/Twitter Name]'
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/actions/actions_helper.rb

@@ -73,6 +73,10 @@ module Fastlane
     end
 
     def self.sh_no_action(command)
+      # Set the encoding first, the user might have set it wrong
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
+
       command = command.join(' ') if command.is_a?(Array) # since it's an array of one element when running from the Fastfile
       Helper.log.info ['[SHELL COMMAND]', command.yellow].join(': ')
 

data/lib/fastlane/actions/deliver.rb

@@ -15,6 +15,7 @@ module Fastlane
 
           Dir.chdir(config[:deliver_file_path] || FastlaneFolder.path || Dir.pwd) do
             # This should be executed in the fastlane folder
+            return if Helper.is_test?
 
             Deliver::Deliverer.new(nil,
                                    force: config[:force],

data/lib/fastlane/actions/increment_version_number.rb

@@ -16,7 +16,7 @@ module Fastlane
         # https://developer.apple.com/library/ios/qa/qa1827/_index.html
 
         begin
-          folder = '.' #Current folder is the default folder
+          folder = params[:xcodeproj] ? File.join('.', params[:xcodeproj], '..') : '.'
 
           command_prefix = [
               'cd',
@@ -35,7 +35,7 @@ module Fastlane
             if Helper.test?
               version_array = [1,0,0]
             else
-              raise "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d.\d.\d/)
+              raise "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d+.\d+.\d+/)
               version_array = current_version.split(".").map(&:to_i)
             end
 
@@ -107,7 +107,8 @@ module Fastlane
                                        verify_block: Proc.new do |value|
                                         raise "Please pass the path to the project, not the workspace".red if value.include?"workspace"
                                         raise "Could not find Xcode project".red unless File.exists?(value)
-                                       end)
+                                       end,
+                                       optional: true)
         ]
       end
 

data/lib/fastlane/actions/ipa.rb

@@ -44,7 +44,7 @@ module Fastlane
         build_args = params_to_build_args(params)
 
         unless (params[:scheme] rescue nil)
-          Helper.log.warn "You haven't specified a scheme. This might cause problems. If you can't see any outupt, please pass a `scheme`"
+          Helper.log.warn "You haven't specified a scheme. This might cause problems. If you can't see any output, please pass a `scheme`"
         end
 
         # If no dest directory given, default to current directory
@@ -59,19 +59,40 @@ module Fastlane
         # Joins args into space delimited string
         build_args = build_args.join(' ')
 
-        command = "set -o pipefail && krausefx-ipa build #{build_args} --verbose | xcpretty"
+        core_command = "krausefx-ipa build #{build_args} --verbose | xcpretty"
+        command = "set -o pipefail && #{core_command}"
         Helper.log.debug command
-        Actions.sh command
 
-        # Finds absolute path of IPA and dSYM
-        absolute_ipa_path = find_ipa_file(absolute_dest_directory)
-        absolute_dsym_path = find_dsym_file(absolute_dest_directory)
-
-        # Sets shared values to use after this action is performed
-        Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_ipa_path
-        Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path
-        ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
-        ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path
+        begin
+          Actions.sh command
+
+          # Finds absolute path of IPA and dSYM
+          absolute_ipa_path = find_ipa_file(absolute_dest_directory)
+          absolute_dsym_path = find_dsym_file(absolute_dest_directory)
+
+          # Sets shared values to use after this action is performed
+          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_ipa_path
+          Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path
+          ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
+          ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path
+        rescue => ex
+          [
+            "-------------------------------------------------------",
+            "Original Error:",
+            " => " + ex.to_s,
+            "A build error occured. This can have many reasons, usually",
+            "it has something to do with code signing. The `ipa` action",
+            "uses `shenzhen` under the hood: https://github.com/nomad/shenzhen",
+            "The command that was used by fastlane:",
+            core_command,
+            "-------------------------------------------------------"
+          ].each do |txt|
+            Helper.log.error txt.yellow
+          end
+          
+          # Raise a custom exception, as the the normal one is useless for the user
+          raise "A build error occured, this is usually related to code signing. Take a look at the error above".red
+        end
       end
 
       def self.params_to_build_args(config)

data/lib/fastlane/actions/reset_git_repo.rb

@@ -6,6 +6,8 @@ module Fastlane
         if params[:force] || params[:force] || Actions.lane_context[SharedValues::GIT_REPO_WAS_CLEAN_ON_START]
           paths = (params[:files] rescue nil)
 
+          return paths if Helper.is_test?
+          
           if (paths || []).count == 0
             Actions.sh('git reset --hard HEAD')
             Actions.sh('git clean -qfdx')
@@ -40,6 +42,7 @@ module Fastlane
                                        env_name: "FL_RESET_GIT_FILES",
                                        description: "Array of files the changes should be discarded from. If not given, all files will be discarded",
                                        optional: true,
+                                       is_string: false,
                                        verify_block: Proc.new do |value|
                                         raise "Please pass an array only" unless value.kind_of?Array
                                        end),

data/lib/fastlane/actions/snapshot.rb

@@ -21,7 +21,7 @@ module Fastlane
         ENV['SNAPSHOT_SKIP_OPEN_SUMMARY'] = "1" # it doesn't make sense to show the HTML page here
 
         begin
-          Dir.chdir(FastlaneFolder.path) do
+          Dir.chdir(params[:snapshot_file_path] || FastlaneFolder.path) do
             Snapshot::SnapshotConfig.shared_instance
             Snapshot::Runner.new.work(clean: clean)
 
@@ -49,7 +49,14 @@ module Fastlane
                                        env_name: "FL_SNAPSHOT_VERBOSE",
                                        description: "Print out the UI Automation output",
                                        is_string: false,
-                                       default_value: false)
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :snapshot_file_path,
+                                       env_name: "FL_SNAPSHOT_CONFIG_PATH",
+                                       description: "Specify a path to the directory containing the Snapfile",
+                                       default_value: FastlaneFolder.path || Dir.pwd, # defaults to fastlane folder
+                                       verify_block: Proc.new do |value|
+                                        raise "Couldn't find folder '#{value}'. Make sure to pass the path to the directory not the file!".red unless File.directory?(value)
+                                       end)
         ]
       end
 

data/lib/fastlane/actions/update_project_provisioning.rb

@@ -0,0 +1,119 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      
+    end
+
+    class UpdateProjectProvisioningAction < Action
+      ROOT_CERTIFICATE_URL = "http://www.apple.com/appleca/AppleIncRootCertificate.cer"
+      def self.run(params)
+        
+        # assign folder from parameter or search for xcodeproj file
+        folder = params[:xcodeproj] || Dir["*.xcodeproj"].first
+        
+        # validate folder
+        folder = File.join(folder, "project.pbxproj")
+        raise "Could not find path to project config '#{folder}'. Pass the path to your project (not workspace)!".red unless File.exists?(folder)
+
+        # download certificate
+        if not File.exists?(params[:certificate])
+          Helper.log.info("Downloading root certificate from (#{ROOT_CERTIFICATE_URL}) to path '#{params[:certificate]}'")
+          require 'open-uri'
+          File.open(params[:certificate], "w") do |file|
+            file.write(open(ROOT_CERTIFICATE_URL, "rb").read)
+          end
+        end
+
+        # parsing mobileprovision file
+        Helper.log.info("Parsing mobile provisioning profile from '#{params[:profile]}'")
+        profile = File.read(params[:profile])
+        p7 = OpenSSL::PKCS7.new(profile)
+        store = OpenSSL::X509::Store.new
+        cert = OpenSSL::X509::Certificate.new(File.read(params[:certificate]))
+        store.add_cert(cert)
+        verification = p7.verify([cert], store)
+        data = Plist::parse_xml(p7.data)
+        
+        filter = params[:build_configuration_filter]
+
+        # manipulate project file
+        Helper.log.info("Going to update project '#{folder}' with UUID".green)
+        require 'pbxplorer'
+
+        project_file = XCProjectFile.new(folder)
+        project_file.project.targets.each do |target|
+          if filter
+            if target['productName'].match(filter) or target['productType'].match(filter)
+              Helper.log.info "Updating target #{target['productName']}...".green
+            else
+              Helper.log.info "Skipping target #{target['productName']} as it doesn't match the filter '#{filter}'".yellow
+              next
+            end
+          else
+            Helper.log.info "Updating target #{target['productName']}...".green
+          end
+
+          target.build_configuration_list.build_configurations.each do |build_configuration|
+            build_configuration["buildSettings"]["PROVISIONING_PROFILE"] = data["UUID"]
+            build_configuration["buildSettings"]["CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]"] = "$(SDKROOT)/ResourceRules.plist"
+          end
+        end
+
+        project_file.save
+
+        # complete
+        Helper.log.info("Successfully updated project settings in'#{params[:xcodeproj]}'".green)
+      end
+
+      def self.description
+        "Update projects code signing settings from your profisioning profile"
+      end
+
+      def self.details
+        [
+          "This action retrieves a provisioning profile UUID from a provisioning profile (.mobileprovision) to set",
+          "up the xcode projects' code signing settings in *.xcodeproj/project.pbxproj",
+          "",
+          "The `build_configuration_filter` value can be used to only update code signing for one target",
+          "Example Usage is the WatchKit Extension or WatchKit App, where you need separate provisioning profiles",
+          "Example: `update_project_provisioning(xcodeproj: \"..\", build_configuration_filter: \".*WatchKit App.*\")"
+        ].join("\n")
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :xcodeproj,
+                                       env_name: "FL_PROJECT_PROVISIONING_PROJECT_PATH",
+                                       description: "Path to your Xcode project",
+                                       optional: true,
+                                       verify_block: Proc.new do |value|
+                                        raise "Path to xcode project is invalid".red unless File.exists?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :profile,
+                                       env_name: "FL_PROJECT_PROVISIONING_PROFILE_FILE",
+                                       description: "Path to provisioning profile (.mobileprovision)",
+                                       default_value: Actions.lane_context[SharedValues::SIGH_PROFILE_PATH],
+                                       verify_block: Proc.new do |value|
+                                        raise "Path to provisioning profile is invalid".red unless File.exists?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :build_configuration_filter,
+                                       env_name: "FL_PROJECT_PROVISIONING_PROFILE_FILTER",
+                                       description: "A filter for the target name. Use a standard regex",
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :certificate,
+                                       env_name: "FL_PROJECT_PROVISIONING_CERTIFICATE_PATH",
+                                       description: "Path to apple root certificate",
+                                       default_value: "/tmp/AppleIncRootCertificate.cer")
+        ]
+      end
+
+      def self.author
+        "tobiasstrebitzer"
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/fastlane_folder.rb

@@ -2,6 +2,7 @@ module Fastlane
   class FastlaneFolder
     FOLDER_NAME = 'fastlane'
 
+    # Path to the fastlane folder containing the Fastfile and other configuration files
     def self.path
       return "./#{FOLDER_NAME}/" if File.directory?("./#{FOLDER_NAME}/")
       return "./.#{FOLDER_NAME}/" if File.directory?("./.#{FOLDER_NAME}/") # hidden folder
@@ -10,9 +11,10 @@ module Fastlane
       nil
     end
 
+    # Does a fastlane configuration already exist? 
     def self.setup?
       return false unless path
-      File.exist?(path)
+      File.exist?(File.join(path, "Fastfile"))
     end
 
     def self.create_folder!(path = nil)

data/lib/fastlane/setup.rb

@@ -3,7 +3,10 @@
 module Fastlane
   class Setup
     def run
-      raise "Fastlane already set up at path #{folder}".yellow if (FastlaneFolder.setup? and not Helper.is_test?)
+      if (FastlaneFolder.setup? and not Helper.is_test?)
+        Helper.log.info "Fastlane already set up at path #{folder}".yellow
+        return
+      end
 
       show_infos
       response = agree('Do you want to get started? This will move your Deliverfile and Snapfile (if they exist) (y/n)'.yellow, true)
@@ -63,8 +66,10 @@ module Fastlane
     def generate_app_metadata
       Helper.log.info '------------------------------'
       Helper.log.info 'To not re-enter your username and app identifier every time you run one of the fastlane tools or fastlane, these will be stored from now on.'.green
+      
       app_identifier = ask('App Identifier (com.krausefx.app): '.yellow)
       apple_id = ask('Your Apple ID (fastlane@krausefx.com): '.yellow)
+
       template = File.read("#{Helper.gem_path('fastlane')}/lib/assets/AppfileTemplate")
       template.gsub!('[[APP_IDENTIFIER]]', app_identifier)
       template.gsub!('[[APPLE_ID]]', apple_id)
@@ -117,6 +122,14 @@ module Fastlane
     def generate_fastfile
       template = File.read("#{Helper.gem_path('fastlane')}/lib/assets/FastfileTemplate")
 
+      scheme = ask("Optional: The scheme name of your app. If you don't need one, just click enter: ").to_s.strip
+      if scheme.length > 0
+        template.gsub!('[[SCHEME]]', "(scheme: \"#{scheme}\")")
+      else
+        template.gsub!('[[SCHEME]]', "")
+      end
+
+
       template.gsub!('deliver', '# deliver') unless @tools[:deliver]
       template.gsub!('snapshot', '# snapshot') unless @tools[:snapshot]
       template.gsub!('sigh', '# sigh') unless @tools[:sigh]

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: pbxplorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fastlane_core
   requirement: !ruby/object:Gem::Requirement
@@ -198,56 +212,56 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: sigh
+  name: cert
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: produce
+  name: sigh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: cert
+  name: produce
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -426,6 +440,7 @@ files:
 - lib/fastlane/actions/typetalk.rb
 - lib/fastlane/actions/update_fastlane.rb
 - lib/fastlane/actions/update_project_code_signing.rb
+- lib/fastlane/actions/update_project_provisioning.rb
 - lib/fastlane/actions/xcode_select.rb
 - lib/fastlane/actions/xcodebuild.rb
 - lib/fastlane/actions/xctool.rb