fastlane 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d13313e93649ee90caa553d9e61ae6759c22db
-  data.tar.gz: 2cfbb113190bb42dd7f401f651652243a0b909a4
+  metadata.gz: 9959b0da34326315d18cd09fb1b797e1a520ef81
+  data.tar.gz: 7a3b437b3e752e3bbac7f4c8fad4b487e2e94ae7
 SHA512:
-  metadata.gz: 09dcc32c05045d06865f2fc569fd6611ec21cf8b9640acdf665a54706ca610ea84fd0e2818b3e5fa29a460d373dee3f49c008957aa738de0ce92f3c1f71638d5
-  data.tar.gz: e2d19739f74a77f5cbfe5688a634ab04fd0908803650dae3d8234f20416b6dc6a54b0e1901bb7cf3b6b1f33a069ed88c101ce552ad2d0100ae355a4513d3a0b4
+  metadata.gz: 0fb6fa250d1ec52e73976fc37a7cfa3106cf29c52b393a1dccf8fe2500b1d5d7cc46efb1de935928a36ead0962dbfeab99fd0972ca13c0b08da988deefca6d0a
+  data.tar.gz: c2ee2872282500c11e4a32da4998d333a2626fb0b8219a6b215f6af0dfc34beec200786630c69d917ba9ec73ef172555308b8b58ec6a8262e300bf62488297ac

data/lib/fastlane/actions/gym.rb

@@ -12,14 +12,20 @@ module Fastlane
         begin
           FastlaneCore::UpdateChecker.start_looking_for_update('gym') unless Helper.is_test?
 
-          values[:provisioning_profile_path] ||= Actions.lane_context[Actions::SharedValues::SIGH_PROFILE_PATH] || ENV["SIGH_PROFILE_PATH"]
-          path = File.expand_path(Gym::Manager.new.work(values))
-          dsym_path = path.gsub(".ipa", ".app.dSYM.zip")
+          if values[:provisioning_profile_path].to_s.length == 0
+            sigh_path = Actions.lane_context[Actions::SharedValues::SIGH_PROFILE_PATH] || ENV["SIGH_PROFILE_PATH"]
+            values[:provisioning_profile_path] = File.expand_path(sigh_path) if sigh_path
+          end
+          
+          absolute_ipa_path = File.expand_path(Gym::Manager.new.work(values))
+          absolute_dsym_path = absolute_ipa_path.gsub(".ipa", ".app.dSYM.zip")
 
-          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = path # absolute path
-          Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = dsym_path if File.exist?(dsym_path)
+          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_ipa_path
+          Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path if File.exist?(absolute_dsym_path)
+          ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
+          ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path if File.exist?(absolute_dsym_path)
           
-          return path
+          return absolute_ipa_path
         ensure
           FastlaneCore::UpdateChecker.show_update_status('gym', Gym::VERSION)
         end

data/lib/fastlane/actions/register_devices.rb

@@ -10,19 +10,17 @@ module Fastlane
       end
 
       def self.run(params)
-        require 'cupertino/provisioning_portal'
-        require 'csv'
+        require 'spaceship'
 
-        devices       = params[:devices]
-        devices_file  = params[:devices_file]
-        team_id       = params[:team_id]
-        username      = params[:username]
+        devices = params[:devices]
+
+        credentials = CredentialsManager::PasswordManager.shared_manager(params[:username])
+        Spaceship::Portal.login(credentials.username, credentials.password)
 
         if devices
           device_objs = devices.map do |k, v|
             raise "Passed invalid UDID: #{v} for device: #{k}".red unless UDID_REGEXP =~ v
-
-            Cupertino::ProvisioningPortal::Device.new(k, v)
+            Spaceship::Device.create!(name: k, udid: v)
           end
         elsif devices_file
           devices_file = CSV.read(File.expand_path(File.join(devices_file)), col_sep: "\t")
@@ -33,31 +31,13 @@ module Fastlane
             raise 'Invalid device line, please provide a file according to the Apple Sample UDID file (https://devimages.apple.com.edgekey.net/downloads/devices/Multiple-Upload-Samples.zip)'.red unless device.count == 2
             raise "Passed invalid UDID: #{device[0]} for device: #{device[1]}".red unless UDID_REGEXP =~ device[0]
 
-            Cupertino::ProvisioningPortal::Device.new(device[1], device[0])
+            Spaceship::Device.create!(name: device[1], udid: device[0])
           end
         else
           raise 'You must pass either a valid `devices` or `devices_file`. Please check the readme.'.red
         end
 
-        credentials = CredentialsManager::PasswordManager.shared_manager(username)
-
-        agent = Cupertino::ProvisioningPortal::Agent.new
-        agent.username = credentials.username
-        agent.password = credentials.password
-        agent.team_id = team_id if team_id
-
-        Helper.log.info "Fetching list of currently registered devices..."        
-        existing_devices = agent.list_devices
-        new_devices = device_objs.select{ |device| !existing_devices.map(&:udid).include?(device.udid) } # calculate the diff based on the UDID
-
-        if new_devices.count > 0
-          Helper.log.info "Adding new devices..."
-          agent.add_devices(*new_devices) rescue raise 'Could not add devices. Please ensure you have passed the correct username/password combination, as well as a valid team_id if a member of multiple teams.'.red
-
-          Helper.log.info "Successfully registered #{new_devices.count} new devices. Total devices now registered: #{existing_devices.count + new_devices.count}!".green
-        else
-          Helper.log.info "Device list up to date, all #{device_objs.count} devices are already registered. Total devices registed: #{existing_devices.count}.".green
-        end
+        Helper.log.info "Successfully registered new devices.".green
       end
 
       def self.description
@@ -83,8 +63,8 @@ module Fastlane
                                        description: "optional: Your team ID",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
-                                       env_name: "CUPERTINO_USERNAME",
-                                       description: "optional: Your Apple ID ",
+                                       env_name: "DELIVER_USER",
+                                       description: "Optional: Your Apple ID",
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)),
         ]
       end

data/lib/fastlane/actions/team_id.rb

@@ -10,7 +10,7 @@ module Fastlane
 
         Helper.log.info "Setting Team ID to '#{team}' for all build steps"
 
-        [:CERT_TEAM_ID, :SIGH_TEAM_ID, :PEM_TEAM_ID, :PRODUCE_TEAM_ID, :SIGH_TEAM_ID, :CUPERTINO_TEAM_ID, :FASTLANE_TEAM_ID].each do |current|
+        [:CERT_TEAM_ID, :SIGH_TEAM_ID, :PEM_TEAM_ID, :PRODUCE_TEAM_ID, :SIGH_TEAM_ID, :FASTLANE_TEAM_ID].each do |current|
           ENV[current.to_s] = team
         end
       end

data/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -0,0 +1,299 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      XCODE_SERVER_GET_ASSETS_PATH = :XCODE_SERVER_GET_ASSETS_PATH
+      XCODE_SERVER_GET_ASSETS_ARCHIVE_PATH = :XCODE_SERVER_GET_ASSETS_ARCHIVE_PATH
+    end
+
+    class XcodeServerGetAssetsAction < Action
+
+      require 'excon'
+      require 'json'
+      require 'fileutils'
+
+      def self.run(params)
+
+        host = params[:host]
+        bot_name = params[:bot_name]
+        integration_number_override = params[:integration_number]
+        target_folder = params[:target_folder]
+        keep_all_assets = params[:keep_all_assets]
+        username = params[:username]
+        password = params[:password]
+        trust_self_signed_certs = params[:trust_self_signed_certs]
+
+        # setup (not)trusting self signed certificates.
+        # it's normal to have a self signed certificate on your Xcode Server
+        Excon.defaults[:ssl_verify_peer] = !trust_self_signed_certs # for self-signed certificates
+
+        # create Xcode Server config
+        xcs = XcodeServer.new(host, username, password)
+        bots = xcs.fetch_all_bots
+
+        Helper.log.info "Fetched #{bots.count} Bots from Xcode Server at #{host}.".yellow
+
+        # pull out names
+        bot_names = bots.map { |bot| bot['name'] }
+
+        # match the bot name with a found bot, otherwise fail
+        found_bots = bots.select { |bot| bot['name'] == bot_name }
+        raise "Failed to find a Bot with name #{bot_name} on server #{host}, only available Bots: #{bot_names}".red if found_bots.count == 0
+
+        bot = found_bots[0]
+
+        Helper.log.info "Found Bot with name #{bot_name} with id #{bot['_id']}.".green
+
+        # we have our bot, get finished integrations, sorted from newest to oldest
+        integrations = xcs.fetch_integrations(bot['_id']).select { |i| i['currentStep'] == 'completed' }
+        raise "Failed to find any completed integration for Bot \"#{bot_name}\"".red if (integrations || []).count == 0
+        
+        # if no integration number is specified, pick the newest one (this is sorted from newest to oldest)
+        if integration_number_override
+          integration = integrations.select { |i| i['number'] == integration_number_override }.first
+          raise "Specified integration number #{integration_number_override} does not exist.".red unless integration
+        else
+          integration = integrations.first
+        end
+
+        # consider: only taking the last successful one? or allow failing tests? warnings?
+
+        Helper.log.info "Using integration #{integration['number']}.".yellow
+
+        # fetch assets for this integration
+        assets_path = xcs.fetch_assets(integration['_id'], target_folder, self)
+        raise "Failed to fetch assets for integration #{integration['number']}." unless assets_path
+
+        asset_entries = Dir.entries(assets_path).map { |i| File.join(assets_path, i) }
+
+        Helper.log.info "Successfully downloaded #{asset_entries.count} assets to file #{assets_path}!".green
+
+        # now find the archive and unzip it
+        zipped_archive_path = asset_entries.select { |i| i.end_with?('xcarchive.zip') }.first
+
+        if zipped_archive_path
+
+          Helper.log.info "Found an archive in the assets folder...".yellow
+
+          archive_file_path = File.basename(zipped_archive_path, File.extname(zipped_archive_path))
+          archive_dir_path = File.dirname(zipped_archive_path)
+          archive_path = File.join(archive_dir_path, archive_file_path)
+          if File.exists?(archive_path)
+            # we already have the archive, skip
+            Helper.log.info "Archive #{archive_path} already exists, not unzipping again...".yellow
+          else
+            # unzip the archive
+            sh "unzip -q \"#{zipped_archive_path}\" -d \"#{archive_dir_path}\""
+          end
+
+          # reload asset entries to also contain the xcarchive file
+          asset_entries = Dir.entries(assets_path).map { |i| File.join(assets_path, i) }
+
+          # optionally delete everything except for the archive
+          if !keep_all_assets
+            files_to_delete = asset_entries.select do |i| 
+              File.extname(i) != '.xcarchive' && ![".", ".."].include?(File.basename(i))
+            end
+
+            files_to_delete.each do |i|
+              FileUtils.rm_rf(i)
+            end
+          end
+
+          Actions.lane_context[SharedValues::XCODE_SERVER_GET_ASSETS_ARCHIVE_PATH] = archive_path
+        end
+        
+        Actions.lane_context[SharedValues::XCODE_SERVER_GET_ASSETS_PATH] = assets_path
+
+        return assets_path
+      end
+
+      class XcodeServer
+
+        def initialize(host, username, password)
+          @host = host.start_with?('https://') ? host : "https://#{host}"
+          @username = username
+          @password = password
+        end
+
+        def fetch_all_bots
+          response = get_endpoint('/bots')
+          raise "You are unauthorized to access data on #{@host}, please check that you're passing in a correct username and password.".red if response.status == 401 
+          raise "Failed to fetch Bots from Xcode Server at #{@host}, response: #{response.status}: #{response.body}.".red if response.status != 200
+          bots = JSON.parse(response.body)['results']
+        end
+
+        def fetch_integrations(bot_id)
+          response = get_endpoint("/bots/#{bot_id}/integrations?limit=10")
+          raise "Failed to fetch Integrations for Bot #{bot_id} from Xcode Server at #{@host}, response: #{response.status}: #{response.body}".red if response.status != 200
+          integrations = JSON.parse(response.body)['results']
+        end
+
+        def fetch_assets(integration_id, target_folder, action)
+          
+          # create a temp folder and a file, stream the download into it
+          Dir.mktmpdir do |dir|
+
+            temp_file = File.join(dir, "tmp_download.#{rand(1000000)}")
+            f = open(temp_file, 'w')
+            streamer = lambda do |chunk, remaining_bytes, total_bytes|
+              if remaining_bytes && total_bytes
+                Helper.log.info "Downloading: #{100 - (100 * remaining_bytes.to_f / total_bytes.to_f).to_i}%".yellow
+              else
+                Helper.log.error "#{chunk}".red
+              end
+              f.write(chunk)
+            end
+
+            response = self.get_endpoint("/integrations/#{integration_id}/assets", streamer)
+            f.close()
+
+            raise "Integration doesn't have any assets (it probably never ran).".red if response.status == 500
+            raise "Failed to fetch Assets zip for Integration #{integration_id} from Xcode Server at #{@host}, response: #{response.status}: #{response.body}".red if response.status != 200
+
+            # unzip it, it's a .tar.gz file
+            out_folder = File.join(dir, "out_#{rand(1000000)}")
+            FileUtils.mkdir_p(out_folder)
+
+            action.sh "cd \"#{out_folder}\"; cat \"#{temp_file}\" | gzip -d | tar -x"
+
+            # then pull the real name from headers
+            asset_filename = response.headers['Content-Disposition'].split(';')[1].split('=')[1].gsub('"', '')
+            asset_foldername = asset_filename.split('.')[0]
+
+            # rename the folder in out_folder to asset_foldername
+            found_folder = Dir.entries(out_folder).select { |item| item != '.' && item != '..' }[0]
+
+            raise "Internal error, couldn't find unzipped folder".red if found_folder.nil?
+
+            unzipped_folder_temp_name = File.join(out_folder, found_folder)
+            unzipped_folder = File.join(out_folder, asset_foldername)
+
+            # rename to destination name
+            FileUtils.mv(unzipped_folder_temp_name, unzipped_folder)
+
+            target_folder = File.absolute_path(target_folder)
+
+            # create target folder if it doesn't exist
+            FileUtils.mkdir_p(target_folder)
+
+            # and move+rename it to the destination place
+            FileUtils.cp_r(unzipped_folder, target_folder)
+            out = File.join(target_folder, asset_foldername)
+            return out
+          end
+          return nil
+        end
+
+        def headers
+          require 'base64'
+          headers = { 
+            'User-Agent' => 'fastlane-xcode_server_get_assets', # XCS wants user agent. for some API calls. not for others. sigh.
+            'X-XCSAPIVersion' => 1 # XCS API version with this API, Xcode needs this otherwise it explodes in a 500 error fire. Currently Xcode 7 Beta 5 is on Version 5.
+          }
+
+          if @username && @password 
+            userpass = "#{@username}:#{@password}"
+            headers['Authorization'] = "Basic #{Base64.strict_encode64(userpass)}"
+          end
+          
+          return headers
+        end
+
+        def get_endpoint(endpoint, response_block=nil)
+          url = url_for_endpoint(endpoint)
+          headers = self.headers || {}
+
+          if response_block
+            response = Excon.get(url, :response_block => response_block, :headers => headers)
+          else
+            response = Excon.get(url, :headers => headers)
+          end
+
+          return response
+        end
+
+        private 
+
+        def url_for_endpoint(endpoint)
+          "#{@host}:20343/api#{endpoint}"
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Downloads Xcode Bot assets like the `.xcarchive` and logs"
+      end
+
+      def self.details
+        "This action downloads assets from your Xcode Server Bot (works with Xcode Server
+          using Xcode 6 and 7. By default this action downloads all assets, unzips them and
+          deletes everything except for the `.xcarchive`. If you'd like to keep all downloaded
+          assets, pass `:keep_all_assets: true`. This action returns the path to the downloaded
+          assets folder and puts into shared values the paths to the asset folder and to the `.xcarchive` inside it"
+      end
+
+      def self.available_options        
+        [
+          FastlaneCore::ConfigItem.new(key: :host,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_HOST",
+                                       description: "IP Address/Hostname of Xcode Server",
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :bot_name,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_BOT_NAME",
+                                       description: "Name of the Bot to pull assets from",
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :integration_number,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_INTEGRATION_NUMBER",
+                                       description: "Optionally you can override which integration's assets should be downloaded. If not provided, the latest integration is used",
+                                       is_string: false,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :username,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_USERNAME",
+                                       description: "Username for your Xcode Server",
+                                       optional: true,
+                                       default_value: ""),
+          FastlaneCore::ConfigItem.new(key: :password,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_PASSWORD",
+                                       description: "Password for your Xcode Server",
+                                       optional: true,
+                                       default_value: ""),
+          FastlaneCore::ConfigItem.new(key: :target_folder,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_TARGET_FOLDER",
+                                       description: "Relative path to a folder into which to download assets",
+                                       optional: true,
+                                       default_value: './xcs_assets'),
+          FastlaneCore::ConfigItem.new(key: :keep_all_assets,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_KEEP_ALL_ASSETS",
+                                       description: "Whether to keep all assets or let the script delete everything except for the .xcarchive",
+                                       optional: true,
+                                       is_string: false,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :trust_self_signed_certs,
+                                       env_name: "FL_XCODE_SERVER_GET_ASSETS_TRUST_SELF_SIGNED_CERTS",
+                                       description: "Whether to trust self-signed certs on your Xcode Server",
+                                       optional: true,
+                                       is_string: false,
+                                       default_value: true)
+        ]
+      end
+
+      def self.output
+        [
+          ['XCODE_SERVER_GET_ASSETS_PATH', 'Absolute path to the downloaded assets folder'],
+          ['XCODE_SERVER_GET_ASSETS_ARCHIVE_PATH', 'Absolute path to the downloaded xcarchive file']
+        ]
+      end
+
+      def self.authors
+        ["czechboy0"]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/lib/fastlane/lane.rb

@@ -19,6 +19,10 @@ module Fastlane
       raise "lane name must not contain any spaces".red if name.to_s.include?" "
       raise "lane name must start with :".red unless name.kind_of?Symbol
 
+      if self.class.black_list.include?(name.to_s)
+        Helper.log.error "Lane Name '#{name}' can not be one of the followings: #{self.class.black_list}".red
+        raise "Name '#{name}' is already taken"
+      end
       
       self.platform = platform
       self.name = name
@@ -36,5 +40,11 @@ module Fastlane
     def pretty_name
       [platform, name].reject(&:nil?).join(' ')
     end
+
+    class << self
+      def black_list
+        %w{run init new_action lanes list docs action actions help}
+      end
+    end
   end
 end

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.16.0'
+  VERSION = '1.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: cupertino
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -168,30 +154,44 @@ dependencies:
   name: fastlane_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: credentials_manager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: deliver
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -514,6 +514,7 @@ files:
 - lib/fastlane/actions/update_project_code_signing.rb
 - lib/fastlane/actions/update_project_provisioning.rb
 - lib/fastlane/actions/xcode_select.rb
+- lib/fastlane/actions/xcode_server_get_assets.rb
 - lib/fastlane/actions/xcodebuild.rb
 - lib/fastlane/actions/xctool.rb
 - lib/fastlane/actions_list.rb