nixenvironment 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b33c69ca91104d47aa95170b7a5a6f3db8dbe46
-  data.tar.gz: 97b89eb5314b3b07b3f53a9e2c8e04c6527402a6
+  metadata.gz: 1f8c443d2cc4aa251a2219eb02251dedc8ba1b57
+  data.tar.gz: 489a11c8eb72790fc1a47c2e7c213d9f77d96bfa
 SHA512:
-  metadata.gz: cac514d4049ca98eeb5bdfc2c72b72751b91fcc78a5cb7ba5405562e93e7d4740b4578c38ccefec08bcf61f28514f7970f5d82e132e83d97c3ec58c880ae394d
-  data.tar.gz: 1fa15f273d11e9c99bcee25f70c39d09ddd00a9d56018c18b5f5d56057aed216a22fc525f1ceca3f31e524a27597043af381c25e904058960f80e5bcedc207e1
+  metadata.gz: b0c03686f0d07181fe2c5534214a4c4bb51336b3590960fb3ef1230ed79fd17f0e0a7ab269d31009ce0a26abf788a923bba7203fe3b2e959e40ef8e97606fcf6
+  data.tar.gz: 6d7a147b097fee61b943ff37e5d21aae9ec7a4823baeddc4e8b3dd6bffd5b4b0fd84096c28689c8e5642ed9beca8731fa23fde5d67f063b6e6e1d5b919112434

data/bin/Config

@@ -25,10 +25,10 @@ EXCLUDE_PATTERN_FOR_CODE_DUPLICATION: "**/Vendor|**/Scripts"
 # set these var if you want to add build number on icon
 ICONS_PATH: Resources/Icons
 
-# Specifies the device to be used as destination
+# specifies the device to be used as destination
 XCTEST_DESTINATION_DEVICE: platform=iOS Simulator,name=iPhone 5,OS=latest
 
-# Configuration of code coverage
+# configuration of code coverage
 CONFIGURATION_FILES_PATH: ./Scripts/ConfigurationFiles
 CODE_COVERAGE_CONFIGURATION: /CodeCoverage/CodeCoverageConfiguration.xcconfig
 CODE_COVERAGE_OUTPUT_DIRECTORY: ./Coverage/
@@ -36,3 +36,9 @@ CODE_COVERAGE_OUTPUT_DIRECTORY: ./Coverage/
 ENV_VAR_PREFIX: NIXENV_
 
 INFOPLIST_PATH: Resources/Plists/Info.plist
+
+# bundle identifiers and entitlements
+BUNDLE_ID: com.nixsolutions.${PRODUCT_NAME:rfc1034identifier}
+RESIGNED_BUNDLE_ID: com.nixsolutions.ApplicationResignTest
+RESIGNED_BUNDLE_NAME: ApplicationResignTest
+RESIGNED_ENTITLEMENTS_PATH:

data/bin/nixenvironment

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'nixenvironment'
 require 'commander/import'
 require 'yaml'
+require 'FileUtils'
 
 include Nixenvironment
 
@@ -43,6 +44,11 @@ global_option ('--env_var_prefix VALUE') { |value| $env_var_prefix = value }
 
 global_option ('--infoplist_path VALUE') { |value| $infoplist_path = value }
 
+global_option ('--bundle_id VALUE') { |value| $bundle_id = value }
+global_option ('--resigned_bundle_id VALUE') { |value| $resigned_bundle_id= value }
+global_option ('--resigned_bundle_name VALUE') { |value| $resigned_bundle_name = value }
+global_option ('--resigned_entitlements_path VALUE') { |value| $resigned_entitlements_path = value }
+
 command :update do |c|
   c.syntax = 'nixenvironment update'
   c.description = 'Install or update ninbas and other environment stuff'
@@ -63,9 +69,9 @@ command :build do |c|
     read_config(options)
     enable_ci_build(options.ci_build)
     build_settings = setup(options.config)
-    prebuild(build_settings)
+    prebuild(build_settings, options.config)
     build(options.config, options.ipa)
-    revert_info_plist
+    restore_info_plist
   end
 end
 
@@ -215,6 +221,10 @@ def read_config(options)
   update_config('CODE_COVERAGE_OUTPUT_DIRECTORY',        $code_coverage_output_directory)
   update_config('ENV_VAR_PREFIX',                        $env_var_prefix)
   update_config('INFOPLIST_PATH',                        $infoplist_path)
+  update_config('BUNDLE_ID',                             $bundle_id)
+  update_config('RESIGNED_BUNDLE_ID',                    $resigned_bundle_id)
+  update_config('RESIGNED_BUNDLE_NAME',                  $resigned_bundle_name)
+  update_config('RESIGNED_ENTITLEMENTS_PATH',            $resigned_entitlements_path)
 end
 
 def update_config(key, value)
@@ -334,23 +344,22 @@ RESIGNED_ENTITLEMENTS_PATH=\"#{build_settings['RESIGNED_ENTITLEMENTS_PATH']}\"\"
   ")
 end
 
-def prebuild(build_settings)
+def prebuild(build_settings, config)
   save_revision          = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
   tag_icons              = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
-  update_build_number    = File.join(BUILD_SCRIPTS_PATH, 'UpdateBuildNumber.sh')
-  update_revision_number = File.join(BUILD_SCRIPTS_PATH, 'UpdateRevisionNumber.sh')
 
   system("#{save_revision}")
 
   abort unless working_copy_is_clean?
 
+  backup_info_plist
+
   save_build_env_vars(build_settings)
 
+  update_info_plist(build_settings, config)
+
   # TODO: rewrite tagIcons.sh
   # system("#{tag_icons} @config['ICONS_PATH']")
-
-  system("#{update_build_number}")
-  system("#{update_revision_number}")
 end
 
 def build(config, ipa)
@@ -364,24 +373,27 @@ def build(config, ipa)
                                        --target \"#{@config['PROJECT_TARGET_TO_BUILD']}\"\
                                        --configuration \"#{config}\"\
                                        --sdk \"#{@config['SDK']}\"\
-                                       --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
+                                       --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
+                                       DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"")
     else
       build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
                                        --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
                                        --configuration \"#{config}\"\
                                        --sdk \"#{@config['SDK']}\"\
-                                       --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
+                                       --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
+                                       DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"")
     end
   elsif @config['WORKSPACE_TO_BUILD'] and @config['WORKSPACE_TO_BUILD'].length > 0
     build_success = system("#{build} --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
                                      --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
                                      --configuration \"#{config}\"\
                                      --sdk \"#{@config['SDK']}\"\
-                                     --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
+                                     --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
+                                     DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"")
   end
 
   unless build_success
-    revert_info_plist
+    restore_info_plist
     abort('Build error!')
   end
 
@@ -405,18 +417,48 @@ def build(config, ipa)
   make_success = system("#{make}") if defined? make
 
   unless make_success
-    revert_info_plist
+    restore_info_plist
     abort("#{make} error!")
   end
 end
 
-def revert_info_plist
-  p('Reverting Info.plist ...')
+def backup_info_plist
+  p('Backuping Info.plist ...')
+
+  @info_plist_backup_name = @config['INFOPLIST_PATH'] + '.backup'
+  FileUtils.cp(@config['INFOPLIST_PATH'], @info_plist_backup_name)
+
+  p('Info.plist was backuped.')
+end
+
+def update_info_plist(build_settings, config)
+  p('Updating Info.plist ...')
+
+  update_build_number    = File.join(BUILD_SCRIPTS_PATH, 'UpdateBuildNumber.sh')
+  update_revision_number = File.join(BUILD_SCRIPTS_PATH, 'UpdateRevisionNumber.sh')
+
+  update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleIdentifier \"#{@config['BUNDLE_ID']}\"' \"#{@config['INFOPLIST_PATH']}\"")
+  update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :Configuration string \"#{config}\"' \"#{@config['INFOPLIST_PATH']}\"")
+  update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :RevisionNumber string \"undefined\"' \"#{@config['INFOPLIST_PATH']}\"")
+
+  unless update_success
+    restore_info_plist
+    abort('Update Info.plist error!')
+  end
+
+  system("#{update_build_number}")
+  system("#{update_revision_number}")
+
+  p('Info.plist was updated.')
+end
+
+def restore_info_plist
+  p('Restoring Info.plist ...')
 
-  revert_success = system("git checkout #{@config['INFOPLIST_PATH']}")
-  abort('Reverting Info.plist error!') unless revert_success
+  File.delete(@config['INFOPLIST_PATH'])
+  File.rename(@info_plist_backup_name, @config['INFOPLIST_PATH'])
 
-  p('Info.plist was reverted.')
+  p('Info.plist was restored.')
 end
 
 def deploy

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler