thrust 0.5.2 → 0.6.0

data/lib/thrust/deployment_target.rb

@@ -1,9 +1,9 @@
 module Thrust
   class DeploymentTarget
     attr_reader :distribution_list,
-                :ios_build_configuration,
-                :ios_provisioning_search_query,
-                :ios_target,
+                :build_configuration,
+                :provisioning_search_query,
+                :target,
                 :note_generation_method,
                 :notify,
                 :versioning_method,
@@ -11,9 +11,9 @@ module Thrust
 
     def initialize(attributes)
       @distribution_list = attributes['distribution_list']
-      @ios_build_configuration = attributes['ios_build_configuration']
-      @ios_provisioning_search_query = attributes['ios_provisioning_search_query']
-      @ios_target = attributes['ios_target']
+      @build_configuration = attributes['build_configuration']
+      @provisioning_search_query = attributes['provisioning_search_query']
+      @target = attributes['target']
       @note_generation_method = attributes['note_generation_method']
       @notify = attributes['notify']
       @versioning_method = attributes['versioning_method']

data/lib/thrust/execution_helper.rb

@@ -6,7 +6,7 @@ module Thrust
 
     def capture_status_and_output_from_command(command, env = {})
       env_string = ''
-      for key in env.keys
+      env.keys.each do |key|
         env_string += "#{key}=#{env[key]} "
       end
 

data/lib/thrust/executor.rb

@@ -36,10 +36,11 @@ module Thrust
       @out.puts "Executing #{cmd} and checking for FAILURE"
       execution = @execution_helper.capture_status_and_output_from_command("#{cmd} 2>&1", env)
       result = execution[:output]
+
       @out.puts "Results:"
       @out.puts result
 
-      result.include?("Finished") && !result.include?("FAILURE") && !result.include?("EXCEPTION")
+      Thrust::CedarResultsParser.parse_results_for_success(result)
     end
   end
 end

data/lib/thrust/ios_spec_launcher.rb

@@ -0,0 +1,36 @@
+require 'tmpdir'
+
+module Thrust
+  class IOSSpecLauncher
+    def initialize(out = $stdout, thrust_executor = Thrust::Executor.new)
+      @thrust_executor = thrust_executor
+      @out = out
+    end
+
+    def run(executable_name, build_configuration, build_sdk, os_version, device_name, timeout, build_directory, simulator_binary, environment_variables)
+      device_type_id = "com.apple.CoreSimulator.SimDeviceType.#{device_name}, #{os_version}"
+      app_executable = File.join(build_directory, "#{build_configuration}-#{build_sdk}", "#{executable_name}.app")
+      simulator_binary ||= 'ios-sim'
+      output_file = "tmp/thrust_specs_output"
+
+      arguments = ["--devicetypeid \"#{device_type_id}\"",
+                   "--timeout #{timeout || '30'}",
+                   "--stdout #{output_file}",
+                   "--setenv CFFIXED_USER_HOME=\"#{Dir.tmpdir}\"",]
+
+      environment_variables.each do |key, value|
+        arguments << "--setenv #{key}=\"#{value}\""
+      end
+
+      @thrust_executor.system_or_exit("#{simulator_binary} launch #{app_executable} #{arguments.compact.join(' ')}")
+
+      results = File.read(output_file)
+      FileUtils.rm_r('tmp')
+
+      @out.puts 'Results:'
+      @out.puts results
+
+      Thrust::CedarResultsParser.parse_results_for_success(results)
+    end
+  end
+end

data/lib/thrust/osx_spec_launcher.rb

@@ -0,0 +1,15 @@
+module Thrust
+  class OSXSpecLauncher
+    def initialize(out = $stdout, thrust_executor = Thrust::Executor.new)
+      @thrust_executor = thrust_executor
+      @out = out
+    end
+
+    def run(executable_name, build_configuration, build_directory, environment_variables)
+      build_path = File.join(build_directory, build_configuration)
+      app_executable = File.join(build_path, executable_name)
+      env = {'DYLD_FRAMEWORK_PATH' => "\"#{build_path}\""}.merge(environment_variables)
+      @thrust_executor.check_command_for_failure("\"#{app_executable}\"", env)
+    end
+  end
+end

data/lib/thrust/scheme_parser.rb

@@ -0,0 +1,35 @@
+require 'nori'
+
+module Thrust
+  class SchemeParser
+    def parse_environment_variables(scheme, xcodeproj_path = nil)
+      config = load_scheme(scheme, xcodeproj_path)
+
+      env = {}
+
+      if config['Scheme']['LaunchAction']['EnvironmentVariables']
+        environment_variables = config['Scheme']['LaunchAction']['EnvironmentVariables']['EnvironmentVariable']
+        environment_variables = [environment_variables] unless environment_variables.is_a?(Array)
+
+        environment_variables.each do |environment_variable|
+          if environment_variable['@isEnabled'] == 'YES'
+           env[environment_variable['@key']] = environment_variable['@value']
+          end
+        end
+      end
+
+      env
+    end
+
+    private
+
+    def load_scheme(scheme, xcodeproj_path)
+      scheme_path = "**/#{scheme}.xcscheme"
+      scheme_path = "#{xcodeproj_path}/#{scheme_path}" if xcodeproj_path
+
+      scheme_file = Dir.glob(scheme_path).first
+      parser = Nori.new(parser: :rexml)
+      parser.parse(File.read(scheme_file))
+    end
+  end
+end

data/lib/thrust/{ios_spec_target.rb → spec_target.rb}

@@ -1,12 +1,11 @@
 module Thrust
-  class IOSSpecTarget
+  class SpecTarget
     attr_reader :build_configuration,
                 :build_sdk,
                 :device,
                 :device_name,
                 :os_version,
                 :scheme,
-                :target,
                 :type,
                 :timeout
 
@@ -17,7 +16,6 @@ module Thrust
       @device_name = attributes['device_name']
       @os_version = attributes['os_version']
       @scheme = attributes['scheme']
-      @target = attributes['target']
       @type = attributes['type'] || 'app'
       @timeout = attributes['timeout']
     end

data/lib/thrust/tasks.rb

@@ -1,4 +1,4 @@
-load File.expand_path('../../tasks/cedar.rake', __FILE__) unless File.exists?('AndroidManifest.xml')
+load File.expand_path('../../tasks/cedar.rake', __FILE__)
 load File.expand_path('../../tasks/autotag.rake', __FILE__)
 load File.expand_path('../../tasks/testflight.rake', __FILE__)
 load File.expand_path('../../tasks/version.rake', __FILE__)

data/lib/thrust/tasks/autotag/list.rb

@@ -6,8 +6,8 @@ module Thrust
           @git = git
         end
 
-        def run(thrust)
-          thrust.app_config.deployment_targets.each do |deployment_target, _|
+        def run(app_config)
+          app_config.deployment_targets.each do |deployment_target, _|
             puts @git.commit_summary_for_last_deploy(deployment_target)
           end
         end

data/lib/thrust/tasks/clean.rb

@@ -1,18 +1,18 @@
 module Thrust
   module Tasks
     class Clean
-      def initialize(out = $stdout, xcode_tools_provider = Thrust::IOS::XCodeToolsProvider.new)
+      def initialize(out = $stdout, xcode_tools_provider = Thrust::XcodeToolsProvider.new)
         @xcode_tools_provider = xcode_tools_provider
         @out = out
       end
 
-      def run(thrust)
+      def run(app_config)
         tools_options = {
-          project_name: thrust.app_config.project_name,
-          workspace_name: thrust.app_config.workspace_name
+          project_name: app_config.project_name,
+          workspace_name: app_config.workspace_name
         }
 
-        xcode_tools = @xcode_tools_provider.instance(@out, nil, thrust.build_dir, tools_options)
+        xcode_tools = @xcode_tools_provider.instance(@out, nil, app_config.build_directory, tools_options)
         xcode_tools.clean_build
       end
     end

data/lib/thrust/tasks/focused_specs.rb

@@ -3,14 +3,24 @@ module Thrust
     class FocusedSpecs
       FOCUSED_METHODS = %w[fit(@ fcontext(@ fdescribe(@]
 
-      def initialize(executor = Thrust::Executor.new)
+      def initialize(out = $stdout, executor = Thrust::Executor.new)
+        @out = out
         @executor = executor
       end
 
-      def run(thrust)
+      def run(app_config)
+        if app_config.spec_directories.empty?
+          @out.puts 'Unable to find focused specs without `spec_directories` defined in thrust.yml.'.red
+          exit 1
+        end
+
         pattern = FOCUSED_METHODS.join("\\|")
-        directories = thrust.app_config.ios_spec_targets.values.map(&:target).join(' ')
-        @executor.system_or_exit %Q[grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks'; exit 0]
+        directories = app_config.spec_directories.map{ |sd| "\"#{sd}\"" }.join(' ')
+        output = @executor.capture_output_from_system %Q[grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks' || true]
+
+        @out.puts output
+
+        output.split("\n")
       end
     end
   end

data/lib/thrust/tasks/nof.rb

@@ -3,17 +3,22 @@ module Thrust
     class Nof
       FOCUSED_METHODS = %w[fit(@ fcontext(@ fdescribe(@]
 
-      def initialize(executor = Thrust::Executor.new)
+      def initialize(executor = Thrust::Executor.new, focused_specs = Thrust::Tasks::FocusedSpecs.new)
         @executor = executor
+        @focused_specs = focused_specs
       end
 
-      def run
+      def run(app_config)
         substitutions = FOCUSED_METHODS.map do |method|
           unfocused_method = method.sub(/^f/, '')
           "-e 's/#{method}/#{unfocused_method}/g;'"
         end
 
-        @executor.system_or_exit %Q[rake focused_specs | xargs -I filename sed -i '' #{substitutions.join(' ')} "filename"]
+        focused_spec_files = @focused_specs.run(app_config)
+        unless focused_spec_files.empty?
+          quoted_spec_files = focused_spec_files.map { |file| "\"#{file}\"" }.join(' ')
+          @executor.system_or_exit %Q[sed -i '' #{substitutions.join(' ')} #{quoted_spec_files}]
+        end
       end
     end
   end

data/lib/thrust/tasks/spec_runner.rb

@@ -0,0 +1,75 @@
+require 'nori'
+require 'json'
+
+module Thrust
+  module Tasks
+    class SpecRunner
+      def initialize(out = $stdout,
+                     xcode_tools_provider = Thrust::XcodeToolsProvider.new,
+                     ios_spec_launcher = Thrust::IOSSpecLauncher.new,
+                     osx_spec_launcher = Thrust::OSXSpecLauncher.new,
+                     scheme_parser = Thrust::SchemeParser.new)
+        @xcode_tools_provider = xcode_tools_provider
+        @ios_spec_launcher = ios_spec_launcher
+        @osx_spec_launcher = osx_spec_launcher
+        @scheme_parser = scheme_parser
+        @out = out
+      end
+
+      def run(app_config, target_info, args)
+        build_configuration = target_info.build_configuration
+        type = target_info.type
+        scheme = target_info.scheme
+        build_sdk = target_info.build_sdk
+        os_version = args[:os_version] || target_info.os_version
+        device_name = args[:device_name] || target_info.device_name
+
+        if device_name
+          substitution_map = {'bundle' => '-', 'app' => ' '}
+          destination_map = {'bundle' => ' ', 'app' => '-'}
+          device_name.gsub!(substitution_map[type], destination_map[type])
+        end
+
+        xcode_tools = @xcode_tools_provider.instance(@out,
+                                                     build_configuration,
+                                                     app_config.build_directory,
+                                                     project_name: app_config.project_name,
+                                                     workspace_name: app_config.workspace_name)
+
+        if type == 'app'
+          xcode_tools.build_scheme(scheme, build_sdk)
+
+          executable_name = xcode_tools.find_executable_name(scheme)
+          environment_variables = @scheme_parser.parse_environment_variables(scheme, app_config.path_to_xcodeproj)
+          environment_variables['CEDAR_RANDOM_SEED'] = ENV['CEDAR_RANDOM_SEED'] if ENV['CEDAR_RANDOM_SEED']
+
+          if build_sdk.include?('macosx')
+            @osx_spec_launcher.run(executable_name,
+                                   build_configuration,
+                                   app_config.build_directory,
+                                   environment_variables)
+          else
+            xcode_tools.kill_simulator
+
+            @ios_spec_launcher.run(executable_name,
+                                   build_configuration,
+                                   build_sdk,
+                                   os_version,
+                                   device_name,
+                                   target_info.timeout,
+                                   app_config.build_directory,
+                                   app_config.ios_sim_path,
+                                   environment_variables)
+          end
+        else
+          xcode_tools.test(scheme,
+                           build_configuration,
+                           os_version,
+                           device_name,
+                           target_info.timeout,
+                           app_config.build_directory)
+        end
+      end
+    end
+  end
+end

data/lib/thrust/xcode_tools.rb

@@ -0,0 +1,159 @@
+module Thrust
+  class XcodeTools
+    ProvisioningProfileNotFound = Class.new(StandardError)
+    ProvisioningProfileNotEmbedded = Class.new(StandardError)
+
+    def initialize(thrust_executor, out, build_configuration, build_directory, options = {})
+      @thrust_executor = thrust_executor
+      @out = out
+      @git = Thrust::Git.new(@out, @thrust_executor)
+      @build_configuration = build_configuration
+      @build_directory = build_directory
+      @project_name = options[:project_name]
+      @workspace_name = options[:workspace_name]
+      raise "project_name OR workspace_name required" unless @project_name.nil? ^ @workspace_name.nil?
+    end
+
+    def cleanly_create_ipa(target, app_name, signing_identity, provision_search_query = nil)
+      kill_simulator
+      build_target(target, 'iphoneos', true)
+      ipa_name = create_ipa(app_name, signing_identity, provision_search_query)
+      verify_provision(app_name, provision_search_query)
+
+      return ipa_name
+    end
+
+    def build_configuration_directory
+      "#{@build_directory}/#{@build_configuration}-iphoneos"
+    end
+
+    def clean_build
+      @out.puts 'Cleaning...'
+      FileUtils.rm_rf(@build_directory)
+    end
+
+    def build_scheme(scheme, build_sdk, clean = false)
+      @out.puts 'Building...'
+      build("-scheme \"#{scheme}\"", build_sdk, clean)
+    end
+
+    def build_target(target, build_sdk, clean = false)
+      @out.puts 'Building...'
+      build("-target \"#{target}\"", build_sdk, clean)
+    end
+
+    def test(scheme, build_configuration, os_version, device_name, timeout, build_dir)
+      destination = "OS=#{os_version},name=#{device_name}"
+      timeout ||= "30"
+
+      cmd = [
+          "xcodebuild",
+          "test",
+          "-scheme '#{scheme}'",
+          "-configuration '#{build_configuration}'",
+          "-destination '#{destination}'",
+          "-destination-timeout '#{timeout}'",
+          "SYMROOT='#{build_dir}'"
+      ].join(' ')
+
+      @thrust_executor.check_command_for_failure(cmd)
+    end
+
+    def kill_simulator
+      @out.puts('Killing simulator...')
+      @thrust_executor.system %q[killall -m -KILL "gdb"]
+      @thrust_executor.system %q[killall -m -KILL "otest"]
+      @thrust_executor.system %q[killall -m -KILL "iOS Simulator"]
+    end
+
+    def find_executable_name(scheme)
+      build_settings = @thrust_executor.capture_output_from_system("xcodebuild -scheme \"#{scheme}\" -showBuildSettings")
+      matches = build_settings.match(/EXECUTABLE_NAME = (.*)$/)
+      matches.captures.first
+    end
+
+    private
+
+    def provision_path(provision_search_query)
+      provision_search_path = File.expand_path("~/Library/MobileDevice/Provisioning Profiles")
+      command = %Q(find '#{provision_search_path}' -print0 | xargs -0 grep -lr '#{provision_search_query}' --null | xargs -0 ls -t)
+      provisioning_profile = @thrust_executor.capture_output_from_system(command).split("\n").first
+      if !provisioning_profile
+        raise(ProvisioningProfileNotFound, "\nCouldn't find provisioning profiles matching #{provision_search_query}.\n\nThe command used was:\n\n#{command}")
+      end
+      provisioning_profile
+    end
+
+    def build(scheme_or_target_flag, build_sdk, clean)
+      sdk_flag = build_sdk ? "-sdk #{build_sdk}" : nil
+      configuration_build_dir = File.join(@build_directory, "#{@build_configuration}-#{build_sdk}")
+      configuration_build_dir_option = build_sdk.include?('macosx') ? nil : "CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\""
+
+      command = [
+          'set -o pipefail &&',
+          'xcodebuild',
+          project_or_workspace_flag,
+          scheme_or_target_flag,
+          "-configuration #{@build_configuration}",
+          sdk_flag,
+          clean ? 'clean build' : nil,
+          "SYMROOT=\"#{@build_directory}\"",
+          configuration_build_dir_option,
+          '2>&1',
+          "| grep -v 'backing file'"
+      ].compact.join(' ')
+      output_file = output_file("#{@build_configuration}-build")
+      begin
+        @thrust_executor.system_or_exit(command, output_file)
+      rescue Thrust::Executor::CommandFailed => e
+        @out.write File.read(output_file)
+        raise e
+      end
+    end
+
+    def create_ipa(app_name, signing_identity, provision_search_query)
+      @out.puts 'Packaging...'
+      app_filepath = "#{build_configuration_directory}/#{app_name}.app"
+      ipa_filepath = "#{build_configuration_directory}/#{app_name}.ipa"
+      package_command = [
+          "xcrun",
+          "-sdk iphoneos",
+          "-v PackageApplication",
+          "'#{app_filepath}'",
+          "-o '#{ipa_filepath}'",
+          "--embed '#{provision_path(provision_search_query)}'"
+      ].join(' ')
+      @thrust_executor.system_or_exit(package_command)
+
+      @thrust_executor.system_or_exit("cd '#{build_configuration_directory}' && unzip '#{app_name}.ipa'")
+      @thrust_executor.system_or_exit("/usr/bin/codesign --verify --force --preserve-metadata=identifier,entitlements --sign '#{signing_identity}' '#{build_configuration_directory}/Payload/#{app_name}.app'")
+      @thrust_executor.system_or_exit("cd '#{build_configuration_directory}' && zip -qr '#{app_name}.ipa' 'Payload'")
+
+      ipa_filepath
+    end
+
+    def verify_provision(app_name, provision_search_query)
+      @out.puts 'Verifying provisioning profile...'
+      embedded_filename = "#{build_configuration_directory}/#{app_name}.app/embedded.mobileprovision"
+      correct_provision_filename = provision_path(provision_search_query)
+
+      if !FileUtils.cmp(embedded_filename, correct_provision_filename)
+        raise(ProvisioningProfileNotEmbedded, "Wrong mobile provision embedded by xcrun. Check your xcode provisioning profile settings.")
+      end
+    end
+
+    def output_file(target)
+      output_dir = if ENV['IS_CI_BOX']
+                     ENV['CC_BUILD_ARTIFACTS']
+                   else
+                     File.exists?(@build_directory) ? @build_directory : FileUtils.mkdir_p(@build_directory)
+                   end
+
+      File.join(output_dir, "#{target}.output").tap { |file| @out.puts "Output: #{file}" }
+    end
+
+    def project_or_workspace_flag
+      @workspace_name ? "-workspace #{@workspace_name}.xcworkspace" : "-project #{@project_name}.xcodeproj"
+    end
+  end
+end