fastlane 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336461764c0b6885ff9354c63b43ea624af08754
-  data.tar.gz: 2dc310d65dbf28a4661291fd6a649e9a9c158443
+  metadata.gz: d3dfcedf5ac0b272b5a1c08e2db5cc401152f748
+  data.tar.gz: 9c552d89e71e93de66eb151e95d2cb1d31128da8
 SHA512:
-  metadata.gz: 75725246d80859a2343169dc987f562725ffad36cd3255ef6966ab224bce72eb50c37f51772c017decbd1c8ad6c877e3dcab2dc446586a034d6b65ff7df03deb
-  data.tar.gz: 92181b49d70b81cf4b2bc515745e44f19e355a7f1baf3d6933c876f42567df7b2ff5a40b9415f259cf5f5a703804aa29d84f5edb055893ae860ba90c2a29901c
+  metadata.gz: c2839d75b434b3f866be56449b9d4f579bb31ccf901d43aa238842d1e5665007d975067fd7eb5ffee2b93b9f316dccf01b0808644a1b3ed41033b9eec588c02f
+  data.tar.gz: 76f073a6ed2428e1ca28b32d0e389825f4e471ca2a1edc331197046614c1e111661c263a581ef7309d0cd65a1730006e5047a98a5bf34dfc296e72c109d7fd2e

data/lib/assets/FastfileTemplate

@@ -22,12 +22,10 @@ default_platform :ios
 
 
 platform :ios do
-
   before_all do
     # ENV["SLACK_URL"] = "https://hooks.slack.com/services/..."
-
     cocoapods
-
+    carthage
     # increment_build_number
 
     gym[[SCHEME]] # Build your app - more options available
@@ -70,7 +68,6 @@ platform :ios do
     # )
   end
 
-
   error do |lane, exception|
     # slack(
     #   message: exception.message,

data/lib/fastlane/actions/cocoapods.rb

@@ -4,6 +4,15 @@ module Fastlane
       def self.run(params)
         cmd = []
 
+        unless params[:podfile].nil?
+          if params[:podfile].end_with?('Podfile')
+            podfile_folder = File.dirname(params[:podfile])
+          else
+            podfile_folder = params[:podfile]
+          end
+          cmd << ["cd '#{podfile_folder}' &&"]
+        end
+
         cmd << ['bundle exec'] if File.exist?('Gemfile') && params[:use_bundle_exec]
         cmd << ['pod install']
 
@@ -57,7 +66,15 @@ module Fastlane
                                        env_name: "FL_COCOAPODS_USE_BUNDLE_EXEC",
                                        description: "Use bundle exec when there is a Gemfile presented",
                                        is_string: false,
-                                       default_value: true)
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :podfile,
+                                       env_name: "FL_COCOAPODS_PODFILE",
+                                       description: "Explicitly specify the path to the Cocoapods' Podfile. You can either set it to the Podfile's path or to the folder containing the Podfile file",
+                                       optional: true,
+                                       is_string: true,
+                                       verify_block: proc do |value|
+                                         raise "Could not find Podfile".red unless File.exist?(value) || Helper.test?
+                                       end)
         ]
       end
 
@@ -66,7 +83,7 @@ module Fastlane
       end
 
       def self.authors
-        ["KrauseFx", "tadpol", "birmacher"]
+        ["KrauseFx", "tadpol", "birmacher", "Liquidsoul"]
       end
     end
   end

data/lib/fastlane/actions/hockey.rb

@@ -52,7 +52,7 @@ module Fastlane
           Helper.log.info 'Build successfully uploaded to HockeyApp!'.green
         else
           raise "Error when trying to upload ipa to HockeyApp: #{response.body}".red
-          end
+        end
       end
 
       def self.description

data/lib/fastlane/actions/import_from_git.rb

@@ -37,7 +37,7 @@ module Fastlane
       end
 
       def self.authors
-        ["fabiomassimo", "KrauseFx"]
+        ["fabiomassimo", "KrauseFx", "Liquidsoul"]
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/actions/register_devices.rb

@@ -15,8 +15,8 @@ module Fastlane
         devices = params[:devices]
         devices_file = params[:devices_file]
 
-        credentials = CredentialsManager::PasswordManager.shared_manager(params[:username])
-        Spaceship::Portal.login(credentials.username, credentials.password)
+        credentials = CredentialsManager::AccountManager.new(user: params[:username])
+        Spaceship::Portal.login(credentials.user, credentials.password)
 
         if devices
           device_objs = devices.map do |k, v|

data/lib/fastlane/actions/set_changelog.rb

@@ -84,10 +84,7 @@ module Fastlane
                                      short_option: "-u",
                                      env_name: "FASTLANE_USERNAME",
                                      description: "Your Apple ID Username",
