thrust 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3c733a86a1d3a7d7aec4521cc0c746713b8225
-  data.tar.gz: e9b1773c0d258a7aa9409b6cb0e07fd72eda7157
+  metadata.gz: 1fb35577e4d2487d491cf57395111792a028a785
+  data.tar.gz: f0e51c4c87b0c4a13bca26cd6e6a470e35c67da6
 SHA512:
-  metadata.gz: b498bcb659a91cbfd17fabef26e3a7b26e109a034e86475526d5255321ff049395e75675dc76212c43afbb1a9092ea33c5b6ef42445eb3476c14e863ef96d486
-  data.tar.gz: 6579b916c3db7a727960a744147773d10e438ff97f20ec940837f33e24db7868f9529b515166379e1a2efda12ba92feec5a6dc6a2404bb66b171cf80f7571de0
+  metadata.gz: bd29c2f0d662de90beb61fff4184025a56fdceff88cff0a47425f5f8c2bed2bc94b31a6c7a87bce8490a7ac77846cbea9e69816c5352d59dbca1ff63103dc098
+  data.tar.gz: fa708a3f2a70f51bb1063487e59c6276d1811364057f35db4d627d95d7e90ddaf7439b6ba24367d2d8df49d4d7186e2d867b65d706e28c5e79843f0e16e8ff91

data/bin/thrust

@@ -16,8 +16,8 @@ project_root = Dir.pwd
 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'"
+File.open(rakefile, 'a+') do |f|
+  f.puts "require 'thrust/tasks'" unless f.grep(/require 'thrust\/tasks'/).any?
 end
 
 if File.exists?('AndroidManifest.xml')
@@ -29,12 +29,8 @@ 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
-puts "  to:\n\n"
-puts "    #{project_root}/thrust.yml\n".blue
-puts "  and edit it for your project."
+puts '  To finish installation of Thrust, rename ' + 'thrust.example.yml'.blue + ' to ' + 'thrust.yml'.blue + ' and edit it for your project.'
 
 puts ''
-puts "  Thrust rake tasks were generated in your Rakefile."
-puts "  Type 'rake -T' to see the list of tasks after you have created your thrust.yml configuration.".green
+puts '  Thrust rake tasks were generated in your Rakefile.'
+puts "  Type 'rake -T' to see the list of available tasks after you have created your thrust.yml configuration."

data/lib/config/android_example.yml

@@ -1,4 +1,4 @@
-thrust_version: 0.4
+thrust_version: 0.5
 project_name: My Great Project
 app_name: My Great App
 

data/lib/config/ios_example.yml

@@ -1,10 +1,10 @@
-thrust_version: 0.4
+thrust_version: 0.5
 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'
-ios_sim_binary: 'ios-sim' # or wax-sim. iOS only.
+#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:
   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-
@@ -15,29 +15,38 @@ 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 only.
-    ios_build_configuration: Release # iOS only
-    ios_provisioning_search_query: 'query to find Provisioning Profile' # iOS only. Optional.
-    versioning_method: 'none' # Optional. Leave blank to use Git commit sha's for build numbers.
+    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/
+    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'
 
 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)
-    type: app # Spec target type: app or bundle. Optional, defaults to app.
-    build_configuration: Debug # name of the build configuration
+    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.
+    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.
-    runtime_sdk: 7.0 # SDK used to run the target. Not optional.
-#    device: ipad # Device to run the specs on. Deprecated in ios-sim 3.0+, use device_type_id instead.
-    device_type_id: com.apple.CoreSimulator.SimDeviceType.iPad-Retina, 7.0 # required if using ios-sim 3.0
+    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.
 
-  integration:
+  spec_bundle: # Example of a spec bundle configuration.
+    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 in addition to target when you want to use a scheme (necessary if you are building with an xcode workspace)
+    scheme: IntegrationSpecs (My Great App) # Use if the scheme name is different from the target name.  Necessary when building in an xcode workspace.
     build_configuration: Release
     build_sdk: macosx
-    runtime_sdk: macosx

data/lib/tasks/cedar.rake

@@ -27,7 +27,7 @@ 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"
-  task target_name, :runtime_sdk do |_, args|
+  task target_name, :device_name, :os_version do |_, args|
     exit(1) unless Thrust::Tasks::IOSSpecs.new.run(@thrust, target_info, args)
   end
 end

data/lib/tasks/testflight.rake

@@ -10,15 +10,19 @@ namespace :testflight do
       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
-
-        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::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
+        begin
+          Thrust::IOS::DeployProvider.new.instance(@thrust, deployment_config, task_name).run
+        rescue Exception => e
+          puts "\n\n"
+          puts e.message.red
+          puts "\n\n"
 
-        Rake::Task['autotag:create'].invoke(task_name)
+          Thrust::Git.new($stdout, Thrust::Executor.new).reset
+        end
       end
     end
   end

data/lib/tasks/version.rake

@@ -8,6 +8,6 @@ task :set_build_number, :build_number do |_, args|
     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], path_to_xcodeproj)
+    Thrust::IOS::AgvTool.new.change_build_number(args[:build_number], nil, path_to_xcodeproj)
   end
 end

data/lib/thrust/android/deploy.rb

@@ -1,24 +1,26 @@
 module Thrust
   module Android
     class Deploy
-      def initialize(out, tools, git, testflight, notify, distribution_list, autogenerate_notes, deployment_target)
+      def initialize(out, tools, git, testflight, deployment_config, deployment_target)
         @out = out
         @tools = tools
         @git = git
         @testflight = testflight
-        @notify = notify
-        @distribution_list = distribution_list
+        @deployment_config = deployment_config
         @deployment_target = deployment_target
-        @autogenerate_notes = autogenerate_notes
       end
 
       def run
         @git.ensure_clean
+        @git.checkout_tag(@deployment_config.tag) if @deployment_config.tag
+
         @tools.change_build_number(Time.now.utc.strftime('%y%m%d%H%M'), @git.current_commit)
         apk_path = @tools.build_signed_release
 
-        @testflight.upload(apk_path, @notify, @distribution_list, @autogenerate_notes, @deployment_target)
+        autogenerate_notes = @deployment_config.note_generation_method == 'autotag'
+        @testflight.upload(apk_path, @deployment_config.notify, @deployment_config.distribution_list, autogenerate_notes, @deployment_target)
 
+        @git.create_tag(@deployment_target)
         @git.reset
       end
     end

data/lib/thrust/android/deploy_provider.rb

@@ -9,8 +9,7 @@ module Thrust
         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)
+        Thrust::Android::Deploy.new($stdout, tools, git, testflight, deployment_config, deployment_target)
       end
     end
   end

data/lib/thrust/app_config.rb

@@ -7,7 +7,7 @@ module Thrust
     attr_reader :app_name,
                 :deployment_targets,
                 :ios_distribution_certificate,
-                :ios_sim_binary,
+                :ios_sim_path,
                 :ios_spec_targets,
                 :project_name,
                 :testflight,
@@ -19,7 +19,7 @@ module Thrust
       @app_name = attributes['app_name']
       @deployment_targets = generate_deployment_targets(attributes['deployment_targets'])
       @ios_distribution_certificate = attributes['ios_distribution_certificate']
-      @ios_sim_binary = attributes['ios_sim_binary']
+      @ios_sim_path = attributes['ios_sim_path']
       @ios_spec_targets = generate_ios_spec_targets(attributes['ios_spec_targets'])
       @project_name = attributes['project_name']
       @testflight = generate_testflight_credentials(attributes['testflight'])

data/lib/thrust/config.rb

@@ -6,7 +6,7 @@ module Thrust
   class Config
     attr_reader :project_root, :app_config, :build_dir
 
-    THRUST_VERSION = '0.4'
+    THRUST_VERSION = '0.5'
     THRUST_ROOT = File.expand_path('../..', __FILE__)
 
     def self.make(relative_project_root, config_file)

data/lib/thrust/deployment_target.rb

@@ -6,7 +6,8 @@ module Thrust
                 :ios_target,
                 :note_generation_method,
                 :notify,
-                :versioning_method
+                :versioning_method,
+                :tag
 
     def initialize(attributes)
       @distribution_list = attributes['distribution_list']
@@ -16,6 +17,7 @@ module Thrust
       @note_generation_method = attributes['note_generation_method']
       @notify = attributes['notify']
       @versioning_method = attributes['versioning_method']
+      @tag = attributes['tag']
     end
   end
 end

data/lib/thrust/executor.rb

@@ -24,6 +24,7 @@ module Thrust
     end
 
     def capture_output_from_system(cmd, env = {})
+      @out.puts "Executing #{cmd}"
       execution = @execution_helper.capture_status_and_output_from_command(cmd, env)
 
       raise(CommandFailed, '******** Build failed ********') unless execution[:success]

data/lib/thrust/git.rb

@@ -21,8 +21,14 @@ module Thrust
       @thrust_executor.capture_output_from_system('git log --format=format:%h -1').strip
     end
 
+    def checkout_tag(tag)
+      tag_sha = latest_commit_with_tag(tag)
+      @thrust_executor.system_or_exit("git checkout #{tag_sha}")
+    end
+
     def reset
       @thrust_executor.system_or_exit('git reset --hard')
+      @thrust_executor.system_or_exit('git checkout master')
     end
 
     def checkout_file(filename)
@@ -30,7 +36,7 @@ module Thrust
     end
 
     def commit_summary_for_last_deploy(deployment_target)
-      sha_of_latest_deployed_commit = latest_deployed_commit(deployment_target)
+      sha_of_latest_deployed_commit = latest_commit_with_tag(deployment_target)
       if sha_of_latest_deployed_commit
         "#{deployment_target}:".blue + " #{summary_for_commit(sha_of_latest_deployed_commit)}"
       else
@@ -40,7 +46,7 @@ module Thrust
 
     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_deployed_commit = latest_deployed_commit(deployment_target)
+      sha_of_latest_deployed_commit = latest_commit_with_tag(deployment_target)
 
       notes = Tempfile.new('deployment_notes')
 
@@ -58,14 +64,18 @@ module Thrust
       @thrust_executor.capture_output_from_system("git rev-list HEAD | wc -l").strip
     end
 
+    def create_tag(tag_name)
+      @thrust_executor.system_or_exit("autotag create #{tag_name}")
+    end
+
     private
 
     def summary_for_commit(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}")
+    def latest_commit_with_tag(tag_name)
+      list = @thrust_executor.capture_output_from_system("autotag list #{tag_name}")
       unless list.strip.empty?
         list.split("\n").last.split(" ").first
       end

data/lib/thrust/ios/agv_tool.rb

@@ -6,9 +6,9 @@ module Thrust
         @git = git
       end
 
-      def change_build_number(build_number, path_to_xcodeproj)
+      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 '#{build_number}'"
+        @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

data/lib/thrust/ios/cedar.rb

@@ -8,31 +8,18 @@ module Thrust
         @out = out
       end
 
-      def run(build_configuration, target, runtime_sdk, build_sdk, device, device_type_id, build_dir, simulator_binary)
+      def run(build_configuration, target, build_sdk, os_version, device_name, timeout, 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(app_dir.inspect, {'DYLD_FRAMEWORK_PATH' => build_path.inspect})
         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}])
-          elsif simulator_binary =~ /ios-sim$/
-            if (device_type_id.nil?)
-              if device == "ipad"
-                @thrust_executor.check_command_for_failure(%Q[#{simulator_binary} launch #{app_executable} --sdk #{runtime_sdk} --family #{device} --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_HEADLESS_SPECS=1 --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
-              else
-                @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])
-              end
-            else
-              @thrust_executor.check_command_for_failure(%Q[#{simulator_binary} launch #{app_executable} --devicetypeid '#{device_type_id}' --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_HEADLESS_SPECS=1 --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
-            end
+          device_type_id = "com.apple.CoreSimulator.SimDeviceType.#{device_name}, #{os_version}"
 
-          else
-            @out.puts "Unknown binary for running specs: '#{simulator_binary}'"
-            false
-          end
+          app_executable = File.join(build_dir, "#{build_configuration}-#{build_sdk}", "#{target}.app")
+          simulator_binary ||= 'ios-sim'
+          timeout ||= '30'
+          @thrust_executor.check_command_for_failure(%Q[#{simulator_binary} launch #{app_executable} --devicetypeid '#{device_type_id}' --timeout #{timeout} --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
         end
       end
     end

data/lib/thrust/ios/deploy.rb

@@ -14,25 +14,30 @@ module Thrust
 
       def run
         @git.ensure_clean
+        @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, @thrust_config.app_config.path_to_xcodeproj)
+          if @deployment_config.versioning_method == 'commits'
+            @agv_tool.change_build_number(@git.commit_count, nil, @thrust_config.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'), @thrust_config.app_config.path_to_xcodeproj)
           else
-            @agv_tool.change_build_number(@git.current_commit, @thrust_config.app_config.path_to_xcodeproj)
+            @agv_tool.change_build_number(@git.current_commit, nil, @thrust_config.app_config.path_to_xcodeproj)
           end
         end
 
-
         app_name = @thrust_config.app_config.app_name
         target = @deployment_config.ios_target || app_name
 
         ipa_file = @x_code_tools.cleanly_create_ipa(target, app_name, @thrust_config.app_config.ios_distribution_certificate, @deployment_config.ios_provisioning_search_query)
 
         dsym_path = "#{@x_code_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
       end
     end

data/lib/thrust/ios/x_code_tools.rb

@@ -36,19 +36,20 @@ module Thrust
 
       def build_scheme_or_target(scheme_or_target, build_sdk, architecture=nil)
         @out.puts "Building..."
-        run_xcode('build', build_sdk, scheme_or_target, architecture)
+        run_xcode(build_sdk, scheme_or_target, architecture)
       end
 
-      def test(scheme, build_configuration, runtime_sdk, build_dir)
-        destination = "OS=#{runtime_sdk},name=iPhone Retina (3.5-inch)"
+      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}",
+          "-scheme '#{scheme}'",
+          "-configuration '#{build_configuration}'",
           "-destination '#{destination}'",
-          "ARCHS=i386",
+          "-destination-timeout '#{timeout}'",
           "SYMROOT='#{build_dir}'"
         ].join(' ')
 
@@ -65,26 +66,34 @@ module Thrust
       private
 
       def provision_path(provision_search_query)
-        provision_search_path = File.expand_path("~/Library/MobileDevice/Provisioning Profiles/")
-        command = %Q(grep -rl "#{provision_search_query}" "#{provision_search_path}")
-        paths = `#{command}`.split("\n")
-        paths.first or raise(ProvisioningProfileNotFound, "\nCouldn't find provisioning profiles matching #{provision_search_query}.\n\nThe command used was:\n\n#{command}")
+        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 = `#{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 create_ipa(app_name, signing_identity, provision_search_query)
         @out.puts 'Packaging...'
-        ipa_filename = "#{build_configuration_directory}/#{app_name}.ipa"
-        cmd = [
+        app_filepath = "#{build_configuration_directory}/#{app_name}.app"
+        ipa_filepath = "#{build_configuration_directory}/#{app_name}.ipa"
+        package_command = [
           "xcrun",
           "-sdk iphoneos",
           "-v PackageApplication",
-          "'#{build_configuration_directory}/#{app_name}.app'",
-          "-o '#{ipa_filename}'",
-          "--sign '#{signing_identity}'",
+          "'#{app_filepath}'",
+          "-o '#{ipa_filepath}'",
           "--embed '#{provision_path(provision_search_query)}'"
         ].join(' ')
-        @thrust_executor.system_or_exit(cmd)
-        ipa_filename
+        @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)
@@ -97,7 +106,7 @@ module Thrust
         end
       end
 
-      def run_xcode(build_command, sdk = nil, scheme_or_target = nil, architecture = nil)
+      def run_xcode(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
@@ -112,13 +121,13 @@ module Thrust
           target_flag,
           "-configuration #{@build_configuration}",
           sdk_flag,
-          "#{build_command}",
+          "clean build",
           "SYMROOT=#{@build_directory.inspect}",
           configuration_build_dir_option,
           '2>&1',
           "| grep -v 'backing file'"
         ].compact.join(' ')
-        output_file = output_file("#{@build_configuration}-#{build_command}")
+        output_file = output_file("#{@build_configuration}-build")
         begin
           @thrust_executor.system_or_exit(command, output_file)
         rescue Thrust::Executor::CommandFailed => e

data/lib/thrust/ios_spec_target.rb

@@ -3,21 +3,23 @@ module Thrust
     attr_reader :build_configuration,
                 :build_sdk,
                 :device,
-                :device_type_id,
-                :runtime_sdk,
+                :device_name,
+                :os_version,
                 :scheme,
                 :target,
-                :type
+                :type,
+                :timeout
 
     def initialize(attributes)
       @build_configuration = attributes['build_configuration']
       @build_sdk = attributes['build_sdk'] || 'iphonesimulator'
       @device = attributes['device'] || 'iphone'
-      @device_type_id = attributes['device_type_id']
-      @runtime_sdk = attributes['runtime_sdk']
+      @device_name = attributes['device_name']
+      @os_version = attributes['os_version']
       @scheme = attributes['scheme']
       @target = attributes['target']
       @type = attributes['type'] || 'app'
+      @timeout = attributes['timeout']
     end
   end
 end

data/lib/thrust/tasks/ios_specs.rb

@@ -15,21 +15,25 @@ module Thrust
         target = target_info.target
         scheme = target_info.scheme
         build_sdk = target_info.build_sdk
-        runtime_sdk = args[:runtime_sdk] || target_info.runtime_sdk
+        os_version = args[:os_version] || target_info.os_version
+        device_name = args[:device_name] || target_info.device_name
+
+        substitution_map = {'bundle' => '-', 'app' => ' '}
+        destination_map = {'bundle' => ' ', 'app' => '-'}
+        device_name.gsub!(substitution_map[type], destination_map[type])
 
         tools_options = {
           project_name: thrust.app_config.project_name,
           workspace_name: thrust.app_config.workspace_name
         }
-
         xcode_tools = @xcode_tools_provider.instance(@out, build_configuration, thrust.build_dir, tools_options)
-        xcode_tools.build_scheme_or_target(scheme || target, build_sdk)
 
         if type == 'app'
+          xcode_tools.build_scheme_or_target(scheme || target, build_sdk)
           xcode_tools.kill_simulator
-          @cedar.run(build_configuration, target, runtime_sdk, build_sdk, target_info.device, target_info.device_type_id, thrust.build_dir, thrust.app_config.ios_sim_binary)
+          @cedar.run(build_configuration, target, build_sdk, os_version, device_name, target_info.timeout, thrust.build_dir, thrust.app_config.ios_sim_path)
         else
-          xcode_tools.test(target || scheme, build_configuration, runtime_sdk, thrust.build_dir)
+          xcode_tools.test(target || scheme, build_configuration, os_version, device_name, target_info.timeout, thrust.build_dir)
         end
       end
     end

data/lib/thrust/testflight.rb

@@ -1,5 +1,7 @@
 module Thrust
   class Testflight
+    UploadFailed = Class.new(StandardError)
+
     def initialize(thrust_executor, out, input, api_token, team_token)
       @thrust_executor = thrust_executor
       @out = out
@@ -23,16 +25,25 @@ module Thrust
         message_file_path = Thrust::UserPrompt.get_user_input('Deploy Notes: ', @out, @in)
       end
 
-      @thrust_executor.system_or_exit [
-        'curl http://testflightapp.com/api/builds.json',
-        "-F file=@#{package_file}",
-        ("-F dsym=@#{zipped_dsym_path}" if dsym_path),
-        "-F api_token='#{(ENV['TESTFLIGHT_API_TOKEN'] || @api_token)}'",
-        "-F team_token='#{@team_token}'",
-        "-F notes=@#{message_file_path}",
-        "-F notify=#{(ENV['NOTIFY'] || notify).to_s.downcase.capitalize}",
-        ("-F distribution_lists='#{distribution_list}'" if distribution_list)
-      ].compact.join(' ')
+      @out.puts 'Uploading to TestFlight...'.green
+
+      testflight_response = @thrust_executor.capture_output_from_system(['curl -sw "thrust_testflight_status_code:%{http_code}" http://testflightapp.com/api/builds.json',
+          "-F file=@#{package_file}",
+          ("-F dsym=@#{zipped_dsym_path}" if dsym_path),
+          "-F api_token='#{(ENV['TESTFLIGHT_API_TOKEN'] || @api_token)}'",
+          "-F team_token='#{@team_token}'",
+          "-F notes=@#{message_file_path}",
+          "-F notify=#{(ENV['NOTIFY'] || notify).to_s.downcase.capitalize}",
+          ("-F distribution_lists='#{distribution_list}'" if distribution_list)
+      ].compact.join(' '))
+
+      status_code = testflight_response.match(/thrust_testflight_status_code:(\d+)/).captures.first
+      if status_code.to_i >= 400
+        error_message = testflight_response.gsub(/thrust_testflight_status_code:(\d+)/, '')
+        raise(UploadFailed, "******** Upload Failed: #{error_message} ********")
+      else
+        @out.puts 'Finished uploading to TestFlight'.green
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Aaron Levine
@@ -20,13 +20,14 @@ authors:
 - Molly Trombley-McCann
 - Philip Kuryloski
 - Rachel Bobbins
+- Raphael Weiner
 - Sheel Choksi
 - Tyler Schultz
 - Wiley Kestner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize