fastlane 1.107.0 → 1.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bd9af9625b7943456db4b5c3eb18ba991ad5cb1
-  data.tar.gz: a3818da10900a45a7c9e385b55d5b0f49eaa6a5e
+  metadata.gz: dc2c2b50354833ba4132088197a516c4559402bd
+  data.tar.gz: f229785555b1062b0e35326eb78c38d5635043b6
 SHA512:
-  metadata.gz: e94876d0287bf33c09016a4e19a1ac00c84ba7d05d9b803b6e2db0d643fef2d1749eebff5db52020fddb431697288887cc8195110c5dc5e51cff6873be73f95a
-  data.tar.gz: c943660f08ad4ff5c2aa23d37adf67a63c9232156ae96dfec33e4875a7ab471d5c5cc27229e6c8db452768b6c64ed09e3a371c943f2dc9a11ed8565ecc3d8e2d
+  metadata.gz: 8449c5ac9309de388ecbe0f7d335e9d7edb55774682700da02e1b89308bd84599f8cc5e079d4b9d6ee93c39b169213dc2e15de6482b082ebdcb40c011a12a7da
+  data.tar.gz: 8eb65c0be52f83651570ba2444eedc365bbc82e6fdc7710d03187fcf8987eb60d57117666ff5b2dcfc838b98ca66ac3579fcf10d47049f46bf37735f5d126302

data/lib/assets/Actions.md.erb

@@ -60,6 +60,7 @@ Key | Description
 ----|------------
 <%- (action.available_options || []).each do |config_item| -%>
   <%- next unless config_item.kind_of?(FastlaneCore::ConfigItem) -%>
+  <%- next if config_item.description.to_s.length == 0 -%>
   `<%= config_item.key %>` | <%= config_item.description %>
 <%- end %>
 </details>

data/lib/fastlane.rb

@@ -20,6 +20,7 @@ require 'fastlane/command_line_handler'
 require 'fastlane/documentation/docs_generator'
 require 'fastlane/other_action'
 require 'fastlane/plugins/plugins'
+require 'fastlane/fastlane_require'
 
 module Fastlane
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/lib/fastlane/action.rb

@@ -118,6 +118,11 @@ module Fastlane
       UI.user_error!("To call another action from an action use `OtherAction.#{method_sym}` instead")
     end
 
+    # When shelling out from the actoin, should we use `bundle exec`?
+    def self.shell_out_should_use_bundle_exec?
+      return File.exist?('Gemfile') && !Helper.contained_fastlane?
+    end
+
     # Return a new instance of the OtherAction action
     # We need to do this, since it has to have access to
     # the runner object

data/lib/fastlane/actions/cocoapods.rb

@@ -14,7 +14,7 @@ module Fastlane
           cmd << ["cd '#{podfile_folder}' &&"]
         end
 
-        cmd << ['bundle exec'] if File.exist?('Gemfile') && params[:use_bundle_exec]
+        cmd << ['bundle exec'] if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
         cmd << ['pod install']
 
         cmd << '--no-clean' unless params[:clean]

data/lib/fastlane/actions/commit_version_bump.rb

@@ -19,7 +19,7 @@ module Fastlane
           UI.user_error!("Could not find the specified xcodeproj: #{xcodeproj_path}") unless File.directory?(xcodeproj_path)
         else
           # find an xcodeproj (ignoring the Cocoapods one)
-          xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| %r{Pods\/.*.xcodeproj} =~ path }
+          xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| %r{/Pods/[^/]*.xcodeproj} =~ path }
 
           # no projects found: error
           UI.user_error!('Could not find a .xcodeproj in the current repository\'s working directory.') if xcodeproj_paths.count == 0

data/lib/fastlane/actions/create_keychain.rb

@@ -8,30 +8,44 @@ module Fastlane
 
     class CreateKeychainAction < Action
       def self.run(params)
-        escaped_name = params[:name].shellescape
         escaped_password = params[:password].shellescape
 
+        if params[:name]
+          escaped_name = params[:name].shellescape
+          keychain_path = "~/Library/Keychains/#{escaped_name}"
+        else
+          keychain_path = params[:path].shellescape
+        end
+
+        if keychain_path.nil?
+          UI.user_error!("You either have to set :name or :path")
+        end
+
         commands = []
-        commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{escaped_name}", log: false)
+        commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{keychain_path}", log: false)
 
         if params[:default_keychain]
-          Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN] = Fastlane::Actions.sh("security default-keychain", log: false).strip
-          commands << Fastlane::Actions.sh("security default-keychain -s #{escaped_name}", log: false)
+          # if there is no default keychain - setting the original will fail - silent this error
+          begin
+            Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN] = Fastlane::Actions.sh("security default-keychain", log: false).strip
+          rescue
+          end
+          commands << Fastlane::Actions.sh("security default-keychain -s #{keychain_path}", log: false)
         end
 
-        commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{escaped_name}", log: false) if params[:unlock]
+        commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{keychain_path}", log: false) if params[:unlock]
 
         command = "security set-keychain-settings"
         command << " -t #{params[:timeout]}" if params[:timeout]
         command << " -l" if params[:lock_when_sleeps]
         command << " -u" if params[:lock_after_timeout]
-        command << " ~/Library/Keychains/#{escaped_name}"
+        command << " #{keychain_path}"
 
         commands << Fastlane::Actions.sh(command, log: false)
 
         if params[:add_to_search_list]
           keychains = Action.sh("security list-keychains -d user").shellsplit
-          keychains << File.expand_path(params[:name], "~/Library/Keychains")
+          keychains << File.expand_path(keychain_path)
           commands << Fastlane::Actions.sh("security list-keychains -s #{keychains.shelljoin}", log: false)
         end
 
@@ -47,7 +61,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :name,
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain name",
-                                       optional: false),
+                                       conflicting_options: [:path],
+                                       is_string: true,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :path,
+                                       env_name: "KEYCHAIN_PATH",
+                                       description: "Path to Keychain",
+                                       is_string: true,
+                                       conflicting_options: [:name],
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :password,
                                        env_name: "KEYCHAIN_PASSWORD",
                                        description: "Password for the keychain",

data/lib/fastlane/actions/danger.rb

@@ -5,7 +5,7 @@ module Fastlane
         Actions.verify_gem!('danger')
         cmd = []
 
-        cmd << 'bundle exec' if File.exist?('Gemfile') && params[:use_bundle_exec]
+        cmd << 'bundle exec' if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
         cmd << 'danger'
         cmd << '--verbose' if params[:verbose]
 

data/lib/fastlane/actions/hg_commit_version_bump.rb

@@ -24,8 +24,9 @@ module Fastlane
             UI.user_error!("Could not find the specified xcodeproj: #{xcodeproj_path}") unless File.directory?(xcodeproj_path)
           end
         else
+          all_xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))]
           # find an xcodeproj (ignoring the Cocoapods one)
-          xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| %r{Pods\/.*.xcodeproj} =~ path }
+          xcodeproj_paths = ignore_cocoapods_path(all_xcodeproj_paths)
 
           # no projects found: error
           UI.user_error!('Could not find a .xcodeproj in the current repository\'s working directory.') if xcodeproj_paths.count == 0
@@ -106,6 +107,10 @@ module Fastlane
         end
       end
 
+      def self.ignore_cocoapods_path(all_xcodeproj_paths)
+        all_xcodeproj_paths.reject { |path| %r{/Pods/[^/]*.xcodeproj} =~ path }
+      end
+
       def self.description
         "This will commit a version bump to the hg repo"
       end

data/lib/fastlane/actions/import_certificate.rb

@@ -4,12 +4,9 @@ module Fastlane
   module Actions
     class ImportCertificateAction < Action
       def self.run(params)
-        command = "security import #{params[:certificate_path].shellescape} -k ~/Library/Keychains/#{params[:keychain_name].shellescape}"
-        command << " -P #{params[:certificate_password].shellescape}" if params[:certificate_password]
-        command << " -T /usr/bin/codesign"
-        command << " -T /usr/bin/security"
+        keychain_path = File.expand_path(File.join("~", "Library", "Keychains", params[:keychain_name]))
 
-        Fastlane::Actions.sh(command, log: params[:log_output])
+        FastlaneCore::KeychainImporter.import_file(params[:certificate_path], keychain_path, keychain_password: params[:keychain_password], certificate_password: params[:certificate_password], output: params[:log_output])
       end
 
       def self.description
@@ -22,11 +19,16 @@ module Fastlane
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain the items should be imported to",
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :keychain_password,
+                                       env_name: "FL_IMPORT_CERT_KEYCHAIN_PASSWORD",
+                                       description: "The password for the keychain. Note that for the login keychain this is your user's password",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :certificate_path,
                                        description: "Path to certificate",
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :certificate_password,
                                        description: "Certificate password",
+                                       default_value: "",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :log_output,
                                        description: "If output should be logged to the console",

data/lib/fastlane/actions/pod_lib_lint.rb

