fastlane 1.62.0 → 1.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38f8789384c96fbbf2a8135629f4ac47326912a
-  data.tar.gz: 6d57b912e744ee6d4eeccab52a0c3bbaec11cada
+  metadata.gz: 6a1d03886641cb6e37a2e1050678327f3ff8ffa4
+  data.tar.gz: aabe7a99dcbb2568bab3c949ac944bdf192f9546
 SHA512:
-  metadata.gz: 831c8ab0c35ce8cdf8c289e973eee995653ff92268a31ffa58d8fa1e769f13a0a8d23825e47d098e328c7c1d5b5cec72dc0c2fcff5701419ae9da520eceb6d31
-  data.tar.gz: eeb059e37cb59f69d8c15e9e8480a09d6476ab15bab4f36610f74f76c7ef975c5da3d2d1ad9729359c78bbc5dfe1b0a31d7096a34b9e2f312f69e57f3509f397
+  metadata.gz: c7163d0dda0c6c01f15a6a3007fc616b90cc9293df083d2c172fb0013057f92c36ff990b0429ec32daa5a7099ca9a61a7a8dc6ec2ca83766c7c578ba3d44a0f3
+  data.tar.gz: 6ba39cddb16a1f3bcec3bcd9ee3feabc29f58e1a32ab2a94bbc72d0abcc7df40930869c2ee7ee5e620b5348565940532960e811c751575630aaff42a25608d27

data/README.md

@@ -89,7 +89,7 @@ fastlane appstore
 :mountain_cableway: | Implement a fully working Continuous Delivery process
 :ghost: | [Jenkins Integration](https://github.com/fastlane/fastlane/blob/master/docs/Jenkins.md): Show the output directly in the Jenkins test results
 :book: | Automatically generate a markdown documentation of your lane config
-:hatching_chick: | Over 140 built-in integrations available
+:hatching_chick: | Over 150 built-in integrations available
 :computer: | Support for both iOS, Mac OS and Android apps
 :octocat: | Full git and mercurial support
 

data/lib/assets/s3_html_template.erb

@@ -54,7 +54,7 @@
 
     <div class="oneRow">
       <span class="download" id="ios">
-        <a href="itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=<%= url %>" id="text" class="btn btn-lg btn-default" onclick="document.getElementById('finished').id = '';">
+        <a href="itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=<%= plist_url %>" id="text" class="btn btn-lg btn-default" onclick="document.getElementById('finished').id = '';">
           Install <%= title %> <%= bundle_version %>
         </a>
       </span>
@@ -62,7 +62,7 @@
       <!-- <span class="download" id="android">
       </span> -->
     </div>
-    
+
     <h3 id="desktop">Please open this page on your iPhone!</h3>
 
     <p id="finished">
@@ -70,7 +70,7 @@
     </p>
 
     <p id="footnote">
-      This is a beta version and is not meant to share with the public. 
+      This is a beta version and is not meant to share with the public.
     </p>
     <img src="https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane_medium.png" id="fastlaneLogo" />
   </body>
@@ -92,4 +92,4 @@
       // document.getElementById("android").remove()
     }
   </script>
-</html>
+</html>

data/lib/assets/s3_plist_template.erb

@@ -11,7 +11,7 @@
           <key>kind</key>
           <string>software-package</string>
           <key>url</key>
-          <string><%= url %></string>
+          <string><%= ipa_url %></string>
         </dict>
       </array>
       <key>metadata</key>
@@ -28,4 +28,4 @@
     </dict>
   </array>
 </dict>
-</plist>
+</plist>

data/lib/assets/s3_version_template.erb

@@ -1,4 +1,4 @@
-{ 
+{
     "latestVersion": "<%= full_version %>",
-    "updateUrl": "itms-services://?action=download-manifest&url=<%= url %>"
+    "updateUrl": "itms-services://?action=download-manifest&url=<%= plist_url %>"
 }

data/lib/fastlane/actions/appaloosa.rb

@@ -1,27 +1,16 @@
 module Fastlane
   module Actions
     class AppaloosaAction < Action
-      APPALOOSA_SERVER = 'https://www.appaloosa-store.com/api/v1'
+      APPALOOSA_SERVER = 'https://www.appaloosa-store.com/api/v2'.freeze
       def self.run(params)
-        require 'http'
-
         api_key = params[:api_token]
         store_id = params[:store_id]
-
-        if request_email?(api_key, store_id)
-          auth = create_an_account params[:email]
-          api_key = auth['api_key']
-          store_id = auth['store_id']
-          return if error_detected(auth['errors'])
-        end
-
-        binary = normalize_binary_name(params[:binary])
+        binary = params[:binary]
         remove_extra_screenshots_file(params[:screenshots])
         binary_url = get_binary_link(binary, api_key, store_id, params[:group_ids])
         return if binary_url.nil?
         screenshots_url = get_screenshots_links(api_key, store_id, params[:screenshots], params[:locale], params[:device])
         upload_on_appaloosa(api_key, store_id, binary_url, screenshots_url, params[:group_ids])
-        reset_original_binary_names(binary, params[:binary])
       end
 
       def self.get_binary_link(binary, api_key, store_id, group_ids)
@@ -32,15 +21,15 @@ module Fastlane
 
       def self.upload_on_s3(file, api_key, store_id, group_ids = '')
         file_name = file.split('/').last
-        response = HTTP.get("#{APPALOOSA_SERVER}/upload_services/presign_form",
-                            json: { file: file_name,
-                                    store_id: store_id,
-                                    group_ids: group_ids })
-        json_res = JSON.parse(response)
+        uri = URI("#{APPALOOSA_SERVER}/upload_services/presign_form")
+        params = { file: file_name, store_id: store_id, group_ids: group_ids }
+        uri.query = URI.encode_www_form(params)
+        presign_form_response = Net::HTTP.get_response(uri)
+        json_res = JSON.parse(presign_form_response.body)
         return if error_detected json_res['errors']
-        url = json_res['s3_sign']
+        s3_sign = json_res['s3_sign']
         path = json_res['path']
-        uri = URI.parse(Base64.decode64(url))
+        uri = URI.parse(Base64.decode64(s3_sign))
         File.open(file, 'rb') do |f|
           Net::HTTP.start(uri.host) do |http|
             http.send_request('PUT', uri.request_uri, f.read, 'content-type' => '')
@@ -50,42 +39,23 @@ module Fastlane
       end
 
       def self.get_s3_url(api_key, store_id, path)
-        binary_path = HTTP.get("#{APPALOOSA_SERVER}/#{store_id}/upload_services/url_for_download",
-                               json: { store_id: store_id,
-                                       api_key: api_key,
-                                       key: path })
-        if binary_path.status == 404
-          return nil if error_detected("A problem occurred with your API token and your store id. Please try again.")
+        uri = URI("#{APPALOOSA_SERVER}/#{store_id}/upload_services/url_for_download")
+        params = { store_id: store_id, api_key: api_key, key: path }
+        uri.query = URI.encode_www_form(params)
+        url_for_download_response = Net::HTTP.get_response(uri)
+        if url_for_download_response.kind_of?(Net::HTTPNotFound)
+          UI.user_error!("ERROR: A problem occurred with your API token and your store id. Please try again.")
         end
-        json_res = JSON.parse(binary_path)
+        json_res = JSON.parse(url_for_download_response.body)
         return if error_detected(json_res['errors'])
         json_res['binary_url']
       end
 
-      def self.reset_original_binary_names(current_name, original_name)
-        File.rename("#{current_name}", "#{original_name}")
-      end
-
       def self.remove_extra_screenshots_file(screenshots_env)
         extra_file = "#{screenshots_env}/screenshots.html"
         File.unlink(extra_file) if File.exist?(extra_file)
       end
 
-      def self.normalize_binary_name(binary)
-        binary_rename = binary.delete(' ')
-        File.rename("#{binary}", "#{binary_rename}")
-        binary_rename
-      end
-
-      def self.create_an_account(email)
-        response = HTTP.post("#{APPALOOSA_SERVER}/upload_services/create_an_account", form: { email: email })
-        JSON.parse(response)
-      end
-
-      def self.request_email?(api_key, store_id)
-        api_key.size == 0 && store_id.size == 0
-      end
-
       def self.upload_screenshots(screenshots, api_key, store_id)
         return if screenshots.nil?
         list = []
@@ -113,7 +83,7 @@ module Fastlane
       def self.get_screenshots(screenshots_path, locale, device)
         get_env_value('screenshots').nil? ? locale = '' : locale.concat('/')
         device.nil? ? device = '' : device.concat('-')
-        screenshots_path.strip.size > 0 ? screenshots_list(screenshots_path, locale, device) : nil
+        !screenshots_path.strip.empty? ? screenshots_list(screenshots_path, locale, device) : nil
       end
 
       def self.screenshots_list(path, locale, device)
@@ -127,21 +97,24 @@ module Fastlane
 
       def self.upload_on_appaloosa(api_key, store_id, binary_path, screenshots, group_ids)
         screenshots = all_screenshots_links(screenshots)
-        response = HTTP.post("#{APPALOOSA_SERVER}/#{store_id}/applications/upload",
-                             json: { store_id: store_id,
-                                     api_key: api_key,
-                                     application: {
-                                       binary_path: binary_path,
-                                       screenshot1: screenshots[0],
-                                       screenshot2: screenshots[1],
-                                       screenshot3: screenshots[2],
-                                       screenshot4: screenshots[3],
-                                       screenshot5: screenshots[4],
-                                       group_ids: group_ids,
-                                       provider: 'fastlane'
-                                     }
-                                   })
-        json_res = JSON.parse(response)
+        uri = URI("#{APPALOOSA_SERVER}/#{store_id}/mobile_application_updates/upload")
+        http = Net::HTTP.new(uri.host, uri.port)
+        req = Net::HTTP::Post.new(uri.path, { 'Content-Type' => 'application/json' })
+        req.body = { store_id: store_id,
+                     api_key: api_key,
+                     mobile_application_update: {
+                       binary_path: binary_path,
+                       screenshot1: screenshots[0],
+                       screenshot2: screenshots[1],
+                       screenshot3: screenshots[2],
+                       screenshot4: screenshots[3],
+                       screenshot5: screenshots[4],
+                       group_ids: group_ids,
+                       provider: 'fastlane'
+                     }
+                   }.to_json
+        uoa_response = http.request(req)
+        json_res = JSON.parse(uoa_response.body)
         if json_res['errors']
           UI.error "App: #{json_res['errors']}"
         else
@@ -172,8 +145,7 @@ module Fastlane
 
       def self.error_detected(errors)
         if errors
-          UI.error("ERROR: #{errors}")
-          true
+          UI.user_error!("ERROR: #{errors}")
         else
           false
         end
@@ -194,34 +166,28 @@ module Fastlane
 
       def self.details
         [
-          "Appaloosa is a private mobile application store. This action offers a quick deployment on the platform.",
-          "You can create an account, push to your existing account, or manage your user groups. We accept iOS, Mac and Android applications."
-        ].join(" ")
+          "Appaloosa is a private mobile application store. This action ",
+          "offers a quick deployment on the platform. You can create an ",
+          "account, push to your existing account, or manage your user ",
+          "groups. We accept iOS and Android applications."
+        ].join("\n")
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :binary,
                                        env_name: 'FL_APPALOOSA_BINARY',
-                                       description: 'Path to your IPA or APK file. Optional for ipa if you use the `ipa` or `xcodebuild` action. For Mac zip the .app',
+                                       description: 'Binary path. Optional for ipa if you use the `ipa` or `xcodebuild` action',
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
                                        verify_block: proc do |value|
-                                         fail "Couldn't find ipa || apk file at path '#{value}'".red unless File.exist?(value)
+                                         raise "Couldn't find ipa || apk file at path '#{value}'".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: 'FL_APPALOOSA_API_TOKEN',
-                                       description: "Your API Token, if you don\'t have an account hit [enter]",
-                                       verify_block: proc do
-                                       end),
+                                       description: "Your API token"),
           FastlaneCore::ConfigItem.new(key: :store_id,
                                        env_name: 'FL_APPALOOSA_STORE_ID',
-                                       description: "Your Store id, if you don\'t have an account hit [enter]",
-                                       verify_block: proc do |_value|
-                                       end),
-          FastlaneCore::ConfigItem.new(key: :email,
-                                       env_name: 'FL_APPALOOSA_EMAIL',
-                                       description: "It's your first time? Give your email address",
-                                       optional: false),
+                                       description: "Your Store id"),
           FastlaneCore::ConfigItem.new(key: :group_ids,
                                        env_name: 'FL_APPALOOSA_GROUPS',
                                        description: 'Your app is limited to special users? Give us the group ids',
@@ -235,13 +201,11 @@ module Fastlane
                                        env_name: 'FL_APPALOOSA_LOCALE',
                                        description: 'Select the folder locale for yours screenshots',
                                        default_value: 'en-US',
-                                       optional: true
-                                      ),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :device,
                                        env_name: 'FL_APPALOOSA_DEVICE',
                                        description: 'Select the device format for yours screenshots',
