fastlane 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04596998fa46152b86981296ddddea92a7ef472e
-  data.tar.gz: 613ebe717ae9897d7e1ee01db394a51a24c77b08
+  metadata.gz: 64f1a81d7ec4ad739a33b9dba38c780bcc07737c
+  data.tar.gz: a3154316dee6147a0913d14574338719af912b8d
 SHA512:
-  metadata.gz: c4c44a73cc339613bd3beca3f2b9e18843169d7de3c5d73e985161b1d3f75960c13c767c31ef4d9368579f69ecee91fff24fefcff804e55e6e2ac073b790d108
-  data.tar.gz: a27ff89089022503a16f41e63639464ef082fb95bc3b651e1195527cb178bf73225918352ce510406263904725f0a7ad7dcff94b0448828b924b962d6dfb1e3e
+  metadata.gz: 264bfa8c54093d531463cf67e60ca431866acd3ae1b3d20f74424215be314912c3a48e9b0bf019c8d130cf04e07f9f273479aad6335b3af64e2248a2763f9cff
+  data.tar.gz: 3cb2045749cacced43d5644c304010cfcd440adc815df4dca653f20b2f5fe04c2d7eba7fbfa537f182061e2ebaa201ace5ac5c7c82c8ea6fd38d5b99f90635f3

data/README.md

@@ -139,6 +139,7 @@ When one command fails, the execution will be aborted.
 
 ### Project
 - [CocoaPods](https://github.com/KrauseFx/fastlane/blob/master/Actions.md#cocoapods): Setup your CocoaPods project
+- [Carthage](https://github.com/KrauseFx/fastlane/blob/master/Actions.md#carthage): Setup your Carthage project
 - [increment_build_number](https://github.com/KrauseFx/fastlane/blob/master/Actions.md#increment_build_number): Increment the Xcode build number before building the app
 
 ### Testing
@@ -267,16 +268,17 @@ before_all do |lane|
   cocoapods
 
   xctool :test
+end
 
-  ipa({
-    workspace: "MyApp.xcworkspace"
-  })
+lane :test do
+  snapshot
 end
 
 lane :beta do
   cert
-
   sigh :adhoc
+  
+  ipa
 
   deliver :beta
 
@@ -288,8 +290,8 @@ end
 
 lane :deploy do
   cert
-
   sigh
+  ipa
 
   snapshot
 
@@ -315,7 +317,8 @@ error do |lane, exception|
   reset_git_repo
 
   slack({
-    message: "An error occured"
+    message: "An error occured",
+    success: false
   })
 end
 ```

data/lib/assets/FastfileTemplate

@@ -18,11 +18,7 @@ before_all do
 
   # increment_build_number
 
-  ipa({
-    workspace: "MyApp.xcworkspace",
-    configuration: "Debug",
-    scheme: "MyApp",
-  })
+  ipa
 
   xctool
 end

data/lib/fastlane/actions/commit_version_bump.rb

@@ -11,25 +11,39 @@ module Fastlane
         params = params.first
 
         commit_message = (params && params[:message]) || 'Version Bump'
+        xcodeproj_path = (params && params[:xcodeproj]) ? File.expand_path(File.join('.', params[:xcodeproj])) : nil
 
         # find the repo root path
         repo_path = `git rev-parse --show-toplevel`.strip
+        repo_pathname = Pathname.new(repo_path)
 
-        # find an xcodeproj (ignoreing the Cocoapods one)
-        xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| /Pods\/.*.xcodeproj/ =~ path }
+        if xcodeproj_path
+          # ensure that the xcodeproj passed in was OK
+          raise "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| /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
-        xcodeproj_path = xcodeproj_paths.first
+          # no projects found: error
+          raise 'Could not find a .xcodeproj in the current repository\'s working directory.'.red if xcodeproj_paths.count == 0
+
+          # too many projects found: error
+          if xcodeproj_paths.count > 1
+            relative_projects = xcodeproj_paths.map { |e| Pathname.new(e).relative_path_from(repo_pathname).to_s }.join("\n")
+            raise "Found multiple .xcodeproj projects in the current repository's working directory. Please specify your app's main project: \n#{relative_projects}".red
+          end
+
+          # one project found: great
+          xcodeproj_path = xcodeproj_paths.first
+        end
 
         # find the pbxproj path, relative to git directory
-        git_pathname = Pathname.new(repo_path)
         pbxproj_pathname = Pathname.new(File.join(xcodeproj_path, 'project.pbxproj'))
-        pbxproj_path = pbxproj_pathname.relative_path_from(git_pathname).to_s
+        pbxproj_path = pbxproj_pathname.relative_path_from(repo_pathname).to_s
 
         # find the info_plist files
         project = Xcodeproj::Project.open(xcodeproj_path)
-        info_plist_files = project.objects.select { |object| object.isa == 'XCBuildConfiguration' }.map(&:to_hash).map { |object_hash| object_hash['buildSettings'] }.select { |build_settings| build_settings.has_key?('INFOPLIST_FILE') }.map { |build_settings| build_settings['INFOPLIST_FILE'] }.uniq
+        info_plist_files = project.objects.select { |object| object.isa == 'XCBuildConfiguration' }.map(&:to_hash).map { |object_hash| object_hash['buildSettings'] }.select { |build_settings| build_settings.key?('INFOPLIST_FILE') }.map { |build_settings| build_settings['INFOPLIST_FILE'] }.uniq.map { |info_plist_path| Pathname.new(File.expand_path(File.join(xcodeproj_path, '..', info_plist_path))).relative_path_from(repo_pathname).to_s }
 
         # create our list of files that we expect to have changed, they should all be relative to the project root, which should be equal to the git workdir root
         expected_changed_files = []
@@ -48,7 +62,7 @@ module Fastlane
         raise "Found unexpected uncommited changes in the working directory. Expected these files to have changed: #{expected_changed_files}. But found these actual changes: #{git_dirty_files}. Make sure you have cleaned up the build artifacts and are only left with the changed version files at this stage in your lane, and don't touch the working directory while your lane is running.".red unless changed_files_as_expected
 
         # get the absolute paths to the files
-        git_add_paths = expected_changed_files.map { |path| File.expand_path(File.join(git_pathname, path)) }
+        git_add_paths = expected_changed_files.map { |path| File.expand_path(File.join(repo_pathname, path)) }
 
         # then create a commit with a message
         Actions.sh("git add #{git_add_paths.map(&:shellescape).join(' ')}")

data/lib/fastlane/actions/install_carthage

@@ -0,0 +1,9 @@
+module Fastlane
+  module Actions
+    class CarthageAction
+      def self.run(_params)
+        Actions.sh('carthage bootstrap')
+      end
+    end
+  end
+end

data/lib/fastlane/actions/xcodebuild.rb

@@ -76,7 +76,10 @@ module Fastlane
             params[:export_format] ||= "ipa"
 
             # If not passed, construct export path from env vars
-            params[:export_path] ||= "#{build_path}#{scheme}"
+            if params[:export_path] == nil
+              ipa_filename = scheme ? scheme : File.basename(params[:archive_path], ".*")
+              params[:export_path] = "#{build_path}#{ipa_filename}"
+            end
 
             # Store IPA path for later deploy steps (i.e. Crashlytics)
             Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = params[:export_path] + "." + params[:export_format].downcase
@@ -113,13 +116,6 @@ module Fastlane
         # 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]
@@ -129,21 +125,30 @@ module Fastlane
 
             xcpretty_args.push report_formats
 
+            # Save screenshots flag
+            if params[:report_formats].include?("html") && params[:report_screenshots]
+              xcpretty_args.push "--screenshots"
+            end
+
+            xcpretty_args.sort!
+
             # 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
 
-        xcpretty_args = xcpretty_args.sort.join(" ")
+        # Stdout format
+        if testing && !archiving
+          xcpretty_args.push "--test"
+        else
+          xcpretty_args.push "--simple"
+        end
+
+        xcpretty_args = xcpretty_args.join(" ")
 
         Actions.sh "set -o pipefail && xcodebuild #{xcodebuild_args} | xcpretty #{xcpretty_args}"
       end

data/lib/fastlane/runner.rb

@@ -26,7 +26,9 @@ module Fastlane
       return return_val
     rescue => ex
       Dir.chdir(path_to_use) do
-        @error.call(key, ex) if @error # notify the block
+        # Provide error block exception without colour code
+        error_ex = ex.exception(ex.message.gsub(/\033\[\d+m/, ''))
+        @error.call(key, error_ex) if @error # notify the block
       end
       raise ex
     end

data/lib/fastlane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: deliver
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +365,7 @@ files:
 - lib/fastlane/actions/hipchat.rb
 - lib/fastlane/actions/hockey.rb
 - lib/fastlane/actions/increment_build_number.rb
+- lib/fastlane/actions/install_carthage
 - lib/fastlane/actions/install_cocapods.rb
 - lib/fastlane/actions/ipa.rb
 - lib/fastlane/actions/notify.rb