fastlane 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b562d1fafbac12f67b12cc30b13728f7ab0e37
-  data.tar.gz: 3617c1e228aad25ba9c2b785bea9d1405a603338
+  metadata.gz: 04596998fa46152b86981296ddddea92a7ef472e
+  data.tar.gz: 613ebe717ae9897d7e1ee01db394a51a24c77b08
 SHA512:
-  metadata.gz: b7b1513521bfd4f508c6acc18cc9e49bf192cc1974222c5da1c192a29d6d043b05a49baebb2758363d9c0ad738a8bdbce0c31b9154a1493c6a1df7d8cf9eee48
-  data.tar.gz: ea70445ede668df8b1515af734e89d1589deebf0ba3cfa7ee0723e0676f83dafa6997b73dd1ceda27fcc357c82593e38c7e95e1d1144177c3767b866bb61957f
+  metadata.gz: c4c44a73cc339613bd3beca3f2b9e18843169d7de3c5d73e985161b1d3f75960c13c767c31ef4d9368579f69ecee91fff24fefcff804e55e6e2ac073b790d108
+  data.tar.gz: a27ff89089022503a16f41e63639464ef082fb95bc3b651e1195527cb178bf73225918352ce510406263904725f0a7ad7dcff94b0448828b924b962d6dfb1e3e

data/README.md

@@ -54,11 +54,25 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 - Saves you **hours** of preparing app submission, uploading screenshots and deploying the app for each update
 - Very flexible configuration using a fully customizable `Fastfile`
 - Once up and running, you have a fully working **Continuous Deployment** process. Just trigger ```fastlane``` and you're good to go.
+- Over 30 built-in integrations available
 
 ##### Take a look at the [fastlane website](https://fastlane.tools) for more information about why and when to use `fastlane`.
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
+# Special Thanks
+
+Thanks to all sponsors and contributors for extending and improving the `fastlane` suite:
+- [Detroit Labs](http://www.detroitlabs.com/)
+- Josh Holtz ([@joshdholtz](https://twitter.com/joshdholtz))
+- Dan Trenz ([@dtrenz](https://twitter.com/dtrenz))
+- Luka Mirosevic ([@lmirosevic](https://twitter.com/lmirosevic))
+- Almas Sapargali ([@almassapargali](https://twitter.com/almassapargali))
+- Manuel Wallner ([@milch](https://github.com/milch))
+- Pawel Dudek ([@eldudi](https://twitter.com/eldudi))
+
+Check out the project pages of the other tools for more sponsors and contributors.
+
 # Installation
 
 I recommend following the [fastlane guide](https://github.com/KrauseFx/fastlane/blob/master/GUIDE.md) to get started.

data/lib/assets/FastfileTemplate

@@ -5,6 +5,10 @@
 
 # All lines starting with a # are ignored when running `fastlane`
 
+# This is the minimum version number required. 
+# Update this, if you use features of a newer version
+fastlane_version "[[FASTLANE_VERSION]]" 
+
 before_all do
   # ENV["SLACK_URL"] = "https://hooks.slack.com/services/..."
 

data/lib/fastlane/actions/actions_helper.rb

@@ -91,7 +91,7 @@ module Fastlane
 
         file_name = File.basename(file).gsub('.rb', '')
 
-        class_name = file_name.classify + 'Action'
+        class_name = file_name.fastlane_class + 'Action'
         class_ref = nil
         begin
           class_ref = Fastlane::Actions.const_get(class_name)

data/lib/fastlane/actions/commit_version_bump.rb

@@ -16,7 +16,7 @@ module Fastlane
         repo_path = `git rev-parse --show-toplevel`.strip
 
         # find an xcodeproj (ignoreing the Cocoapods one)
-        xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| /.*Pods.xcodeproj/ =~ path }
+        xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| /Pods\/.*.xcodeproj/ =~ path }
 
         raise 'Could not find a .xcodeproj in the current repository\'s working directory.'.red if xcodeproj_paths.count == 0
         raise 'Found multiple .xcodeproj projects in the current repository\'s working directory. This tool only support project folders with a single .xcodeproj.'.red if xcodeproj_paths.count > 1

data/lib/fastlane/actions/crashlytics.rb

@@ -13,15 +13,24 @@ module Fastlane
 
         params = params.first
 
-        crashlytics_path = params[:crashlytics_path]
-        api_token        = params[:api_token]
-        build_secret     = params[:build_secret]
+        crashlytics_path = params[:crashlytics_path] || ENV["CRASHLYTICS_FRAMEWORK_PATH"]
+        api_token        = params[:api_token] || ENV["CRASHLYTICS_API_TOKEN"]
+        build_secret     = params[:build_secret] || ENV["CRASHLYTICS_BUILD_SECRET"]
         ipa_path         = params[:ipa_path] || Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
         notes_path       = params[:notes_path]
         emails           = params[:emails]
-        groups           = params[:groups]
         notifications    = params[:notifications]
 
+        # can pass groups param either as an Array or a String
+        case params[:groups]
+        when NilClass
+          groups = nil
+        when Array
+          groups = params[:groups].join(',')
+        when String
+          groups = params[:groups]
+        end
+
         assert_valid_params!(crashlytics_path, api_token, build_secret, ipa_path)
 
         Helper.log.info 'Uploading the IPA to Crashlytics. Go for a coffee ☕️.'.green

data/lib/fastlane/actions/fastlane_version.rb

@@ -0,0 +1,24 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      
+    end
+
+    class FastlaneVersionAction
+      def self.run(params)
+        defined_version = ((Gem::Version.new(params.first) if params.first) rescue nil)
+        raise "Please pass minimum fastlane version as parameter to fastlane_version".red unless defined_version
+
+        if Gem::Version.new(Fastlane::VERSION) < defined_version
+          raise "The Fastfile requires a fastlane version of >= #{defined_version}. You are on #{Fastlane::VERSION}. Please update using `sudo gem update fastlane`.".red
+        end
+
+        Helper.log.info "fastlane version valid"
+      end
+
+      def self.step_text
+        "Verifying required fastlane version"
+      end
+    end
+  end
+end

data/lib/fastlane/actions/increment_build_number.rb

@@ -5,20 +5,39 @@ module Fastlane
     end
 
     class IncrementBuildNumberAction
+      require 'shellwords'
+
       def self.run(params)
         # More information about how to set up your project and how it works:
         # https://developer.apple.com/library/ios/qa/qa1827/_index.html
         # Attention: This is NOT the version number - but the build number
 
         begin
-          custom_number = (params.first rescue nil)
-
-          command = nil
-          if custom_number
-            command = "agvtool new-version -all #{custom_number}"
-          else
-            command = 'agvtool next-version -all'
+          first_param = (params.first rescue nil)
+
+          case first_param
+          when NilClass
+            custom_number = nil
+            folder = '.'
+          when Fixnum
+            custom_number = first_param
+            folder = '.'
+          when Hash
+            custom_number = first_param[:build_number]
+            folder = first_param[:xcodeproj] ? File.join('.', first_param[:xcodeproj], '..') : '.'
           end
+            
+          command_prefix = [
+            'cd',
+            File.expand_path(folder).shellescape,
+            '&&'
+          ].join(' ')
+
+          command = [
+            command_prefix,
+            'agvtool',
+            custom_number ? "new-version -all #{custom_number}" : 'next-version -all'
+          ].join(' ')
 
           if Helper.test?
             Actions.lane_context[SharedValues::BUILD_NUMBER] = command
@@ -27,10 +46,9 @@ module Fastlane
             Actions.sh command
 
             # Store the new number in the shared hash
-            build_number = `agvtool what-version`.split("\n").last.to_i
+            build_number = `#{command_prefix} agvtool what-version`.split("\n").last.to_i
 
             Actions.lane_context[SharedValues::BUILD_NUMBER] = build_number
-
           end
         rescue => ex
           Helper.log.error 'Make sure to to follow the steps to setup your Xcode project: https://developer.apple.com/library/ios/qa/qa1827/_index.html'.yellow

data/lib/fastlane/actions/slack.rb

@@ -29,14 +29,15 @@ module Fastlane
       def self.run(params)
         options = { message: '',
                     success: true,
-                    channel: nil
+                    channel: nil,
+                    payload: {}
                   }.merge(params.first || {})
 
         require 'slack-notifier'
 
         color = (options[:success] ? 'good' : 'danger')
         options[:message] = options[:message].to_s
-        
+
         options[:message] = Slack::Notifier::LinkFormatter.format(options[:message])
 
         url = ENV['SLACK_URL']
@@ -53,37 +54,57 @@ module Fastlane
           notifier.channel = ('#' + notifier.channel) unless ['#', '@'].include?(notifier.channel[0]) # send message to channel by default
         end
 
-        test_result = {
+        should_add_payload = ->(payload_name) { options[:default_payloads].nil? || options[:default_payloads].include?(payload_name) }
+
+        slack_attachment = {
           fallback: options[:message],
           text: options[:message],
           color: color,
-          fields: [
-            {
-              title: 'Lane',
-              value: Actions.lane_context[Actions::SharedValues::LANE_NAME],
-              short: true
-            },
-            {
-              title: 'Test Result',
-              value: (options[:success] ? 'Success' : 'Error'),
-              short: true
-            }
-          ]
+          fields: []
         }
 
-        if git_branch
-          test_result[:fields] << {
+        # custom user payloads
+        slack_attachment[:fields] += options[:payload].map do |k, v|
+          {
+            title: k.to_s,
+            value: v.to_s,
+            short: false
+          }
+        end
+
+        # lane
+        if should_add_payload[:lane]
+          slack_attachment[:fields] << {
+            title: 'Lane',
+            value: Actions.lane_context[Actions::SharedValues::LANE_NAME],
+            short: true
+          }
+        end
+
+        # test_result
+        if should_add_payload[:test_result]
+          slack_attachment[:fields] << {
+            title: 'Test Result',
+            value: (options[:success] ? 'Success' : 'Error'),
+            short: true
+          }
+        end
+
+        # git branch
+        if git_branch && should_add_payload[:git_branch]
+          slack_attachment[:fields] << {
             title: 'Git Branch',
             value: git_branch,
             short: true
           }
         end
 
-        if git_author
-          if ENV['FASTLANE_SLACK_HIDE_AUTHOR_ON_SUCCESS'] and options[:success]
+        # git_author
+        if git_author && should_add_payload[:git_author]
+          if ENV['FASTLANE_SLACK_HIDE_AUTHOR_ON_SUCCESS'] && options[:success]
             # We only show the git author if the build failed
           else
-            test_result[:fields] << {
+            slack_attachment[:fields] << {
               title: 'Git Author',
               value: git_author,
               short: true
@@ -91,8 +112,9 @@ module Fastlane
           end
         end
 
-        if last_git_commit
-          test_result[:fields] << {
+        # last_git_commit
+        if last_git_commit && should_add_payload[:last_git_commit]
+          slack_attachment[:fields] << {
             title: 'Git Commit',
             value: last_git_commit,
             short: false
@@ -101,7 +123,7 @@ module Fastlane
 
         result = notifier.ping '',
                                icon_url: 'https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png',
-                               attachments: [test_result]
+                               attachments: [slack_attachment]
 
         unless result.code.to_i == 200
           Helper.log.debug result

data/lib/fastlane/actions/xcodebuild.rb

@@ -48,19 +48,20 @@ module Fastlane
         end
 
         # The args we will build with
-        cli_args = Array[]
+        xcodebuild_args = Array[]
 
         # Supported ENV vars
-        build_path = ENV["BUILD_PATH"] || ""
-        scheme     = ENV["SCHEME"]
-        workspace  = ENV["WORKSPACE"]
-        project    = ENV["PROJECT"]
+        build_path = ENV["XCODE_BUILD_PATH"] || nil
+        scheme     = ENV["XCODE_SCHEME"]
+        workspace  = ENV["XCODE_WORKSPACE"]
+        project    = ENV["XCODE_PROJECT"]
 
         # Append slash to build path, if needed
-        unless build_path.end_with? "/"
+        if build_path && !build_path.end_with?("/")
           build_path += "/"
         end
 
+
         if params = params.first
           # Operation bools
           archiving = params.key? :archive
@@ -84,6 +85,12 @@ module Fastlane
             params[:scheme] ||= scheme
             params[:workspace] ||= workspace
             params[:project] ||= project
+
+            # If no project or workspace was passed in or set as an environment
+            # variable, attempt to autodetect the workspace.
+            if params[:project].to_s.empty? && params[:workspace].to_s.empty?
+              params[:workspace] = detect_workspace
+            end
           end
 
           if archiving
@@ -95,20 +102,53 @@ module Fastlane
           end
 
           # Maps parameter hash to CLI args
-          if hash_args = hash_to_cli_args(params)
-            cli_args += hash_args
+          if hash_args = hash_to_args(params)
+            xcodebuild_args += hash_args
           end
         end
 
         # Joins args into space delimited string
-        cli_args = cli_args.join(" ")
+        xcodebuild_args = xcodebuild_args.join(" ")
+
+        # Default args
+        xcpretty_args = [ "--color" ]
+
+        # Stdout format
+        if testing && !archiving
+          xcpretty_args.push "--test"
+        else
+          xcpretty_args.push "--simple"
+        end
+
+        if testing
+          # Test report file format
+          if params[:report_formats]
+            report_formats = params[:report_formats].map do |format|
+              "--report #{format}"
+            end.sort().join(" ")
+
+            xcpretty_args.push report_formats
+
+            # Test report file path
+            if params[:report_path]
+              xcpretty_args.push "--output \"#{params[:report_path]}\""
+            elsif build_path
+              xcpretty_args.push "--output \"#{build_path}report\""
+            end
+
+            # Save screenshots flag
+            if params[:report_formats].include?("html") && params[:report_screenshots]
+              xcpretty_args.push "--screenshots"
+            end
+          end
+        end
 
-        output_format = testing && !archiving ? "--test" : "--simple"
+        xcpretty_args = xcpretty_args.sort.join(" ")
 
-        Actions.sh "xcodebuild #{cli_args} | xcpretty #{output_format} --color"
+        Actions.sh "set -o pipefail && xcodebuild #{xcodebuild_args} | xcpretty #{xcpretty_args}"
       end
 
-      def self.hash_to_cli_args(hash)
+      def self.hash_to_args(hash)
         # Remove nil value params
         hash = hash.delete_if { |_, v| v.nil? }
 
@@ -118,12 +158,30 @@ module Fastlane
           if arg = ARGS_MAP[k]
             value = (v != true && v.to_s.length > 0 ? "\"#{v}\"" : "")
             "#{arg} #{value}".strip
+          elsif k == :build_settings
+            v.map{|setting,value| "#{setting}=\"#{value}\""}.join(' ')
           elsif k == :keychain && v.to_s.length > 0
             # If keychain is specified, append as OTHER_CODE_SIGN_FLAGS
             "OTHER_CODE_SIGN_FLAGS=\"--keychain #{v}\""
           end
         end.compact.sort
       end
+
+      def self.detect_workspace
+        workspace = nil
+        workspaces = Dir.glob("*.xcworkspace")
+
+        if workspaces.length > 1
+          Helper.log.warn "Multiple workspaces detected."
+        end
+
+        if !workspaces.empty?
+          workspace = workspaces.first
+          Helper.log.warn "Using workspace \"#{workspace}\""
+        end
+
+        return workspace
+      end
     end
 
     class XcarchiveAction
@@ -166,4 +224,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/core_ext/string.rb

@@ -1,5 +1,5 @@
 class String
-  def classify
+  def fastlane_class
     split('_').collect!(&:capitalize).join
   end
-end
+end

data/lib/fastlane/fast_file.rb

@@ -63,7 +63,7 @@ module Fastlane
     def method_missing(method_sym, *arguments, &_block)
       # First, check if there is a predefined method in the actions folder
 
-      class_name = method_sym.to_s.classify + 'Action'
+      class_name = method_sym.to_s.fastlane_class + 'Action'
       class_ref = nil
       begin
         class_ref = Fastlane::Actions.const_get(class_name)
@@ -73,10 +73,9 @@ module Fastlane
       end
 
       if class_ref && class_ref.respond_to?(:run)
-        line = "----------" + ("-" * method_sym.to_s.length) + "----"
-        Helper.log.info line.green
-        Helper.log.info "--- Step: #{method_sym.to_s} ---".green
-        Helper.log.info line.green
+        step_name = class_ref.step_text rescue nil
+        step_name = method_sym.to_s unless step_name
+        Helper.log_alert("Step: " + step_name)
 
         Dir.chdir('..') do # go up from the fastlane folder, to the project folder
           Actions.execute_action(method_sym) do

data/lib/fastlane/new_action.rb

@@ -21,7 +21,7 @@ module Fastlane
       template = File.read("#{Helper.gem_path('fastlane')}/lib/assets/custom_action_template.rb")
       template.gsub!('[[NAME]]', name)
       template.gsub!('[[NAME_UP]]', name.upcase)
-      template.gsub!('[[NAME_CLASS]]', name.classify + 'Action')
+      template.gsub!('[[NAME_CLASS]]', name.fastlane_class + 'Action')
 
       actions_path = File.join((FastlaneFolder.path || Dir.pwd), 'actions')
       FileUtils.mkdir_p(actions_path) unless File.directory?(actions_path)

data/lib/fastlane/setup.rb

@@ -112,6 +112,7 @@ module Fastlane
       template.gsub!('sigh', '# sigh') unless @tools[:sigh]
       template.gsub!('xctool', '# xctool') unless @tools[:xctool]
       template.gsub!('cocoapods', '# cocoapods') unless @tools[:cocoapods]
+      template.gsub!('[[FASTLANE_VERSION]]', Fastlane::VERSION)
 
       @tools.each do |key, value|
         Helper.log.info "'#{key}' enabled.".magenta if value

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: deliver
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,7 @@ files:
 - lib/fastlane/actions/deliver.rb
 - lib/fastlane/actions/deploygate.rb
 - lib/fastlane/actions/ensure_git_status_clean.rb
+- lib/fastlane/actions/fastlane_version.rb
 - lib/fastlane/actions/frameit.rb
 - lib/fastlane/actions/gcovr.rb
 - lib/fastlane/actions/hipchat.rb