-                                       optional: true
-                                      )
+                                       optional: true)
         ]
       end
 

data/lib/fastlane/actions/badge.rb

@@ -11,7 +11,8 @@ module Fastlane
           shield: params[:shield],
           alpha: params[:alpha],
           shield_io_timeout: params[:shield_io_timeout],
-          glob: params[:glob]
+          glob: params[:glob],
+          alpha_channel: params[:alpha_channel]
         }
         Badge::Runner.new.run(params[:path], options)
       end
@@ -91,7 +92,15 @@ module Fastlane
                                        env_name: "FL_BADGE_GLOB",
                                        description: "Glob pattern for finding image files",
                                        optional: true,
-                                       is_string: true)
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :alpha_channel,
+                                       env_name: "FL_BADGE_ALPHA_CHANNEL",
+                                       description: "Keeps/adds an alpha channel to the icon (useful for android icons)",
+                                       optional: true,
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         raise "alpha_channel is only a flag and should always be true".red unless value == true
+                                       end)
         ]
       end
 

data/lib/fastlane/actions/last_git_commit.rb

@@ -10,11 +10,11 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Return last git commit message and author"
+        "Return last git commit hash, abbreviated commit hash, commit message and author"
       end
 
       def self.return_value
-        "Returns the following dict: {author: \"Author\", message: \"commit message\"}"
+        "Returns the following dict: {commit_hash: \"commit hash\", abbreviated_commit_hash: \"abbreviated commit hash\" author: \"Author\", message: \"commit message\"}"
       end
 
       def self.author

data/lib/fastlane/actions/make_changelog_from_jenkins.rb

@@ -42,7 +42,9 @@ module Fastlane
       end
 
       def self.output
-        ['FL_CHANGELOG', 'The changelog generated by Jenkins']
+        [
+          ['FL_CHANGELOG', 'The changelog generated by Jenkins']
+        ]
       end
 
       def self.authors

data/lib/fastlane/actions/s3.rb

@@ -135,6 +135,7 @@ module Fastlane
         end
         plist_render = eth.render(plist_template, {
           url: ipa_url,
+          ipa_url: ipa_url,
           build_num: build_num,
           bundle_id: bundle_id,
           bundle_version: bundle_version,
@@ -149,6 +150,8 @@ module Fastlane
         end
         html_render = eth.render(html_template, {
           url: plist_url,
+          plist_url: plist_url,
+          ipa_url: ipa_url,
           build_num: build_num,
           bundle_id: bundle_id,
           bundle_version: bundle_version,
@@ -163,6 +166,8 @@ module Fastlane
         end
         version_render = eth.render(version_template, {
           url: plist_url,
+          plist_url: plist_url,
+          ipa_url: ipa_url,
           build_num: build_num,
           bundle_version: bundle_version,
           full_version: full_version
@@ -282,7 +287,8 @@ module Fastlane
                                        env_name: "",
                                        description: "Upload relevant metadata for this build",
                                        optional: true,
-                                       default_value: true),
+                                       default_value: true,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :plist_template_path,
                                        env_name: "",
                                        description: "plist template path",

data/lib/fastlane/helper/git_helper.rb

@@ -28,7 +28,9 @@ module Fastlane
 
       {
           author: last_git_commit_formatted_with('%an'),
-          message: last_git_commit_formatted_with('%B')
+          message: last_git_commit_formatted_with('%B'),
+          commit_hash: last_git_commit_formatted_with('%H'),
+          abbreviated_commit_hash: last_git_commit_formatted_with('%h')
       }
     end
 

data/lib/fastlane/helper/sh_helper.rb

@@ -22,10 +22,15 @@ module Fastlane
       if Helper.test?
         result << command # only for the tests
       else
-        if ENV['USE_SIMPLE_POPEN'] == 'true'
-          exit_status = execute_with_simple_popen(command, log, result)
-        else
-          exit_status = execute_with_popen(command, log, result)
+        exit_status = nil
+        IO.popen(command, err: [:child, :out]) do |io|
+          io.sync = true
+          io.each do |line|
+            UI.command_output(line.strip) if log
+            result << line
+          end
+          io.close
+          exit_status = $?.exitstatus
         end
 
         if exit_status != 0
@@ -47,30 +52,5 @@ module Fastlane
       Encoding.default_external = previous_encoding.first
       Encoding.default_internal = previous_encoding.last
     end
-
-    def self.execute_with_popen(command, log, result)
-      exit_status = nil
-      IO.popen(command, err: [:child, :out]) do |io|
-        io.sync = true
-        io.each do |line|
-          UI.command_output(line.strip) if log
-          result << line
-        end
-        io.close
-        exit_status = $?.exitstatus
-      end
-      exit_status
-    end
-
-    def self.execute_with_simple_popen(command, log, result)
-      puts 'Using simple popen'
-      IO.popen(command, err: [:child, :out]) do |io|
-        io.each do |line|
-          UI.command_output(line.strip) if log
-          result << line
-        end
-      end
-      $?.exitstatus
-    end
   end
 end

data/lib/fastlane/setup/setup_ios.rb

@@ -22,29 +22,48 @@ module Fastlane
 
       show_infos
 
+      FastlaneFolder.create_folder! unless Helper.is_test?
+      fastlane_actions_path = File.join(FastlaneFolder.path, 'actions')
+      is_manual_setup = false
+
       begin
-        FastlaneFolder.create_folder! unless Helper.is_test?
         setup_project
         ask_for_apple_id
         detect_if_app_is_available
         print_config_table
-        fastlane_actions_path = File.join(FastlaneFolder.path, 'actions')
         if UI.confirm("Please confirm the above values")
           default_setup(path: fastlane_actions_path)
         else
+          is_manual_setup = true
           manual_setup(path: fastlane_actions_path)
         end
         Helper.log.info 'Successfully finished setting up fastlane'.green
       rescue => ex # this will also be caused by Ctrl + C
-        # Something went wrong with the setup, clear the folder again
-        # and restore previous files
-        Helper.log.fatal 'Error occurred with the setup program! Reverting changes now!'.red
-        restore_previous_state
-        raise ex
+        if is_manual_setup
+          handle_exception(exception: ex)
+        else
+          Helper.log.error ex.to_s
+          Helper.log.error 'An error occured during the setup process. Falling back to manual setup!'.yellow
+          try_manual_setup(path: fastlane_actions_path)
+        end
       end
       # rubocop:enable Lint/RescueException
     end
 
+    def handle_exception(exception: nil)
+      # Something went wrong with the setup, clear the folder again
+      # and restore previous files
+      Helper.log.fatal 'Error occurred with the setup program! Reverting changes now!'.red
+      restore_previous_state
+      raise exception
+    end
+
+    def try_manual_setup(path: nil)
+      manual_setup(path: path)
+    rescue => ex
+      handle_exception(exception: ex)
+    end
+
     def default_setup(path: nil)
       copy_existing_files
       generate_appfile(manually: false)
@@ -70,7 +89,7 @@ module Fastlane
 
     def ask_to_enable_other_tools
       if self.itc_ref.nil? && self.portal_ref.nil?
-        wants_to_create_app = agree('Would you like to create your app on iTunes Connect and the Developer Portal?', true)
+        wants_to_create_app = agree('Would you like to create your app on iTunes Connect and the Developer Portal? (y/n)', true)
         if wants_to_create_app
           create_app_if_necessary
           detect_if_app_is_available # check if the app was, in fact, created.

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.62.0'
+  VERSION = '1.63.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.62.0
+  version: 1.63.0
 platform: ruby
 authors:
 - Felix Krause
@@ -47,7 +47,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -827,7 +827,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Connect all iOS deployment tools into one streamlined workflow