nixenvironment 0.0.71 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ae2568f0e26258c2c5e3f378a4aee05e0b81fd2
-  data.tar.gz: 5d6ad9e68cd00116e9b6d2d7d43bd37dc6aa1ce2
+  metadata.gz: 94649fdebb03545fcac8ae40b7584aabda8526ee
+  data.tar.gz: a6be2884186d11d082d152668134e9926ba98786
 SHA512:
-  metadata.gz: f6f8c13907d4f803eb394d014e5806f77a703df837fade6863486ae6c485e373ebf834517ba79b92c5e620d0dd31ac41d6149fc42f044a1b28dfe7a492c8b770
-  data.tar.gz: b52b91be9c13277b93325dc528308b7256d218f6c32ab3cc9c1bb80fbfdad0f3b72ac24480f3974b0fbacdfe30a3358d50c701fcd8af788b6e16f2d63a67bbc3
+  metadata.gz: 9bca24fc940fab470d7071e601a6dd57d3bd20460259483eb6fe1b35f21e6dfd2b15f5fd1ca41c288171ae36c32eab566bb7ded3d4b21be1d285cbecdc100488
+  data.tar.gz: 70bd4c5d606642f6dc6f9425c2b01661ae506e09c6a1a6cd7f056c1953b349d80b43c55aa75140b59169cd60d0fe6a07db179f125cba6144952bb0b780c662ac

data/bin/nixenvironment

@@ -62,6 +62,7 @@ command :build do |c|
   c.syntax = 'nixenvironment build [options]'
   c.description = 'Build project for selected configuration and make signed/resigned ipa'
   c.option '--config NAME', String, 'Select configuration'
+  c.option '--xcconfig PATH', String, 'Specify the path to .xcconfig file'
   c.option '--ipa TYPES', String, 'Select sign (device, resigned_device, resigned_adhoc, resigned_appstore)'
   c.option '--unity_path PATH', String, 'Select unity executable path (UNITY, UNITY_4 or custom path)'
   c.option '--development_build', 'Enable Developmen flag in Unity project'
@@ -73,7 +74,9 @@ command :build do |c|
   c.option '--ndsym', 'Disable .dsym generation for ios project'
   c.option '--ci_build', 'Deprecated' # TODO: remove
   c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
-  c.option '--app_version VERSION', String, 'Specify the version of the app (for mac and unity-winphone builds only)'
+  c.option '--app_version VERSION', String, 'Specify the version of the app (not implemented for unity-android)' # TODO: implement for unity-android
+  c.option '--build_number BUILD_NUMBER', String, 'Specify the build number of the app (not implemented for unity-android)' # TODO: implement for unity-android
+  c.option '--requires_fullscreen', 'Set UIRequiresFullScreen to YES in Info.plist (ios)'
   c.action do |_args, options|
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
     unity_platform    = options.unity_platform
@@ -82,6 +85,8 @@ command :build do |c|
     need_to_process_macos_build    = false
     need_to_process_winphone_build = false
 
+    $build_number = options.build_number
+
     if is_unity_platform
       unity_path = ENV[options.unity_path] || options.unity_path
       unity_build(options.config, unity_platform, unity_path, options.development_build, options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
@@ -95,7 +100,7 @@ command :build do |c|
 
       info_plist = Plist.from_file(plist_path)
       info_plist['RevisionNumber']             = revision
-      info_plist['CFBundleVersion']            = monotonic_revision
+      info_plist['CFBundleVersion']            = build_number
       info_plist['CFBundleShortVersionString'] = options.app_version   if options.app_version.present?
       info_plist['CFBundleName']               = $resigned_bundle_name if $resigned_bundle_name.present?
       info_plist['CFBundleDisplayName']        = $resigned_bundle_name if $resigned_bundle_name.present?
@@ -110,7 +115,7 @@ command :build do |c|
       @config_settings[CONFIGURATION_KEY]         = options.development_build ? 'Debug' : 'Release'
       @config_settings[SDK_NAME_KEY]              = 'macosx'
 
-      save_build_env_vars
+      BuildEnvVarsLoader.save_last_build_vars(@config_settings)
 
       Archiver.make_macos_zip
     elsif need_to_process_winphone_build
@@ -118,7 +123,7 @@ command :build do |c|
 
       File.open(manifest_path,'w') do |f|
         manifest = Nokogiri::XML(File.open(f))
-        manifest.at('Package/Identity')['Version'] = "#{options.app_version}.#{monotonic_revision}"
+        manifest.at('Package/Identity')['Version'] = "#{options.app_version}.#{build_number}"
       end
     elsif need_to_build_ios
       Dir.chdir(UNITY_IOS_PROJECT_PATH) if is_unity_platform
@@ -146,8 +151,8 @@ command :build do |c|
       @config_settings.merge!(Xcodebuild.config_settings) { |_key, v1, v2| v1 || v2 }
 
       begin
-        prebuild(options.config)
-        build(options.config, options.ipa, options.ndsym, options.icon_tagger)
+        prebuild(options.config, options.app_version, options.requires_fullscreen)
+        build(options.config, options.xcconfig, options.ipa, options.ndsym, options.icon_tagger)
       ensure
         restore_info_plists
       end
@@ -379,61 +384,27 @@ def revision
   BuildEnvVarsLoader.load_last_revision['REVISION']
 end
 
-def monotonic_revision
-  BuildEnvVarsLoader.load_last_revision['MONOTONIC_REVISION']
+def build_number
+  $build_number.presence || BuildEnvVarsLoader.load_last_revision['MONOTONIC_REVISION']
 end
 
-def save_build_env_vars
-  executable_name               = @config_settings[EXECUTABLE_NAME_KEY]
-  watchkit_app_executable       = executable_name + WATCHKIT_APP_SUFFIX_WITH_EXT
-  watchkit_extension_executable = executable_name + WATCHKIT_EXTENSION_SUFFIX_WITH_EXT
-  widget_executable             = executable_name + WIDGET_SUFFIX_WITH_EXT
-
-  app_product                         = File.join(@config_settings[BUILT_PRODUCTS_DIR_KEY], executable_name) + APP_EXT
-  watchkit_extension_relative_product = @config_settings[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].nil? ? nil : File.join(IOS_PLUGINS_FOLDER_NAME, watchkit_extension_executable)
-  watchkit_app_relative_product       = @config_settings[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].nil? ? nil : File.join(watchkit_extension_relative_product, watchkit_app_executable)
-  widget_relative_product             = @config_settings[RESIGNED_WIDGET_BUNDLE_ID_KEY].nil? ? nil : File.join(IOS_PLUGINS_FOLDER_NAME, widget_executable)
-
-  resigned_watchkit_extension_entitlements_path = @config_settings[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].nil? ? nil : @config_settings[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY]
-  resigned_widget_entitlements_path             = @config_settings[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].nil? ? nil : @config_settings[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY]
-
-  system("
-echo \"#!/bin/sh\
-#{AUTOGENERATED_FILES_HEADER}
-            PROJECT='#{@config_settings[PROJECT_KEY]}'
-BUILT_PRODUCTS_DIR='#{@config_settings[BUILT_PRODUCTS_DIR_KEY]}'
-OBJECTS_NORMAL_DIR='#{@config_settings[OBJECT_FILE_DIR_NORMAL_KEY]}'
-    EXECUTABLE_NAME='#{@config_settings[EXECUTABLE_NAME_KEY]}'
-        APP_PRODUCT='#{app_product}'
-WATCHKIT_APP_RELATIVE_PRODUCT='#{watchkit_app_relative_product}'
-WATCHKIT_EXTENSION_RELATIVE_PRODUCT='#{watchkit_extension_relative_product}'
-WIDGET_RELATIVE_PRODUCT='#{widget_relative_product}'
-           APP_DSYM='#{app_product + DSYM_EXT}'
-APP_INFOPLIST_FILE='#{@config_settings[PRODUCT_SETTINGS_PATH_KEY]}'
-   EMBEDDED_PROFILE='#{app_product}/#{@config_settings[EMBEDDED_PROFILE_NAME_KEY]}'
-        TARGET_NAME='#{@config_settings[TARGET_NAME_KEY]}'
-      CONFIGURATION='#{@config_settings[CONFIGURATION_KEY]}'
-           SDK_NAME='#{@config_settings[SDK_NAME_KEY]}'
-RESIGNED_BUNDLE_ID='#{@config_settings[RESIGNED_BUNDLE_ID_KEY]}'
-RESIGNED_WATCHKIT_APP_BUNDLE_ID='#{@config_settings[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY]}'
-RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID='#{@config_settings[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY]}'
-RESIGNED_WIDGET_BUNDLE_ID='#{@config_settings[RESIGNED_WIDGET_BUNDLE_ID_KEY]}'
-RESIGNED_BUNDLE_NAME='#{@config_settings[RESIGNED_BUNDLE_NAME_KEY]}'
-RESIGNED_ENTITLEMENTS_PATH='#{@config_settings[RESIGNED_ENTITLEMENTS_PATH_KEY]}'
-RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH='#{resigned_watchkit_extension_entitlements_path}'
-RESIGNED_WIDGET_ENTITLEMENTS_PATH='#{resigned_widget_entitlements_path}'\" > #{AUTOGENERATED_LAST_BUILD_VARS}
-  ")
-end
+def save_revision
+  revision, monotonic_revision, working_copy_is_clean = SCM.last_revision
+  build_num = $build_number.presence || monotonic_revision
+
+  BuildEnvVarsLoader.save_last_revision(revision, build_num, working_copy_is_clean)
 
-def prebuild(config)
-  SCM.save_revision
   error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean?
+end
+
+def prebuild(config, app_version, requires_fullscreen)
+  save_revision
   backup_info_plists
-  save_build_env_vars
-  update_info_plists(config)
+  BuildEnvVarsLoader.save_last_build_vars(@config_settings)
+  update_info_plists(config, app_version, requires_fullscreen)
 end
 
-def build(config, ipa, ndsym, icon_tagger)
+def build(config, xcconfig, ipa, ndsym, icon_tagger)
   project_to_build          = @config_settings[PROJECT_TO_BUILD_KEY]
   project_target_to_build   = @config_settings[PROJECT_TARGET_TO_BUILD_KEY]
   workspace_to_build        = @config_settings[WORKSPACE_TO_BUILD_KEY]
@@ -449,7 +420,7 @@ def build(config, ipa, ndsym, icon_tagger)
   other_args = { 'DEBUG_INFORMATION_FORMAT' => debug_information_format, 'DWARF_DSYM_FOLDER_PATH' => dwarf_dsym_folder_path,
                  'CONFIGURATION_BUILD_DIR' => configuration_build_dir, 'BUILT_PRODUCTS_DIR' => built_products_dir }
 
-  Xcodebuild.build(sdk, config, project_to_build, project_target_to_build,  workspace_to_build, workspace_scheme_to_build, env_var_prefix, other_args)
+  Xcodebuild.build(sdk, config, xcconfig, project_to_build, project_target_to_build,  workspace_to_build, workspace_scheme_to_build, env_var_prefix, other_args)
 
   error('Build error!') unless Xcodebuild.last_cmd_success?
 
@@ -500,8 +471,7 @@ def build(config, ipa, ndsym, icon_tagger)
 end
 
 def unity_build(configuration, unity_platform, unity_path, development_build, keystore_path, keystore_password, key_alias_name, key_alias_password)
-  SCM.save_revision
-  error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean?
+  save_revision
 
   if File.directory?(UNITY_EDITOR_DIR)
     FileUtils.cp_r(UNITY_BUILD_SCRIPTS_DIR, UNITY_EDITOR_DIR)
@@ -560,7 +530,7 @@ def tag_icon(short_version)
   app_product        = File.join(@config_settings[BUILT_PRODUCTS_DIR_KEY], @config_settings[EXECUTABLE_NAME_KEY]) + APP_EXT
 
   system("#{TAGGER_UTILITY_PATH} --shortVersion='#{version}'\
-                                 --buildNumber='#{monotonic_revision}'\
+                                 --buildNumber='#{build_number}'\
                                  --style='#{style}'\
                                  --maskPath='#{mask_path}'\
                                  --plist='#{plist_path}'\
@@ -588,27 +558,29 @@ def backup_info_plist(product_settings_path, description)
   info_plist_backup_name
 end
 
-def update_info_plists(config)
-  monoc_revision = monotonic_revision
-  bundle_id      = @config_settings[BUNDLE_ID_KEY]
+def update_info_plists(config, app_version, requires_fullscreen)
+  build_num   = build_number
+  bundle_id   = @config_settings[BUNDLE_ID_KEY]
 
-  update_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    monoc_revision, revision, bundle_id, config, nil)
-  update_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       monoc_revision, nil, nil, nil, WATCHKIT_APP_PREFIX)
-  update_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], monoc_revision, nil, nil, nil, WATCHKIT_EXTENSION_PREFIX)
-  update_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             monoc_revision, nil, nil, nil, WIDGET_PREFIX)
+  update_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    app_version, requires_fullscreen, build_num, revision, bundle_id, config, nil)
+  update_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       app_version, nil, build_num, nil, nil, nil, WATCHKIT_APP_PREFIX)
+  update_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], app_version, nil, build_num, nil, nil, nil, WATCHKIT_EXTENSION_PREFIX)
+  update_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             app_version, nil, build_num, nil, nil, nil, WIDGET_PREFIX)
 end
 
-def update_info_plist(product_settings_path, monotonic_revision, revision, bundle_id, config, description)
+def update_info_plist(product_settings_path, app_version, requires_fullscreen, build_num, revision, bundle_id, config, description)
   return if product_settings_path.blank?
 
   puts "Updating #{description}Info.plist ..."
 
   begin
     info_plist = Plist.from_file(product_settings_path)
-    info_plist['CFBundleVersion']    = monotonic_revision if monotonic_revision
-    info_plist['RevisionNumber']     = revision           if revision
-    info_plist['CFBundleIdentifier'] = bundle_id          if bundle_id
-    info_plist['Configuration']      = config             if config
+    info_plist['UIRequiresFullScreen']       = true        if requires_fullscreen
+    info_plist['CFBundleShortVersionString'] = app_version if app_version
+    info_plist['CFBundleVersion']            = build_num   if build_num
+    info_plist['RevisionNumber']             = revision    if revision
+    info_plist['CFBundleIdentifier']         = bundle_id   if bundle_id
+    info_plist['Configuration']              = config      if config
     info_plist.save(product_settings_path, Plist::FORMAT_XML)
   rescue => e
     error("Update #{description}Info.plist error!", e)

data/lib/nixenvironment/archiver.rb

@@ -18,17 +18,18 @@ module Nixenvironment
     AVAILABLE_PROFILE_TYPES = [PROFILE_TYPE_DEVELOPER, PROFILE_TYPE_ADHOC, PROFILE_TYPE_APPSTORE]
 
     class ProfileInfo
-      attr_accessor :path, :name, :app_id, :device_count
+      attr_accessor :path, :name, :app_id, :device_count, :expiration_date
 
-      def initialize(path, name, app_id, device_count)
-        @path         = path
-        @name         = name
-        @app_id       = app_id
-        @device_count = device_count
+      def initialize(path, name, app_id, device_count, expiration_date)
+        @path            = path
+        @name            = name
+        @app_id          = app_id
+        @device_count    = device_count
+        @expiration_date = expiration_date
       end
 
       def to_s
-        "<'path=#{@path}', name='#{@name}', app_id='#{@app_id}', device_count=#{@device_count}>"
+        "<path='#{@path}', name='#{@name}', app_id='#{@app_id}', device_count=#{@device_count}, expiration_date=#{@expiration_date || 'None'}>"
       end
     end
 
@@ -470,7 +471,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       end
 
       def app_id_prefix_from_profile(profile_path)
-        _profile_name, app_id, _certs, _device_count = parse_profile(profile_path)
+        _profile_name, app_id, _certs, _device_count, _expiration_date = parse_profile(profile_path)
         app_id.partition('.').first
       end
 
@@ -587,9 +588,9 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           print_underline "Profile '#{filename}', "
 
           profile_path = File.join(profiles_path, filename)
-          profile_name, app_id, certs, device_count = parse_profile(profile_path)
+          profile_name, app_id, certs, device_count, expiration_date = parse_profile(profile_path)
 
-          puts "name = '#{profile_name}', app id='#{app_id}', #{device_count} device(s)"
+          puts "name = '#{profile_name}', app_id = '#{app_id}', #{device_count} device(s)" + (expiration_date.present? ? ", expires at #{expiration_date}" : '')
 
           unless bundle_id_corresponds_to_app_id(new_bundle_id, app_id)
             puts_warning "\t--> Can't use this profile, because app id '#{app_id}' doesn't allow new bundle id '#{new_bundle_id}'"
@@ -597,10 +598,16 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           end
 
           puts_header "\t--> Profile's app id '#{app_id}' allows new bundle id '#{new_bundle_id}'"
+
+          if expiration_date.present? && expiration_date < Time.now
+            puts_warning "\t--> Can't use this profile, because it has expired at '#{expiration_date}'"
+            next
+          end
+
           puts_bold "\t--> Scan certs ..."
 
           get_matching_identities_from_certs(certs) do |identity_name|
-            profile_info = ProfileInfo.new(profile_path, profile_name, app_id, device_count)
+            profile_info = ProfileInfo.new(profile_path, profile_name, app_id, device_count, expiration_date)
             match = [profile_info, identity_name]
 
             puts_header "\t--> Match found: #{profile_info.to_s}, identity_name='#{identity_name}'"
@@ -617,13 +624,14 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       def parse_profile(profile_path)
         plist = get_plist_from_file(profile_path)
 
-        profile_name = plist['Name']
-        app_id       = plist[ENTITLEMENTS_KEY][APPLICATION_IDENTIFIER_KEY]
-        certs        = plist['DeveloperCertificates']
-        devices      = plist['ProvisionedDevices']
-        device_count = devices.present? ? devices.size : 0
+        profile_name    = plist['Name']
+        app_id          = plist[ENTITLEMENTS_KEY][APPLICATION_IDENTIFIER_KEY]
+        certs           = plist['DeveloperCertificates']
+        expiration_date = plist["ExpirationDate"]
+        devices         = plist['ProvisionedDevices']
+        device_count    = devices.present? ? devices.size : 0
 
-        return profile_name, app_id, certs, device_count
+        return profile_name, app_id, certs, device_count, expiration_date
       end
 
       def get_plist_from_file(path)
@@ -650,7 +658,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           # key.subject.to_a => [["UID", ..., ...], ["CN", identity_name, ...], ...]
           identity_name = key.subject.to_a[1][1]
 
-          print "\tIdentity '#{identity_name}'..."
+          print "\tIdentity '#{identity_name}'... "
 
           unless identity_is_valid(identity_name)
             puts_warning 'invalid'

data/lib/nixenvironment/build_env_vars_loader.rb

@@ -1,33 +1,85 @@
 module Nixenvironment
   class BuildEnvVarsLoader
+    def self.save_last_build_vars(config_settings)
+      executable_name               = config_settings[EXECUTABLE_NAME_KEY]
+      watchkit_app_executable       = executable_name + WATCHKIT_APP_SUFFIX_WITH_EXT
+      watchkit_extension_executable = executable_name + WATCHKIT_EXTENSION_SUFFIX_WITH_EXT
+      widget_executable             = executable_name + WIDGET_SUFFIX_WITH_EXT
+
+      app_product                         = File.join(config_settings[BUILT_PRODUCTS_DIR_KEY], executable_name) + APP_EXT
+      watchkit_extension_relative_product = config_settings[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].nil? ? nil : File.join(IOS_PLUGINS_FOLDER_NAME, watchkit_extension_executable)
+      watchkit_app_relative_product       = config_settings[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].nil? ? nil : File.join(watchkit_extension_relative_product, watchkit_app_executable)
+      widget_relative_product             = config_settings[RESIGNED_WIDGET_BUNDLE_ID_KEY].nil? ? nil : File.join(IOS_PLUGINS_FOLDER_NAME, widget_executable)
+
+      resigned_watchkit_extension_entitlements_path = config_settings[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].nil? ? nil : @config_settings[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY]
+      resigned_widget_entitlements_path             = config_settings[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].nil? ? nil : @config_settings[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY]
+
+      embedded_profile = File.join(app_product, config_settings[EMBEDDED_PROFILE_NAME_KEY])
+
+      system("
+echo \"#!/bin/sh\
+#{AUTOGENERATED_FILES_HEADER}
+            PROJECT='#{config_settings[PROJECT_KEY]}'
+BUILT_PRODUCTS_DIR='#{config_settings[BUILT_PRODUCTS_DIR_KEY]}'
+OBJECTS_NORMAL_DIR='#{config_settings[OBJECT_FILE_DIR_NORMAL_KEY]}'
+    EXECUTABLE_NAME='#{config_settings[EXECUTABLE_NAME_KEY]}'
+        APP_PRODUCT='#{app_product}'
+WATCHKIT_APP_RELATIVE_PRODUCT='#{watchkit_app_relative_product}'
+WATCHKIT_EXTENSION_RELATIVE_PRODUCT='#{watchkit_extension_relative_product}'
+WIDGET_RELATIVE_PRODUCT='#{widget_relative_product}'
+           APP_DSYM='#{app_product + DSYM_EXT}'
+   EMBEDDED_PROFILE='#{embedded_profile}'
+        TARGET_NAME='#{config_settings[TARGET_NAME_KEY]}'
+      CONFIGURATION='#{config_settings[CONFIGURATION_KEY]}'
+           SDK_NAME='#{config_settings[SDK_NAME_KEY]}'
+RESIGNED_BUNDLE_ID='#{config_settings[RESIGNED_BUNDLE_ID_KEY]}'
+RESIGNED_WATCHKIT_APP_BUNDLE_ID='#{config_settings[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY]}'
+RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID='#{config_settings[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY]}'
+RESIGNED_WIDGET_BUNDLE_ID='#{config_settings[RESIGNED_WIDGET_BUNDLE_ID_KEY]}'
+RESIGNED_BUNDLE_NAME='#{config_settings[RESIGNED_BUNDLE_NAME_KEY]}'
+RESIGNED_ENTITLEMENTS_PATH='#{config_settings[RESIGNED_ENTITLEMENTS_PATH_KEY]}'
+RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH='#{resigned_watchkit_extension_entitlements_path}'
+RESIGNED_WIDGET_ENTITLEMENTS_PATH='#{resigned_widget_entitlements_path}'\" > #{AUTOGENERATED_LAST_BUILD_VARS}
+             ")
+    end
+
+    def self.save_last_revision(revision, monotonic_revision, working_copy_is_clean)
+      system("
+echo \"#!/bin/sh\
+#{AUTOGENERATED_FILES_HEADER}
+REVISION='#{revision}'
+MONOTONIC_REVISION='#{monotonic_revision}'
+WORKING_COPY_IS_CLEAN='#{working_copy_is_clean}'\" > #{AUTOGENERATED_LAST_REVISION}
+             ")
+    end
+
     def self.load
       build_env_vars = load_last_revision.merge(load_last_build_vars)
-
-      built_products_dir = build_env_vars[BUILT_PRODUCTS_DIR_KEY]
-      app_product        = build_env_vars[APP_PRODUCT_KEY]
-      ipa_product        = build_env_vars[IPA_PRODUCT_KEY]
-      app_infoplist_file = build_env_vars['APP_INFOPLIST_FILE']
+      app_product_path   = build_env_vars[APP_PRODUCT_KEY]
       embedded_profile   = build_env_vars['EMBEDDED_PROFILE']
       monotonic_revision = build_env_vars['MONOTONIC_REVISION']
       sdk                = build_env_vars[SDK_NAME_KEY]
 
-      raise "error: directory '#{built_products_dir}' must exist (build products dir)!" unless File.exist?(built_products_dir)
-      raise "error: app product directory '#{app_product}' or ipa file '#{ipa_product}' must exist!" unless File.exist?(app_product) && File.exist?(ipa_product)
-      raise "error: file '#{app_infoplist_file}' must exist (app info plist)!" unless File.exist?(app_infoplist_file)
+      info_plist_relative_path = nil
 
-      if sdk.include?('ios')
-        embedded_profile_exist = embedded_profile.present? && File.exist?(embedded_profile)
-        embedded_profile_name = embedded_profile_exist ? %x[ /usr/libexec/PlistBuddy -c 'Print :Name' /dev/stdin <<< $(security cms -D -i '#{embedded_profile}') ].strip : 'SIMULATOR'
+      if sdk.include?('iphoneos')
+        embedded_profile_exist   = embedded_profile.present? && File.exist?(embedded_profile)
+        embedded_profile_name    = embedded_profile_exist ? %x[ /usr/libexec/PlistBuddy -c 'Print :Name' /dev/stdin <<< $(security cms -D -i '#{embedded_profile}') ].strip : 'SIMULATOR'
+        info_plist_relative_path = 'Info.plist'
+      elsif sdk.include?('macos')
+        info_plist_relative_path = 'Contents/Info.plist'
       end
 
-      current_app_version = %x[ /usr/libexec/PlistBuddy -c 'Print CFBundleShortVersionString' '#{app_infoplist_file}' ].strip
+      info_plist_path = File.join(app_product_path, info_plist_relative_path)
+      info_plist = Plist.from_file(info_plist_path)
+      current_app_version = info_plist['CFBundleShortVersionString']
 
       build_env_vars[EMBEDDED_PROFILE_NAME_KEY] = embedded_profile_name
       build_env_vars[CURRENT_APP_VERSION_KEY]   = current_app_version
       build_env_vars[CURRENT_BUILD_VERSION_KEY] = monotonic_revision
 
       puts
-      puts "#{EMBEDDED_PROFILE_NAME_KEY} = #{embedded_profile_name}"
+      puts "#{EMBEDDED_PROFILE_NAME_KEY} = #{embedded_profile_name}" # TODO: find out why it's blank!!!
       puts "#{CURRENT_APP_VERSION_KEY} = #{current_app_version}"
       puts "#{CURRENT_BUILD_VERSION_KEY} = #{monotonic_revision}"
       puts

data/lib/nixenvironment/deployer.rb

@@ -88,11 +88,14 @@ module Nixenvironment
         end
 
         # zip dsym
-        dsym_path        = executable_name + APP_EXT + DSYM_EXT
-        zipped_dsym_path = File.join(configuration_full_path, dsym_path + ZIP_EXT)
+        dsym_path        = File.dirname(app_dsym)
+        zipped_dsym_name = executable_name + APP_EXT + DSYM_EXT
+        zipped_dsym_path = File.join(configuration_full_path, zipped_dsym_name + ZIP_EXT)
 
         if File.exist?(app_dsym)
-          Dir.chdir(File.dirname(app_dsym)) do
+          Dir.chdir(dsym_path) do
+            puts
+            puts "--> Zip '#{app_dsym}' into '#{zipped_dsym_path}' ..."
             system("/usr/bin/zip --symlinks --verbose --recurse-paths '#{zipped_dsym_path}' '#{File.basename(app_dsym)}'")
           end
         end
@@ -108,18 +111,41 @@ module Nixenvironment
     def self.scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app)
       puts
       puts "Uploading build from '#{local_path_to_app}' ...".blue
-      puts
-
-      max_percentage = 100
-      progress_step = 5
-      max_progress = max_percentage / progress_step
 
-      Net::SCP.upload!(deploy_host, deploy_user, local_path_to_app, deploy_dir, :ssh => { :password => deploy_password }, :recursive => true, :preserve => true) do |_ch, _name, sent, total|
-        percentage = (sent.to_f / total.to_f * max_percentage).round(1)
-        current_progress = (percentage / progress_step).floor
-        progress_bar = '|' + '#' * current_progress + '_' * (max_progress - current_progress) + '|'
-        print "#{percentage}% #{progress_bar}\r"
-      end
+      raise 'Deploy error!' unless system("#{DEPLOY_SCRIPT_PATH} '#{deploy_host}' '#{deploy_dir}' '#{deploy_user}' '#{deploy_password}' '#{local_path_to_app}'")
+
+      # TODO: Will use code below after fix https://github.com/net-ssh/net-scp/issues/24
+      #
+      # max_percentage = 100
+      # progress_step = 5
+      # max_progress = max_percentage / progress_step
+      #
+      # prev_file_name = ''
+      # prev_print_threshold = -1
+      #
+      # Net::SCP.upload!(deploy_host, deploy_user, local_path_to_app, deploy_dir, :ssh => { :password => deploy_password }, :recursive => true, :preserve => true) do |_ch, name, sent, total|
+      #   # percentage = (sent.to_f / total.to_f * max_percentage).round(1)
+      #   # current_progress = (percentage / progress_step).floor
+      #   # progress_bar = '|' + '#' * current_progress + '-' * (max_progress - current_progress) + '|'
+      #   # print "#{percentage}% #{progress_bar}\r"
+      #
+      #   if name != prev_file_name
+      #     prev_file_name = name
+      #     puts
+      #     puts "#{File.basename(name)}:"
+      #   end
+      #
+      #   percentage = sent.to_f / total.to_f * max_percentage
+      #   print_threshold = (percentage / max_progress).floor
+      #
+      #   if print_threshold != prev_print_threshold
+      #     prev_print_threshold = print_threshold
+      #     print_percentage = print_threshold * max_progress
+      #     current_progress = (print_percentage / progress_step).floor
+      #     progress_bar = '|' + '#' * current_progress + '-' * (max_progress - current_progress) + '|'
+      #     print "#{print_percentage}% #{progress_bar}\r"
+      #   end
+      # end
 
       puts
     end

data/lib/nixenvironment/scm.rb

@@ -17,7 +17,7 @@ module Nixenvironment
       return 'undefined'
     end
 
-    def self.save_revision
+    def self.last_revision
       scm_type = current
       case scm_type
         when SCM_SVN
@@ -114,13 +114,7 @@ module Nixenvironment
           working_copy_is_clean = 0
       end
 
-      system("
-echo \"#!/bin/sh\
-#{AUTOGENERATED_FILES_HEADER}
-REVISION='#{current_revision.strip!}'
-MONOTONIC_REVISION='#{current_monotonic_revision.strip!}'
-WORKING_COPY_IS_CLEAN='#{working_copy_is_clean}'\" > #{AUTOGENERATED_LAST_REVISION}
-      ")
+      return current_revision.strip!, current_monotonic_revision.strip!, working_copy_is_clean
     end
 
     # TODO: implement --all for svn

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.71'
+  VERSION = '0.0.73'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -26,10 +26,11 @@ module Nixenvironment
     end
 
     # other => other args to be passed to xcodebuild
-    def self.build(sdk = nil, config = nil, project = nil, target = nil, workspace = nil, scheme = nil, env_var_prefix = nil, other = {})
+    def self.build(sdk = nil, config = nil, xcconfig = nil, project = nil, target = nil, workspace = nil, scheme = nil, env_var_prefix = nil, other = {})
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
+      build_args << "-xcconfig '#{xcconfig}'"    if xcconfig.present?
 
       if project.present?
         build_args << "-project '#{project}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.73
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility