nixenvironment 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d233c5bc47f433ab59ff12000961e0bc8fbc60cb
-  data.tar.gz: b153a6f3d5ab86a5b0527834ae47f7139598a767
+  metadata.gz: 7c81ee2f6fc5ab2485889d1246e7dc7709fcaca7
+  data.tar.gz: 8351fabd6b626aa47924d21fd9d69bda73795096
 SHA512:
-  metadata.gz: 7c1e0498ffbc2f0500c19586b2f0cee8856affba3f8183269efbccdb3f7416ef99f2415c2ee50ff676d2fae0e2769b001b13a75bab3cacb00e4d1a28437253fc
-  data.tar.gz: 963f1840d25c356979339018052c8e767d4969b7334e28b00f3319937012082a8de1ac0b18934d7a7eca1c1d5e24fc99ea6c4086e24224cb914eb3e8475b2a42
+  metadata.gz: 0903aabc22641305f0a5dfb4a12d486183bc8d099bbab3c02188d647c54fc46a0307773391feeb03f0d9628424c0f2a8d5c149d1b6f42b1facd94f08b00f55b3
+  data.tar.gz: 7cdc54b824b2bad93cc4f492b2fe2239ef10d20ee184006b0aecbbb21a55f8df4b142dee78739c2032716fe351153b6d84d15345cf8eeb99a1cf434809fc08da

data/bin/Config

@@ -23,7 +23,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/Icons
+ICONS_PATH: Resources/Images/Images.xcassets
 
 # specifies the device to be used as destination
 XCTEST_DESTINATION_DEVICE: platform=iOS Simulator,name=iPhone 5,OS=latest

data/bin/nixenvironment

@@ -65,8 +65,9 @@ command :build do |c|
   c.option '--ci_build', 'Define NIXENV_CI_BUILD environment variable'
   c.option '--unity TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
+  c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
   c.action do |args, options|
-    options.default :config => 'Debug', :ipa => 'ipa'
+    options.default :config => 'Debug', :ipa => 'ipa', :icon_tagger => 'full'
 
     need_to_build_ios = true
 
@@ -80,7 +81,7 @@ command :build do |c|
         enable_ci_build(options.ci_build)
         supplement_config_settings(options.config)
         prebuild(options.config)
-        build(options.config, options.ipa, options.ndsym)
+        build(options.config, options.ipa, options.ndsym, options.icon_tagger)
         restore_info_plist
       rescue
         raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
@@ -400,7 +401,6 @@ end
 
 def prebuild(config)
   save_revision = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
-  tag_icons     = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
 
   system("#{save_revision}")
 
@@ -411,12 +411,9 @@ def prebuild(config)
   save_build_env_vars
 
   update_info_plist(config)
-
-  # TODO: rewrite tagIcons.sh
-  # system("#{tag_icons} #{@config_settings['ICONS_PATH']}")
 end
 
-def build(config, ipa, ndsym)
+def build(config, ipa, ndsym, icon_tagger)
   build = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
 
   build_success = nil
@@ -466,6 +463,21 @@ def build(config, ipa, ndsym)
     abort('Build error!')
   end
 
+  if config == 'Release'
+    p('IconTagger: configuration is Release. Skipping...')
+  else
+    case icon_tagger
+      when 'full'
+        tag_icon(false)
+      when 'short'
+        tag_icon(true)
+      when 'off'
+        p('IconTagger is disabled. Skipping...')
+      else
+        p("Unknown IconTagger mode: '#{icon_tagger}'. Skipping...")
+    end
+  end
+
   case ipa
     # create .ipa file from last built app product
     when 'ipa'
@@ -540,6 +552,26 @@ def unity_build(unity)
   return need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir
 end
 
+def tag_icon(short_version)
+  tagger_directory = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger')
+  utility = File.join(tagger_directory, 'IconTagger')
+  plist_path = @unescaped_product_settings_path
+  version =  %x[ /usr/libexec/PlistBuddy -c 'Print CFBundleShortVersionString' '#{plist_path}' ].strip!
+  monotonic_revision = %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
+  style = short_version ? 'OneLine' : 'TwoLine'
+  mask_path = File.join(tagger_directory, "masks/#{style}Mask.png")
+  icons_dir = File.join(Dir.pwd, @config_settings['ICONS_PATH'])
+  app_product = File.join(@config_settings['BUILT_PRODUCTS_DIR'], @config_settings['EXECUTABLE_NAME']) + '.app'
+
+  system("#{utility} --shortVersion=#{version}\
+                     --buildNumber=#{monotonic_revision}\
+                     --style=#{style}\
+                     --maskPath=\"#{mask_path}\"\
+                     --plist=\"#{plist_path}\"\
+                     --sourceIconsPath=\"#{icons_dir}\"\
+                     --destinationIconsPath=#{app_product}")
+end
+
 def backup_info_plist
   p('Backuping Info.plist ...')
 

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility