thrust 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4af4e735542bbbc21050f9b8f23a081eb3132c93
-  data.tar.gz: 087eaad19b5bbfbd21346b8fcd6f63a94e63bf41
+  metadata.gz: 49104e9b67fae157899bc8c13c55d9f05de51639
+  data.tar.gz: 30e80bbd2a0dfa458347b2d04f4b3ad3a3c82028
 SHA512:
-  metadata.gz: 7276e115badf2322966be2f3b1dbd3f395dd99a654b7579b38745c65cff6b08b4522c7fcfa152ce4a9c38d2ed42d039698caf470378539f925d29f2d2fffd6b2
-  data.tar.gz: 77bef75792b11abc24117e6101c488b08f10c44c15e3989ea435dfd6ca5ee7160c15bbd5e64c90111e7563554e95cb925a71920c2a8b1bae234593a012f7a9f5
+  metadata.gz: ca03bbb26bf562bc0354f0a93568f416dab0a95e141d2bdb92b30d0e453e6ca04cd5bd7b8fc5ffb439a64657aa8e8594fe4da5d621d827f5d8005c6227451f30
+  data.tar.gz: 188c251925c482ac4a81050cb007558f8d4d66d340ab89aa65d1b606347a15ee408d643bd0b78a35859591abd19a58c22300444e416a3fd6a9fc5fc51a7d64d9

data/lib/config/thrust_example.yml

@@ -1,4 +1,4 @@
-thrust_version: 0.6
+thrust_version: 0.7
 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.
@@ -6,15 +6,8 @@ app_name: My Great App
 distribution_certificate: 'Name of Distribution Signing Certificate'
 #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-
-  team_token: 'testflight team token' # To find your Team Token, follow the instructions at: http://help.testflightapp.com/customer/portal/articles/829942-how-do-i-find-my-team-token-
-
 deployment_targets:
   staging:
-    distribution_list: Developers # This is the name of a TestFlight distribution list
-    notify: true # Whether to notify people on the distribution list about this deployment
-    note_generation_method: autotag  # If you set this value, it will auto-generate the deploy notes from the commit history. Optional.
     target: MyGreatAppTarget # Name of the build target. Optional, defaults to app name.
     build_configuration: Release
     provisioning_search_query: 'query to find Provisioning Profile' # Otherwise, it will use the first provisioning profile in ~/Library/MobileDevice/Provisioning Profiles/
@@ -22,8 +15,6 @@ deployment_targets:
     tag: ci # Deploys latest commit with the tag. Leave blank to deploy from master.
 
   demo:
-    distribution_list: Beta Testers
-    notify: true
     build_configuration: Demo
     provisioning_search_query: 'query to find Provisioning Profile'
 

data/lib/tasks/autotag.rake

@@ -3,8 +3,9 @@ require_relative '../thrust'
 @app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
 namespace :autotag do
-  task :create, :stage do |_, args|
-    Thrust::Tasks::Autotag::Create.new.run(args[:stage])
+  desc 'Create a tag for the given deployment environment'
+  task :create, :environment do |_, args|
+    Thrust::Tasks::Autotag::Create.new.run(args[:environment])
   end
 
   desc 'Show the commit that is currently deployed to each environment'

data/lib/tasks/{testflight.rake → build_ipa.rake}

@@ -2,11 +2,11 @@ require_relative '../thrust'
 
 @app_config = Thrust::ConfigLoader.load_configuration(Dir.getwd, File.join(Dir.getwd, 'thrust.yml'))
 
-namespace :testflight do
+namespace :build_ipa do
   @app_config.deployment_targets.each do |task_name, deployment_config|
-    desc "Deploy iOS build to #{task_name} (use NOTIFY=false to prevent team notification)"
+    desc "Build an .ipa file for deployment to #{task_name}"
     task task_name do |_, _|
-      Thrust::DeployProvider.new.instance(@app_config, deployment_config, task_name).run
+      Thrust::IPABuilderProvider.new.instance(@app_config, deployment_config, task_name).run
     end
   end
 end

data/lib/thrust.rb

@@ -2,13 +2,12 @@ require 'thrust/config_loader'
 require 'thrust/executor'
 require 'thrust/execution_helper'
 require 'thrust/git'
-require 'thrust/testflight'
 require 'thrust/user_prompt'
 require 'thrust/agv_tool'
 require 'thrust/ios_spec_launcher'
 require 'thrust/osx_spec_launcher'
-require 'thrust/deploy'
-require 'thrust/deploy_provider'
+require 'thrust/ipa_builder'
+require 'thrust/ipa_builder_provider'
 require 'thrust/xcode_tools'
 require 'thrust/xcode_tools_provider'
 require 'thrust/scheme_parser'

data/lib/thrust/app_config.rb

@@ -1,6 +1,5 @@
 require_relative 'deployment_target'
 require_relative 'spec_target'
-require_relative 'testflight_credentials'
 
 module Thrust
   class AppConfig
@@ -10,7 +9,6 @@ module Thrust
                 :ios_sim_path,
                 :spec_targets,
                 :project_name,
-                :testflight,
                 :thrust_version,
                 :workspace_name,
                 :path_to_xcodeproj,
@@ -28,7 +26,6 @@ module Thrust
       @spec_targets = generate_spec_targets(attributes['spec_targets'])
       @spec_directories = generate_spec_directories(attributes['spec_directories'])
       @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']
@@ -61,11 +58,5 @@ module Thrust
         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_loader.rb

@@ -9,7 +9,7 @@ module Thrust
     class MalformedConfigError < ConfigError ; end
     class InvalidVersionConfigError < ConfigError ; end
 
-    THRUST_VERSION = '0.6'
+    THRUST_VERSION = '0.7'
 
     def self.load_configuration(relative_project_root, config_file, out = STDERR)
       begin

data/lib/thrust/{deploy.rb → ipa_builder.rb}

@@ -1,11 +1,10 @@
 module Thrust
-  class Deploy
-    def initialize(out, xcode_tools, agv_tool, git, testflight, app_config, deployment_config, deployment_target)
+  class IPABuilder
+    def initialize(out, xcode_tools, agv_tool, git, app_config, deployment_config, deployment_target)
       @out = out
       @xcode_tools = xcode_tools
       @agv_tool = agv_tool
       @git = git
-      @testflight = testflight
       @app_config = app_config
       @deployment_config = deployment_config
       @deployment_target = deployment_target
@@ -32,14 +31,11 @@ module Thrust
 
         ipa_file = @xcode_tools.cleanly_create_ipa(target, app_name, @app_config.distribution_certificate, @deployment_config.provisioning_search_query)
 
-        dsym_path = "#{@xcode_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
+
+        @out.puts "\n\n"
+        @out.puts "Successfully built .ipa:".green
+        @out.puts ipa_file
       rescue Exception => e
         @out.puts "\n\n"
         @out.puts e.message.red

data/lib/thrust/{deploy_provider.rb → ipa_builder_provider.rb}

@@ -1,5 +1,5 @@
 module Thrust
-  class DeployProvider
+  class IPABuilderProvider
     def instance(app_config, deployment_config, deployment_target)
       stdout = $stdout
       thrust_executor = Thrust::Executor.new
@@ -8,10 +8,8 @@ module Thrust
       xcode_tools = Thrust::XcodeToolsProvider.new.instance(stdout, build_configuration, app_config.build_directory, tools_options)
       git = Thrust::Git.new(stdout, thrust_executor)
       agv_tool = Thrust::AgvTool.new(thrust_executor, git)
-      testflight_config = app_config.testflight
-      testflight = Thrust::Testflight.new(thrust_executor, stdout, $stdin, testflight_config.api_token, testflight_config.team_token)
 
-      Thrust::Deploy.new(stdout, xcode_tools, agv_tool, git, testflight, app_config, deployment_config, deployment_target)
+      Thrust::IPABuilder.new(stdout, xcode_tools, agv_tool, git, app_config, deployment_config, deployment_target)
     end
   end
 end

data/lib/thrust/tasks.rb

@@ -1,4 +1,4 @@
 load File.expand_path('../../tasks/cedar.rake', __FILE__)
 load File.expand_path('../../tasks/autotag.rake', __FILE__)
-load File.expand_path('../../tasks/testflight.rake', __FILE__)
 load File.expand_path('../../tasks/version.rake', __FILE__)
+load File.expand_path('../../tasks/build_ipa.rake', __FILE__)

data/lib/thrust/xcode_tools.rb

@@ -125,6 +125,7 @@ module Thrust
       ].join(' ')
       @thrust_executor.system_or_exit(package_command)
 
+      @thrust_executor.system_or_exit("rm -rf #{build_configuration_directory}/Payload")
       @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'")
@@ -153,7 +154,7 @@ module Thrust
     end
 
     def project_or_workspace_flag
-      @workspace_name ? "-workspace #{@workspace_name}.xcworkspace" : "-project #{@project_name}.xcodeproj"
+      @workspace_name ? "-workspace \"#{@workspace_name}.xcworkspace\"" : "-project \"#{@project_name}.xcodeproj\""
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Aaron Levine
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +128,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 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
+  tasks for running Cedar test suites and for building iOS app archives for deployment.
+email: avonderhaar@pivotal.io
 executables:
 - thrust
 extensions: []
@@ -138,21 +138,21 @@ files:
 - bin/thrust
 - lib/config/thrust_example.yml
 - lib/tasks/autotag.rake
+- lib/tasks/build_ipa.rake
 - lib/tasks/cedar.rake
-- lib/tasks/testflight.rake
 - lib/tasks/version.rake
 - lib/thrust.rb
 - lib/thrust/agv_tool.rb
 - lib/thrust/app_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_spec_launcher.rb
+- lib/thrust/ipa_builder.rb
+- lib/thrust/ipa_builder_provider.rb
 - lib/thrust/osx_spec_launcher.rb
 - lib/thrust/scheme_parser.rb
 - lib/thrust/spec_target.rb
@@ -164,8 +164,6 @@ files:
 - 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
@@ -194,4 +192,3 @@ signing_key:
 specification_version: 4
 summary: Thrust is a collection of rake tasks for iOS development and deployment
 test_files: []
-has_rdoc: 

data/lib/thrust/testflight.rb

@@ -1,49 +0,0 @@
-module Thrust
-  class Testflight
-    UploadFailed = Class.new(StandardError)
-
-    def initialize(thrust_executor, out, input, api_token, team_token)
-      @thrust_executor = thrust_executor
-      @out = out
-      @in = input
-      @git = Thrust::Git.new(@out, @thrust_executor)
-      @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
-
-      @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

data/lib/thrust/testflight_credentials.rb

@@ -1,11 +0,0 @@
-module Thrust
-  class TestflightCredentials
-    attr_reader :api_token,
-                :team_token
-
-    def initialize(attributes)
-      @api_token = attributes['api_token']
-      @team_token = attributes['team_token']
-    end
-  end
-end