@@ -4,9 +4,7 @@ module Fastlane
       def self.run(params)
         command = []
 
-        if File.exist?("Gemfile") && params[:use_bundle_exec]
-          command << "bundle exec"
-        end
+        command << "bundle exec" if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
 
         command << "pod lib lint"
 

data/lib/fastlane/actions/set_pod_key.rb

@@ -5,7 +5,7 @@ module Fastlane
         Actions.verify_gem!('cocoapods-keys')
         cmd = []
 
-        cmd << ['bundle exec'] if File.exist?('Gemfile') && params[:use_bundle_exec]
+        cmd << ['bundle exec'] if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
         cmd << ['pod keys set']
 
         cmd << ["\"#{params[:key].shellescape}\""]

data/lib/fastlane/actions/slather.rb

@@ -62,7 +62,7 @@ module Fastlane
 
       def self.build_command(params)
         command = []
-        command.push("bundle exec") if params[:use_bundle_exec]
+        command.push("bundle exec") if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
         command << "slather coverage"
 
         ARGS_MAP.each do |key, cli_param|

data/lib/fastlane/cli_tools_distributor.rb

@@ -61,7 +61,7 @@ module Fastlane
 
       def print_slow_fastlane_warning
         # `BUNDLE_BIN_PATH` is used when the user uses `bundle exec`
-        return if ENV['BUNDLE_BIN_PATH'] || ENV['SKIP_SLOW_FASTLANE_WARNING']
+        return if ENV['BUNDLE_BIN_PATH'] || ENV['SKIP_SLOW_FASTLANE_WARNING'] || FastlaneCore::Helper.contained_fastlane?
 
         gemfile_path = PluginManager.new.gemfile_path
         if gemfile_path

data/lib/fastlane/commands_generator.rb

@@ -188,6 +188,24 @@ module Fastlane
         end
       end
 
+      command :env do |c|
+        c.syntax = 'fastlane env'
+        c.description = 'Print your fastlane environment, use this when you submit an issue on GitHub'
+        c.action do |args, options|
+          require "fastlane/environment_printer"
+          Fastlane::EnvironmentPrinter.output
+        end
+      end
+
+      command :update_fastlane do |c|
+        c.syntax = 'fastlane update_fastlane'
+        c.description = 'Update fastlane to the latest release'
+        c.action do |args, options|
+          require 'fastlane/one_off'
+          Fastlane::OneOff.run(action: "update_fastlane", parameters: {})
+        end
+      end
+
       #####################################################
       # @!group Plugins
       #####################################################
@@ -244,15 +262,6 @@ module Fastlane
         end
       end
 
-      command :env do |c|
-        c.syntax = 'fastlane env'
-        c.description = 'Print your fastlane environment, use this when you submit an issue on GitHub'
-        c.action do |args, options|
-          require "fastlane/environment_printer"
-          Fastlane::EnvironmentPrinter.output
-        end
-      end
-
       default_command :trigger
       run!
     end

data/lib/fastlane/environment_printer.rb

@@ -15,6 +15,7 @@ module Fastlane
       require "fastlane/markdown_table_formatter"
       env_output = ""
       env_output << print_system_environment
+      env_output << print_system_locale
       env_output << print_fastlane_files
       env_output << print_loaded_fastlane_gems
       env_output << print_loaded_plugins
@@ -128,6 +129,35 @@ module Fastlane
       return env_output
     end
 
+    def self.print_system_locale
+      env_output = "### System Locale\n\n"
+      found_one = false
+      env_table = ""
+      ["LANG", "LC_ALL", "LANGUAGE"].each do |e|
+        env_icon = "🚫"
+        if ENV[e] && ENV[e].end_with?("UTF-8")
+          env_icon = "✅"
+          found_one = true
+        end
+        if ENV[e].nil?
+          env_icon = ""
+        end
+        env_table << "| #{e} | #{ENV[e]} | #{env_icon} |\n"
+      end
+      if !found_one
+        table = "| Error |\n"
+        table << "|-----|\n"
+        table << "| No Locale with UTF8 found 🚫|\n"
+      else
+        table = "| Variable | Value |  |\n"
+        table << "|-----|---------|----|\n"
+        table << env_table
+      end
+      rendered_table = MarkdownTableFormatter.new table
+      env_output << rendered_table.to_md
+      env_output << "\n\n"
+    end
+
     def self.print_system_environment
       require "openssl"
 
@@ -201,11 +231,8 @@ module Fastlane
     # Make sure to ask the user first, as some people don't
     # use a clipboard manager, so they might lose something important
     def self.copy_to_clipboard(string)
-      require 'tempfile'
-      Tempfile.create('environment_printer') do |tmp_file|
-        File.write(tmp_file, string)
-        `cat '#{tmp_file.path}' | pbcopy`
-      end
+      require 'open3'
+      Open3.popen3('pbcopy') { |input, _, _| input << string }
     end
   end
 end

data/lib/fastlane/fast_file.rb

@@ -24,6 +24,12 @@ module Fastlane
                 'you should turn off smart quotes in your editor of choice.'
       end
 
+      content.scan(/^\s*require (.*)/).each do |current|
+        gem_name = current.last
+        next if gem_name.include?(".") # these are local gems
+        UI.important("You require a gem, please call `fastlane_require #{gem_name}` before to ensure the gem is installed")
+      end
+
       parse(content, @path)
     end
 
@@ -179,6 +185,10 @@ module Fastlane
       @desc_collection ||= []
     end
 
+    def fastlane_require(gem_name)
+      FastlaneRequire.install_gem_if_needed(gem_name: gem_name, require_gem: true)
+    end
+
     def import(path = nil)
       UI.user_error!("Please pass a path to the `import` action") unless path
 

data/lib/fastlane/fastlane_require.rb

@@ -0,0 +1,33 @@
+module Fastlane
+  class FastlaneRequire
+    class << self
+      def install_gem_if_needed(gem_name: nil, require_gem: true)
+        gem_require_name = gem_name.tr("-", "/") # from "fastlane-plugin-xcversion" to "fastlane/plugin/xcversion"
+        bundle_path = "~/.fastlane/bin/"
+
+        # check if it's installed
+        if gem_installed?(gem_name)
+          UI.success("gem '#{gem_name}' is already installed") if $verbose
+          require gem_require_name if require_gem
+          return true
+        end
+
+        require "rubygems/command_manager"
+        installer = Gem::CommandManager.instance[:install]
+
+        UI.important "Installing Ruby gem '#{gem_name}'..."
+        return if Helper.test?
+
+        # We install the gem like this because we also want to gem to be available to be required
+        # at this point. If we were to shell out, this wouldn't be the case
+        installer.install_gem(gem_name, Gem::Requirement.default)
+        UI.success("Successfully installed '#{gem_name}' to '#{bundle_path}'")
+        require gem_require_name if require_gem
+      end
+
+      def gem_installed?(name, req = Gem::Requirement.default)
+        Gem::Specification.any? { |s| s.name == name and req =~ s.version }
+      end
+    end
+  end
+end

data/lib/fastlane/helper/gem_helper.rb

@@ -4,7 +4,7 @@ module Fastlane
     # this will *not* 'require' the gem
     def self.verify_gem!(gem_name)
       begin
-        Gem::Specification.find_by_name(gem_name)
+        FastlaneRequire.install_gem_if_needed(gem_name: gem_name, require_gem: false)
         # We don't import this by default, as it's not always the same
         # also e.g. cocoapods is just required and not imported
       rescue Gem::LoadError

data/lib/fastlane/lane.rb

@@ -74,6 +74,7 @@ module Fastlane
           search_plugins
           help
           env
+          update_fastlane
         )
       end
 

data/lib/fastlane/plugins/plugin_manager.rb

@@ -273,7 +273,8 @@ module Fastlane
           # any actions were overwritten
           self.loaded_fastlane_actions.concat(Fastlane::Actions.constants)
 
-          require gem_name.tr("-", "/") # from "fastlane-plugin-xcversion" to "fastlane/plugin/xcversion"
+          FastlaneRequire.install_gem_if_needed(gem_name: gem_name, require_gem: true)
+
           store_plugin_reference(gem_name)
           loaded_plugins = true
         rescue => ex

data/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '1.107.0'.freeze
+  VERSION = '1.108.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.107.0
+  version: 1.108.0
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krausefx-shenzhen
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 0.14.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -33,7 +33,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 0.14.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -225,7 +225,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -235,7 +235,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -379,7 +379,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -389,7 +389,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -479,7 +479,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -489,7 +489,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -519,7 +519,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -529,7 +529,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -940,6 +940,7 @@ files:
 - lib/fastlane/erb_template_helper.rb
 - lib/fastlane/fast_file.rb
 - lib/fastlane/fastlane_folder.rb
+- lib/fastlane/fastlane_require.rb
 - lib/fastlane/features.rb
 - lib/fastlane/helper/README.md
 - lib/fastlane/helper/adb_helper.rb