nixenvironment 0.0.68 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a8a720fb6217e2b04685a2f71b7f11856a0e7ee
-  data.tar.gz: d7e0c0eafae687a85f4816b76109c852d915d0a4
+  metadata.gz: d35cd4aa2d61d3d735e5f5a69600af479dc28cb7
+  data.tar.gz: 6fca4e5c7717eba21d548bb7543170eea7d0cf56
 SHA512:
-  metadata.gz: 49c1ecf47b7b61763eee3de8a83a9202bc78704dba1c7ff5f5dac54c9756c0176abcfb64536dea5bde6d5e34d3a012b47041abf855feeccade4aec69759c8667
-  data.tar.gz: 37f92ab70e4895ef634b1d258ba0bc4226e33e5853cbcdec29945497e2a67451ce211746ead1ed1fa424153284387ffb79ad7be58cb3e3b39eb6bbe8490a7482
+  metadata.gz: 99fde8218c5802d03af77e6c81b6ec0acbb58afe50f31bf696bc05cf334c6e629eb929578e5077f7efc5c4c8ed29ea71329e32498d4910814b5ec241d1876cf2
+  data.tar.gz: adcb08b12b4c491924e0c34945def72488d709a46c136afc67d3bcacb32196a68edbe92616ef7517efbf9008ea1cc9544af5b3b8813b3b36bc18bb85ec8866c8

data/bin/nixenvironment

@@ -76,23 +76,22 @@ command :build do |c|
   c.option '--app_version VERSION', String, 'Specify the version of the app (for mac and unity-winphone builds only)'
   c.action do |_args, options|
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
-
-    need_to_build_ios   = true
-    need_to_process_macos_build = false
+    unity_platform    = options.unity_platform
+    is_unity_platform = unity_platform.present?
+    need_to_build_ios              = true
+    need_to_process_macos_build    = false
     need_to_process_winphone_build = false
-    is_unity_platform = options.unity_platform.present?
 
     if is_unity_platform
       unity_path = ENV[options.unity_path] || options.unity_path
-      unity_build(options.config, options.unity_platform, unity_path, options.development_build, options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
-      need_to_build_ios              = options.unity_platform == 'ios'
-      need_to_process_macos_build    = options.unity_platform == 'macos'
-      need_to_process_winphone_build = options.unity_platform == 'winphone'
+      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)
+      need_to_build_ios              = unity_platform == 'ios'
+      need_to_process_macos_build    = unity_platform == 'macos'
+      need_to_process_winphone_build = unity_platform == 'winphone'
     end
 
     if need_to_process_macos_build
-      build_path = File.join(UNITY_IOS_PROJECT_PATH, 'build.app')
-      plist_path = File.join(build_path, 'Contents/Info.plist')
+      plist_path = File.join(UNITY_MACOS_BUILD_PATH, 'Contents/Info.plist')
 
       info_plist = Plist.from_file(plist_path)
       info_plist['CFBundleVersion']            = monotonic_revision
@@ -100,16 +99,25 @@ command :build do |c|
       info_plist['CFBundleName']               = $resigned_bundle_name if $resigned_bundle_name.present?
       info_plist['CFBundleDisplayName']        = $resigned_bundle_name if $resigned_bundle_name.present?
       info_plist.save(plist_path, Plist::FORMAT_XML)
+
+      read_config_settings
+
+      @config_settings[PRODUCT_SETTINGS_PATH_KEY] = plist_path
+      @config_settings[BUILT_PRODUCTS_DIR_KEY]    = UNITY_MACOS_PROJECT_PATH
+      @config_settings[EXECUTABLE_NAME_KEY]       = UNITY_MACOS_BUILD_NAME
+      @config_settings[CONFIGURATION_KEY]         = options.development_build ? 'Debug' : 'Release'
+      @config_settings[SDK_NAME_KEY]              = 'macosx'
+
+      save_build_env_vars
+
+      Archiver.make_macos_zip
     elsif need_to_process_winphone_build
