fastlane 2.14.2 → 2.15.0.beta.20170213032052

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df08ee848469d56fc5c96626b12d4f6c1cd84c0
-  data.tar.gz: 51ef2d002b8b926b037607fc0c92bd76b6c2de62
+  metadata.gz: a80b498fd3f3fbffbd59594a476a1f95248bbed7
+  data.tar.gz: b46aa1e1ed70776ffd15339348267ed4cd48a176
 SHA512:
-  metadata.gz: c9a9bec7a4ad536e78e17b32063b5d9dac15ed424924b5b68a0e080585ceb1ccee888eee83adcbf084f26209850fd2ba004d8eb8c159d330ee794065ae91e680
-  data.tar.gz: 28c49fd2ad59c7119de1c03dafe9204ef3f9c1e0661c9efa98901de6c4667a0c3348f9d83c97f957cf9ba7efc95d19765bf8a27048b23dded1e5a5c1451adf90
+  metadata.gz: 85ce9e2c95a972e50364c7092b20db57f819e0441184147182747b6116303a17832dac191dc68adfa66b0cd3e172e797261afc82964b300fb9558f463c3b6a44
+  data.tar.gz: 9c3c95543e4cdcf18ae12d3fbcec7123d1d5b00fb44a1408090c8244c04f01be93d50132a4bd7c679ef83c8ad4b4e91dacabad6eb3a545439dac290fd9adc491

data/cert/lib/cert/commands_generator.rb

@@ -20,7 +20,7 @@ module Cert
       program :help, 'GitHub', 'https://github.com/fastlane/cert'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       FastlaneCore::CommanderGenerator.new.generate(Cert::Options.available_options)
 

data/cert/lib/cert/runner.rb

@@ -63,7 +63,7 @@ module Cert
           revoke_count += 1
         rescue => e
           UI.error "An error occurred while revoking #{certificate.id} #{certificate.name}"
-          UI.error "#{e.message}\n#{e.backtrace.join("\n")}" if $verbose
+          UI.error "#{e.message}\n#{e.backtrace.join("\n")}" if FastlaneCore::Globals.verbose?
         end
       end
 

data/credentials_manager/lib/credentials_manager/appfile_config.rb

@@ -44,7 +44,7 @@ module CredentialsManager
           eval(content)
           # rubocop:enable Security/Eval
 
-          print_debug_information(path: full_path) if $verbose
+          print_debug_information(path: full_path) if FastlaneCore::Globals.verbose?
         end
       end
 

data/deliver/lib/deliver/commands_generator.rb

@@ -39,7 +39,7 @@ module Deliver
 
       FastlaneCore::CommanderGenerator.new.generate(deliverfile_options)
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       always_trace!
 

data/deliver/lib/deliver/runner.rb

@@ -72,10 +72,10 @@ module Deliver
     def prepare_app_icons(options = {})
       return unless options[:metadata_path]
 
-      default_app_icon_path = File.join(options[:metadata_path], "app_icon.png")
+      default_app_icon_path = Dir[File.join(options[:metadata_path], "app_icon.{png,jpg}")].first
       options[:app_icon] ||= default_app_icon_path if File.exist?(default_app_icon_path)
 
-      default_watch_icon_path = File.join(options[:metadata_path], "watch_icon.png")
+      default_watch_icon_path = Dir[File.join(options[:metadata_path], "watch_icon.{png,jpg}")].first
       options[:app_icon] ||= default_watch_icon_path if File.exist?(default_watch_icon_path)
     end
 

data/deliver/lib/deliver/setup.rb

@@ -70,12 +70,14 @@ module Deliver
 
       # get App icon + watch icon
       if v.large_app_icon.asset_token
-        app_icon_path = File.join(path, "app_icon.png")
+        app_icon_extension = File.extname(v.large_app_icon.url)
+        app_icon_path = File.join(path, "app_icon#{app_icon_extension}")
         File.write(app_icon_path, open(v.large_app_icon.url).read)
         UI.success("Successfully downloaded large app icon")
       end
       if v.watch_app_icon.asset_token
-        watch_icon_path = File.join(path, "watch_icon.png")
+        watch_app_icon_extension = File.extname(v.watch_app_icon.url)
+        watch_icon_path = File.join(path, "watch_icon#{watch_app_icon_extension}")
         File.write(watch_icon_path, open(v.watch_app_icon.url).read)
         UI.success("Successfully downloaded watch icon")
       end

data/fastlane/lib/fastlane/actions/actions_helper.rb

@@ -115,7 +115,7 @@ module Fastlane
           class_ref = Fastlane::Actions.const_get(class_name)
 
           if class_ref.respond_to?(:run)
-            UI.success "Successfully loaded custom action '#{file}'." if $verbose
+            UI.success "Successfully loaded custom action '#{file}'." if FastlaneCore::Globals.verbose?
           else
             UI.error "Could not find method 'run' in class #{class_name}."
             UI.error 'For more information, check out the docs: https://docs.fastlane.tools/'

data/fastlane/lib/fastlane/actions/add_extra_platforms.rb

@@ -0,0 +1,45 @@
+module Fastlane
+  module Actions
+    class AddExtraPlatformsAction < Action
+      def self.run(params)
+        UI.verbose "Before injecting extra platforms: #{Fastlane::SupportedPlatforms.all}"
+        Fastlane::SupportedPlatforms.extra = params[:platforms]
+        UI.verbose "After injecting extra platforms (#{params[:platforms]})...: #{Fastlane::SupportedPlatforms.all}"
+      end
+
+      def self.description
+        "Modify the default list of supported platforms"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :platforms,
+                                       optional: false,
+                                       type: Array,
+                                       default_value: "",
+                                       description: "The optional extra platforms to support")
+        ]
+      end
+
+      def self.authors
+        ["lacostej"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+
+      def self.example_code
+        [
+          'add_extra_platforms(
+            platforms: [:windows,:neogeo]
+          )'
+        ]
+      end
+
+      def self.category
+        :misc
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb

@@ -30,9 +30,9 @@ module Fastlane
         end
 
         if params[:commits_count]
-          changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering)
+          changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format])
         else
-          changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering)
+          changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format])
         end
         changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
         Actions.lane_context[SharedValues::FL_CHANGELOG] = changelog
@@ -89,6 +89,11 @@ module Fastlane
                                        optional: true,
                                        default_value: '%B',
                                        is_string: true),
+          FastlaneCore::ConfigItem.new(key: :date_format,
+                                       env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_DATE_FORMAT',
+                                       description: 'The date format applied to each commit while generating the collected value',
+                                       optional: true,
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :tag_match_pattern,
                                        env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_TAG_MATCH_PATTERN',
                                        description: 'A glob(7) pattern to match against when finding the last git tag',
@@ -124,7 +129,7 @@ module Fastlane
       end
 
       def self.author
-        ['mfurtak', 'asfalcone', 'SiarheiFedartsou']
+        ['mfurtak', 'asfalcone', 'SiarheiFedartsou', 'allewun']
       end
 
       def self.is_supported?(platform)
@@ -135,10 +140,11 @@ module Fastlane
         [
           'changelog_from_git_commits',
           'changelog_from_git_commits(
-            between: ["7b092b3", "HEAD"], # Optional, lets you specify a revision/tag range between which to collect commit info
-            pretty: "- (%ae) %s", # Optional, lets you provide a custom format to apply to each commit when generating the changelog text
-            match_lightweight_tag: false, # Optional, lets you ignore lightweight (non-annotated) tags when searching for the last tag
-            include_merges: true # Optional, lets you filter out merge commits
+            between: ["7b092b3", "HEAD"],            # Optional, lets you specify a revision/tag range between which to collect commit info
+            pretty: "- (%ae) %s",                    # Optional, lets you provide a custom format to apply to each commit when generating the changelog text
+            date_format: "short",                    # Optional, lets you provide an additional date format to dates within the pretty-formatted string
+            match_lightweight_tag: false,            # Optional, lets you ignore lightweight (non-annotated) tags when searching for the last tag
+            merge_commit_filtering: "exclude_merges" # Optional, lets you filter out merge commits
           )'
         ]
       end

data/fastlane/lib/fastlane/actions/crashlytics.rb

@@ -35,7 +35,7 @@ module Fastlane
                  .gsub(params[:build_secret], '[[BUILD_SECRET]]')
         end
 
-        UI.verbose sanitizer.call(command.join(' ')) if $verbose
+        UI.verbose sanitizer.call(command.join(' ')) if FastlaneCore::Globals.verbose?
 
         error_callback = proc do |error|
           clean_error = sanitizer.call(error)
@@ -51,7 +51,7 @@ module Fastlane
 
         return command if Helper.test?
 
-        UI.verbose sanitizer.call(result) if $verbose
+        UI.verbose sanitizer.call(result) if FastlaneCore::Globals.verbose?
 
         UI.success('Build successfully uploaded to Crashlytics Beta 🌷')
         UI.success('Visit https://fabric.io/_/beta to add release notes and notify testers.')

data/fastlane/lib/fastlane/actions/ensure_no_debug_code.rb

@@ -22,6 +22,12 @@ module Fastlane
 
         command << " --exclude #{params[:exclude]}" if params[:exclude]
 
+        if params[:exclude_dirs]
+          params[:exclude_dirs].each do |dir|
+            command << " --exclude-dir #{dir.shellescape}"
+          end
+        end
+
         return command if Helper.is_test?
 
         UI.important(command)
@@ -84,7 +90,13 @@ module Fastlane
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_EXCLUDE",
                                        description: "Exclude a certain pattern from the search",
                                        optional: true,
-                                       is_string: true)
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :exclude_dirs,
+                                       env_name: "FL_ENSURE_NO_DEBUG_CODE_EXCLUDE_DIRS",
+                                       description: "An array of dirs that should not be included in the search",
+                                       optional: true,
+                                       type: Array,
+                                       is_string: false)
         ]
       end
 

data/fastlane/lib/fastlane/actions/git_tag_exists.rb

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class GitTagExistsAction < Action
       def self.run(params)
-        result = Actions.sh("git rev-parse -q --verify refs/tags/#{params[:tag].shellescape} || true", log: $verbose).chomp
+        result = Actions.sh("git rev-parse -q --verify refs/tags/#{params[:tag].shellescape} || true", log: FastlaneCore::Globals.verbose?).chomp
         !result.empty?
       end
 

data/fastlane/lib/fastlane/actions/hockey.rb

@@ -1,3 +1,9 @@
+if ENV["SPACESHIP_DEBUG"]
+  require 'openssl'
+  # this has to be on top of this file, since the value can't be changed later
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+end
+
 module Fastlane
   module Actions
     module SharedValues
@@ -6,18 +12,46 @@ module Fastlane
     end
 
     class HockeyAction < Action
-      def self.upload_build(api_token, ipa, options)
+      def self.connection(options)
         require 'faraday'
         require 'faraday_middleware'
 
-        base_url = options[:bypass_cdn] ? "https://rink.hockeyapp.net" : "https://upload.hockeyapp.net"
-        connection = Faraday.new(url: base_url) do |builder|
+        base_url = options.delete(:bypass_cdn) ? "https://rink.hockeyapp.net" : "https://upload.hockeyapp.net"
+        foptions = {
+          url: base_url
+        }
+        Faraday.new(foptions) do |builder|
           builder.request :multipart
           builder.request :url_encoded
           builder.response :json, content_type: /\bjson$/
           builder.use FaradayMiddleware::FollowRedirects
           builder.adapter :net_http
+          if ENV['SPACESHIP_DEBUG']
+            # for debugging only
+            # This enables tracking of networking requests using Charles Web Proxy
+            builder.proxy "https://127.0.0.1:8888"
+          end
+
+          if ENV["DEBUG"]
+            puts "To run _spaceship_ through a local proxy, use SPACESHIP_DEBUG"
+          end
+        end
+      end
+
+      def self.upload(api_token, ipa, options)
+        create_update = options.delete(:create_update)
+
+        if create_update
+          self.create_and_update_build(api_token, ipa, options)
+        else
+          self.upload_build(api_token, ipa, options)
         end
+      end
+
+      # Uses https://support.hockeyapp.net/kb/api/api-versions#upload-version if a `public_identifier` was specified
+      # otherwise https://support.hockeyapp.net/kb/api/api-apps#upload-app
+      def self.upload_build(api_token, ipa, options)
+        connection = self.connection(options)
 
         options[:ipa] = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa and File.exist?(ipa)
 
@@ -37,9 +71,48 @@ module Fastlane
         end
       end
 
-      def self.run(options)
-        # Available options: http://support.hockeyapp.net/kb/api/api-versions#upload-version
+      # Uses https://support.hockeyapp.net/kb/api/api-versions#create-version
+      # and https://support.hockeyapp.net/kb/api/api-versions#update-version
+      # to upload a build
+      def self.create_and_update_build(api_token, ipa, options)
+        [:public_identifier, :bundle_short_version, :bundle_version].each do |key|
+          UI.user_error!("To use the 'create_update' upload mechanism you need to pass the '#{key.to_sym}' option.") unless options[key]
+        end
+        # https://support.hockeyapp.net/discussions/problems/33355-is-uploadhockeyappnet-available-for-general-use
+        # GET requests are cached on CDN, so bypass it
+        options[:bypass_cdn] = true
+        connection = self.connection(options)
+
+        options.delete(:ipa)
+        options.delete(:apk)
+        app_id = options.delete(:public_identifier)
+
+        ipaio = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa and File.exist?(ipa)
+
+        response = connection.get do |req|
+          req.url("/api/2/apps/#{app_id}/app_versions/new")
+          req.headers['X-HockeyAppToken'] = api_token
+          req.body = options
+        end
 
+        case response.status
+        when 200...300
+          app_version_id = response.body['id']
+          UI.message("successfully created version with id #{app_version_id}")
+        else
+          UI.user_error!("Error trying to create app version:  #{response.status} - #{response.body}")
+        end
+
+        options[:ipa] = ipaio
+
+        connection.put do |req|
+          req.url("/api/2/apps/#{app_id}/app_versions/#{app_version_id}")
+          req.headers['X-HockeyAppToken'] = api_token
+          req.body = options
+        end
+      end
+
+      def self.run(options)
         build_file = [
           options[:ipa],
           options[:apk]
@@ -53,8 +126,8 @@ module Fastlane
             UI.user_error!("You have to provide a build file")
           end
 
-          dsym_path = options[:ipa].to_s.gsub('ipa', 'app.dSYM.zip')
-          if options[:ipa]
+          if options[:ipa].to_s.end_with?(".ipa")
+            dsym_path = options[:ipa].to_s.gsub('.ipa', '.app.dSYM.zip')
             if File.exist?(dsym_path)
               dsym_filename = dsym_path
             else
@@ -69,19 +142,23 @@ module Fastlane
         if options[:upload_dsym_only]
           UI.success('Starting with dSYM upload to HockeyApp... this could take some time.')
         else
-          UI.success('Starting with ipa upload to HockeyApp... this could take some time.')
+          UI.success('Starting with file(s) upload to HockeyApp... this could take some time.')
         end
 
         values = options.values
         values[:dsym_filename] = dsym_filename
         values[:notes_type] = options[:notes_type]
 
+        api_token = values.delete(:api_token)
+
+        values.delete_if { |k, v| v.nil? }
+
         return values if Helper.test?
 
         ipa_filename = build_file
         ipa_filename = nil if options[:upload_dsym_only]
 
-        response = self.upload_build(options[:api_token], ipa_filename, values)
+        response = self.upload(api_token, ipa_filename, values)
         case response.status
         when 200...300
           url = response.body['public_url']
@@ -95,7 +172,7 @@ module Fastlane
           if response.body.to_s.include?("App could not be created")
             UI.user_error!("Hockey has an issue processing this app. Please confirm that an app in Hockey matches this IPA's bundle ID or that you are using the correct API upload token. If error persists, please provide the :public_identifier option from the HockeyApp website. More information https://github.com/fastlane/fastlane/issues/400")
           else
-            UI.user_error!("Error when trying to upload ipa to HockeyApp: #{response.body}")
+            UI.user_error!("Error when trying to upload file(s) to HockeyApp: #{response.status} - #{response.body}")
           end
         end
       end
@@ -127,7 +204,7 @@ module Fastlane
                                        end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "FL_HOCKEY_IPA",
-                                       description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action. For Mac zip the .app. For Android provide path to .apk file",
+                                       description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action. For Mac zip the .app. For Android provide path to .apk file. In addition you could use this to upload .msi, .zip, .pkg, etc if you use the 'create_update' mechanism",
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
                                        optional: true,
                                        verify_block: proc do |value|
@@ -145,6 +222,15 @@ module Fastlane
                                        verify_block: proc do |value|
                                          # validation is done in the action
                                        end),
+          FastlaneCore::ConfigItem.new(key: :create_update,
+                                       env_name: "FL_HOCKEY_CREATE_UPDATE",
+                                       description: "Set true if you want to create then update your app as opposed to just upload it."\
+                                         " You will need the 'public_identifier', 'bundle_version' and 'bundle_short_version'",
+                                       is_string: false,
+                                       default_value: false,
+                                       verify_block: proc do |value|
+                                         # validation is done in the action
+                                       end),
           FastlaneCore::ConfigItem.new(key: :notes,
                                        env_name: "FL_HOCKEY_NOTES",
                                        description: "Beta Notes",
@@ -181,9 +267,17 @@ module Fastlane
                                       env_name: "FL_HOCKEY_TAGS",
                                       description: "Comma separated list of tags which will receive access to the build",
                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :bundle_short_version,
+                                      env_name: "FL_HOCKEY_BUNDLE_SHORT_VERSION",
+                                      description: "The bundle_short_version of your application, required when using `create_update`",
+                                      optional: true),
+          FastlaneCore::ConfigItem.new(key: :bundle_version,
+                                      env_name: "FL_HOCKEY_BUNDLE_VERSION",
+                                      description: "The bundle_version of your application, required when using `create_update`",
+                                      optional: true),
           FastlaneCore::ConfigItem.new(key: :public_identifier,
                                       env_name: "FL_HOCKEY_PUBLIC_IDENTIFIER",
-                                      description: "App id of the app you are targeting, usually you won't need this value. Required, if `upload_dsm_only` set to `true`",
+                                      description: "App id of the app you are targeting, usually you won't need this value. Required, if `upload_dsym_only` set to `true`",
                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :commit_sha,
                                       env_name: "FL_HOCKEY_COMMIT_SHA",
@@ -235,11 +329,11 @@ module Fastlane
       end
 
       def self.author
-        ["KrauseFx", "modzelewski"]
+        ["KrauseFx", "modzelewski", "lacostej"]
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac, :android].include? platform
+        true
       end
 
       def self.details
@@ -255,6 +349,15 @@ module Fastlane
             api_token: "...",
             ipa: "./app.ipa",
             notes: "Changelog"
+          )',
+          'hockey(
+            api_token: "...",
+            create_update: true,
+            public_identifier: "....",
+            bundle_short_version: "1.0.2,
+            bundle_version: "1.0.2.145",
+            ipa: "./my.msi",
+            notes: "Changelog"
           )'
         ]
       end