-                                     default_value: ENV["DELIVER_USER"] || CredentialsManager::AppfileConfig.try_fetch_value(:apple_id),
-                                     verify_block: proc do |value|
-                                       CredentialsManager::PasswordManager.shared_manager(value)
-                                     end),
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "FL_SET_CHANGELOG_VERSION",
                                        description: "The version number to create/update",

data/lib/fastlane/actions/set_github_release.rb

@@ -14,14 +14,15 @@ module Fastlane
         Helper.log.info "Will also upload assets #{params[:upload_assets]}.".yellow if params[:upload_assets]
 
         require 'json'
-        body = {
+        body_obj = {
           'tag_name' => params[:tag_name],
-          'target_commitish' => params[:commitish],
           'name' => params[:name],
           'body' => params[:description],
           'draft' => params[:is_draft],
           'prerelease' => params[:is_prerelease]
-        }.to_json
+        }
+        body_obj['target_commitish'] = params[:commitish] if params[:commitish]
+        body = body_obj.to_json
 
         repo_name = params[:repository_name]
         api_token = params[:api_token]

data/lib/fastlane/actions/unlock_keychain.rb

@@ -0,0 +1,97 @@
+module Fastlane
+  module Actions
+    class UnlockKeychainAction < Action
+      def self.run(params)
+        keychain_path = self.expand_keychain_path(params[:path])
+        add_to_search_list = params[:add_to_search_list]
+
+        if keychain_path.empty?
+          raise "Could not find the keychain file: #{keychain_path}".red
+        end
+
+        # add to search list if not already added
+        if add_to_search_list
+          add_keychain_to_search_list(keychain_path)
+        end
+
+        escaped_path = keychain_path.shellescape
+        escaped_password = params[:password].shellescape
+
+        commands = []
+        # unlock given keychain and disable lock and timeout
+        commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{escaped_path}", log: false)
+        commands << Fastlane::Actions.sh("security set-keychain-settings #{escaped_path}", log: false)
+        commands
+      end
+
+      def self.add_keychain_to_search_list(keychain_path)
+        escaped_path = keychain_path.shellescape
+
+        result = Fastlane::Actions.sh("security list-keychains", log: false)
+
+        # add the keychain to the keychains list
+        # the basic strategy is to open the keychain file with Keychain Access
+        unless result.include?(keychain_path)
+          commands = []
+          commands << Fastlane::Actions.sh("open #{escaped_path}")
+          commands
+        end
+      end
+
+      def self.expand_keychain_path(keychain_path)
+        possible_locations = []
+        possible_locations << keychain_path
+        possible_locations << "~/Library/Keychains/#{keychain_path}"
+        possible_locations << "~/Library/Keychains/#{keychain_path}.keychain"
+
+        possible_locations.each do |location|
+          expanded_location = File.expand_path(location)
+          if File.exist?(expanded_location)
+            return expanded_location
+          end
+        end
+
+        return ""
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Unlock a keychain"
+      end
+
+      def self.details
+        "Unlocks the give keychain file and adds it to the keychain search list"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :path,
+                                       env_name: "FL_UNLOCK_KEYCHAIN_PATH",
+                                       description: "Path to the Keychain file",
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :password,
+                                       env_name: "FL_UNLOCK_KEYCHAIN_PASSWORD",
+                                       description: "Keychain password",
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :add_to_search_list,
+                                       env_name: "FL_UNLOCK_KEYCHAIN_ADD_TO_SEARCH_LIST",
+                                       description: "Add to keychain search list",
+                                       is_string: false,
+                                       default_value: true)
+
+        ]
+      end
+
+      def self.authors
+        ["xfreebird"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/lib/fastlane/command_line_handler.rb

@@ -8,8 +8,8 @@ module Fastlane
       platform_lane_info = [] # the part that's responsible for the lane/platform definition
       args.each do |current|
         if current.include? ":" # that's a key/value which we want to pass to the lane
-          key, value = current.split(":")
-          raise "Please pass values like this: key:value" unless key.length > 0 and value.length > 0
+          key, value = current.split(":", 2)
+          raise "Please pass values like this: key:value" unless key.length > 0
           value = convert_value(value)
           Helper.log.debug "Using #{key}: #{value}".green
           lane_parameters[key.to_sym] = value

data/lib/fastlane/fast_file.rb

@@ -196,41 +196,35 @@ module Fastlane
         # Checkout the repo
         repo_name = url.split("/").last
 
-        folder = File.join("/tmp", "fl_clones", repo_name)
+        clone_folder = File.join("/tmp", "fl_clones", repo_name)
 
         branch_option = ""
         branch_option = "--branch #{branch}" if branch != 'HEAD'
 
-        clone_command = "git clone '#{url}' '#{folder}' --depth 1 -n #{branch_option}"
-
-        if File.directory? folder
-          Helper.log.info "Using existing git repo..."
-          begin
-            Actions.sh("cd '#{folder}' && git pull")
-          rescue
-            # Something went wrong, clear the folder and pull again
-            Actions.sh("rm -rf '#{folder}'")
-            Actions.sh(clone_command)
-          end
-        else
-          # When this fails, we have to clone the git repo
-          Helper.log.info "Cloning remote git repo..."
-          Actions.sh(clone_command)
+        clone_command = "git clone '#{url}' '#{clone_folder}' --depth 1 -n #{branch_option}"
+
+        if Dir.exist? clone_folder
+          # We want to re-clone if the folder already exists
+          Helper.log.info "Deleting existing git repo..."
+          Actions.sh("rm -rf '#{clone_folder}'")
         end
 
-        Actions.sh("cd '#{folder}' && git checkout #{branch} '#{path}'")
+        Helper.log.info "Cloning remote git repo..."
+        Actions.sh(clone_command)
+
+        Actions.sh("cd '#{clone_folder}' && git checkout #{branch} '#{path}'")
 
         # We also want to check out all the local actions of this fastlane setup
         containing = path.split(File::SEPARATOR)[0..-2]
         containing = "." if containing.count == 0
         actions_folder = File.join(containing, "actions")
         begin
-          Actions.sh("cd '#{folder}' && git checkout #{branch} '#{actions_folder}'")
+          Actions.sh("cd '#{clone_folder}' && git checkout #{branch} '#{actions_folder}'")
         rescue
           # We don't care about a failure here, as local actions are optional
         end
 
-        import(File.join(folder, path))
+        import(File.join(clone_folder, path))
       end
     end
 

data/lib/fastlane/helper/sh_helper.rb

@@ -21,19 +21,24 @@ module Fastlane
       if Helper.test?
         result << command # only for the tests
       else
-        exit_status = nil
-        IO.popen(command, err: [:child, :out]) do |io|
-          io.each do |line|
-            Helper.log.info ['[SHELL]', line.strip].join(': ')
-            result << line
+        begin
+          PTY.spawn(command) do |r, w, pid|
+            begin
+              r.each_line do |line|
+                Helper.log.info ['[SHELL]', line.strip].join(': ')
+                result << line
+              end
+            rescue Errno::EIO
+            end
+            Process.wait(pid)
           end
-          io.close
-          exit_status = $?.exitstatus
+          exit_status = $?.to_i
+        rescue PTY::ChildExited => e
+          exit_status = e.status.to_i
         end
 
         if exit_status != 0
-          # this will also append the output to the exception
-          raise "Exit status of command '#{command}' was #{exit_status} instead of 0. \n#{result}"
+          raise "Exit status of command '#{command}' was #{exit_status} instead of 0.\n#{result}"
         end
       end
 

data/lib/fastlane/setup.rb

@@ -88,6 +88,7 @@ module Fastlane
       @tools[:snapshot] = File.exist?(File.join(folder, 'Snapfile'))
       @tools[:xctool] = File.exist?(File.join(File.expand_path('..', folder), '.xctool-args'))
       @tools[:cocoapods] = File.exist?(File.join(File.expand_path('..', folder), 'Podfile'))
+      @tools[:carthage] = File.exist?(File.join(File.expand_path('..', folder), 'Cartfile'))
       @tools[:sigh] = false
     end
 
@@ -137,7 +138,8 @@ module Fastlane
       template.gsub!('snapshot', '# snapshot') unless @tools[:snapshot]
       template.gsub!('sigh', '# sigh') unless @tools[:sigh]
       template.gsub!('xctool', '# xctool') unless @tools[:xctool]
-      template.gsub!('cocoapods', '# cocoapods') unless @tools[:cocoapods]
+      template.gsub!('cocoapods', '') unless @tools[:cocoapods]
+      template.gsub!('carthage', '') unless @tools[:carthage]
       template.gsub!('[[FASTLANE_VERSION]]', Fastlane::VERSION)
 
       @tools.each do |key, value|

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.24.0'
+  VERSION = '1.25.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -212,7 +212,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.16.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -222,7 +222,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.16.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -232,7 +232,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -242,7 +242,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -252,7 +252,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -262,7 +262,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -292,7 +292,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -302,7 +302,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -332,7 +332,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -342,7 +342,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -352,7 +352,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -362,7 +362,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -372,7 +372,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -382,7 +382,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -392,7 +392,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -402,7 +402,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -412,7 +412,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -422,7 +422,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -432,7 +432,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -442,7 +442,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -662,6 +662,7 @@ files:
 - lib/fastlane/actions/testflight.rb
 - lib/fastlane/actions/testmunk.rb
 - lib/fastlane/actions/typetalk.rb
+- lib/fastlane/actions/unlock_keychain.rb
 - lib/fastlane/actions/update_app_group_identifiers.rb
 - lib/fastlane/actions/update_fastlane.rb
 - lib/fastlane/actions/update_info_plist.rb
@@ -711,7 +712,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Connect all iOS deployment tools into one streamlined workflow