-      build_path = File.join(Dir.pwd, 'Builds/WinPhone')
-      manifest_path = Dir.glob("#{build_path}/**/*.appxmanifest").first
+      manifest_path = Dir.glob("#{UNITY_WINPHONE_PROJECT_PATH}/**/*.appxmanifest").first
 
       File.open(manifest_path,'w') do |f|
         manifest = Nokogiri::XML(File.open(f))
         manifest.at('Package/Identity')['Version'] = "#{options.app_version}.#{monotonic_revision}"
       end
-
-      # TODO: update app_version
     elsif need_to_build_ios
       Dir.chdir(UNITY_IOS_PROJECT_PATH) if is_unity_platform
       read_config_settings
@@ -148,15 +156,35 @@ end
 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 or android)'
+  c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity deploy (ios | macos | android | winphone)'
   c.option '--deliver_deploy', 'Not only verify but also submit the build on iTunes Connect. (resigned_appstore builds only)'
   c.action do |_args, options|
-    need_to_deploy_ios = true
-    is_unity_platform  = options.unity_platform.present?
-    need_to_deploy_ios = unity_deploy(options.unity_platform) if is_unity_platform
+    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
 
-    if need_to_deploy_ios
-      Dir.chdir(UNITY_IOS_PROJECT_PATH) if is_unity_platform
+    if need_to_deploy_ios || need_to_deploy_macos_build
       read_config_settings
       deploy(options.deliver_deploy)
     end
@@ -241,7 +269,7 @@ def init
   end
 
   puts
-  dest_url                 = ask('Destination repository url: ')
+  dest_url = ask('Destination repository url: ')
 
   Git.ls_remote(dest_url)
   raise "Repository not found: '#{dest_url}'" unless Git.last_cmd_success?
@@ -249,14 +277,15 @@ def init
   local_directory_to_clone = ask('Directory to clone into: ')
   raise 'Cloning into an existing directory is not allowed!' if Dir.exist?(local_directory_to_clone)
 
-  repo_name                = File.basename(dest_url,             GIT_EXT)
-  template_project_name    = File.basename(template_project_url, GIT_EXT)
+  repo_name              = File.basename(dest_url,             GIT_EXT)
+  template_project_name  = File.basename(template_project_url, GIT_EXT)
 
   begin
-    FileUtils.rm_rf(ADJUSTER_WORKING_COPY_PATH)
+    adjuster_working_copy_path = File.join(Dir.tmpdir, ADJUSTER_WORKING_COPY_NAME)
+    FileUtils.rm_rf(adjuster_working_copy_path)
 
-    Dir.mkdir(ADJUSTER_WORKING_COPY_PATH)
-    Dir.chdir(ADJUSTER_WORKING_COPY_PATH) do
+    Dir.mkdir(adjuster_working_copy_path)
+    Dir.chdir(adjuster_working_copy_path) do
       puts
       puts 'Cloning template project ...'
       Git.clone(template_project_url, nil, :r => true)
@@ -506,8 +535,7 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
     error('iOS build unity error!') unless unity_success
     success('IOS project was generated.')
   when 'macos'
-    build_path = File.join(UNITY_IOS_PROJECT_PATH, 'build.app')
-    build_path_arg = "buildPath=#{build_path}"
+    build_path_arg = "buildPath=#{UNITY_MACOS_BUILD_PATH}"
     development_build_arg = development_build ? ';developmentBuild=' : ''
 
     unity_success = system("#{unity_path} -projectPath '#{Dir.pwd}' -batchmode -logFile -quit -executeMethod NIXBuilder.MakeMacOSBuild -customArgs:'#{build_path_arg}#{development_build_arg}'")
@@ -523,8 +551,7 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
                                                                #{development_build_arg} #{keystore_path_arg} #{keystore_password_arg} #{key_alias_name_arg} #{key_alias_password_arg}")
     error('Android build unity error!') unless build_success
   when 'winphone'
-    build_path = File.join(Dir.pwd, 'Builds/WinPhone')
-    build_path_arg = "buildPath=#{build_path}"
+    build_path_arg = "buildPath=#{UNITY_WINPHONE_PROJECT_PATH}"
     development_build_arg  = development_build ? ';developmentBuild=' : ''
 
     puts 'Generating WinPhone project from UNITY project ...'
@@ -652,11 +679,12 @@ def deploy(deliver_deploy)
     FileUtils.mkdir(configuration_full_path)
     FileUtils.cp(ipa_product, File.join(configuration_full_path, executable_name) + ZIP_EXT)
 
-    if File.exist?(app_dsym)
-      Dir.chdir(built_products_dir)
-      destination = File.join(configuration_full_path, "#{executable_name + APP_EXT + DSYM_EXT + ZIP_EXT}")
-      system("zip -r \"#{destination}\" \"#{executable_name + APP_EXT + DSYM_EXT}\"")
-    end
+    # TODO: mds currently doesn't support dsym for mac projects. Will be implemented later.
+    # if File.exist?(app_dsym)
+    #   Dir.chdir(built_products_dir)
+    #   destination = File.join(configuration_full_path, "#{executable_name + APP_EXT + DSYM_EXT + ZIP_EXT}")
+    #   system("zip -r '#{destination}' '#{executable_name + APP_EXT + DSYM_EXT}'")
+    # end
 
     deploy_path    = @config_settings[DEPLOY_PATH_KEY].blank? ? MACOS_PROJECTS_DEPLOY_PATH : @config_settings[DEPLOY_PATH_KEY]
     deploy_success = system("#{DEPLOY_SCRIPT_PATH} #{deploy_host} #{deploy_path} #{deploy_username} #{deploy_password} #{local_path_to_app}")
@@ -668,18 +696,6 @@ def deploy(deliver_deploy)
   deploy_success ? success('Deploy complete!') : error('Deploy error!')
 end
 
-def unity_deploy(unity_platform)
-  need_to_deploy_ios = false
-
-  case unity_platform
-  when 'ios'     then need_to_deploy_ios = true
-  when 'android' then system(DEPLOY_APK_SCRIPT_PATH) ? success('Unity android deploy complete!') : error('Unity android deploy error!')
-  else                error("Error: Unknown unity target platform '#{unity_platform}'!")
-  end
-
-  need_to_deploy_ios
-end
-
 def clean
   FileUtils.rm_f(Dir.glob('*.pyc'))
   FileUtils.rm_f('last_revision.sh')

data/legacy/DeployIPA.sh

@@ -56,9 +56,9 @@ if [[ -f "${IPA_PRODUCT_RESIGNED_APPSTORE}" ]]; then
         echo "DEPLOY_ITUNESCONNECT_USER isn't specified, skipping deliver..."
     else
         if [ "${DELIVER_DEPLOY}" == 1 ]; then
-+           pilot upload -i "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}"
+            pilot upload -i "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}"
         else
-+           pilot upload -i "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}" --skip_submission
+            pilot upload -i "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}" --skip_submission
         fi
     fi
 

data/legacy/LoadBuildEnvVars.sh

@@ -116,8 +116,7 @@ fi
 
 echo "EMBEDDED_PROFILE_NAME = ${EMBEDDED_PROFILE_NAME}"
 
-CURRENT_APP_VERSION="`/usr/libexec/PlistBuddy -c 'Print CFBundleShortVersionString' \
-    "${APP_INFOPLIST_FILE}"`"
+CURRENT_APP_VERSION="`/usr/libexec/PlistBuddy -c 'Print CFBundleShortVersionString' "${APP_INFOPLIST_FILE}"`"
 CURRENT_BUILD_VERSION=${MONOTONIC_REVISION}
 
 echo "CURRENT_APP_VERSION = ${CURRENT_APP_VERSION}"

data/legacy/UnityBuildAutomationScripts/NIXBuilder.cs

@@ -89,10 +89,13 @@ public static class NIXBuilder
     {
         string projectPath = CommandLineReader.GetCustomArgument(BuildPathArgument);
         CreateFolder(projectPath);
-		
+#if UNITY_4_6
+		BuildTarget buildTarget = BuildTarget.MetroPlayer;
+		EditorUserBuildSettings.metroSDK = MetroSDK.PhoneSDK81;
+#else
 		BuildTarget buildTarget = BuildTarget.WSAPlayer;
-		
 		EditorUserBuildSettings.wsaSDK = WSASDK.PhoneSDK81;
+#endif
 		EditorUserBuildSettings.SwitchActiveBuildTarget(buildTarget);
 		
 		BuildPipeline.BuildPlayer(GetScenePaths(), projectPath, buildTarget, GetBuildOptions());

data/lib/nixenvironment/archiver.rb

@@ -291,7 +291,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           end
 
           is_widget_provision_replaced = nil
-          is_widget_bundle_idchanged   = nil
+          is_widget_bundle_id_changed  = nil
 
           dest_widget_product_path = nil
 
@@ -299,7 +299,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           if widget_relative_product_path.present?
             dest_widget_product_path     = File.join(dest_app_product_path, widget_relative_product_path)
             is_widget_provision_replaced = replace_provision(dest_widget_product_path, widget_profile_path)
-            is_widget_bundle_idchanged   = rename_bundle_id(dest_widget_product_path, new_widget_bundle_id)
+            is_widget_bundle_id_changed  = rename_bundle_id(dest_widget_product_path, new_widget_bundle_id)
           end
 
           # TODO: codesign watchkit app!
@@ -312,7 +312,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
 
           # codesign widget
           if widget_relative_product_path.present?
-            codesign(widget_identity_name, new_widget_entitlements_path, is_widget_provision_replaced, is_widget_bundle_idchanged,
+            codesign(widget_identity_name, new_widget_entitlements_path, is_widget_provision_replaced, is_widget_bundle_id_changed,
                      dest_widget_product_path, widget_profile_path, new_widget_bundle_id)
           end
 
@@ -397,39 +397,41 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       end
 
       def rename_bundle_id_and_name(app_product_path, new_bundle_id, new_bundle_name)
-        rename_bundle_id(app_product_path, new_bundle_id) && rename_bundle_name(app_product_path, new_bundle_name)
+        is_bundle_id_changed   = rename_bundle_id(app_product_path, new_bundle_id)
+        is_bundle_name_changed = rename_bundle_name(app_product_path, new_bundle_name)
+        is_bundle_id_changed || is_bundle_name_changed
       end
 
       def rename_bundle_id(app_product_path, new_bundle_id)
-        original_bundle_id    = get_bundle_id(app_product_path)
-        is_bundle_id_the_same = false
+        original_bundle_id   = get_bundle_id(app_product_path)
+        is_bundle_id_changed = false
 
         if new_bundle_id == original_bundle_id
           puts_header "--> Bundle id '#{new_bundle_id}' will not be modified"
-          is_bundle_id_the_same = true
         else
           puts_header "--> Rename bundle id from '#{original_bundle_id}' into '#{new_bundle_id} in '#{app_product_path}' Info.plist ..."
           set_plist_values_in_app_path(app_product_path, 'CFBundleIdentifier' => new_bundle_id)
+          is_bundle_id_changed = true
         end
 
-        is_bundle_id_the_same
+        is_bundle_id_changed
       end
 
       def rename_bundle_name(app_product_path, new_bundle_name)
         original_bundle_name         = get_bundle_name(app_product_path)
         original_bundle_display_name = get_bundle_display_name(app_product_path)
 
-        is_bundle_name_the_same = false
+        is_bundle_name_changed = false
 
         if new_bundle_name == original_bundle_name && new_bundle_name == original_bundle_display_name
           puts_header "--> Bundle name '#{new_bundle_name}' will not be modified"
-          is_bundle_name_the_same = true
         else
           puts_header "--> Rename bundle name/bundle display name from '#{original_bundle_name}'/'#{original_bundle_display_name}' into '#{new_bundle_name}' in '#{app_product_path}' Info.plist ..."
           set_plist_values_in_app_path(app_product_path, { 'CFBundleName' => new_bundle_name, 'CFBundleDisplayName' => new_bundle_name } )
+          is_bundle_name_changed = true
         end
 
-        is_bundle_name_the_same
+        is_bundle_name_changed
       end
 
       def get_bundle_id(app_product_path)

data/lib/nixenvironment/config.rb

@@ -60,18 +60,25 @@ module Nixenvironment
   IOS_PLUGINS_FOLDER_NAME = 'PlugIns'
 
   # unity
-  UNITY_BUILDS_IOS_PATH    = 'Builds/iOS'
-  UNITY_BUILDS_IOS_PROJECT = 'Unity-iPhone.xcodeproj'
-  UNITY_BUILDS_IOS_SCHEME  = 'Unity-iPhone'
-  UNITY_BUILDS_ICONS_PATH  = 'Unity-iPhone/Images.xcassets'
-  UNITY_BUILD_SCRIPTS_PATH = 'UnityBuildAutomationScripts'
-  UNITY_ASSETS_EDITOR_PATH = 'Assets/Editor'
-  UNITY_BUILD_SCRIPTS_DIR  = File.join(BUILD_SCRIPTS_PATH, UNITY_BUILD_SCRIPTS_PATH)
-  UNITY_EDITOR_DIR         = File.join(Dir.pwd, UNITY_ASSETS_EDITOR_PATH)
-  UNITY_IOS_PROJECT_PATH   = File.join(Dir.pwd, UNITY_BUILDS_IOS_PATH)
+  UNITY_BUILDS_IOS_PATH       = 'Builds/iOS'
+  UNITY_BUILDS_MACOS_PATH     = 'Builds/MacOS'
+  UNITY_BUILDS_WINPHONE_PATH  = 'Builds/WinPhone'
+  UNITY_BUILDS_IOS_PROJECT    = 'Unity-iPhone.xcodeproj'
+  UNITY_BUILDS_IOS_SCHEME     = 'Unity-iPhone'
+  UNITY_BUILDS_ICONS_PATH     = 'Unity-iPhone/Images.xcassets'
+  UNITY_BUILD_SCRIPTS_PATH    = 'UnityBuildAutomationScripts'
+  UNITY_ASSETS_EDITOR_PATH    = 'Assets/Editor'
+  UNITY_BUILD_SCRIPTS_DIR     = File.join(BUILD_SCRIPTS_PATH, UNITY_BUILD_SCRIPTS_PATH)
+  UNITY_EDITOR_DIR            = File.join(Dir.pwd, UNITY_ASSETS_EDITOR_PATH)
+  UNITY_IOS_PROJECT_PATH      = File.join(Dir.pwd, UNITY_BUILDS_IOS_PATH)
+  UNITY_MACOS_PROJECT_PATH    = File.join(Dir.pwd, UNITY_BUILDS_MACOS_PATH)
+  UNITY_WINPHONE_PROJECT_PATH = File.join(Dir.pwd, UNITY_BUILDS_WINPHONE_PATH)
+
+  UNITY_MACOS_BUILD_NAME = 'Build'
+  UNITY_MACOS_BUILD_PATH = File.join(UNITY_MACOS_PROJECT_PATH, "#{UNITY_MACOS_BUILD_NAME}#{APP_EXT}")
 
   # project adjuster
-  ADJUSTER_WORKING_COPY_PATH = '/tmp/NIXProjectAdjuster'
+  ADJUSTER_WORKING_COPY_NAME = 'NIXProjectAdjuster'
   ADJUSTER_TEMP_PROJECT_NAME = 'newProj'
 
   # tests

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.68'
+  VERSION = '0.0.69'
 end

data/nixenvironment.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize'
   spec.add_dependency 'CFPropertyList', '= 2.2.8'
   spec.add_dependency 'pilot',          '~> 1.0.0'
+  spec.add_dependency 'nokogiri',       '= 1.6.7.rc2'
 
   # Development only
   spec.add_development_dependency 'bundler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -109,6 +109,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.7.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.7.rc2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement