nixenvironment 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df4cc7c88289ab2ede054b02ee51bfa8ad2fbd3
-  data.tar.gz: 974b2e06bb200e99abf558fa222bcfc13df1ecdc
+  metadata.gz: 6a9ab55b6ff41beef7bead9d609d3cd498f4507c
+  data.tar.gz: c2d3711028fa1e74f51c585c648b58760467243e
 SHA512:
-  metadata.gz: 6834f84560438b839f32e975d0199f2352203652decf7ccae3ae541182d95e7d8b64ac822fad0fcc53fd56d66f31b31c5a5d7126585b9d60b95e9ac8fae443d7
-  data.tar.gz: 8eac37bb4e6ecca60d279bf8b276a13ff4be4b0bf294b5c4fd921b58314d035190f15facef274ec129544d9471e2b90bfde5e2b9ca8ccbfea7a80c0b5e0dbcab
+  metadata.gz: d51e6eb9189c9e816e3c9e638cac16eeffd8b7b9957eca307bba5a8048aa7c2bc2473229732dc056150e870ac2b5b3c7de032c94497b33cfe49ac6cce59c7871
+  data.tar.gz: a0aa5a3216e2e21e6f940499e65496936c4361ae82939c9baa712de972ce55fea1c137ef9fb0a7e1b65586e627f4759910f46b59dcbeb26fe9d285f3897ea6e3

data/bin/nixenvironment

@@ -173,38 +173,39 @@ command :deploy do |c|
   c.syntax = 'nixenvironment deploy'
   c.description = 'Deploy built artifacts to given server'
   c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity deploy (ios | macos | android | winphone)'
+  c.option '--deployment_names NAMES', String, 'Set names for mds buttons for each ipa type'
   c.option '--deliver_deploy', 'Not only verify but also submit the build on iTunes Connect. (resigned_appstore builds only)'
   c.action do |_args, options|
-    return if ENV['SKIP_DEPLOY'].present?
-
-    unity_platform = options.unity_platform
-    need_to_deploy_ios            = false
-    need_to_deploy_macos_build    = false
-    need_to_deploy_winphone_build = false
-
-    if unity_platform.present?
-      case unity_platform
-        when 'ios'
-          Dir.chdir(UNITY_IOS_PROJECT_PATH)
-          need_to_deploy_ios = true
-        when 'macos'
-          #Dir.chdir(UNITY_MACOS_PROJECT_PATH)
-          need_to_deploy_macos_build = true
-        when 'android'
-          system(DEPLOY_APK_SCRIPT_PATH) ? success('Unity android deploy complete!') : error('Unity android deploy error!')
-        when 'winphone'
-          #Dir.chdir(UNITY_WINPHONE_PROJECT_PATH)
-          need_to_deploy_winphone_build = true
-        else
-          error("Error: Unknown unity target platform '#{unity_platform}'!")
+    unless ENV['SKIP_DEPLOY'].present?
+      unity_platform = options.unity_platform
+      need_to_deploy_ios            = false
+      need_to_deploy_macos_build    = false
+      need_to_deploy_winphone_build = false
+
+      if unity_platform.present?
+        case unity_platform
+          when 'ios'
+            Dir.chdir(UNITY_IOS_PROJECT_PATH)
+            need_to_deploy_ios = true
+          when 'macos'
+            #Dir.chdir(UNITY_MACOS_PROJECT_PATH)
+            need_to_deploy_macos_build = true
+          when 'android'
+            system(DEPLOY_APK_SCRIPT_PATH) ? success('Unity android deploy complete!') : error('Unity android deploy error!')
+          when 'winphone'
+            #Dir.chdir(UNITY_WINPHONE_PROJECT_PATH)
+            need_to_deploy_winphone_build = true
+          else
+            error("Error: Unknown unity target platform '#{unity_platform}'!")
+        end
+      else
+        need_to_deploy_ios = true
       end
-    else
-      need_to_deploy_ios = true
-    end
 
-    if need_to_deploy_ios || need_to_deploy_macos_build
-      read_config_settings
-      deploy(options.deliver_deploy)
+      if need_to_deploy_ios || need_to_deploy_macos_build
+        read_config_settings
+        deploy(options.deliver_deploy, options.deployment_names)
+      end
     end
   end
 end
@@ -689,7 +690,7 @@ def restore_info_plist(product_settings_path, info_plist_backup_name, descriptio
   puts "#{description}Info.plist was restored."
 end
 
-def deploy(deliver_deploy)
+def deploy(deliver_deploy, deployment_names)
   deploy_host                   = @config_settings[DEPLOY_HOST_KEY].blank?                   ? ENV[DEPLOY_HOST_KEY]                   : @config_settings[DEPLOY_HOST_KEY]
   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]
@@ -699,7 +700,7 @@ def deploy(deliver_deploy)
 
   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)
+  Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deliver_deploy, deployment_names)
 
   success('Deploy complete!')
 end

data/lib/nixenvironment/archiver.rb

@@ -35,19 +35,19 @@ module Nixenvironment
 
     class << self
       def make_signed_ipa
-        make_ipa(PROFILE_TYPE_DEVELOPER, nil, 'IPA_PRODUCT', 'IPA_BUNDLE_ID', 'NAME_FOR_DEPLOYMENT')
+        make_ipa(PROFILE_TYPE_DEVELOPER, nil, IPA_PRODUCT_KEY, IPA_BUNDLE_ID_KEY, NAME_FOR_DEPLOYMENT_KEY)
       end
 
       def make_resigned_ipa_for_device
-        make_ipa(PROFILE_TYPE_DEVELOPER, '-Resigned', 'IPA_PRODUCT_RESIGNED_DEVICE', 'IPA_BUNDLE_ID_RESIGNED_DEVICE', 'NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE')
+        make_ipa(PROFILE_TYPE_DEVELOPER, '-Resigned', IPA_PRODUCT_RESIGNED_DEVICE_KEY, IPA_BUNDLE_ID_RESIGNED_DEVICE_KEY, NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE_KEY)
       end
 
       def make_resigned_ipa_for_adhoc
-        make_ipa(PROFILE_TYPE_ADHOC, '-Resigned-AdHoc', 'IPA_PRODUCT_RESIGNED_ADHOC', 'IPA_BUNDLE_ID_RESIGNED_ADHOC', 'NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC')
+        make_ipa(PROFILE_TYPE_ADHOC, '-Resigned-AdHoc', IPA_PRODUCT_RESIGNED_ADHOC_KEY, IPA_BUNDLE_ID_RESIGNED_ADHOC_KEY, NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC_KEY)
       end
 
       def make_resigned_ipa_for_appstore
-        make_ipa(PROFILE_TYPE_APPSTORE, '-Resigned-Appstore', 'IPA_PRODUCT_RESIGNED_APPSTORE', 'IPA_BUNDLE_ID_RESIGNED_APPSTORE', 'NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE')
+        make_ipa(PROFILE_TYPE_APPSTORE, '-Resigned-Appstore', IPA_PRODUCT_RESIGNED_APPSTORE_KEY, IPA_BUNDLE_ID_RESIGNED_APPSTORE_KEY, NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE_KEY)
       end
 
       def make_macos_zip
@@ -86,9 +86,9 @@ module Nixenvironment
         ipa_bundle_id = get_bundle_id(File.join(app_product, 'Contents'))
 
         system("echo \"\n
-IPA_PRODUCT='#{new_ipa_path}'
-IPA_BUNDLE_ID='#{ipa_bundle_id}'
-NAME_FOR_DEPLOYMENT='#{configuration}'
+#{IPA_PRODUCT_KEY}='#{new_ipa_path}'
+#{IPA_BUNDLE_ID_KEY}='#{ipa_bundle_id}'
+#{NAME_FOR_DEPLOYMENT_KEY}='#{configuration}'
     \" >> #{AUTOGENERATED_LAST_BUILD_VARS}")
       end
 

data/lib/nixenvironment/config.rb

@@ -92,24 +92,32 @@ module Nixenvironment
   PROJECT_TO_BUILD_KEY                              = 'PROJECT_TO_BUILD'
   PROJECT_TARGET_TO_BUILD_KEY                       = 'PROJECT_TARGET_TO_BUILD'
   PROJECT_TARGET_TO_TEST_KEY                        = 'PROJECT_TARGET_TO_TEST'
+
   WORKSPACE_TO_BUILD_KEY                            = 'WORKSPACE_TO_BUILD'
   WORKSPACE_SCHEME_TO_BUILD_KEY                     = 'WORKSPACE_SCHEME_TO_BUILD'
   WORKSPACE_SCHEME_TO_TEST_KEY                      = 'WORKSPACE_SCHEME_TO_TEST'
+
   SDK_KEY                                           = 'SDK'
   SDK_FOR_TESTS_KEY                                 = 'SDK_FOR_TESTS'
+
   EXCLUDE_PATTERN_FOR_CODE_COVERAGE_KEY             = 'EXCLUDE_PATTERN_FOR_CODE_COVERAGE'
   EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY          = 'EXCLUDE_PATTERN_FOR_CODE_DUPLICATION'
+
   DEPLOY_HOST_KEY                                   = 'DEPLOY_HOST'
   DEPLOY_PATH_KEY                                   = 'DEPLOY_PATH'
   DEPLOY_USERNAME_KEY                               = 'DEPLOY_USERNAME'
   DEPLOY_PASSWORD_KEY                               = 'DEPLOY_PASSWORD'
   DEPLOY_ITUNESCONNECT_USERNAME_KEY                 = 'DEPLOY_ITUNESCONNECT_USERNAME'
+
   ICONS_PATH_KEY                                    = 'ICONS_PATH'
   XCTEST_DESTINATION_DEVICE_KEY                     = 'XCTEST_DESTINATION_DEVICE'
   CONFIGURATION_FILES_PATH_KEY                      = 'CONFIGURATION_FILES_PATH'
+
   CODE_COVERAGE_CONFIGURATION_KEY                   = 'CODE_COVERAGE_CONFIGURATION'
   CODE_COVERAGE_OUTPUT_DIRECTORY_KEY                = 'CODE_COVERAGE_OUTPUT_DIRECTORY'
+
   ENV_VAR_PREFIX_KEY                                = 'ENV_VAR_PREFIX'
+
   BUNDLE_ID_KEY                                     = 'BUNDLE_ID'
   RESIGNED_BUNDLE_ID_KEY                            = 'RESIGNED_BUNDLE_ID'
   RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY               = 'RESIGNED_WATCHKIT_APP_BUNDLE_ID'
@@ -133,14 +141,29 @@ module Nixenvironment
   CONFIGURATION_KEY                                 = 'CONFIGURATION'
   APP_PRODUCT_KEY                                   = 'APP_PRODUCT'
   SDK_NAME_KEY                                      = 'SDK_NAME'
-  IPA_BUNDLE_ID_KEY                                 = 'IPA_BUNDLE_ID'
+
   CURRENT_APP_VERSION_KEY                           = 'CURRENT_APP_VERSION'
   CURRENT_BUILD_VERSION_KEY                         = 'CURRENT_BUILD_VERSION'
+
+  IPA_BUNDLE_ID_KEY                                 = 'IPA_BUNDLE_ID'
+  IPA_BUNDLE_ID_RESIGNED_DEVICE_KEY                 = 'IPA_BUNDLE_ID_RESIGNED_DEVICE'
+  IPA_BUNDLE_ID_RESIGNED_ADHOC_KEY                  = 'IPA_BUNDLE_ID_RESIGNED_ADHOC'
+  IPA_BUNDLE_ID_RESIGNED_APPSTORE_KEY               = 'IPA_BUNDLE_ID_RESIGNED_APPSTORE'
+
   NAME_FOR_DEPLOYMENT_KEY                           = 'NAME_FOR_DEPLOYMENT'
+  NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE_KEY           = 'NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE'
+  NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC_KEY            = 'NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC'
+  NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE_KEY         = 'NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE'
+
   IPA_PRODUCT_KEY                                   = 'IPA_PRODUCT'
+  IPA_PRODUCT_RESIGNED_DEVICE_KEY                   = 'IPA_PRODUCT_RESIGNED_DEVICE'
+  IPA_PRODUCT_RESIGNED_ADHOC_KEY                    = 'IPA_PRODUCT_RESIGNED_ADHOC'
+  IPA_PRODUCT_RESIGNED_APPSTORE_KEY                 = 'IPA_PRODUCT_RESIGNED_APPSTORE'
+
   APP_DSYM_KEY                                      = 'APP_DSYM'
   SCM_USERNAME_KEY                                  = 'SCM_USERNAME'
   SCM_PASSWORD_KEY                                  = 'SCM_PASSWORD'
+
   WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY      = 'WATCHKIT_EXTENSION_' + PRODUCT_SETTINGS_PATH_KEY
   WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY            = 'WATCHKIT_APP_'       + PRODUCT_SETTINGS_PATH_KEY
   WIDGET_PRODUCT_SETTINGS_PATH_KEY                  = 'WIDGET_'             + PRODUCT_SETTINGS_PATH_KEY

data/lib/nixenvironment/deployer.rb

@@ -3,31 +3,68 @@ require 'colorize'
 
 module Nixenvironment
   class Deployer
-    def self.deploy(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy)
+    def self.deploy(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy, deployment_names)
       build_env_vars = BuildEnvVarsLoader.load
       raise 'Error! Working copy is not clean!' unless BuildEnvVarsLoader.working_copy_is_clean?
 
       ipa_product                           = build_env_vars[IPA_PRODUCT_KEY]
-      ipa_product_resigned_device           = build_env_vars['IPA_PRODUCT_RESIGNED_DEVICE']
-      ipa_product_resigned_adhoc            = build_env_vars['IPA_PRODUCT_RESIGNED_ADHOC']
-      ipa_product_resigned_appstore         = build_env_vars['IPA_PRODUCT_RESIGNED_APPSTORE']
+      ipa_product_resigned_device           = build_env_vars[IPA_PRODUCT_RESIGNED_DEVICE_KEY]
+      ipa_product_resigned_adhoc            = build_env_vars[IPA_PRODUCT_RESIGNED_ADHOC_KEY]
+      ipa_product_resigned_appstore         = build_env_vars[IPA_PRODUCT_RESIGNED_APPSTORE_KEY]
 
       ipa_bundle_id                         = build_env_vars[IPA_BUNDLE_ID_KEY]
-      ipa_bundle_id_resigned_device         = build_env_vars['IPA_BUNDLE_ID_RESIGNED_DEVICE']
-      ipa_bundle_id_resigned_adhoc          = build_env_vars['IPA_BUNDLE_ID_RESIGNED_ADHOC']
-      ipa_bundle_id_resigned_appstore       = build_env_vars['IPA_BUNDLE_ID_RESIGNED_APPSTORE']
+      ipa_bundle_id_resigned_device         = build_env_vars[IPA_BUNDLE_ID_RESIGNED_DEVICE_KEY]
+      ipa_bundle_id_resigned_adhoc          = build_env_vars[IPA_BUNDLE_ID_RESIGNED_ADHOC_KEY]
+      ipa_bundle_id_resigned_appstore       = build_env_vars[IPA_BUNDLE_ID_RESIGNED_APPSTORE_KEY]
 
       current_app_version                   = build_env_vars[CURRENT_APP_VERSION_KEY]
       current_build_version                 = build_env_vars[CURRENT_BUILD_VERSION_KEY]
 
       name_for_deployment                   = build_env_vars[NAME_FOR_DEPLOYMENT_KEY]
-      name_for_deployment_resigned_device   = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE']
-      name_for_deployment_resigned_adhoc    = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC']
-      name_for_deployment_resigned_appstore = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE']
+      name_for_deployment_resigned_device   = build_env_vars[NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE_KEY]
+      name_for_deployment_resigned_adhoc    = build_env_vars[NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC_KEY]
+      name_for_deployment_resigned_appstore = build_env_vars[NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE_KEY]
 
-      executable_name                       = build_env_vars[EXECUTABLE_NAME_KEY]
-      app_dsym                              = build_env_vars[APP_DSYM_KEY]
-      sdk                                   = build_env_vars[SDK_NAME_KEY]
+      if deployment_names.present?
+        names = deployment_names.scan(/(?:\w|'[^']*')+/).map! {|name| name.tr("'", '')}
+
+        ipas_count = 0
+        ipas_count += 1 if name_for_deployment.present?
+        ipas_count += 1 if name_for_deployment_resigned_device.present?
+        ipas_count += 1 if name_for_deployment_resigned_adhoc.present?
+        ipas_count += 1 if name_for_deployment_resigned_appstore.present?
+
+        raise 'Deployment names count does not match ipa files count!' if ipas_count != names.count
+
+        ipa_index = 0
+
+        if name_for_deployment.present?
+          deployment_name = names[ipa_index]
+          name_for_deployment = deployment_name if deployment_name != '_'
+          ipa_index += 1
+        end
+
+        if name_for_deployment_resigned_device.present?
+          deployment_name = names[ipa_index]
+          name_for_deployment_resigned_device = deployment_name if deployment_name != '_'
+          ipa_index += 1
+        end
+
+        if name_for_deployment_resigned_adhoc.present?
+          deployment_name = names[ipa_index]
+          name_for_deployment_resigned_adhoc = deployment_name if deployment_name != '_'
+          ipa_index += 1
+        end
+
+        if name_for_deployment_resigned_appstore.present?
+          deployment_name = names[ipa_index]
+          name_for_deployment_resigned_appstore = deployment_name if deployment_name != '_'
+        end
+      end
+
+      executable_name = build_env_vars[EXECUTABLE_NAME_KEY]
+      app_dsym        = build_env_vars[APP_DSYM_KEY]
+      sdk             = build_env_vars[SDK_NAME_KEY]
 
       ipa_count = 0
 

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.81'
+  VERSION = '0.0.82'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods