thrust 0.5.2 → 0.6.0

data/lib/thrust/xcode_tools_provider.rb

@@ -0,0 +1,11 @@
+module Thrust
+  class XcodeToolsProvider
+    def initialize(thrust_executor = Thrust::Executor.new)
+      @thrust_executor = thrust_executor
+    end
+
+    def instance(out, build_configuration, build_directory, options)
+      Thrust::XcodeTools.new(@thrust_executor, out, build_configuration, build_directory, options)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Aaron Levine
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -71,6 +71,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: nori
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -91,14 +105,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -113,50 +127,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-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
+description: Thrust provides a collection of rake tasks for iOS projects.  These include
+  tasks for running Cedar test suites and for deploying iOS apps to Testflight.
+email: edellapenna@pivotal.io
 executables:
 - thrust
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/thrust
-- lib/config/android_example.yml
-- lib/config/ios_example.yml
+- lib/config/thrust_example.yml
 - lib/tasks/autotag.rake
 - 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/agv_tool.rb
 - lib/thrust/app_config.rb
-- lib/thrust/config.rb
+- lib/thrust/cedar_results_parser.rb
+- lib/thrust/config_loader.rb
+- lib/thrust/deploy.rb
+- lib/thrust/deploy_provider.rb
 - lib/thrust/deployment_target.rb
 - lib/thrust/execution_helper.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/ios_spec_target.rb
+- lib/thrust/ios_spec_launcher.rb
+- lib/thrust/osx_spec_launcher.rb
+- lib/thrust/scheme_parser.rb
+- lib/thrust/spec_target.rb
 - lib/thrust/tasks.rb
 - lib/thrust/tasks/autotag/create.rb
 - lib/thrust/tasks/autotag/list.rb
 - lib/thrust/tasks/clean.rb
 - lib/thrust/tasks/focused_specs.rb
-- lib/thrust/tasks/ios_specs.rb
 - lib/thrust/tasks/nof.rb
+- lib/thrust/tasks/spec_runner.rb
 - lib/thrust/tasks/trim.rb
 - lib/thrust/testflight.rb
 - lib/thrust/testflight_credentials.rb
 - lib/thrust/user_prompt.rb
+- lib/thrust/xcode_tools.rb
+- lib/thrust/xcode_tools_provider.rb
 homepage: http://github.com/pivotal/thrust
 licenses:
 - MIT
@@ -180,5 +192,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Thrust is a collection of rake tasks for iOS/Android development and deployment
+summary: Thrust is a collection of rake tasks for iOS development and deployment
 test_files: []
+has_rdoc: 

data/lib/config/android_example.yml

@@ -1,17 +0,0 @@
-thrust_version: 0.5
-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/thrust/android/deploy.rb

@@ -1,38 +0,0 @@
-module Thrust
-  module Android
-    class Deploy
-      def initialize(out, tools, git, testflight, deployment_config, deployment_target)
-        @out = out
-        @tools = tools
-        @git = git
-        @testflight = testflight
-        @deployment_config = deployment_config
-        @deployment_target = deployment_target
-      end
-
-      def run
-        @git.ensure_clean
-
-        begin
-          @git.checkout_tag(@deployment_config.tag) if @deployment_config.tag
-
-          @tools.change_build_number(Time.now.utc.strftime('%y%m%d%H%M'), @git.current_commit)
-          apk_path = @tools.build_signed_release
-
-          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
-        rescue Exception => e
-          @out.puts "\n\n"
-          @out.puts e.message.red
-          @out.puts "\n\n"
-
-          @git.reset
-          exit 1
-        end
-      end
-    end
-  end
-end

data/lib/thrust/android/deploy_provider.rb

@@ -1,16 +0,0 @@
-module Thrust
-  module Android
-    class DeployProvider
-      def instance(thrust_config, deployment_config, deployment_target)
-        thrust_executor = Thrust::Executor.new
-        tools = Thrust::Android::Tools.new($stdout, thrust_executor)
-        git = Thrust::Git.new($stdout, thrust_executor)
-
-        testflight_config = thrust_config.app_config.testflight
-        testflight = Thrust::Testflight.new(thrust_executor, $stdout, $stdin, testflight_config.api_token, testflight_config.team_token)
-
-        Thrust::Android::Deploy.new($stdout, tools, git, testflight, deployment_config, deployment_target)
-      end
-    end
-  end
-end

data/lib/thrust/android/tools.rb

@@ -1,43 +0,0 @@
-require 'colorize'
-
-module Thrust
-  module Android
-    class Tools
-      def initialize(out = $stdout, thrust_executor = Thrust::Executor.new)
-        @thrust_executor = thrust_executor
-        @out = out
-      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
-        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
-  end
-end

data/lib/thrust/config.rb

@@ -1,43 +0,0 @@
-require 'colorize'
-require_relative 'app_config'
-require 'yaml'
-
-module Thrust
-  class Config
-    attr_reader :project_root, :app_config, :build_dir
-
-    THRUST_VERSION = '0.5'
-    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 = Thrust::AppConfig.new(config)
-      verify_configuration
-    end
-
-    private
-
-    def verify_configuration
-      if @app_config.thrust_version != THRUST_VERSION
-        fail "Invalid configuration. Have you updated thrust recently? Your thrust.yml specifies an out-of-date version, and thrust is at version: #{THRUST_VERSION}. See README for details.".red
-      end
-    end
-  end
-end

data/lib/thrust/ios/agv_tool.rb

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

data/lib/thrust/ios/cedar.rb

@@ -1,27 +0,0 @@
-require 'tmpdir'
-
-module Thrust
-  module IOS
-    class Cedar
-      def initialize(out = $stdout, thrust_executor = Thrust::Executor.new)
-        @thrust_executor = thrust_executor
-        @out = out
-      end
-
-      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
-          device_type_id = "com.apple.CoreSimulator.SimDeviceType.#{device_name}, #{os_version}"
-
-          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
-  end
-end

data/lib/thrust/ios/deploy.rb

@@ -1,55 +0,0 @@
-module Thrust
-  module IOS
-    class Deploy
-      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
-        @deployment_config = deployment_config
-        @deployment_target = deployment_target
-      end
-
-      def run
-        @git.ensure_clean
-
-        begin
-          @git.checkout_tag(@deployment_config.tag) if @deployment_config.tag
-
-          if @deployment_config.versioning_method != 'none'
-            if @deployment_config.versioning_method == 'commits'
-              @agv_tool.change_build_number(@git.commit_count, nil, @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, 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
-        rescue Exception => e
-          @out.puts "\n\n"
-          @out.puts e.message.red
-          @out.puts "\n\n"
-
-          @git.reset
-          exit 1
-        end
-      end
-    end
-  end
-end

data/lib/thrust/ios/deploy_provider.rb

@@ -1,19 +0,0 @@
-module Thrust
-  module IOS
-    class 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)
-        git = Thrust::Git.new(stdout, thrust_executor)
-        agv_tool = Thrust::IOS::AgvTool.new(thrust_executor, git)
-        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
-  end
-end

data/lib/thrust/ios/x_code_tools.rb

@@ -1,154 +0,0 @@
-module Thrust
-  module IOS
-    class XCodeTools
-      ProvisioningProfileNotFound = Class.new(StandardError)
-      ProvisioningProfileNotEmbedded = Class.new(StandardError)
-
-      def initialize(thrust_executor, out, build_configuration, build_directory, options = {})
-        @thrust_executor = thrust_executor
-        @out = out
-        @git = Thrust::Git.new(@out, @thrust_executor)
-        @build_configuration = build_configuration
-        @build_directory = build_directory
-        @project_name = options[:project_name]
-        @workspace_name = options[:workspace_name]
-        raise "project_name OR workspace_name required" unless @project_name.nil? ^ @workspace_name.nil?
-      end
-
-      def cleanly_create_ipa(target, app_name, signing_identity, provision_search_query = nil)
-        clean_build
-        kill_simulator
-        build_scheme_or_target(target, 'iphoneos')
-        ipa_name = create_ipa(app_name, signing_identity, provision_search_query)
-        verify_provision(app_name, provision_search_query)
-
-        return ipa_name
-      end
-
-      def build_configuration_directory
-        "#{@build_directory}/#{@build_configuration}-iphoneos"
-      end
-
-      def clean_build
-        @out.puts 'Cleaning...'
-        FileUtils.rm_rf(@build_directory)
-      end
-
-      def build_scheme_or_target(scheme_or_target, build_sdk, architecture=nil)
-        @out.puts "Building..."
-        run_xcode(build_sdk, scheme_or_target, architecture)
-      end
-
-      def test(scheme, build_configuration, os_version, device_name, timeout, build_dir)
-        destination = "OS=#{os_version},name=#{device_name}"
-        timeout ||= "30"
-
-        cmd = [
-          "xcodebuild",
-          "test",
-          "-scheme '#{scheme}'",
-          "-configuration '#{build_configuration}'",
-          "-destination '#{destination}'",
-          "-destination-timeout '#{timeout}'",
-          "SYMROOT='#{build_dir}'"
-        ].join(' ')
-
-        @thrust_executor.check_command_for_failure(cmd)
-      end
-
-      def kill_simulator
-        @out.puts('Killing simulator...')
-        @thrust_executor.system %q[killall -m -KILL "gdb"]
-        @thrust_executor.system %q[killall -m -KILL "otest"]
-        @thrust_executor.system %q[killall -m -KILL "iPhone Simulator"]
-      end
-
-      private
-
-      def provision_path(provision_search_query)
-        provision_search_path = File.expand_path("~/Library/MobileDevice/Provisioning Profiles")
-        command = %Q(find '#{provision_search_path}' -print0 | xargs -0 grep -lr '#{provision_search_query}' --null | xargs -0 ls -t)
-        provisioning_profile = `#{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...'
-        app_filepath = "#{build_configuration_directory}/#{app_name}.app"
-        ipa_filepath = "#{build_configuration_directory}/#{app_name}.ipa"
-        package_command = [
-          "xcrun",
-          "-sdk iphoneos",
-          "-v PackageApplication",
-          "'#{app_filepath}'",
-          "-o '#{ipa_filepath}'",
-          "--embed '#{provision_path(provision_search_query)}'"
-        ].join(' ')
-        @thrust_executor.system_or_exit(package_command)
-
-        @thrust_executor.system_or_exit("cd '#{build_configuration_directory}' && unzip '#{app_name}.ipa'")
-        @thrust_executor.system_or_exit("/usr/bin/codesign --verify --force --preserve-metadata=identifier,entitlements --sign '#{signing_identity}' '#{build_configuration_directory}/Payload/#{app_name}.app'")
-        @thrust_executor.system_or_exit("cd '#{build_configuration_directory}' && zip -qr '#{app_name}.ipa' 'Payload'")
-
-        ipa_filepath
-      end
-
-      def verify_provision(app_name, provision_search_query)
-        @out.puts 'Verifying provisioning profile...'
-        embedded_filename = "#{build_configuration_directory}/#{app_name}.app/embedded.mobileprovision"
-        correct_provision_filename = provision_path(provision_search_query)
-
-        if !FileUtils.cmp(embedded_filename, correct_provision_filename)
-          raise(ProvisioningProfileNotEmbedded, "Wrong mobile provision embedded by xcrun. Check your xcode provisioning profile settings.")
-        end
-      end
-
-      def 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
-        configuration_build_dir = File.join(@build_directory, "#{@build_configuration}-#{sdk}").inspect
-        configuration_build_dir_option = sdk != 'macosx' ? "CONFIGURATION_BUILD_DIR=#{configuration_build_dir}" : nil
-
-        command = [
-          'set -o pipefail &&',
-          'xcodebuild',
-          project_or_workspace_flag,
-          architecture_flag,
-          target_flag,
-          "-configuration #{@build_configuration}",
-          sdk_flag,
-          "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")
-        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)
-        output_dir = if ENV['IS_CI_BOX']
-                       ENV['CC_BUILD_ARTIFACTS']
-                     else
-                       File.exists?(@build_directory) ? @build_directory : FileUtils.mkdir_p(@build_directory)
-                     end
-
-        File.join(output_dir, "#{target}.output").tap { |file| @out.puts "Output: #{file}" }
-      end
-
-      def project_or_workspace_flag
-        @workspace_name ? "-workspace #{@workspace_name}.xcworkspace" : "-project #{@project_name}.xcodeproj"
-      end
-    end
-  end
-end