thrust 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b885837e6c3dac116eca861cc6e772243c2d54
-  data.tar.gz: 625f5556939cdb39a575c648c9b85de3b4825a92
+  metadata.gz: 978a630b927682d5514cf9ce5b71ce2bc2c9a9ff
+  data.tar.gz: ca9c565b330db40e39c02a7ca6ee600ae1a1a682
 SHA512:
-  metadata.gz: 7f249ea7b0d1b30871c64de088427dccaf5a05fe66f1feb8707855c808374971b273b085ca1646b062e0358cac21866c9f9abc911425430c4c9ec2931a04f91d
-  data.tar.gz: 254b3ca985e6b4cee3c4d866d60e30d48fd9fe8f9fa3fdde3b665ad5b17a70eee309ec229c991ea0b64043444de9e0fcf9e1716e3079db67c84d225ae3554443
+  metadata.gz: 483178b25da64bc6d343d3032fc60b4d0bf12fdf5380794564a4bec13f2dc0e97dd6424f4111ff06c83ce891d71d5ce5e30c48ae784b0ecb8824f91142edcbe8
+  data.tar.gz: 79ea4ddc3b9ad3879d0572a354922b7a1d2ac4450f1134ee2cdf53103a916e6c3414487d6801458165adc573924c530c0c6ceb467a38f57586a722ca35d9123d

data/bin/thrust

@@ -20,7 +20,14 @@ File.open(rakefile, 'a') do |f|
   f.puts "require 'thrust/tasks'"
 end
 
-FileUtils.cp(File.join(thrust_root, 'lib', 'config', 'example.yml'), File.join(project_root, 'thrust.example.yml'))
+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'))
 puts ''
 puts "  To finish installation of " + "Thrust".green + ", rename:\n\n"
 puts "    #{project_root}/thrust.example.yml\n".blue

data/lib/config/android_example.yml

@@ -0,0 +1,17 @@
+thrust_version: 0.3
+project_name: My Great Project
+app_name: My Great App
+
+testflight:
+  api_token: 'testflight api token'
+  team_token: 'testflight team token'
+
+deployment_targets:
+  staging:
+    distribution_list: Developers
+    notify: true
+    note_generation_method: autotag  # If you set this value, it will auto-generate the deploy notes from the commit history. Optional.
+
+  demo:
+    distribution_list: Beta Testers
+    notify: true

data/lib/config/ios_example.yml

@@ -0,0 +1,39 @@
+thrust_version: 0.3
+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
+app_name: My Great App
+ios_distribution_certificate: 'Name of Distribution Signing Certificate'
+ios_sim_binary: 'ios-sim' # or wax-sim. iOS only.
+
+testflight:
+  api_token: 'testflight api token' # To find your App Token, follow the instructions at: http://help.testflightapp.com/customer/portal/articles/829956-what-does-the-api-token-do-
+  team_token: 'testflight team token' # To find your Team Token, follow the instructions at: http://help.testflightapp.com/customer/portal/articles/829942-how-do-i-find-my-team-token-
+
+deployment_targets:
+  staging:
+    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 only.
+    ios_build_configuration: Release # iOS only
+    ios_provisioning_search_query: 'query to find Provisioning Profile' # iOS only. Optional.
+
+  demo:
+    distribution_list: Beta Testers
+    notify: true
+
+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 in addition to target when you want to use a scheme (necessary if you are building with an xcode workspace)
+    build_configuration: Debug # name of the build configuration
+    build_sdk: iphonesimulator7.0 # SDK used to build the target. Optional, defaults to latest iphonesimulator.
+    runtime_sdk: 7.0 # SDK used to run the target. Not optional.
+    device: ipad # Device to run the specs on. Optional, defaults to iPhone.
+
+  integration:
+    target: IntegrationSpecs
+#    scheme: IntegrationSpecs (My Great App) # use in addition to target when you want to use a scheme (necessary if you are building with an xcode workspace)
+    build_configuration: Release
+    build_sdk: macosx
+    runtime_sdk: macosx

data/lib/tasks/cedar.rake

@@ -3,6 +3,8 @@ require 'tmpdir'
 require File.expand_path('../../thrust', __FILE__)
 
 @thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@xcode_tools_provider = Thrust::IOS::XCodeToolsProvider.new
+@executor = Thrust::Executor.new
 
 desc 'Trim whitespace'
 task :trim do
@@ -16,51 +18,57 @@ task :trim do
   AWK
   awk_statement.gsub!(%r{\s+}, " ")
 
-  Thrust::Executor.system_or_exit %Q[git status --porcelain | awk '#{awk_statement}' | grep -e '.*\.[cmh]$' | xargs sed -i '' -e 's/	/    /g;s/ *$//g;']
+  @executor.system_or_exit %Q[git status --porcelain | awk '#{awk_statement}' | grep -e '.*\.[cmh]$' | xargs sed -i '' -e 's/	/    /g;s/ *$//g;']
 end
 
-desc "Remove any focus from specs"
+desc 'Remove any focus from specs'
 task :nof do
   substitutions = focused_methods.map do |method|
     unfocused_method = method.sub(/^f/, '')
     "-e 's/#{method}/#{unfocused_method}/g;'"
   end
 
-  Thrust::Executor.system_or_exit %Q[ rake focused_specs | xargs -I filename sed -i '' #{substitutions.join(' ')} "filename" ]
+  @executor.system_or_exit %Q[ rake focused_specs | xargs -I filename sed -i '' #{substitutions.join(' ')} "filename" ]
 end
 
-desc "Print out names of files containing focused specs"
+desc 'Print out names of files containing focused specs'
 task :focused_specs do
   pattern = focused_methods.join("\\|")
   directories = @thrust.app_config['ios_spec_targets'].values.map {|h| h['target']}.join(' ')
-  Thrust::Executor.system_or_exit %Q[ grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks' ; exit 0 ]
+  @executor.system_or_exit %Q[ grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks' ; exit 0 ]
 end
 
 desc 'Clean all targets'
-task :clean_build do
-  Thrust::IOS::XCodeTools.build_configurations(@thrust.app_config['project_name']).each do |config|
-    xcode_tools = Thrust::IOS::XCodeTools.new($stdout, config, @thrust.build_dir, @thrust.app_config['project_name'])
-    xcode_tools.clean_build
-  end
+task :clean do
+  xcode_tools_instance(nil).clean_build
 end
 
+desc 'Clean all targets (deprecated, use "clean")'
+task :clean_build => :clean
+
 (@thrust.app_config['ios_spec_targets'] || []).each do |task_name, target_info|
-  desc "Run the #{target_info['target']} target"
-  task task_name do
+  desc target_info['scheme'] ? "Run the #{target_info['scheme'].inspect} scheme" :  "Run the #{target_info['target'].inspect} target"
+  task task_name, :runtime_sdk do |_, args|
     build_configuration = target_info['build_configuration']
     target = target_info['target']
+    scheme = target_info['scheme']
     build_sdk = target_info['build_sdk'] || 'iphonesimulator' #build sdk - version you compile the code with
-    runtime_sdk = target_info['runtime_sdk'] #runtime sdk
+    runtime_sdk = args[:runtime_sdk] || target_info['runtime_sdk'] #runtime sdk
 
-    xcode_tools = Thrust::IOS::XCodeTools.new($stdout, build_configuration, @thrust.build_dir, @thrust.app_config['project_name'])
-    xcode_tools.clean_and_build_target(target, build_sdk)
+    xcode_tools = xcode_tools_instance(build_configuration)
+    xcode_tools.build_scheme_or_target(scheme || target, build_sdk, 'i386')
 
-    cedar_success = Thrust::IOS::Cedar.run($stdout, build_configuration, target, runtime_sdk, build_sdk, target_info['device'], @thrust.build_dir, @thrust.app_config['ios_sim_binary'])
+    cedar_success = Thrust::IOS::Cedar.new.run($stdout, build_configuration, target, runtime_sdk, build_sdk, target_info['device'], @thrust.build_dir, @thrust.app_config['ios_sim_binary'])
 
-		exit(cedar_success ? 0 : 1)
+    exit(1) unless cedar_success
   end
 end
 
 def focused_methods
-  ["fit", "fcontext", "fdescribe"].map { |method| "#{method}(@" }
+  %w(fit fcontext fdescribe).map { |method| "#{method}(@" }
+end
+
+def xcode_tools_instance(build_configuration)
+  tools_options = { project_name: @thrust.app_config['project_name'], workspace_name: @thrust.app_config['workspace_name'] }
+  @xcode_tools_provider.instance($stdout, build_configuration, @thrust.build_dir, tools_options)
 end

data/lib/tasks/testflight.rake

@@ -11,14 +11,14 @@ namespace :testflight do
     if android_project
       desc "Deploy Android build to #{task_name} (use NOTIFY=false to prevent team notification)"
       task task_name do |_, _|
-        Thrust::Android::Deploy.make(@thrust, deployment_config, task_name).run
+        Thrust::Android::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
 
         Rake::Task['autotag:create'].invoke(task_name)
       end
     else
       desc "Deploy iOS build to #{task_name} (use NOTIFY=false to prevent team notification)"
       task task_name do |_, _|
-        Thrust::IOS::Deploy.make(@thrust, deployment_config, task_name).run
+        Thrust::IOS::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
 
         Rake::Task['autotag:create'].invoke(task_name)
       end
@@ -34,7 +34,7 @@ namespace :autotag do
   desc 'Show the commit that is currently deployed to each environment'
   task :list do
     @thrust.app_config['deployment_targets'].each do |deployment_target, _|
-      puts Thrust::Git.new($stdout).commit_summary_for_last_deploy(deployment_target)
+      puts Thrust::Git.new(Thrust::Executor.new, $stdout).commit_summary_for_last_deploy(deployment_target)
     end
   end
 end

data/lib/tasks/version.rake

@@ -0,0 +1,12 @@
+require File.expand_path('../../thrust', __FILE__)
+
+desc 'Set build number'
+task :set_build_number, :build_number do |_, args|
+  executor = Thrust::Executor.new
+
+  if File.exists?('AndroidManifest.xml')
+    Thrust::Android::Tools.new(executor, $stdout).change_build_number(Time.now.utc.strftime('%y%m%d%H%M'), args[:build_number])
+  else
+    Thrust::IOS::AgvTool.new(executor, $stdout).change_build_number(args[:build_number])
+  end
+end

data/lib/thrust/android/deploy.rb

@@ -1,15 +1,4 @@
 class Thrust::Android::Deploy
-  def self.make(thrust_config, deployment_config, deployment_target)
-    tools = Thrust::Android::Tools.new($stdout)
-    git = Thrust::Git.new($stdout)
-
-    testflight_config = thrust_config.app_config['testflight']
-    testflight = Thrust::Testflight.new($stdout, $stdin, testflight_config['api_token'], testflight_config['team_token'])
-
-    autogenerate_notes = deployment_config['note_generation_method'] == 'autotag'
-    new($stdout, tools, git, testflight, deployment_config['notify'], deployment_config['distribution_list'], autogenerate_notes, deployment_target)
-  end
-
   def initialize(out, tools, git, testflight, notify, distribution_list, autogenerate_notes, deployment_target)
     @out = out
     @tools = tools

data/lib/thrust/android/deploy_provider.rb

@@ -0,0 +1,13 @@
+class Thrust::Android::DeployProvider
+  def instance(thrust_config, deployment_config, deployment_target)
+    thrust_executor = Thrust::Executor.new
+    tools = Thrust::Android::Tools.new(thrust_executor, $stdout)
+    git = Thrust::Git.new(thrust_executor, $stdout)
+
+    testflight_config = thrust_config.app_config['testflight']
+    testflight = Thrust::Testflight.new(thrust_executor, $stdout, $stdin, testflight_config['api_token'], testflight_config['team_token'])
+
+    autogenerate_notes = deployment_config['note_generation_method'] == 'autotag'
+    Thrust::Android::Deploy.new($stdout, tools, git, testflight, deployment_config['notify'], deployment_config['distribution_list'], autogenerate_notes, deployment_target)
+  end
+end

data/lib/thrust/android/tools.rb

@@ -1,33 +1,39 @@
 require 'colorize'
 
 class Thrust::Android::Tools
-  def initialize(out)
+  def initialize(thrust_executor, out)
+    @thrust_executor = thrust_executor
     @out = out
-
-    if ENV['ANDROID_HOME'].nil?
-      if File.directory?('/usr/local/opt/android-sdk')
-        @out.puts 'Setting /usr/local/opt/android-sdk as ANDROID_HOME...'.magenta
-        ENV['ANDROID_HOME'] = '/usr/local/opt/android-sdk'
-      else
-        raise('**********Android is not installed. Run `brew install android`.**********')
-      end
-    end
   end
 
   def change_build_number(version_code, version_name)
-    Thrust::Executor.system_or_exit(
+    @thrust_executor.system_or_exit(
         "sed -i ''" +
             " -e 's/android:versionCode=\"[0-9]*\"/android:versionCode=\"#{version_code}\"/'" +
             " -e 's/android:versionName=\"\\([^ \"]*\\)[^\"]*\"/android:versionName=\"\\1 (#{version_name})\"/'" +
             " AndroidManifest.xml")
-    Thrust::Executor.system_or_exit(
+    @thrust_executor.system_or_exit(
         "sed -i ''" +
             " '1,/<version>/s/<version>\\([^- <]*\\)[^<]*<\\/version>/<version>\\1 (#{version_name})<\\/version>/'" +
             " pom.xml")
   end
 
   def build_signed_release
-    Thrust::Executor.system_or_exit('mvn clean package -Prelease')
+    verify_android_installed!
+    @thrust_executor.system_or_exit('mvn clean package -Prelease')
     Dir.glob('target/*-signed-aligned.apk').first or raise 'Signed APK was not generated'
   end
+
+  private
+
+  def verify_android_installed!
+    if ENV['ANDROID_HOME'].nil?
+      if File.directory?('/usr/local/opt/android-sdk')
+        @out.puts 'Setting /usr/local/opt/android-sdk as ANDROID_HOME...'.magenta
+        ENV['ANDROID_HOME'] = '/usr/local/opt/android-sdk'
+      else
+        raise('**********Android is not installed. Run `brew install android`.**********')
+      end
+    end
+  end
 end

data/lib/thrust/config.rb

@@ -2,7 +2,7 @@ require 'colorize'
 
 class Thrust::Config
   attr_reader :project_root, :app_config, :build_dir
-  THRUST_VERSION = 0.2
+  THRUST_VERSION = 0.3
   THRUST_ROOT = File.expand_path('../..', __FILE__)
 
   def self.make(relative_project_root, config_file)

data/lib/thrust/executor.rb

@@ -1,22 +1,24 @@
-module Thrust::Executor
-  def self.system_or_exit(cmd, output_file = nil)
-    self.system(cmd, output_file) or raise '******** Build failed ********'
+class Thrust::Executor
+  CommandFailed = Class.new(StandardError)
+
+  def system_or_exit(cmd, output_file = nil)
+    system(cmd, output_file) or raise(CommandFailed, '******** Build failed ********')
   end
 
-  def self.system(cmd, output_file = nil)
+  def system(cmd, output_file = nil)
     STDERR.puts "Executing #{cmd}"
     cmd += " > #{output_file}" if output_file
     Kernel::system(cmd)
   end
 
-  def self.capture_output_from_system(cmd)
+  def capture_output_from_system(cmd)
     captured_output = `#{cmd}`
-    raise '******** Build failed ********' if $?.exitstatus > 0
+    raise(CommandFailed, '******** Build failed ********') if $?.exitstatus > 0
 
     captured_output
   end
 
-  def self.check_command_for_failure(cmd)
+  def check_command_for_failure(cmd)
     STDERR.puts "Executing #{cmd} and checking for FAILURE"
     result = %x[#{cmd} 2>&1]
     STDERR.puts "Results:"

data/lib/thrust/git.rb

@@ -1,7 +1,8 @@
 require 'colorize'
 
 class Thrust::Git
-  def initialize(out)
+  def initialize(thrust_executor, out)
+    @thrust_executor = thrust_executor
     @out = out
   end
 
@@ -10,20 +11,20 @@ class Thrust::Git
       @out.puts 'WARNING NOT CHECKING FOR CLEAN WORKING DIRECTORY'.red
     else
       @out.puts 'Checking for clean working tree...'
-      Thrust::Executor.system_or_exit 'git diff-index --quiet HEAD'
+      @thrust_executor.system_or_exit 'git diff-index --quiet HEAD'
     end
   end
 
   def current_commit
-    Thrust::Executor.capture_output_from_system('git log --format=format:%h -1').strip
+    @thrust_executor.capture_output_from_system('git log --format=format:%h -1').strip
   end
 
   def reset
-    Thrust::Executor.system_or_exit('git reset --hard')
+    @thrust_executor.system_or_exit('git reset --hard')
   end
 
   def checkout_file(filename)
-    Thrust::Executor.system_or_exit("git checkout #{filename}")
+    @thrust_executor.system_or_exit("git checkout #{filename}")
   end
 
   def commit_summary_for_last_deploy(deployment_target)
@@ -36,13 +37,13 @@ class Thrust::Git
   end
 
   def generate_notes_for_deployment(deployment_target)
-    sha_of_latest_commit = Thrust::Executor.capture_output_from_system('git rev-parse HEAD').strip
+    sha_of_latest_commit = @thrust_executor.capture_output_from_system('git rev-parse HEAD').strip
     sha_of_latest_deployed_commit = latest_deployed_commit(deployment_target)
 
     notes = Tempfile.new('deployment_notes')
 
     if sha_of_latest_deployed_commit
-      Thrust::Executor.system_or_exit("git log --oneline #{sha_of_latest_deployed_commit}...#{sha_of_latest_commit}", notes.path)
+      @thrust_executor.system_or_exit("git log --oneline #{sha_of_latest_deployed_commit}...#{sha_of_latest_commit}", notes.path)
     else
       notes.puts(summary_for_commit(sha_of_latest_commit))
       notes.close
@@ -54,11 +55,11 @@ class Thrust::Git
   private
 
   def summary_for_commit(sha)
-    Thrust::Executor.capture_output_from_system("git log --oneline -n 1 #{sha}")
+    @thrust_executor.capture_output_from_system("git log --oneline -n 1 #{sha}")
   end
 
   def latest_deployed_commit(deployment_target)
-    list = Thrust::Executor.capture_output_from_system("autotag list #{deployment_target}")
+    list = @thrust_executor.capture_output_from_system("autotag list #{deployment_target}")
     unless list.strip.empty?
       list.split("\n").last.split(" ").first
     end

data/lib/thrust/ios/agv_tool.rb

@@ -0,0 +1,13 @@
+class Thrust::IOS::AgvTool
+
+  def initialize(thrust_executor, out)
+    @thrust_executor = thrust_executor
+    @out = out
+    @git = Thrust::Git.new(@thrust_executor, @out)
+  end
+
+  def change_build_number(build_number)
+    @thrust_executor.system_or_exit "agvtool new-version -all '#{build_number}'"
+    @git.checkout_file('*.xcodeproj')
+  end
+end

data/lib/thrust/ios/cedar.rb

@@ -1,17 +1,21 @@
 class Thrust::IOS::Cedar
 
-  def self.run(out, build_configuration, target, runtime_sdk, build_sdk, device, build_dir, simulator_binary)
+  def initialize(thrust_executor = Thrust::Executor.new)
+    @thrust_executor = thrust_executor
+  end
+
+  def run(out, build_configuration, target, runtime_sdk, build_sdk, device, build_dir, simulator_binary)
     if build_sdk == 'macosx'
       build_path = File.join(build_dir, build_configuration)
       app_dir = File.join(build_path, target)
-      Thrust::Executor.check_command_for_failure("DYLD_FRAMEWORK_PATH=#{build_path.inspect} #{app_dir}")
+      @thrust_executor.check_command_for_failure("DYLD_FRAMEWORK_PATH=#{build_path.inspect} #{app_dir}")
     else
       app_executable = File.join(build_dir, "#{build_configuration}-#{build_sdk}", "#{target}.app")
 
       if simulator_binary =~ /waxim%/
-        Thrust::Executor.check_command_for_failure(%Q[#{simulator_binary} -s #{runtime_sdk} -f #{device} -e CFFIXED_USER_HOME=#{Dir.tmpdir} -e CEDAR_HEADLESS_SPECS=1 -e CEDAR_REPORTER_CLASS=CDRDefaultReporter #{app_executable}])
+        @thrust_executor.check_command_for_failure(%Q[#{simulator_binary} -s #{runtime_sdk} -f #{device} -e CFFIXED_USER_HOME=#{Dir.tmpdir} -e CEDAR_HEADLESS_SPECS=1 -e CEDAR_REPORTER_CLASS=CDRDefaultReporter #{app_executable}])
       elsif simulator_binary =~ /ios-sim$/
-        Thrust::Executor.check_command_for_failure(%Q[#{simulator_binary} launch #{app_executable} --sdk #{runtime_sdk} --family #{device} --retina --tall --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_HEADLESS_SPECS=1 --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
+        @thrust_executor.check_command_for_failure(%Q[#{simulator_binary} launch #{app_executable} --sdk #{runtime_sdk} --family #{device} --retina --tall --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_HEADLESS_SPECS=1 --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
       else
         out.puts "Unknown binary for running specs: '#{simulator_binary}'"
         false

data/lib/thrust/ios/deploy.rb

@@ -1,17 +1,8 @@
 class Thrust::IOS::Deploy
-  def self.make(thrust_config, deployment_config, deployment_target)
-    build_configuration = deployment_config['ios_build_configuration']
-    x_code_tools = Thrust::IOS::XCodeTools.new($stdout, build_configuration, thrust_config.build_dir, thrust_config.app_config['project_name'])
-    git = Thrust::Git.new($stdout)
-    testflight_config = thrust_config.app_config['testflight']
-    testflight = Thrust::Testflight.new($stdout, $stdin, testflight_config['api_token'], testflight_config['team_token'])
-
-    new($stdout, x_code_tools, git, testflight, thrust_config, deployment_config, deployment_target)
-  end
-
-  def initialize(out, x_code_tools, git, testflight, thrust_config, deployment_config, deployment_target)
+  def initialize(out, x_code_tools, agv_tool, git, testflight, thrust_config, deployment_config, deployment_target)
     @out = out
     @x_code_tools = x_code_tools
+    @agv_tool = agv_tool
     @git = git
     @testflight = testflight
     @thrust_config = thrust_config
@@ -21,7 +12,7 @@ class Thrust::IOS::Deploy
 
   def run
     @git.ensure_clean
-    @x_code_tools.change_build_number(@git.current_commit)
+    @agv_tool.change_build_number(@git.current_commit)
 
     app_name = @thrust_config.app_config['app_name']
     target = @deployment_config['ios_target'] || app_name

data/lib/thrust/ios/deploy_provider.rb

@@ -0,0 +1,15 @@
+class Thrust::IOS::DeployProvider
+  def instance(thrust_config, deployment_config, deployment_target)
+    stdout = $stdout
+    thrust_executor = Thrust::Executor.new
+    build_configuration = deployment_config['ios_build_configuration']
+    tools_options = { project_name: thrust_config.app_config['project_name'], workspace_name: thrust_config.app_config['workspace_name'] }
+    x_code_tools = Thrust::IOS::XCodeToolsProvider.new.instance(stdout, build_configuration, thrust_config.build_dir, tools_options)
+    agv_tool = Thrust::IOS::AgvTool.new(thrust_executor, stdout)
+    git = Thrust::Git.new(thrust_executor, stdout)
+    testflight_config = thrust_config.app_config['testflight']
+    testflight = Thrust::Testflight.new(thrust_executor, stdout, $stdin, testflight_config['api_token'], testflight_config['team_token'])
+
+    Thrust::IOS::Deploy.new(stdout, x_code_tools, agv_tool, git, testflight, thrust_config, deployment_config, deployment_target)
+  end
+end

data/lib/thrust/ios/x_code_tools.rb

@@ -1,33 +1,21 @@
 class Thrust::IOS::XCodeTools
   ProvisioningProfileNotFound = Class.new(StandardError)
 
-  def self.build_configurations(project_name) #TODO:  Backfill a test
-    output = Thrust::Executor.capture_output_from_system("xcodebuild -project #{project_name}.xcodeproj -list")
-    match = /Build Configurations:(.+?)\n\n/m.match(output)
-    if match
-      match[1].strip.split("\n").map { |line| line.strip }
-    else
-      []
-    end
-  end
-
-  def initialize(out, build_configuration, build_directory, project_name)
+  def initialize(thrust_executor, out, build_configuration, build_directory, options = {})
+    @thrust_executor = thrust_executor
     @out = out
-    @git = Thrust::Git.new(out)
+    @git = Thrust::Git.new(@thrust_executor, @out)
     @build_configuration = build_configuration
     @build_directory = build_directory
-    @project_name = project_name
-  end
-
-  def change_build_number(build_number)
-    Thrust::Executor.system_or_exit "agvtool new-version -all '#{build_number}'"
-    @git.checkout_file('*.xcodeproj')
+    @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)
     clean_build
     kill_simulator
-    build_target(target, 'iphoneos')
+    build_scheme_or_target(target, 'iphoneos')
     create_ipa(app_name, signing_identity, provision_search_query)
   end
 
@@ -37,27 +25,21 @@ class Thrust::IOS::XCodeTools
 
   def clean_build
     @out.puts 'Cleaning...'
-    run_xcode('clean')
-    FileUtils.rm_rf(build_configuration_directory)
+    FileUtils.rm_rf(@build_directory)
   end
 
-  def clean_and_build_target(target, build_sdk)
-    clean_build
-    build_target(target, build_sdk)
+  def build_scheme_or_target(scheme_or_target, build_sdk, architecture=nil)
+    @out.puts "Building..."
+    run_xcode('build', build_sdk, scheme_or_target, architecture)
   end
 
   private
 
-  def build_target(target, build_sdk)
-    @out.puts "Building..."
-    run_xcode('build', build_sdk, target)
-  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 "iPhone Simulator"]
+    @thrust_executor.system %q[killall -m -KILL "gdb"]
+    @thrust_executor.system %q[killall -m -KILL "otest"]
+    @thrust_executor.system %q[killall -m -KILL "iPhone Simulator"]
   end
 
   def provision_path(provision_search_query)
@@ -79,30 +61,37 @@ class Thrust::IOS::XCodeTools
         "--sign '#{signing_identity}'",
         "--embed '#{provision_path(provision_search_query)}'"
     ].join(' ')
-    Thrust::Executor.system_or_exit(cmd)
+    @thrust_executor.system_or_exit(cmd)
     ipa_filename
   end
 
-
-  def run_xcode(build_command, sdk = nil, target = nil)
-    target_flag = target ? "-target #{target}" : "-alltargets"
-    sdk_flag = sdk ? "-sdk #{sdk}" : ''
-
-    Thrust::Executor.system_or_exit(
-        [
-            'set -o pipefail &&',
-            'xcodebuild',
-            "-project #{@project_name}.xcodeproj",
-            target_flag,
-            "-configuration #{@build_configuration}",
-            sdk_flag,
-            "#{build_command}",
-            "SYMROOT=#{@build_directory.inspect}",
-            '2>&1',
-            "| grep -v 'backing file'"
-        ].join(' '),
-        output_file("#{@build_configuration}-#{build_command}")
-    )
+  def run_xcode(build_command, sdk = nil, scheme_or_target = nil, architecture=nil)
+    architecture_flag = architecture ? "-arch #{architecture}" : nil
+    target_flag = @workspace_name ? "-scheme \"#{scheme_or_target}\"" : "-target \"#{scheme_or_target}\""
+    sdk_flag = sdk ? "-sdk #{sdk}" : nil
+    configuration_build_dir = File.join(@build_directory, "#{@build_configuration}-#{sdk}")
+
+    command = [
+      'set -o pipefail &&',
+      'xcodebuild',
+      project_or_workspace_flag,
+      architecture_flag,
+      target_flag,
+      "-configuration #{@build_configuration}",
+      sdk_flag,
+      "#{build_command}",
+      "SYMROOT=#{@build_directory.inspect}",
+      "CONFIGURATION_BUILD_DIR=#{configuration_build_dir.inspect}",
+      '2>&1',
+      "| grep -v 'backing file'"
+    ].compact.join(' ')
+    output_file = output_file("#{@build_configuration}-#{build_command}")
+    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 output_file(target)
@@ -114,4 +103,8 @@ class Thrust::IOS::XCodeTools
 
     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

data/lib/thrust/ios/x_code_tools_provider.rb

@@ -0,0 +1,10 @@
+class Thrust::IOS::XCodeToolsProvider
+
+  def initialize(thrust_executor = Thrust::Executor.new)
+    @thrust_executor = thrust_executor
+  end
+
+  def instance(out, build_configuration, build_directory, options)
+    Thrust::IOS::XCodeTools.new(@thrust_executor, out, build_configuration, build_directory, options)
+  end
+end

data/lib/thrust/tasks.rb

@@ -1,3 +1,3 @@
-Dir[File.expand_path("../../tasks/*.rake", __FILE__)].each do |file|
-  load file
-end
+load File.expand_path("../../tasks/cedar.rake", __FILE__) unless File.exists?('AndroidManifest.xml')
+load File.expand_path("../../tasks/testflight.rake", __FILE__)
+load File.expand_path("../../tasks/version.rake", __FILE__)

data/lib/thrust/testflight.rb

@@ -1,8 +1,9 @@
 class Thrust::Testflight
-  def initialize(out, input, api_token, team_token)
+  def initialize(thrust_executor, out, input, api_token, team_token)
+    @thrust_executor = thrust_executor
     @out = out
     @in = input
-    @git = Thrust::Git.new(@out)
+    @git = Thrust::Git.new(@thrust_executor, @out)
     @api_token = api_token
     @team_token = team_token
   end
@@ -11,7 +12,7 @@ class Thrust::Testflight
     if dsym_path
       @out.puts 'Zipping dSYM...'
       zipped_dsym_path = "#{dsym_path}.zip"
-      Thrust::Executor.system_or_exit "zip -r -T -y '#{zipped_dsym_path}' '#{dsym_path}'"
+      @thrust_executor.system_or_exit "zip -r -T -y '#{zipped_dsym_path}' '#{dsym_path}'"
       @out.puts 'Done!'
     end
 
@@ -22,7 +23,7 @@ class Thrust::Testflight
     end
 
 
-    Thrust::Executor.system_or_exit [
+    @thrust_executor.system_or_exit [
                                       'curl http://testflightapp.com/api/builds.json',
                                       "-F file=@#{package_file}",
                                       ("-F dsym=@#{zipped_dsym_path}" if dsym_path),

data/lib/thrust.rb

@@ -9,8 +9,12 @@ 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'

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
-- Michael McCormick
-- Johnathon Britz
-- Jonathan Barnes
+- Aaron Levine
+- Aaron VonderHaar
+- Andrew Bruce
 - Andrew Kitchen
-- Tyler Schultz
-- Wiley Kestner
 - Brandon Liu
+- Can Berk Güder
+- Eugenia Dellapenna
 - Jeff Hui
+- Johnathon Britz
+- Jonathan Barnes
+- Michael McCormick
+- Molly Trombley-McCann
 - Philip Kuryloski
-- Andrew Bruce
-- Aaron Levine
-- Eugenia Dellapenna
-- Aaron VonderHaar
-- Sheel Choksi
 - Rachel Bobbins
-- Molly Trombley-McCann
+- Sheel Choksi
+- Tyler Schultz
+- Wiley Kestner
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -119,18 +120,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/thrust
-- lib/config/example.yml
+- lib/config/android_example.yml
+- lib/config/ios_example.yml
 - lib/tasks/cedar.rake
 - lib/tasks/testflight.rake
+- lib/tasks/version.rake
 - lib/thrust.rb
 - lib/thrust/android/deploy.rb
+- lib/thrust/android/deploy_provider.rb
 - lib/thrust/android/tools.rb
 - lib/thrust/config.rb
 - lib/thrust/executor.rb
 - lib/thrust/git.rb
+- lib/thrust/ios/agv_tool.rb
 - lib/thrust/ios/cedar.rb
 - lib/thrust/ios/deploy.rb
+- lib/thrust/ios/deploy_provider.rb
 - lib/thrust/ios/x_code_tools.rb
+- lib/thrust/ios/x_code_tools_provider.rb
 - lib/thrust/tasks.rb
 - lib/thrust/testflight.rb
 - lib/thrust/user_prompt.rb
@@ -154,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Thrust is a collection of rake tasks for iOS/Android development and deployment

data/lib/config/example.yml

@@ -1,36 +0,0 @@
-thrust_version: 0.2
-project_name: My Great Project
-app_name: My Great App
-ios_distribution_certificate: 'Name of Distribution Signing Certificate'
-ios_sim_binary: 'ios-sim' # or wax-sim. iOS only.
-
-testflight:
-  api_token: 'testflight api token'
-  team_token: 'testflight team token'
-
-deployment_targets:
-  staging:
-    distribution_list: Developers
-    notify: true
-    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 only.
-    ios_build_configuration: Release # iOS only
-    ios_provisioning_search_query: 'query to find Provisioning Profile' # iOS only. Optional.
-
-  demo:
-    distribution_list: Beta Testers
-    notify: true
-
-ios_spec_targets:
-  specs:
-    target: UISpecs # name of the build target
-    build_configuration: Debug # name of the build configuration
-    build_sdk: 6.1 # SDK used to build the target. Optional, defaults to iphonesimulator.
-    runtime_sdk: 7.0 # SDK used to run the target. Not optional.
-    device: ipad # Device to run the specs on. Optional, defaults to iPhone.
-
-  integration:
-    target: IntegrationSpecs
-    build_configuration: Release
-    build_sdk: macosx
-    runtime_sdk: macosx