nixenvironment 0.0.92 → 0.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b50dc63d54a91dc4811dc6314199bb9b8647a8
-  data.tar.gz: 1923b97bc3c0f8a8dba5ea08bb7de170a3203294
+  metadata.gz: 8316fdbac243fcb2b668efa67815008c72f52bd4
+  data.tar.gz: 0c5bea8f1e7408de15b347043c014fdf45fe289f
 SHA512:
-  metadata.gz: e84e1ea1b2048a6b527b6ad0617fda59f721de7a4f1c32a64e8399cfcb100084bdcfb4acae881ac6d3ca7f36831f4815275751cdb1f7bc0aec2237fd592483f8
-  data.tar.gz: ac83c5fafe0d909a53717e2d232e4be2552cb57ebbdc99c6c401fbcce91f6cc9afea8b16cd8f464b7476a5e49c53fc3f8304ec83fcd883f972378927a7ec6bc3
+  metadata.gz: 1eb0577e0c37c2275a6d729752cf2971856c0f0b39600bfd8126abe9076e3a98f0efd8ddf7e20af5cf8645064f17826485843585358e548761c7b38c02272cef
+  data.tar.gz: 5d9e8a8c272f9097a9aaff5764ebab4a061609680aa814fa9f70aef17bed09a9d597bba38bc36307eafc728bf4032983101f53ab273554c9295dbbbb20ceaa51

data/bin/nixenvironment

@@ -45,6 +45,7 @@ global_option ('--deploy_path VALUE')                                   { |value
 global_option ('--deploy_username VALUE')                               { |value| $deploy_username                               = value }
 global_option ('--deploy_password VALUE')                               { |value| $deploy_password                               = value }
 global_option ('--deploy_itunesconnect_username VALUE')                 { |value| $deploy_itunesconnect_username                 = value }
+global_option ('--deploy_team_name VALUE')                              { |value| $deploy_team_name                              = value }
 global_option ('--icons_path VALUE')                                    { |value| $icons_path                                    = value }
 global_option ('--xctest_destination_device VALUE')                     { |value| $xctest_destination_device                     = value }
 global_option ('--configuration_files_path VALUE')                      { |value| $configuration_files_path                      = value }
@@ -439,6 +440,7 @@ def read_config_settings
   update_config_settings(DEPLOY_USERNAME_KEY,                               $deploy_username,                               table, true)
   update_config_settings(DEPLOY_PASSWORD_KEY,                               $deploy_password,                               table, true)
   update_config_settings(DEPLOY_ITUNESCONNECT_USERNAME_KEY,                 $deploy_itunesconnect_username,                 table, true)
+  update_config_settings(DEPLOY_TEAM_NAME_KEY,                              $deploy_team_name,                              table, true)
   update_config_settings(ICONS_PATH_KEY,                                    $icons_path,                                    table, true)
   update_config_settings(XCTEST_DESTINATION_DEVICE_KEY,                     $xctest_destination_device,                     table, true)
   update_config_settings(CONFIGURATION_FILES_PATH_KEY,                      $configuration_files_path,                      table, true)
@@ -710,12 +712,13 @@ def deploy(deliver_deploy, deployment_names)
   deploy_username               = @config_settings[DEPLOY_USERNAME_KEY].blank?               ? ENV[DEPLOY_USERNAME_KEY]               : @config_settings[DEPLOY_USERNAME_KEY]
   deploy_password               = @config_settings[DEPLOY_PASSWORD_KEY].blank?               ? ENV[DEPLOY_PASSWORD_KEY]               : @config_settings[DEPLOY_PASSWORD_KEY]
   deploy_itunesconnect_username = @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY].blank? ? ENV[DEPLOY_ITUNESCONNECT_USERNAME_KEY] : @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY]
+  deploy_team_name              = @config_settings[DEPLOY_TEAM_NAME_KEY].blank?              ? ENV[DEPLOY_TEAM_NAME_KEY]              : @config_settings[DEPLOY_TEAM_NAME_KEY]
 
   sdk_name = BuildEnvVarsLoader.load_last_build_vars[SDK_NAME_KEY]
 
   deploy_path = sdk_name.include?('macos') ? MACOS_PROJECTS_DEPLOY_PATH : ENV[DEPLOY_PATH_KEY]
   deploy_path = @config_settings[DEPLOY_PATH_KEY] if @config_settings[DEPLOY_PATH_KEY].present?
-  Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deliver_deploy, deployment_names)
+  Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deploy_team_name, deliver_deploy, deployment_names)
 
   success('Deploy complete!')
 end

data/lib/nixenvironment/config.rb

@@ -110,6 +110,7 @@ module Nixenvironment
   DEPLOY_USERNAME_KEY                               = 'DEPLOY_USERNAME'
   DEPLOY_PASSWORD_KEY                               = 'DEPLOY_PASSWORD'
   DEPLOY_ITUNESCONNECT_USERNAME_KEY                 = 'DEPLOY_ITUNESCONNECT_USERNAME'
+  DEPLOY_TEAM_NAME_KEY                              = 'DEPLOY_TEAM_NAME'
 
   ICONS_PATH_KEY                                    = 'ICONS_PATH'
   XCTEST_DESTINATION_DEVICE_KEY                     = 'XCTEST_DESTINATION_DEVICE'

data/lib/nixenvironment/deployer.rb

@@ -3,7 +3,7 @@ require 'colorize'
 
 module Nixenvironment
   class Deployer
-    def self.deploy(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy, deployment_names)
+    def self.deploy(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deploy_team_name, deliver_deploy, deployment_names)
       build_env_vars = BuildEnvVarsLoader.load
       raise 'Error! Working copy is not clean!' unless BuildEnvVarsLoader.working_copy_is_clean?
 
@@ -93,7 +93,7 @@ module Nixenvironment
       if ipa_product_resigned_appstore.present? &&  File.exist?(ipa_product_resigned_appstore)
         ipa_count += 1
         ipa_bundle_id_resigned_appstore = ipa_bundle_id if ipa_bundle_id_resigned_appstore.blank?
-        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deploy_team_name, deliver_deploy,
                         ipa_bundle_id_resigned_appstore, ipa_product_resigned_appstore, current_app_version, current_build_version, name_for_deployment_resigned_appstore,
                         executable_name, app_dsym, sdk)
       end
@@ -101,27 +101,28 @@ module Nixenvironment
       raise 'Nothing to upload!' if ipa_count == 0
     end
 
-    def self.deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+    def self.deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deploy_team_name, deliver_deploy,
                              ipa_bundle_id, ipa_product, current_app_version, current_build_version, name_for_deployment, executable_name, app_dsym, sdk)
-      is_macos_build = sdk.include?('macos')
+      is_iphone_build = sdk.include?('iphone')
 
       local_path_to_app       = File.join(Dir.tmpdir, ipa_bundle_id)
       local_path_to_build     = File.join(local_path_to_app, "v.#{current_app_version}_#{current_build_version}")
       configuration_full_path = File.join(local_path_to_build, name_for_deployment)
-      destination_ipa_product = File.join(configuration_full_path, executable_name + (is_macos_build ? ZIP_EXT : IPA_EXT))
+      destination_ipa_product = File.join(configuration_full_path, executable_name + (is_iphone_build ? IPA_EXT : ZIP_EXT))
 
       FileUtils.rm_rf(local_path_to_build)
       FileUtils.mkdir_p(configuration_full_path)
       FileUtils.cp_r(ipa_product, destination_ipa_product)
 
-      unless is_macos_build
+      if is_iphone_build
         if deploy_itunesconnect_user.present?
           puts
-          print 'Starting pilot ...'.blue
+          print 'Starting upload to TestFlight ...'.blue
           puts
 
           skip_submission = deliver_deploy ? '' : '--skip_submission'
-          system("pilot upload -i '#{ipa_product}' -u '#{deploy_itunesconnect_user}' #{skip_submission}")
+          team_name = deploy_team_name.present? ? "-r '#{deploy_team_name}'" : ''
+          system("pilot upload -i '#{ipa_product}' -u '#{deploy_itunesconnect_user}' #{team_name} #{skip_submission}")
         end
 
         # zip dsym

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.92'
+  VERSION = '0.0.93'
 end

data/nixenvironment.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'terminal-table'
   spec.add_dependency 'colorize'
   spec.add_dependency 'CFPropertyList', '= 2.2.8'
-  spec.add_dependency 'pilot',          '~> 1.0.0'
+  spec.add_dependency 'pilot',          '~> 1.10.0'
   spec.add_dependency 'nokogiri',       '= 1.6.7.2'
   spec.add_dependency 'net-scp'
   spec.add_dependency 'activesupport',  '= 4.2.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.92
+  version: 0.0.93
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement