nixenvironment 0.0.137 → 0.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3df4462e5038ca23d1003c27b7d87625bdd4b34
-  data.tar.gz: 15b3d2a35b397aa822c46dc8a37c211bd1632e08
+  metadata.gz: 8a27eca3d5da6e42c8d35203e9b4753326d79610
+  data.tar.gz: 24d3909d283c43fd1e873b390adc0edc71dadd2a
 SHA512:
-  metadata.gz: 460ac0f9aa4561caed03b21307059174556a56bdcad52044d00b3340d17d4328de48b3f8769d8288f8bfd6a859da7f9ee3155a7c0742bba23435a34587767a78
-  data.tar.gz: d54826405ff3bea10dd66f1eecd3d90b46b192a99087cc1f53a33f05828ec86ae7c93c88f54bde25b957c2afcfe465d1b0d41d4f70e797b7867afe516a97f026
+  metadata.gz: d6359e2d57731b1705e65d74e35dbe7d9608bbe2cc3ed2a25a1b1e42f91a838566405051d29ee9bf93bd2c732dce5dd980be2ab9af4dc09928ec65c50a80226b
+  data.tar.gz: 76337eb3d88d45e91eb8ace785e8868bbf2d9f8513fc20aa058a56ff156e71d0fd6a74e7e8847eba6e8f583f6e5d26712c6135037d2ac1b8ad590030c86426d5

data/bin/Config

@@ -18,7 +18,7 @@ EXCLUDE_PATTERN_FOR_CODE_DUPLICATION: "**/Vendor|**/Scripts|**/Pods"
 # DEPLOY_PASSWORD:
 
 # set these var if you want to add build number on icon
-ICONS_PATH: Resources/Images/Images.xcassets
+ICONS_PATH: Resources/Images/Images.xcassets/AppIcon.appiconset
 
 # specifies the device to be used as destination
 XCTEST_DESTINATION_DEVICE: platform=iOS Simulator,name=iPhone 5,OS=latest

data/bin/nixenvironment

@@ -73,7 +73,7 @@ command :build do |c|
   c.option '--key_alias_password PASSWORD', String, 'Specify the password for accessing an alias name'
   c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios | macos | android | winphone | webgl)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
-  c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
+  c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (on, off)'
   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)'
@@ -86,7 +86,7 @@ command :build do |c|
     $scheme = options.scheme
     $sdk = options.sdk
 
-    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
+    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'on', :unity_path => 'UNITY'
     unity_platform    = options.unity_platform
     is_unity_platform = unity_platform.present?
     need_to_build_ios              = true
@@ -97,7 +97,6 @@ command :build do |c|
     $build_number = options.build_number
 
     if is_unity_platform
-      ENV['UNITY_BUILD'] = 'UNITY_BUILD'
       unity_path = ENV[options.unity_path] || options.unity_path
       unity_build(options.config, unity_platform, unity_path, options.development_build, options.connect_profiler,
                   options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
@@ -571,6 +570,19 @@ def build(config, xcconfig, ipa, ndsym, icon_tagger, xc_args)
 
   FileUtils.rm_rf IOS_BUILD_DIRECTORY_NAME
 
+  if sdk.include?('iphoneos')
+
+    if config == 'Release'
+      puts 'IconTagger: configuration is Release. Skipping ...'
+    else
+      case icon_tagger
+      when 'on'    then tag_icon
+      when 'off'   then puts 'IconTagger is disabled. Skipping ...'
+      else              puts "Unknown IconTagger mode: '#{icon_tagger}'. Skipping ..."
+      end
+    end
+  end
+
   Xcodebuild.build(sdk, config, xcconfig, project, workspace, scheme, env_var_prefix, xc_args)
 
   error('Build error!') unless Xcodebuild.last_cmd_success?
@@ -586,19 +598,6 @@ def build(config, xcconfig, ipa, ndsym, icon_tagger, xc_args)
   elsif sdk.include?('iphoneos')
     puts
 
-    if config == 'Release'
-      puts 'IconTagger: configuration is Release. Skipping ...'
-    else
-      case icon_tagger
-      when 'full'  then tag_icon(false)
-      when 'short' then tag_icon(true)
-      when 'off'   then puts 'IconTagger is disabled. Skipping ...'
-      else              puts "Unknown IconTagger mode: '#{icon_tagger}'. Skipping ..."
-      end
-    end
-
-    puts
-
     ipa.split.each do |current_ipa|
       begin
         case current_ipa
@@ -674,22 +673,15 @@ def unity_build(configuration, unity_platform, unity_path, development_build, co
   success("Unity build complete!\n")
 end
 
-def tag_icon(short_version)
+def tag_icon
   plist_path         = @config_settings[PRODUCT_SETTINGS_PATH_KEY]
   info_plist         = Plist.from_file(plist_path)
   version            = info_plist['CFBundleShortVersionString']
-  style              = short_version ? 'OneLine' : 'TwoLine'
-  mask_path          = File.join(TAGGER_UTILITY_DIRECTORY, "masks/#{style}Mask.png")
   icons_dir          = File.join(Dir.pwd, @config_settings[ICONS_PATH_KEY])
-  app_product        = File.join(@config_settings[BUILT_PRODUCTS_DIR_KEY], @config_settings[EXECUTABLE_NAME_KEY]) + APP_EXT
 
-  system("#{TAGGER_UTILITY_PATH} --shortVersion='#{version}'\
-                                 --buildNumber='#{build_number}'\
-                                 --style='#{style}'\
-                                 --maskPath='#{mask_path}'\
-                                 --plist='#{plist_path}'\
-                                 --sourceIconsPath='#{icons_dir}'\
-                                 --destinationIconsPath='#{app_product}'")
+  workspaces_in_dir  = Dir.pwd
+
+  system("#{TAGGER_UTILITY_PATH} '#{version}' '#{build_number}' '#{workspaces_in_dir}' '#{icons_dir}'")
 end
 
 def backup_info_plists
@@ -833,4 +825,4 @@ end
 def success(msg)
   puts
   puts msg.green.bold
-end
+end

data/lib/nixenvironment/config.rb

@@ -20,8 +20,7 @@ module Nixenvironment
   # utils
   UTILS_PATH                          = File.expand_path('../../../utils', __FILE__)
   IDENTITIESLIST_UTILITY_PATH         = File.join(UTILS_PATH, 'identitieslist')
-  TAGGER_UTILITY_DIRECTORY            = File.join(UTILS_PATH, 'XcodeIconTagger')
-  TAGGER_UTILITY_PATH                 = File.join(TAGGER_UTILITY_DIRECTORY, 'IconTagger')
+  TAGGER_UTILITY_PATH                 = File.join(UTILS_PATH, 'AddVersionToIcons.sh')
 
   # macos
   MACOS_PROJECTS_DEPLOY_PATH = 'Projects/macOSProjects'

data/lib/nixenvironment/deployer.rb

@@ -123,7 +123,7 @@ module Nixenvironment
 
           skip_submission = deliver_deploy ? '' : '--skip_submission'
           team_name = deploy_team_name.present? ? "-r \"#{deploy_team_name}\"" : ''
-          system("fastlane pilot upload -i '#{ipa_product}' -u '#{deploy_itunesconnect_user}' #{team_name} #{skip_submission}")
+          system("fastlane pilot upload -i '#{ipa_product}' -u '#{deploy_itunesconnect_user}' #{team_name} #{skip_submission} --wait_for_uploaded_build")
         end
 
         # zip dsym

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.137'
+  VERSION = '0.0.138'
 end

data/utils/AddVersionToIcons.sh

@@ -0,0 +1,106 @@
+#!/bin/sh -ex
+# Based on Krzysztof Zablocki Boostrap library - https://github.com/krzysztofzablocki/Bootstrap
+
+convertPath=`which convert`
+echo ${convertPath}
+if [[ ! -f ${convertPath} || -z ${convertPath} ]]; then
+	echo "warning: Skipping Icon versioning, you need to install ImageMagick and ghostscript (fonts) first, you can use brew to simplify process:
+	brew install imagemagick
+	brew install ghostscript"
+	exit -1;
+fi
+
+version=$1
+build_num=$2
+project_root_path=$3
+
+shopt -s extglob
+shopt -u extglob
+caption="${version}\n${build_num}"
+echo $caption
+
+function processIcon() {
+    base_file=$1
+    temp_path=$2
+    dest_path=$3
+
+    echo "${base_file} ${temp_path} ${dest_path}"
+
+    if [[ ! -e $base_file ]]; then
+        echo "error: file does not exist: ${base_file}"
+        exit -1;
+    fi
+
+    if [[ -z $temp_path ]]; then
+        echo "error: temp_path does not exist: ${temp_path}"
+        exit -1;
+    fi
+
+    if [[ -z $dest_path ]]; then
+        echo "error: dest_path does not exist: ${dest_path}"
+        exit -1;
+    fi
+
+    file_name=$(basename "$base_file")
+    final_file_path="${dest_path}/${file_name}"
+    
+    base_tmp_normalizedFileName="${file_name%.*}-normalized.${file_name##*.}"
+    base_tmp_normalizedFilePath="${temp_path}/${base_tmp_normalizedFileName}"
+    
+    # Normalize
+    echo "Reverting optimized PNG to normal"
+    echo "xcrun -sdk iphoneos pngcrush -revert-iphone-optimizations -q '${base_file}' '${base_tmp_normalizedFilePath}'"
+    xcrun -sdk iphoneos pngcrush -revert-iphone-optimizations -q "${base_file}" "${base_tmp_normalizedFilePath}"
+    
+    width=`identify -format %w "${base_tmp_normalizedFilePath}"`
+    height=`identify -format %h "${base_tmp_normalizedFilePath}"`
+
+    band_height=$((($height * 33) / 100))
+    band_position=$(($height - $band_height))
+    text_position=$(($band_position - 3))
+    point_size=$(((13 * $width) / 100))
+    
+    echo "Image dimensions ($width x $height) - band height $band_height @ $band_position - point size $point_size"
+    
+    #
+    # blur band and text
+    #
+    convert "${base_tmp_normalizedFilePath}" -blur 10x8 /tmp/blurred.png
+    convert /tmp/blurred.png -gamma 0 -fill white -draw "rectangle 0,$band_position,$width,$height" /tmp/mask.png
+    convert -size ${width}x${band_height} xc:none -fill 'rgba(0,0,0,0.2)' -draw "rectangle 0,0,$width,$band_height" /tmp/labels-base.png
+    convert -background none -size ${width}x${band_height} -pointsize $point_size -fill white -gravity center -gravity South caption:"$caption" /tmp/labels.png
+    
+    convert "${base_tmp_normalizedFilePath}" /tmp/blurred.png /tmp/mask.png -composite /tmp/temp.png
+    
+    rm /tmp/blurred.png
+    rm /tmp/mask.png
+    
+    #
+    # compose final image
+    #
+    filename=New"${base_file}"
+    convert /tmp/temp.png /tmp/labels-base.png -geometry +0+$band_position -composite /tmp/labels.png -geometry +0+$text_position -geometry +${w}-${h} -composite -alpha remove "${final_file_path}"
+    
+    # clean up
+    rm /tmp/temp.png
+    rm /tmp/labels-base.png
+    rm /tmp/labels.png
+    rm "${base_tmp_normalizedFilePath}"
+    
+    echo "Overlayed ${final_file_path}"
+}
+
+if [ -n "$4" ]; then
+icons_path=$4
+else
+asset_path=$(find ${project_root_path} -name "Images.xcassets"  -print -quit)
+icons_path=$(find ${asset_path} -name "AppIcon.appiconset"  -print -quit)
+fi
+
+echo "icons_path: ${icons_path}"
+
+find "${icons_path}" -type f -name "*.png" -print0 | 
+while IFS= read -r -d '' file; do
+    echo "$file"
+    processIcon "${file}" "${icons_path}" "${icons_path}"
+done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.137
+  version: 0.0.138
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -313,9 +313,7 @@ files:
 - lib/nixenvironment/xcodebuild.rb
 - nixenvironment.gemspec
 - test.sh
-- utils/XcodeIconTagger/IconTagger
-- utils/XcodeIconTagger/masks/OneLineMask.png
-- utils/XcodeIconTagger/masks/TwoLineMask.png
+- utils/AddVersionToIcons.sh
 - utils/aapt
 - utils/identitieslist
 - utils/simian-2.3.33.jar
@@ -339,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility