thrust 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978a630b927682d5514cf9ce5b71ce2bc2c9a9ff
-  data.tar.gz: ca9c565b330db40e39c02a7ca6ee600ae1a1a682
+  metadata.gz: cb3c733a86a1d3a7d7aec4521cc0c746713b8225
+  data.tar.gz: e9b1773c0d258a7aa9409b6cb0e07fd72eda7157
 SHA512:
-  metadata.gz: 483178b25da64bc6d343d3032fc60b4d0bf12fdf5380794564a4bec13f2dc0e97dd6424f4111ff06c83ce891d71d5ce5e30c48ae784b0ecb8824f91142edcbe8
-  data.tar.gz: 79ea4ddc3b9ad3879d0572a354922b7a1d2ac4450f1134ee2cdf53103a916e6c3414487d6801458165adc573924c530c0c6ceb467a38f57586a722ca35d9123d
+  metadata.gz: b498bcb659a91cbfd17fabef26e3a7b26e109a034e86475526d5255321ff049395e75675dc76212c43afbb1a9092ea33c5b6ef42445eb3476c14e863ef96d486
+  data.tar.gz: 6579b916c3db7a727960a744147773d10e438ff97f20ec940837f33e24db7868f9529b515166379e1a2efda12ba92feec5a6dc6a2404bb66b171cf80f7571de0

data/lib/config/android_example.yml

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

data/lib/config/ios_example.yml

@@ -1,6 +1,7 @@
-thrust_version: 0.3
+thrust_version: 0.4
 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.
@@ -17,6 +18,7 @@ deployment_targets:
     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.
 
   demo:
     distribution_list: Beta Testers
@@ -26,10 +28,12 @@ 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
     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.
+#    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
 
   integration:
     target: IntegrationSpecs

data/lib/tasks/autotag.rake

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

data/lib/tasks/cedar.rake

@@ -1,74 +1,33 @@
-require 'yaml'
-require 'tmpdir'
-require File.expand_path('../../thrust', __FILE__)
+require_relative '../thrust'
 
 @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
-  awk_statement = <<-AWK
-  {
-    if ($1 == "RM" || $1 == "R")
-      print $4;
-    else if ($1 != "D")
-      print $2;
-  }
-  AWK
-  awk_statement.gsub!(%r{\s+}, " ")
-
-  @executor.system_or_exit %Q[git status --porcelain | awk '#{awk_statement}' | grep -e '.*\.[cmh]$' | xargs sed -i '' -e 's/	/    /g;s/ *$//g;']
+  Thrust::Tasks::Trim.new.run
 end
 
 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
-
-  @executor.system_or_exit %Q[ rake focused_specs | xargs -I filename sed -i '' #{substitutions.join(' ')} "filename" ]
+  Thrust::Tasks::Nof.new.run
 end
 
 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(' ')
-  @executor.system_or_exit %Q[ grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks' ; exit 0 ]
+  Thrust::Tasks::FocusedSpecs.new.run(@thrust)
 end
 
 desc 'Clean all targets'
 task :clean do
-  xcode_tools_instance(nil).clean_build
+  Thrust::Tasks::Clean.new.run(@thrust)
 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 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 = args[:runtime_sdk] || target_info['runtime_sdk'] #runtime sdk
-
-    xcode_tools = xcode_tools_instance(build_configuration)
-    xcode_tools.build_scheme_or_target(scheme || target, build_sdk, 'i386')
-
-    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(1) unless cedar_success
+@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|
+    exit(1) unless Thrust::Tasks::IOSSpecs.new.run(@thrust, target_info, args)
   end
 end
-
-def focused_methods
-  %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

@@ -1,13 +1,11 @@
-require 'yaml'
-require 'tempfile'
-require File.expand_path('../../thrust', __FILE__)
+require_relative '../thrust'
 
 @thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 namespace :testflight do
   android_project = File.exists?('AndroidManifest.xml')
 
-  @thrust.app_config['deployment_targets'].each do |task_name, deployment_config|
+  @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 |_, _|
@@ -25,16 +23,3 @@ namespace :testflight do
     end
   end
 end
-
-namespace :autotag do
-  task :create, :stage do |_, args|
-    `autotag create #{args[:stage]}`
-  end
-
-  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(Thrust::Executor.new, $stdout).commit_summary_for_last_deploy(deployment_target)
-    end
-  end
-end

data/lib/tasks/version.rake

@@ -1,12 +1,13 @@
-require File.expand_path('../../thrust', __FILE__)
+require_relative '../thrust'
+
+@thrust = Thrust::Config.make(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 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])
+    Thrust::Android::Tools.new.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])
+    path_to_xcodeproj = @thrust.app_config.path_to_xcodeproj
+    Thrust::IOS::AgvTool.new.change_build_number(args[:build_number], path_to_xcodeproj)
   end
 end

data/lib/thrust/android/deploy.rb

@@ -1,22 +1,26 @@
-class Thrust::Android::Deploy
-  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
+module Thrust
+  module Android
+    class Deploy
+      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
+      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)
+        @testflight.upload(apk_path, @notify, @distribution_list, @autogenerate_notes, @deployment_target)
 
-    @git.reset
+        @git.reset
+      end
+    end
   end
 end

data/lib/thrust/android/deploy_provider.rb

@@ -1,13 +1,17 @@
-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)
+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'])
+        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)
+        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
   end
 end

data/lib/thrust/android/tools.rb

@@ -1,38 +1,42 @@
 require 'colorize'
 
-class Thrust::Android::Tools
-  def initialize(thrust_executor, out)
-    @thrust_executor = thrust_executor
-    @out = out
-  end
+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 ''" +
+      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 ''" +
+        @thrust_executor.system_or_exit(
+          "sed -i ''" +
             " '1,/<version>/s/<version>\\([^- <]*\\)[^<]*<\\/version>/<version>\\1 (#{version_name})<\\/version>/'" +
             " pom.xml")
-  end
+      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
+      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
+      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`.**********')
+      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

data/lib/thrust/app_config.rb

@@ -0,0 +1,57 @@
+require_relative 'deployment_target'
+require_relative 'ios_spec_target'
+require_relative 'testflight_credentials'
+
+module Thrust
+  class AppConfig
+    attr_reader :app_name,
+                :deployment_targets,
+                :ios_distribution_certificate,
+                :ios_sim_binary,
+                :ios_spec_targets,
+                :project_name,
+                :testflight,
+                :thrust_version,
+                :workspace_name,
+                :path_to_xcodeproj
+
+    def initialize(attributes)
+      @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_spec_targets = generate_ios_spec_targets(attributes['ios_spec_targets'])
+      @project_name = attributes['project_name']
+      @testflight = generate_testflight_credentials(attributes['testflight'])
+      @thrust_version = attributes['thrust_version'].to_s
+      @workspace_name = attributes['workspace_name']
+      @path_to_xcodeproj = attributes['path_to_xcodeproj']
+    end
+
+    private
+
+    def generate_ios_spec_targets(ios_spec_targets_hash)
+      return {} if ios_spec_targets_hash.nil?
+
+      ios_spec_targets_hash.inject({}) do |existing, (key, value)|
+        existing[key] = IOSSpecTarget.new(value)
+        existing
+      end
+    end
+
+    def generate_deployment_targets(deployment_targets_hash)
+      return {} if deployment_targets_hash.nil?
+
+      deployment_targets_hash.inject({}) do |existing, (key, value)|
+        existing[key] = DeploymentTarget.new(value)
+        existing
+      end
+    end
+
+    def generate_testflight_credentials(testflight_credentials_hash)
+      return if testflight_credentials_hash.nil?
+
+      TestflightCredentials.new(testflight_credentials_hash)
+    end
+  end
+end

data/lib/thrust/config.rb

@@ -1,39 +1,43 @@
 require 'colorize'
+require_relative 'app_config'
+require 'yaml'
 
-class Thrust::Config
-  attr_reader :project_root, :app_config, :build_dir
-  THRUST_VERSION = 0.3
-  THRUST_ROOT = File.expand_path('../..', __FILE__)
+module Thrust
+  class Config
+    attr_reader :project_root, :app_config, :build_dir
 
-  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
+    THRUST_VERSION = '0.4'
+    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
-    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
+    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
+    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
+    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/deployment_target.rb

@@ -0,0 +1,21 @@
+module Thrust
+  class DeploymentTarget
+    attr_reader :distribution_list,
+                :ios_build_configuration,
+                :ios_provisioning_search_query,
+                :ios_target,
+                :note_generation_method,
+                :notify,
+                :versioning_method
+
+    def initialize(attributes)
+      @distribution_list = attributes['distribution_list']
+      @ios_build_configuration = attributes['ios_build_configuration']
+      @ios_provisioning_search_query = attributes['ios_provisioning_search_query']
+      @ios_target = attributes['ios_target']
+      @note_generation_method = attributes['note_generation_method']
+      @notify = attributes['notify']
+      @versioning_method = attributes['versioning_method']
+    end
+  end
+end

data/lib/thrust/execution_helper.rb

@@ -0,0 +1,17 @@
+module Thrust
+  class ExecutionHelper
+    def capture_status_from_command(command, env = {})
+      system(env, command)
+    end
+
+    def capture_status_and_output_from_command(command, env = {})
+      env_string = ''
+      for key in env.keys
+        env_string += "#{key}=#{env[key]} "
+      end
+
+      output = `#{env_string}#{command}`
+      { success: $?.exitstatus == 0, output: output }
+    end
+  end
+end

data/lib/thrust/executor.rb

@@ -1,29 +1,44 @@
-class Thrust::Executor
-  CommandFailed = Class.new(StandardError)
+module Thrust
+  class Executor
+    CommandFailed = Class.new(StandardError)
 
-  def system_or_exit(cmd, output_file = nil)
-    system(cmd, output_file) or raise(CommandFailed, '******** Build failed ********')
-  end
+    def initialize(out = STDERR, execution_helper = Thrust::ExecutionHelper.new)
+      @execution_helper = execution_helper
+      @out = out
+    end
 
-  def system(cmd, output_file = nil)
-    STDERR.puts "Executing #{cmd}"
-    cmd += " > #{output_file}" if output_file
-    Kernel::system(cmd)
-  end
+    def system_or_exit(cmd, output_file = nil, env = {})
+      @out.puts "Executing #{cmd}"
+      cmd += " > #{output_file}" if output_file
 
-  def capture_output_from_system(cmd)
-    captured_output = `#{cmd}`
-    raise(CommandFailed, '******** Build failed ********') if $?.exitstatus > 0
+      unless @execution_helper.capture_status_from_command(cmd, env)
+        raise(CommandFailed, '******** Build failed ********')
+      end
+    end
 
-    captured_output
-  end
+    def system(cmd, output_file = nil)
+      @out.puts "Executing #{cmd}"
+      cmd += " > #{output_file}" if output_file
+
+      @execution_helper.capture_status_from_command(cmd)
+    end
+
+    def capture_output_from_system(cmd, env = {})
+      execution = @execution_helper.capture_status_and_output_from_command(cmd, env)
+
+      raise(CommandFailed, '******** Build failed ********') unless execution[:success]
+
+      execution[:output]
+    end
 
-  def check_command_for_failure(cmd)
-    STDERR.puts "Executing #{cmd} and checking for FAILURE"
-    result = %x[#{cmd} 2>&1]
-    STDERR.puts "Results:"
-    STDERR.puts result
+    def check_command_for_failure(cmd, env = {})
+      @out.puts "Executing #{cmd} and checking for FAILURE"
+      execution = @execution_helper.capture_status_and_output_from_command("#{cmd} 2>&1", env)
+      result = execution[:output]
+      @out.puts "Results:"
+      @out.puts result
 
-    result.include?("Finished") && !result.include?("FAILURE") && !result.include?("EXCEPTION")
+      result.include?("Finished") && !result.include?("FAILURE") && !result.include?("EXCEPTION")
+    end
   end
 end