thrust 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61067cb4daeb431ef6273f47bb72187c0ba5573a
-  data.tar.gz: 87bad3017b087b47a85b74757f3d36ad5eb787ba
+  metadata.gz: 4af4e735542bbbc21050f9b8f23a081eb3132c93
+  data.tar.gz: 087eaad19b5bbfbd21346b8fcd6f63a94e63bf41
 SHA512:
-  metadata.gz: dc0d52a8654adb83ef3e369441a709acddf2e620f40d7cb35616649a706341da8c40fb4ecbe6d65a21bcc2c47c651edbe9f859644938df36eb7f8d39390359b5
-  data.tar.gz: 9c0bbd55a2c12afb30999bf093515154d6423dcc2e8b2efc941c021e25a0c42e54adb60d9629797671f23fa6dc8246f9ee088090cbfa2db1c56cce8b92b99452
+  metadata.gz: 7276e115badf2322966be2f3b1dbd3f395dd99a654b7579b38745c65cff6b08b4522c7fcfa152ce4a9c38d2ed42d039698caf470378539f925d29f2d2fffd6b2
+  data.tar.gz: 77bef75792b11abc24117e6101c488b08f10c44c15e3989ea435dfd6ca5ee7160c15bbd5e64c90111e7563554e95cb925a71920c2a8b1bae234593a012f7a9f5

data/bin/thrust

@@ -13,21 +13,14 @@ end
 
 require 'fileutils'
 project_root = Dir.pwd
-thrust_root  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+thrust_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 rakefile = File.join(project_root, 'Rakefile')
 File.open(rakefile, 'a+') do |f|
   f.puts "require 'thrust/tasks'" unless f.grep(/require 'thrust\/tasks'/).any?
 end
 
-if File.exists?('AndroidManifest.xml')
-  example_file_name = 'android_example.yml'
-else
-  example_file_name = 'ios_example.yml'
-end
-
-
-FileUtils.cp(File.join(thrust_root, 'lib', 'config', example_file_name), File.join(project_root, 'thrust.example.yml'))
+FileUtils.cp(File.join(thrust_root, 'lib', 'config', 'thrust_example.yml'), File.join(project_root, 'thrust.example.yml'))
 puts ''
 puts '  To finish installation of Thrust, rename ' + 'thrust.example.yml'.blue + ' to ' + 'thrust.yml'.blue + ' and edit it for your project.'
 

data/lib/config/{ios_example.yml → thrust_example.yml}

@@ -1,9 +1,9 @@
-thrust_version: 0.5
+thrust_version: 0.6
 project_name: My Great Project # do not use if building with an xcode workspace
 # workspace_name: My Workspace # use if building with an xcode workspace
 # path_to_xcodeproj: 'App/MyApp.xcodeproj' # use if xcodeproj is not in the same directory as this yaml file. Optional.
 app_name: My Great App
-ios_distribution_certificate: 'Name of Distribution Signing Certificate'
+distribution_certificate: 'Name of Distribution Signing Certificate'
 #ios_sim_path: '/path/to/ios-sim' # Optional. Use to prefer a specific ios-sim binary (e.g. within project directory) over a system-installed version (homebrew)
 
 testflight:
@@ -15,38 +15,45 @@ deployment_targets:
     distribution_list: Developers # This is the name of a TestFlight distribution list
     notify: true # Whether to notify people on the distribution list about this deployment
     note_generation_method: autotag  # If you set this value, it will auto-generate the deploy notes from the commit history. Optional.
-    ios_target: MyGreatAppTarget # Name of the build target. Optional, defaults to app name.
-    ios_build_configuration: Release
-    ios_provisioning_search_query: 'query to find Provisioning Profile' # Otherwise, it will use the first provisioning profile in ~/Library/MobileDevice/Provisioning Profiles/
+    target: MyGreatAppTarget # Name of the build target. Optional, defaults to app name.
+    build_configuration: Release
+    provisioning_search_query: 'query to find Provisioning Profile' # Otherwise, it will use the first provisioning profile in ~/Library/MobileDevice/Provisioning Profiles/
     versioning_method: 'none' # or 'timestamp-sha' or 'commits'. Leave blank to use Git commit SHAs for build numbers.
     tag: ci # Deploys latest commit with the tag. Leave blank to deploy from master.
 
   demo:
     distribution_list: Beta Testers
     notify: true
-    ios_build_configuration: Demo
-    ios_provisioning_search_query: 'query to find Provisioning Profile'
+    build_configuration: Demo
+    provisioning_search_query: 'query to find Provisioning Profile'
 
-ios_spec_targets:
-  specs: # This is the name of the rake task: `rake specs`
-    target: UISpecs # Name of the build target.
-    scheme: Specs (My Great App) # Use if the scheme name is different from the target name.  Necessary when building in an xcode workspace.
+spec_targets:
+  # Example of an iOS spec suite configuration.
+  specs: # This is the name of the rake task
+    scheme: Specs (My Great App) # Name of the scheme.
     type: app # Spec target type: 'app' or 'bundle'. Optional, defaults to app.
     build_configuration: Debug # Name of the build configuration.
-    build_sdk: iphonesimulator7.0 # SDK used to build the target. Optional, defaults to latest iphonesimulator.
-    device_name: iPhone 4s # Device name as suggested by `ios-sim showdevicetypes`.
-    os_version: 7.1 # OS version to run. Defaults to latest available version.
-    timeout: 90 # Optional. Destination timeout defaults to 30 seconds.
+    build_sdk: iphonesimulator8.1 # SDK used to build the target. Optional, defaults to latest iphonesimulator.
+    device_name: iPhone 6 # Device name. Run `ios-sim showdevicetypes` to see a full list of available devices.
+    os_version: 8.1 # OS version to run. Optional, defaults to latest available version.
+    timeout: 90 # Optional, defaults to 30 seconds.
 
-  spec_bundle: # Example of a spec bundle configuration.
+  # Example of an iOS spec bundle configuration.
+  spec_bundle:
     scheme: My Great App # Use the name for the main app scheme.
     type: bundle
     build_configuration: Debug
     device_name: iPhone 4s
     os_version: 7.1
 
-  integration: # Example of a Mac OSX target.
-    target: IntegrationSpecs
-    scheme: IntegrationSpecs (My Great App) # Use if the scheme name is different from the target name.  Necessary when building in an xcode workspace.
+  # Example of a Mac OSX target configuration.
+  integration:
+    scheme: IntegrationSpecs (My Great App)
     build_configuration: Release
     build_sdk: macosx
+
+spec_directories:
+  - SpecSuite
+  - SpecBundle
+  - WatchKit/SpecBundle
+  - MacSpecSuite

data/lib/tasks/autotag.rake

@@ -1,6 +1,6 @@
 require_relative '../thrust'
 
-@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 namespace :autotag do
   task :create, :stage do |_, args|
@@ -9,6 +9,6 @@ namespace :autotag do
 
   desc 'Show the commit that is currently deployed to each environment'
   task :list do
-    Thrust::Tasks::Autotag::List.new.run(@thrust)
+    Thrust::Tasks::Autotag::List.new.run(@app_config)
   end
 end

data/lib/tasks/cedar.rake

@@ -1,6 +1,6 @@
 require_relative '../thrust'
 
-@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 desc 'Trim whitespace'
 task :trim do
@@ -9,25 +9,22 @@ end
 
 desc 'Remove any focus from specs'
 task :nof do
-  Thrust::Tasks::Nof.new.run
+  Thrust::Tasks::Nof.new.run(@app_config)
 end
 
 desc 'Print out names of files containing focused specs'
 task :focused_specs do
-  Thrust::Tasks::FocusedSpecs.new.run(@thrust)
+  Thrust::Tasks::FocusedSpecs.new.run(@app_config)
 end
 
-desc 'Clean all targets'
+desc 'Cleans all build directories'
 task :clean do
-  Thrust::Tasks::Clean.new.run(@thrust)
+  Thrust::Tasks::Clean.new.run(@app_config)
 end
 
-desc 'Clean all targets (deprecated, use "clean")'
-task :clean_build => :clean
-
-@thrust.app_config.ios_spec_targets.each do |target_name, target_info|
-  desc target_info.scheme ? "Run the #{target_info.scheme} scheme" : "Run the #{target_info.target} target"
+@app_config.spec_targets.each do |target_name, target_info|
+  desc "Run the #{target_info.scheme} scheme"
   task target_name, :device_name, :os_version do |_, args|
-    exit(1) unless Thrust::Tasks::IOSSpecs.new.run(@thrust, target_info, args)
+    exit(1) unless Thrust::Tasks::SpecRunner.new.run(@app_config, target_info, args)
   end
 end

data/lib/tasks/testflight.rake

@@ -1,21 +1,12 @@
 require_relative '../thrust'
 
-@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 namespace :testflight do
-  android_project = File.exists?('AndroidManifest.xml')
-
-  @thrust.app_config.deployment_targets.each do |task_name, deployment_config|
-    if android_project
-      desc "Deploy Android build to #{task_name} (use NOTIFY=false to prevent team notification)"
-      task task_name do |_, _|
-        Thrust::Android::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
-      end
-    else
-      desc "Deploy iOS build to #{task_name} (use NOTIFY=false to prevent team notification)"
-      task task_name do |_, _|
-        Thrust::IOS::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
-      end
+  @app_config.deployment_targets.each do |task_name, deployment_config|
+    desc "Deploy iOS build to #{task_name} (use NOTIFY=false to prevent team notification)"
+    task task_name do |_, _|
+      Thrust::DeployProvider.new.instance(@app_config, deployment_config, task_name).run
     end
   end
 end

data/lib/tasks/version.rake

@@ -1,13 +1,9 @@
 require_relative '../thrust'
 
-@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 desc 'Set build number'
 task :set_build_number, :build_number do |_, args|
-  if File.exists?('AndroidManifest.xml')
-    Thrust::Android::Tools.new.change_build_number(Time.now.utc.strftime('%y%m%d%H%M'), args[:build_number])
-  else
-    path_to_xcodeproj = @thrust.app_config.path_to_xcodeproj
-    Thrust::IOS::AgvTool.new.change_build_number(args[:build_number], nil, path_to_xcodeproj)
-  end
+  path_to_xcodeproj = @app_config.path_to_xcodeproj
+  Thrust::AgvTool.new.change_build_number(args[:build_number], nil, path_to_xcodeproj)
 end

data/lib/thrust.rb

@@ -1,25 +1,23 @@
-require 'thrust/config'
+require 'thrust/config_loader'
 require 'thrust/executor'
 require 'thrust/execution_helper'
 require 'thrust/git'
 require 'thrust/testflight'
 require 'thrust/user_prompt'
-
-require 'thrust/android/deploy'
-require 'thrust/android/deploy_provider'
-require 'thrust/android/tools'
-
-require 'thrust/ios/agv_tool'
-require 'thrust/ios/cedar'
-require 'thrust/ios/deploy'
-require 'thrust/ios/deploy_provider'
-require 'thrust/ios/x_code_tools'
-require 'thrust/ios/x_code_tools_provider'
+require 'thrust/agv_tool'
+require 'thrust/ios_spec_launcher'
+require 'thrust/osx_spec_launcher'
+require 'thrust/deploy'
+require 'thrust/deploy_provider'
+require 'thrust/xcode_tools'
+require 'thrust/xcode_tools_provider'
+require 'thrust/scheme_parser'
+require 'thrust/cedar_results_parser'
 
 require 'thrust/tasks/autotag/create'
 require 'thrust/tasks/autotag/list'
 require 'thrust/tasks/clean'
 require 'thrust/tasks/focused_specs'
-require 'thrust/tasks/ios_specs'
+require 'thrust/tasks/spec_runner'
 require 'thrust/tasks/nof'
 require 'thrust/tasks/trim'

data/lib/thrust/agv_tool.rb

@@ -0,0 +1,14 @@
+module Thrust
+  class AgvTool
+    def initialize(thrust_executor = Thrust::Executor.new, git = Thrust::Git.new)
+      @thrust_executor = thrust_executor
+      @git = git
+    end
+
+    def change_build_number(build_number, timestamp = nil, path_to_xcodeproj = nil)
+      path_to_xcodeproj = path_to_xcodeproj ? File.dirname(path_to_xcodeproj) : '.'
+      @thrust_executor.system_or_exit "cd #{path_to_xcodeproj} && agvtool new-version -all '#{timestamp ? timestamp + '-' : ''}#{build_number}'"
+      @git.checkout_file("#{path_to_xcodeproj}/*.xcodeproj")
+    end
+  end
+end

data/lib/thrust/app_config.rb

@@ -1,26 +1,32 @@
 require_relative 'deployment_target'
-require_relative 'ios_spec_target'
+require_relative 'spec_target'
 require_relative 'testflight_credentials'
 
 module Thrust
   class AppConfig
     attr_reader :app_name,
                 :deployment_targets,
-                :ios_distribution_certificate,
+                :distribution_certificate,
                 :ios_sim_path,
-                :ios_spec_targets,
+                :spec_targets,
                 :project_name,
                 :testflight,
                 :thrust_version,
                 :workspace_name,
-                :path_to_xcodeproj
+                :path_to_xcodeproj,
+                :spec_directories,
+                :build_directory,
+                :project_root
 
     def initialize(attributes)
+      @build_directory = attributes['build_directory']
+      @project_root = attributes['project_root']
       @app_name = attributes['app_name']
       @deployment_targets = generate_deployment_targets(attributes['deployment_targets'])
-      @ios_distribution_certificate = attributes['ios_distribution_certificate']
+      @distribution_certificate = attributes['distribution_certificate']
       @ios_sim_path = attributes['ios_sim_path']
-      @ios_spec_targets = generate_ios_spec_targets(attributes['ios_spec_targets'])
+      @spec_targets = generate_spec_targets(attributes['spec_targets'])
+      @spec_directories = generate_spec_directories(attributes['spec_directories'])
       @project_name = attributes['project_name']
       @testflight = generate_testflight_credentials(attributes['testflight'])
       @thrust_version = attributes['thrust_version'].to_s
@@ -30,15 +36,23 @@ module Thrust
 
     private
 
-    def generate_ios_spec_targets(ios_spec_targets_hash)
-      return {} if ios_spec_targets_hash.nil?
+    def generate_spec_targets(spec_targets_hash)
+      return {} if spec_targets_hash.nil?
 
-      ios_spec_targets_hash.inject({}) do |existing, (key, value)|
-        existing[key] = IOSSpecTarget.new(value)
+      spec_targets_hash.inject({}) do |existing, (key, value)|
+        existing[key] = SpecTarget.new(value)
         existing
       end
     end
 
+    def generate_spec_directories(spec_directories)
+      return [] if spec_directories.nil?
+
+      spec_directories.map do |sd|
+        File.expand_path(File.join(project_root, sd))
+      end
+    end
+
     def generate_deployment_targets(deployment_targets_hash)
       return {} if deployment_targets_hash.nil?
 

data/lib/thrust/cedar_results_parser.rb

@@ -0,0 +1,7 @@
+module Thrust
+  class CedarResultsParser
+    def self.parse_results_for_success(results)
+      results.include?("Finished") && !results.include?("FAILURE") && !results.include?("EXCEPTION")
+    end
+  end
+end

data/lib/thrust/config_loader.rb

@@ -0,0 +1,48 @@
+require 'colorize'
+require_relative 'app_config'
+require 'yaml'
+
+module Thrust
+  class ConfigLoader
+    class ConfigError < StandardError ; end
+    class MissingConfigError < ConfigError ; end
+    class MalformedConfigError < ConfigError ; end
+    class InvalidVersionConfigError < ConfigError ; end
+
+    THRUST_VERSION = '0.6'
+
+    def self.load_configuration(relative_project_root, config_file, out = STDERR)
+      begin
+        config = YAML.load_file(config_file)
+      rescue Errno::ENOENT
+        out.puts ""
+        out.puts "  Missing thrust.yml. Create by running:\n".red
+        out.puts "      cp thrust.example.yml thrust.yml".blue
+        raise MissingConfigError
+      rescue Psych::SyntaxError
+        out.puts ""
+        out.puts "  Malformed thrust.yml.".red
+        raise MalformedConfigError
+      end
+
+      project_root = File.expand_path(relative_project_root)
+      config['project_root'] = project_root
+      config['build_directory'] = File.join(project_root, 'build')
+
+      app_config = Thrust::AppConfig.new(config)
+      verify_configuration(app_config, out)
+
+      app_config
+    end
+
+    private
+
+    def self.verify_configuration(app_config, out)
+      if app_config.thrust_version != THRUST_VERSION
+        out.puts ''
+        out.puts "  Invalid configuration. Have you updated thrust recently? Your thrust.yml specifies an out-of-date version, and thrust is at version: #{THRUST_VERSION}. See README for details.".red
+        raise InvalidVersionConfigError
+      end
+    end
+  end
+end

data/lib/thrust/deploy.rb

@@ -0,0 +1,53 @@
+module Thrust
+  class Deploy
+    def initialize(out, xcode_tools, agv_tool, git, testflight, app_config, deployment_config, deployment_target)
+      @out = out
+      @xcode_tools = xcode_tools
+      @agv_tool = agv_tool
+      @git = git
+      @testflight = testflight
+      @app_config = app_config
+      @deployment_config = deployment_config
+      @deployment_target = deployment_target
+    end
+
+    def run
+      @git.ensure_clean
+
+      begin
+        @git.checkout_tag(@deployment_config.tag) if @deployment_config.tag
+
+        if @deployment_config.versioning_method != 'none'
+          if @deployment_config.versioning_method == 'commits'
+            @agv_tool.change_build_number(@git.commit_count, nil, @app_config.path_to_xcodeproj)
+          elsif @deployment_config.versioning_method == 'timestamp-sha'
+            @agv_tool.change_build_number(@git.current_commit, Time.now.utc.strftime('%y%m%d%H%M'), @app_config.path_to_xcodeproj)
+          else
+            @agv_tool.change_build_number(@git.current_commit, nil, @app_config.path_to_xcodeproj)
+          end
+        end
+
+        app_name = @app_config.app_name
+        target = @deployment_config.target || app_name
+
+        ipa_file = @xcode_tools.cleanly_create_ipa(target, app_name, @app_config.distribution_certificate, @deployment_config.provisioning_search_query)
+
+        dsym_path = "#{@xcode_tools.build_configuration_directory}/#{app_name}.app.dSYM"
+        dsym_path = nil unless File.exist?(dsym_path)
+
+        autogenerate_notes = @deployment_config.note_generation_method == 'autotag'
+        @testflight.upload(ipa_file, @deployment_config.notify, @deployment_config.distribution_list, autogenerate_notes, @deployment_target, dsym_path)
+
+        @git.create_tag(@deployment_target)
+        @git.reset
+      rescue Exception => e
+        @out.puts "\n\n"
+        @out.puts e.message.red
+        @out.puts "\n\n"
+
+        @git.reset
+        exit 1
+      end
+    end
+  end
+end

data/lib/thrust/deploy_provider.rb

@@ -0,0 +1,17 @@
+module Thrust
+  class DeployProvider
+    def instance(app_config, deployment_config, deployment_target)
+      stdout = $stdout
+      thrust_executor = Thrust::Executor.new
+      build_configuration = deployment_config.build_configuration
+      tools_options = {project_name: app_config.project_name, workspace_name: app_config.workspace_name}
+      xcode_tools = Thrust::XcodeToolsProvider.new.instance(stdout, build_configuration, app_config.build_directory, tools_options)
+      git = Thrust::Git.new(stdout, thrust_executor)
+      agv_tool = Thrust::AgvTool.new(thrust_executor, git)
+      testflight_config = app_config.testflight
+      testflight = Thrust::Testflight.new(thrust_executor, stdout, $stdin, testflight_config.api_token, testflight_config.team_token)
+
+      Thrust::Deploy.new(stdout, xcode_tools, agv_tool, git, testflight, app_config, deployment_config, deployment_target)
+    end
+  end
+end