thrust 0.0.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b6b885837e6c3dac116eca861cc6e772243c2d54
+  data.tar.gz: 625f5556939cdb39a575c648c9b85de3b4825a92
+SHA512:
+  metadata.gz: 7f249ea7b0d1b30871c64de088427dccaf5a05fe66f1feb8707855c808374971b273b085ca1646b062e0358cac21866c9f9abc911425430c4c9ec2931a04f91d
+  data.tar.gz: 254b3ca985e6b4cee3c4d866d60e30d48fd9fe8f9fa3fdde3b665ad5b17a70eee309ec229c991ea0b64043444de9e0fcf9e1716e3079db67c84d225ae3554443

data/bin/thrust

@@ -1,27 +1,33 @@
 #!/usr/bin/env ruby
+
+require 'colorize'
+
+command = ARGV.first
+
+if command != 'install'
+  puts ''
+  puts '  USAGE:    '.yellow + 'thrust install'
+  exit 0
+end
+
+
 require 'fileutils'
 project_root = Dir.pwd
 thrust_root  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-if (!Dir.exists?(File.join(project_root, 'thrust', 'lib', 'tasks')))
-  Dir.mkdir(File.join(project_root, 'thrust'))
-  Dir.mkdir(File.join(project_root, 'thrust', 'lib'))
-  Dir.mkdir(File.join(project_root, 'thrust', 'lib', 'tasks'))
+rakefile = File.join(project_root, 'Rakefile')
+File.open(rakefile, 'a') do |f|
+  f.puts "require 'thrust/tasks'"
 end
 
-FileUtils.cp(Dir.glob(File.join(thrust_root, 'lib', 'tasks', '*.rake')), File.join(project_root, 'thrust', 'lib', 'tasks'))
-FileUtils.cp(File.join(thrust_root, 'lib', 'thrust_config.rb'), File.join(project_root, 'thrust', 'lib'))
 FileUtils.cp(File.join(thrust_root, 'lib', 'config', 'example.yml'), 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."
 
-rakefile = File.join(project_root, 'Rakefile')
-if (File.exists?(rakefile))
-  puts "You have an existing rakefile to add thrust tasks you should import its tasks:"
-  puts "Dir.glob('thrust/lib/tasks/*.rake').each { |r| import r }"
-else
-  File.open(rakefile, 'w') do |f|
-    f.puts "Dir.glob('thrust/lib/tasks/*.rake').each { |r| import r }"
-  end
-  puts "a Rakefile was created for you type 'rake -T' to see a list of tasks"
-end
-
-puts "Rename #{project_root}/thrust.example.yml to #{project_root}/thrust.yml 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

data/lib/config/example.yml

@@ -1,29 +1,36 @@
-# rename this file to thrust.yml
+thrust_version: 0.2
 project_name: My Great Project
-app_name: My Great Project
-identity: iOS Signing Identity
+app_name: My Great App
+ios_distribution_certificate: 'Name of Distribution Signing Certificate'
+ios_sim_binary: 'ios-sim' # or wax-sim. iOS only.
 
-specs:
-  configuration: Release # or whichever iOS configuration you want to run specs under
-  target: Specs # Name of the spec build target
-  sdk: 6.1 # SDK version to build/run the specs with
-  binary: 'Specs/bin/ios-sim' # or 'Specs/bin/waxim'
+testflight:
+  api_token: 'testflight api token'
+  team_token: 'testflight team token'
 
-api_token: your testflight token here
-# Add testflight distrobution lists here. Rake tasks are built for all keys directly
-# under distribution.
-distributions:
-  # builds rake testflight:devs task to deploy to the distrobution list. To create a second
-  # deploy task, uncomment and modify the structure below.
-  devs: # http://testflightapp.com/dashboard/team/edit
-    team: TestFlight Team Name
-    token: TestFlight Team Token
-    default_list: Default Distribution List to Permission for the build
-    configuration: iOS configuration to build with e.g. Debug, Release, etc.
+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.
 
-# builds rake testflight:foo
-# foo:
-#   team: Foos
-#   token: somethingthatlookslikeyourapitoken
-#   default_list: Foo People
-#   configuration: Release
+  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

data/lib/tasks/cedar.rake

@@ -1,39 +1,66 @@
 require 'yaml'
 require 'tmpdir'
+require File.expand_path('../../thrust', __FILE__)
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'thrust_config'))
-
-@thrust = ThrustConfig.new(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
-
-task :default => [:trim, :specs]
+@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 desc 'Trim whitespace'
 task :trim do
-  @thrust.system_or_exit %Q[git status --short | awk '{if ($1 != "D" && $1 != "R") print $2}' | grep -e '.*\.[cmh]$' | xargs sed -i '' -e 's/	/    /g;s/ *$//g;']
+  awk_statement = <<-AWK
+  {
+    if ($1 == "RM" || $1 == "R")
+      print $4;
+    else if ($1 != "D")
+      print $2;
+  }
+  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;']
 end
 
-desc 'Clean all targets'
-task :clean do
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -alltargets -configuration 'AdHoc' -sdk iphoneos clean", @thrust.output_file("clean")
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -alltargets -configuration 'Debug' -sdk iphonesimulator clean", @thrust.output_file("clean")
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -alltargets -configuration 'Release' -sdk iphonesimulator clean", @thrust.output_file("clean")
+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" ]
 end
 
-desc 'Build specs'
-task :build_specs do
-  @thrust.kill_simulator
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -target #{@thrust.spec_config['target']} -configuration #{@thrust.spec_config['configuration']} -sdk iphonesimulator build", @thrust.output_file("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 ]
 end
 
-desc 'Run specs'
-task :specs => :build_specs do
-  binary = @thrust.spec_config['binary']
-  if binary =~ /waxim%/
-    @thrust.grep_cmd_for_failure(%Q[#{binary} -s #{@thrust.spec_config['sdk']} -f iphone -e CFFIXED_USER_HOME=#{Dir.tmpdir} -e CEDAR_HEADLESS_SPECS=1 -e CEDAR_REPORTER_CLASS=CDRDefaultReporter #{File.join(sim_dir, "#{@thrust.spec_config['target']}.app")}])
-  elsif binary =~ /ios-sim$/
-    @thrust.grep_cmd_for_failure(%Q[#{binary} launch #{File.join(@thrust.sim_dir, "#{@thrust.spec_config['target']}.app")} --sdk #{@thrust.spec_config['sdk']} --family iphone --retina --tall --setenv CFFIXED_USER_HOME=#{Dir.tmpdir} --setenv CEDAR_HEADLESS_SPECS=1 --setenv CEDAR_REPORTER_CLASS=CDRDefaultReporter])
-  else
-    puts "Uknown binary for running specs: '#{binary}'"
-    exit(1)
+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
 end
+
+(@thrust.app_config['ios_spec_targets'] || []).each do |task_name, target_info|
+  desc "Run the #{target_info['target']} target"
+  task task_name do
+    build_configuration = target_info['build_configuration']
+    target = target_info['target']
+    build_sdk = target_info['build_sdk'] || 'iphonesimulator' #build sdk - version you compile the code with
+    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)
+
+    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'])
+
+		exit(cedar_success ? 0 : 1)
+  end
+end
+
+def focused_methods
+  ["fit", "fcontext", "fdescribe"].map { |method| "#{method}(@" }
+end

data/lib/tasks/testflight.rake

@@ -1,63 +1,40 @@
 require 'yaml'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'thrust_config'))
+require 'tempfile'
+require File.expand_path('../../thrust', __FILE__)
 
-@thrust = ThrustConfig.new(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
+@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
-namespace :bump do
-  desc 'Bumps the build'
-  task :build do
-    @thrust.run_git_with_message 'Bumped build to $(agvtool what-version -terse)' do
-      @thrust.system_or_exit 'agvtool bump -all'
-    end
-  end
-
-  namespace :version do
-    desc 'Bumps the major marketing version in (major.minor.patch)'
-    task :major do
-      @thrust.update_version(:major)
-    end
-
-    desc 'Bumps the minor marketing version in (major.minor.patch)'
-    task :minor do
-      @thrust.update_version(:minor)
-    end
-
-    desc 'Bumps the patch marketing version in (major.minor.patch)'
-    task :patch do
-      @thrust.update_version(:patch)
+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::Deploy.make(@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
+
+        Rake::Task['autotag:create'].invoke(task_name)
+      end
     end
   end
 end
 
-desc 'Build custom configuration'
-task :build_configuration, :configuration do |task_name, args|
-  build_prefix = @thrust.build_prefix_for(args[:configuration])
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -alltargets -configuration '#{args[:configuration]}' -sdk iphoneos clean", @thrust.output_file("clean")
-  @thrust.kill_simulator
-  @thrust.system_or_exit "xcodebuild -project #{@thrust.config['project_name']}.xcodeproj -target #{@thrust.config['app_name']} -configuration '#{args[:configuration]}' -sdk iphoneos build", @thrust.output_file(args[:configuration])
-  @thrust.system_or_exit "/usr/bin/xcrun -sdk iphoneos PackageApplication -v '#{build_prefix}.app' -o '#{build_prefix}.ipa' --sign '#{@thrust.config['identity']}'"
-  @thrust.system_or_exit "zip -r -T -y '#{build_prefix}.app.dSYM.zip' '#{build_prefix}.app.dSYM'"
-end
-
-namespace :testflight do
-  @thrust.config['distributions'].each do |task_name, info|
-    desc "Deploy build to testflight #{info['team']} team (use NOTIFY=false to prevent team notification)"
-    task task_name do
-      Rake::Task["testflight:deploy"].invoke(info['token'], info['default_list'], info['configuration'])
-    end
+namespace :autotag do
+  task :create, :stage do |_, args|
+    `autotag create #{args[:stage]}`
   end
 
-  task :deploy, :team, :distribution_list, :configuration do |task, args|
-    build_prefix = @thrust.build_prefix_for(args[:configuration])
-    Rake::Task["bump:build"].invoke
-    Rake::Task["build_configuration"].invoke(args[:configuration])
-    @thrust.system_or_exit "curl http://testflightapp.com/api/builds.json\
-      -F file=@#{build_prefix}.ipa\
-      -F dsym=@#{build_prefix}.app.dSYM.zip\
-      -F api_token='#{@thrust.config['api_token']}'\
-      -F team_token='#{args[:team]}'\
-      -F notes='This build was uploaded via the upload API'\
-      -F notify=#{(ENV['NOTIFY'] || 'true').downcase.capitalize}\
-      #{"-F distribution_lists='#{args[:distribution_list]}'" if args[:distribution_list]}"
+  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)
+    end
   end
 end

data/lib/thrust/android/deploy.rb

@@ -0,0 +1,33 @@
+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
+    @git = git
+    @testflight = testflight
+    @notify = notify
+    @distribution_list = distribution_list
+    @deployment_target = deployment_target
+    @autogenerate_notes = autogenerate_notes
+  end
+
+  def run
+    @git.ensure_clean
+    @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)
+
+    @git.reset
+  end
+end

data/lib/thrust/android/tools.rb

@@ -0,0 +1,33 @@
+require 'colorize'
+
+class Thrust::Android::Tools
+  def initialize(out)
+    @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(
+        "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(
+        "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')
+    Dir.glob('target/*-signed-aligned.apk').first or raise 'Signed APK was not generated'
+  end
+end

data/lib/thrust/config.rb

@@ -0,0 +1,39 @@
+require 'colorize'
+
+class Thrust::Config
+  attr_reader :project_root, :app_config, :build_dir
+  THRUST_VERSION = 0.2
+  THRUST_ROOT = File.expand_path('../..', __FILE__)
+
+  def self.make(relative_project_root, config_file)
+    begin
+      config_file_contents = YAML.load_file(config_file)
+    rescue Errno::ENOENT
+      puts ""
+      puts "  Missing thrust.yml. Create by running:\n".red
+      puts "      cp thrust.example.yml thrust.yml".blue
+      exit 1
+    rescue Psych::SyntaxError
+      puts ""
+      puts "  Malformed thrust.yml.".red
+      exit 1
+    end
+    new(relative_project_root, config_file_contents)
+  end
+
+  def initialize(relative_project_root, config)
+    @project_root = File.expand_path(relative_project_root)
+    @build_dir = File.join(project_root, 'build')
+    @app_config = config
+    verify_configuration(@app_config)
+  end
+
+  private
+
+  def verify_configuration(config)
+    config['thrust_version'] ||= 0
+    if config['thrust_version'] != THRUST_VERSION
+      fail "Invalid configuration. Have you updated thrust recently? Your thrust.yml specifies version #{config['thrust_version']}, but thrust is at version #{THRUST_VERSION}. See README for details.".red
+    end
+  end
+end

data/lib/thrust/executor.rb

@@ -0,0 +1,27 @@
+module Thrust::Executor
+  def self.system_or_exit(cmd, output_file = nil)
+    self.system(cmd, output_file) or raise '******** Build failed ********'
+  end
+
+  def self.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)
+    captured_output = `#{cmd}`
+    raise '******** Build failed ********' if $?.exitstatus > 0
+
+    captured_output
+  end
+
+  def self.check_command_for_failure(cmd)
+    STDERR.puts "Executing #{cmd} and checking for FAILURE"
+    result = %x[#{cmd} 2>&1]
+    STDERR.puts "Results:"
+    STDERR.puts result
+
+    result.include?("Finished") && !result.include?("FAILURE") && !result.include?("EXCEPTION")
+  end
+end

data/lib/thrust/git.rb

@@ -0,0 +1,66 @@
+require 'colorize'
+
+class Thrust::Git
+  def initialize(out)
+    @out = out
+  end
+
+  def ensure_clean
+    if ENV['IGNORE_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'
+    end
+  end
+
+  def current_commit
+    Thrust::Executor.capture_output_from_system('git log --format=format:%h -1').strip
+  end
+
+  def reset
+    Thrust::Executor.system_or_exit('git reset --hard')
+  end
+
+  def checkout_file(filename)
+    Thrust::Executor.system_or_exit("git checkout #{filename}")
+  end
+
+  def commit_summary_for_last_deploy(deployment_target)
+    sha_of_latest_deployed_commit = latest_deployed_commit(deployment_target)
+    if sha_of_latest_deployed_commit
+      "#{deployment_target}:".blue + " #{summary_for_commit(sha_of_latest_deployed_commit)}"
+    else
+      "#{deployment_target}:".blue + ' Never deployed'
+    end
+  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_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)
+    else
+      notes.puts(summary_for_commit(sha_of_latest_commit))
+      notes.close
+    end
+
+    notes.path
+  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}")
+    unless list.strip.empty?
+      list.split("\n").last.split(" ").first
+    end
+  end
+end

data/lib/thrust/ios/cedar.rb

@@ -0,0 +1,21 @@
+class Thrust::IOS::Cedar
+
+  def self.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}")
+    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$/
+        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
+      end
+    end
+  end
+end

data/lib/thrust/ios/deploy.rb

@@ -0,0 +1,36 @@
+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)
+    @out = out
+    @x_code_tools = x_code_tools
+    @git = git
+    @testflight = testflight
+    @thrust_config = thrust_config
+    @deployment_config = deployment_config
+    @deployment_target = deployment_target
+  end
+
+  def run
+    @git.ensure_clean
+    @x_code_tools.change_build_number(@git.current_commit)
+
+    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"
+
+    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.reset
+  end
+end

data/lib/thrust/ios/x_code_tools.rb

@@ -0,0 +1,117 @@
+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)
+    @out = out
+    @git = Thrust::Git.new(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')
+  end
+
+  def cleanly_create_ipa(target, app_name, signing_identity, provision_search_query = nil)
+    clean_build
+    kill_simulator
+    build_target(target, 'iphoneos')
+    create_ipa(app_name, signing_identity, provision_search_query)
+  end
+
+  def build_configuration_directory
+    "#{@build_directory}/#{@build_configuration}-iphoneos"
+  end
+
+  def clean_build
+    @out.puts 'Cleaning...'
+    run_xcode('clean')
+    FileUtils.rm_rf(build_configuration_directory)
+  end
+
+  def clean_and_build_target(target, build_sdk)
+    clean_build
+    build_target(target, build_sdk)
+  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"]
+  end
+
+  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}")
+  end
+
+  def create_ipa(app_name, signing_identity, provision_search_query)
+    @out.puts 'Packaging...'
+    ipa_filename = "#{build_configuration_directory}/#{app_name}.ipa"
+    cmd = [
+        "xcrun",
+        "-sdk iphoneos",
+        "-v PackageApplication",
+        "'#{build_configuration_directory}/#{app_name}.app'",
+        "-o '#{ipa_filename}'",
+        "--sign '#{signing_identity}'",
+        "--embed '#{provision_path(provision_search_query)}'"
+    ].join(' ')
+    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}")
+    )
+  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
+end

data/lib/thrust/tasks.rb

@@ -0,0 +1,3 @@
+Dir[File.expand_path("../../tasks/*.rake", __FILE__)].each do |file|
+  load file
+end

data/lib/thrust/testflight.rb

@@ -0,0 +1,36 @@
+class Thrust::Testflight
+  def initialize(out, input, api_token, team_token)
+    @out = out
+    @in = input
+    @git = Thrust::Git.new(@out)
+    @api_token = api_token
+    @team_token = team_token
+  end
+
+  def upload(package_file, notify, distribution_list, autogenerate_deploy_notes, deployment_target, dsym_path = nil)
+    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}'"
+      @out.puts 'Done!'
+    end
+
+    if autogenerate_deploy_notes
+      message_file_path = @git.generate_notes_for_deployment(deployment_target)
+    else
+      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='#{@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(' ')
+  end
+end

data/lib/thrust/user_prompt.rb

@@ -0,0 +1,12 @@
+require 'colorize'
+
+module Thrust::UserPrompt
+  def self.get_user_input(prompt, out, stdin = $stdin)
+    out.print prompt.yellow
+    message = stdin.gets
+    message_file = Tempfile.new('message')
+    message_file << message
+    message_file.close
+    message_file.path
+  end
+end

data/lib/thrust.rb

@@ -0,0 +1,16 @@
+module Thrust; end
+module Thrust::Android; end
+module Thrust::IOS; end
+
+require 'thrust/config'
+require 'thrust/executor'
+require 'thrust/git'
+require 'thrust/testflight'
+require 'thrust/user_prompt'
+
+require 'thrust/android/deploy'
+require 'thrust/android/tools'
+
+require 'thrust/ios/cedar'
+require 'thrust/ios/deploy'
+require 'thrust/ios/x_code_tools'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael McCormick
@@ -14,45 +13,149 @@ authors:
 - Brandon Liu
 - Jeff Hui
 - Philip Kuryloski
+- Andrew Bruce
+- Aaron Levine
+- Eugenia Dellapenna
+- Aaron VonderHaar
+- Sheel Choksi
+- Rachel Bobbins
+- Molly Trombley-McCann
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-07-24 00:00:00.000000000 Z
-dependencies: []
-description: ''
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: auto_tagger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Thrust provides a collection of rake tasks for iOS and Android projects.  These
+  include tasks for running Cedar test suites (iOS) and for deploying apps to Testflight
+  (iOS and Android).
 email: mc+jbritz@pivotallabs.com
 executables:
 - thrust
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/thrust_config.rb
+- bin/thrust
+- lib/config/example.yml
 - lib/tasks/cedar.rake
 - lib/tasks/testflight.rake
-- lib/config/example.yml
-- bin/thrust
-homepage: http://github.com/dipolesource/thrust
-licenses: []
+- lib/thrust.rb
+- lib/thrust/android/deploy.rb
+- lib/thrust/android/tools.rb
+- lib/thrust/config.rb
+- lib/thrust/executor.rb
+- lib/thrust/git.rb
+- lib/thrust/ios/cedar.rb
+- lib/thrust/ios/deploy.rb
+- lib/thrust/ios/x_code_tools.rb
+- lib/thrust/tasks.rb
+- lib/thrust/testflight.rb
+- lib/thrust/user_prompt.rb
+homepage: http://github.com/pivotal/thrust
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: iOS raketasks
+specification_version: 4
+summary: Thrust is a collection of rake tasks for iOS/Android development and deployment
 test_files: []

data/lib/thrust_config.rb

@@ -1,129 +0,0 @@
-class ThrustConfig
-  attr_reader :project_root, :config, :spec_config, :build_dir
-
-  def initialize(proj_root, config_file)
-    @project_root = File.expand_path(proj_root)
-    @build_dir = File.join(project_root, 'build')
-    @config = YAML.load_file(config_file)
-    @spec_config = config['specs']
-  end
-
-  def build_prefix_for(configuration)
-    "#{build_dir}/#{configuration}-iphoneos/#{config['app_name']}"
-  end
-
-  # Xcode 4.3 stores its /Developer inside /Applications/Xcode.app, Xcode 4.2 stored it in /Developer
-  def xcode_developer_dir
-    `xcode-select -print-path`.strip
-  end
-
-  def sim_dir
-    File.join(build_dir, spec_config['configuration'] + '-iphonesimulator')
-  end
-
-  def system_or_exit(cmd, stdout = nil)
-    puts "Executing #{cmd}"
-    cmd += " >#{stdout}" if stdout
-    system(cmd) or raise '******** Build failed ********'
-  end
-
-  def run(cmd)
-    puts "Executing #{cmd}"
-    `#{cmd}`
-  end
-
-  def grep_cmd_for_failure(cmd)
-    1.times do
-      puts "Executing #{cmd} and checking for FAILURE"
-      %x[#{cmd} > #{Dir.tmpdir}/cmd.out 2>&1]
-      status = $?
-      result = File.read("#{Dir.tmpdir}/cmd.out")
-      if status.success?
-        puts 'Results:'
-        puts result
-        if result.include?('FAILURE')
-          exit(1)
-        else
-          exit(0)
-        end
-      elsif status == 256
-        redo
-      else
-        puts "Failed to launch: #{status}"
-        exit(1)
-      end
-    end
-  end
-
-    def with_env_vars(env_vars)
-      old_values = {}
-      env_vars.each do |key,new_value|
-        old_values[key] = ENV[key]
-        ENV[key] = new_value
-      end
-
-      yield
-
-      env_vars.each_key do |key|
-        ENV[key] = old_values[key]
-      end
-    end
-
-  def output_file(target)
-    output_dir = if ENV['IS_CI_BOX']
-                   ENV['CC_BUILD_ARTIFACTS']
-                 else
-                   Dir.mkdir(build_dir) unless File.exists?(build_dir)
-                   build_dir
-                 end
-
-    output_file = File.join(output_dir, "#{target}.output")
-    puts "Output: #{output_file}"
-    output_file
-  end
-
-  def kill_simulator
-    system %q[killall -m -KILL "gdb"]
-    system %q[killall -m -KILL "otest"]
-    system %q[killall -m -KILL "iPhone Simulator"]
-  end
-
-  def update_version(release)
-    run_git_with_message('Changes version to $(agvtool what-marketing-version -terse)') do
-      version = run "agvtool what-marketing-version -terse | head -n1 |cut -f2 -d\="
-      puts "version !#{version}!"
-      build_regex = %r{^(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))$}
-      if (match = build_regex.match(version))
-        puts "found match #{match.inspect}"
-        v = {:major => match[:major].to_i, :minor => match[:minor].to_i, :patch => match[:patch].to_i}
-        case(release)
-          when :major then new_build_version(v[:major] + 1, 0, 0)
-          when :minor then new_build_version(v[:major], v[:minor] + 1, 0)
-          when :patch then new_build_version(v[:major], v[:minor], v[:patch] + 1)
-          when :clear then new_build_version(v[:major], v[:minor], v[:patch])
-        end
-      else
-        raise "Unknown version #{version} it should match major.minor.patch"
-      end
-    end
-  end
-
-  def new_build_version(major, minor, patch)
-    version = [major, minor, patch].join(".")
-    system_or_exit "agvtool new-marketing-version \"#{version}\""
-  end
-
-  def run_git_with_message(message, &block)
-    if ENV['IGNORE_GIT']
-      puts 'WARNING NOT CHECKING FOR CLEAN WORKING DIRECTORY'
-      block.call
-    else
-      puts 'Checking for clean working tree...'
-      system_or_exit 'git diff-index --quiet HEAD'
-      puts 'Checking that the master branch is up to date...'
-      system_or_exit 'git fetch && git diff --quiet HEAD origin/master'
-      block.call
-      system_or_exit "git commit -am \"#{message}\" && git push origin head"
-    end
-  end
-end