nixenvironment 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25d7a471f861f5ff4e2f6a6260ffdae72890cc7c
-  data.tar.gz: b39797b9754c940d764e128335247a34bef53e09
+  metadata.gz: 69e8cf4ca774b93ced28488e4f834b6081742024
+  data.tar.gz: 4e6f5b36b7fc976e55cea4ba43ed7d30b823f7b0
 SHA512:
-  metadata.gz: 174971b1f0992cc3efd7c30f0cf638b5eddf823e345c09716cd9fc761d7d4d7f6188ccbb6dda6cd87285f143be582e4c5d3c0a7aad3c17ff7c986461873cdff7
-  data.tar.gz: 09f278e15fa108180067d66d583533fb4565f8c8358be80ec374c609bda6ea54bdcb4f7a8391d679000ed61f78be69767fed737b935962749327ca5c9fe9d3a7
+  metadata.gz: 6a68ed923a7fc37043c80ae741024e06401999493c5f52d98e05b750114f66133e429b8913f92b892e868fa9b05296e04a7af205fce980b925b18e2e2c151a1b
+  data.tar.gz: 95205e01f3d48a13d498ae9c933028bb80a70f0244f2f9da870d824e56cb4e468662e64087c7abf05152ad84a1dfb01a36dac6c1e44aced003feb5c6205bc16a

data/bin/nixenvironment

@@ -65,7 +65,7 @@ command :build do |c|
   c.option '--config NAME', String, 'Select configuration'
   c.option '--ipa TYPE', String, 'Select sign (ipa, resigned_ipa_for_device, resigned_ipa_for_adhoc_distribution or resigned_ipa_for_appstore)'
   c.option '--ci_build', 'Define NIXENV_CI_BUILD environment variable'
-  c.option '--unity TARGET PLATFORM', String, 'Select target platform to build (ios or android)'
+  c.option '--unity TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
   c.action do |args, options|
     options.default :config => 'Debug', :ipa => 'ipa'
 
@@ -94,9 +94,23 @@ end
 command :deploy do |c|
   c.syntax = 'nixenvironment deploy'
   c.description = 'Deploy built artifacts to given server'
+  c.option '--unity TARGET PLATFORM', String, 'Select target platform for unity deploy (ios or android)'
   c.action do |args, options|
-    read_config(options)
-    deploy
+    if options.unity and options.unity.length > 0
+      need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir = unity_deploy(options.unity)
+      return unless need_to_deploy_ios
+    end
+
+    begin
+      read_config(options)
+      deploy
+    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
 
@@ -479,15 +493,14 @@ def unity_build(unity)
   case unity
     when 'ios'
       need_to_build_ios = true
-
-      ios_project_path = File.join(Dir.pwd, 'Builds/iOS')
+      root_working_dir = Dir.pwd
+      ios_project_path = File.join(root_working_dir, UNITY_BUILDS_IOS_PATH)
 
       p('Generating IOS project from UNITY project ...')
-      unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -batchmode -quit -customArgs:path='#{ios_project_path}'")
+      unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -projectPath #{root_working_dir} -batchmode -logFile -quit -customArgs:path='#{ios_project_path}'")
       abort('Build unity error!') unless unity_success
       p('IOS project was generated.')
 
-      root_working_dir = Dir.pwd
       need_chdir_to_root_working_dir = true
 
       clean_working_copy(false)
@@ -555,6 +568,28 @@ def deploy
   abort('Deploy error!') unless deploy_success
 end
 
+def unity_deploy(unity)
+  root_working_dir = nil
+  need_chdir_to_root_working_dir = false
+  need_to_deploy_ios = false
+
+  case unity
+    when 'ios'
+      root_working_dir = Dir.pwd
+      need_chdir_to_root_working_dir = true
+      need_to_deploy_ios = true
+
+      ios_project_path = File.join(root_working_dir, UNITY_BUILDS_IOS_PATH)
+      Dir.chdir(ios_project_path)
+    when 'android'
+      #TODO: implement me!
+    else
+      abort("Error: Unknown unity target platform '#{unity}'!")
+  end
+
+  return need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir
+end
+
 def clean
   remove_temporary_files = File.join(BUILD_SCRIPTS_PATH, 'RemoveTemporaryFiles.sh')
 

data/lib/nixenvironment/config.rb

@@ -4,6 +4,8 @@ module Nixenvironment
 
   BUILD_SCRIPTS_PATH = File.join(Dir.home, NIXENV_ROOT, BUILD_SCRIPTS)
 
+  UNITY_BUILDS_IOS_PATH = 'Builds/iOS'
+
   REPO_LIST = {
     BUILD_SCRIPTS => 'https://bitbucket.org/nixsolutions/ninbas.git',
     # 'nixipl' : 'https://bitbucket.org/nixsolutions/nixipl.git',

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

metadata

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