nixenvironment 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b52d2ffdc327d5174565c56f40290a095745858
-  data.tar.gz: d4920940b6a21231d647fd2cdcea4f8e5620f169
+  metadata.gz: a1a40f3920aa6d88fb30a0cae382d19cb2422258
+  data.tar.gz: 967212aaced9759fe047dcb7290e2caff7b08057
 SHA512:
-  metadata.gz: 48fe45b5c57547811c44f05b80f16934c2fe4b2cc13c697afed9c972b034e9f82b29d7a62ed6754a03f0826c23708198aacd219f0e458e19b603b6954ca511b0
-  data.tar.gz: 47a4132ac00566d8f84d8e1fc64b2e98f7f4d07a4eb6abee4a2aa8b0545f9ee270d8539602e59596cec5584a2fded28c3cdf27c662228a1830700751a9d60aa1
+  metadata.gz: 5ae3af97bc91e56310b368d1ad2369afdec71a3fc255460227cf36102af644a5e596de0b52ed3efcd52d0c63beb169cff2470052cebe3fb072cee995a283c6ac
+  data.tar.gz: 4203401e94cb293ee1febb5e36b9159b9d34d6e1ced77b37811f76da958df35f5dd28c0b633b02d1d8064e2f3631fa45fce442a209ec1592257723df1140036b

data/bin/nixenvironment

@@ -69,21 +69,22 @@ command :build do |c|
 
     if options.unity and options.unity.length > 0
       need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir = unity_build(options.unity)
-      return unless need_to_build_ios
     end
 
-    begin
-      read_config_settings
-      enable_ci_build(options.ci_build)
-      supplement_config_settings(options.config)
-      prebuild(options.config)
-      build(options.config, options.ipa)
-      restore_info_plist
-    rescue
-      raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
-    ensure
-      if need_chdir_to_root_working_dir and root_working_dir
-        Dir.chdir(root_working_dir)
+    if not defined? need_to_build_ios or need_to_build_ios
+      begin
+        read_config_settings
+        enable_ci_build(options.ci_build)
+        supplement_config_settings(options.config)
+        prebuild(options.config)
+        build(options.config, options.ipa)
+        restore_info_plist
+      rescue
+        raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
+      ensure
+        if need_chdir_to_root_working_dir and root_working_dir
+          Dir.chdir(root_working_dir)
+        end
       end
     end
   end
@@ -509,11 +510,10 @@ def unity_build(unity)
 
       p('Generating IOS project from UNITY project ...')
       unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -projectPath #{root_working_dir.shellescape} -batchmode -logFile -quit -customArgs:path='#{ios_project_path}'")
-      abort('Build unity error!') unless unity_success
+      abort('iOS build unity error!') unless unity_success
       p('IOS project was generated.')
 
       need_chdir_to_root_working_dir = true
-
       clean_working_copy(false)
 
       Dir.chdir(ios_project_path)
@@ -521,7 +521,10 @@ def unity_build(unity)
       $project_to_build = 'Unity-iPhone.xcodeproj'
       $project_target_to_build = 'Unity-iPhone'
     when 'android'
-      #TODO: implement me!
+      build_success = system(File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py'))
+      abort('Android build unity error!') unless build_success
+
+      clean_working_copy(false)
     else
       abort("Error: Unknown unity target platform '#{unity}'!")
   end
@@ -567,7 +570,7 @@ def restore_info_plist
 end
 
 def deploy
-  deploy = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
+  deploy = File.join(BUILD_SCRIPTS_PATH, 'DeployIPA.sh')
 
   deploy_host = @config_settings['DEPLOY_HOST'].nil? || @config_settings['DEPLOY_HOST'].empty? ? ENV['DEPLOY_HOST'] : @config_settings['DEPLOY_HOST']
   deploy_path = @config_settings['DEPLOY_PATH'].nil? || @config_settings['DEPLOY_PATH'].empty? ? ENV['DEPLOY_PATH'] : @config_settings['DEPLOY_PATH']
@@ -592,7 +595,8 @@ def unity_deploy(unity)
       ios_project_path = File.join(root_working_dir, UNITY_BUILDS_IOS_PATH)
       Dir.chdir(ios_project_path)
     when 'android'
-      #TODO: implement me!
+      deploy_success = system(File.join(BUILD_SCRIPTS_PATH, 'DeployAPK.py'))
+      abort('Android deploy unity error!') unless deploy_success
     else
       abort("Error: Unknown unity target platform '#{unity}'!")
   end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.31'
+  VERSION = '0.0.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler