nixenvironment 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9616d007f2590a37efc28a74252704e4224f7fae
-  data.tar.gz: 9aca450dec80c7ab997da8bdbcbe23268e2c41f0
+  metadata.gz: 25d7a471f861f5ff4e2f6a6260ffdae72890cc7c
+  data.tar.gz: b39797b9754c940d764e128335247a34bef53e09
 SHA512:
-  metadata.gz: 23e3077afb99d78358f8dfbcc578b20496da0279031a370c2ccd10de575f933621fde644bb85a21c4641aca372072b38233d40c2b6317b8befed943b13fc4257
-  data.tar.gz: 6fafc3e58d77931d964b72adc9073250ce20b87af6799f8496f9a6d3498453f42928db0e587411ed26187bc66a05edebe2203965dae3affdf8674f79b4121c58
+  metadata.gz: 174971b1f0992cc3efd7c30f0cf638b5eddf823e345c09716cd9fc761d7d4d7f6188ccbb6dda6cd87285f143be582e4c5d3c0a7aad3c17ff7c986461873cdff7
+  data.tar.gz: 09f278e15fa108180067d66d583533fb4565f8c8358be80ec374c609bda6ea54bdcb4f7a8391d679000ed61f78be69767fed737b935962749327ca5c9fe9d3a7

data/bin/nixenvironment

@@ -64,36 +64,14 @@ command :build do |c|
   c.description = 'Build project for selected configuration and make signed/resigned ipa'
   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 VALUE', String, 'Define NIXENV_CI_BUILD environment variable (yes, true, 1 or on to enable)'
+  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.action do |args, options|
-    options.default :config => 'Debug', :ipa => 'ipa', :ci_build => 'yes'
+    options.default :config => 'Debug', :ipa => 'ipa'
 
-    root_working_directory = nil
-    need_chdir_to_root_working_directory = false
-
-    unity = options.unity
-    if unity and unity.length > 0
-      case unity
-        when 'ios'
-          ios_project_path = File.join(Dir.pwd, 'Builds/iOS')
-
-          unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -batchmode -quit -customArgs:path='#{ios_project_path}'")
-          abort('Build unity error!') unless unity_success
-
-          root_working_directory = Dir.pwd
-          need_chdir_to_root_working_directory = true
-
-          Dir.chdir(ios_project_path)
-
-          $project_to_build = 'Unity-iPhone.xcodeproj'
-          $project_target_to_build = 'Unity-iPhone'
-          $infoplist_path = 'Info.plist'
-        when 'android'
-          #TODO: implement me!
-        else
-          abort("Error: Unknown unity target platform '#{unity}'!")
-      end
+    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
@@ -104,10 +82,10 @@ command :build do |c|
       build(build_settings, options.config, options.ipa)
       restore_info_plist
     rescue
-      raise # re-rise exception but chdir to root_working_directory in ensure block first if needed
+      raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
     ensure
-      if need_chdir_to_root_working_directory and root_working_directory
-        Dir.chdir(root_working_directory)
+      if need_chdir_to_root_working_dir and root_working_dir
+        Dir.chdir(root_working_dir)
       end
     end
   end
@@ -176,8 +154,9 @@ end
 command :clean_working_copy do |c|
   c.syntax = 'nixenvironment clean_working_copy'
   c.description = 'Make working copy clean'
+  c.option '--all', 'Remove ignored files too'
   c.action do |args, options|
-    clean_working_copy
+    clean_working_copy(options.all)
   end
 end
 
@@ -275,7 +254,7 @@ def update_config(key, value)
 end
 
 def enable_ci_build(ci_build)
-  if ci_build == 'yes' or ci_build == 'true' or ci_build == '1' or ci_build == 'on'
+  if ci_build
     ENV['NIXENV_CI_BUILD'] = '1'
     p('CI_BUILD enabled.')
   else
@@ -478,6 +457,55 @@ def build(build_settings, config, ipa)
   end
 end
 
+def unity_build(unity)
+  root_working_dir = nil
+  need_chdir_to_root_working_dir = false
+  need_to_build_ios = false
+
+  save_revision = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
+  system("#{save_revision}")
+
+  abort unless working_copy_is_clean?
+
+  unity_build_scripts_dir = File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAutomationScripts')
+  unity_editor_dir = File.join(Dir.pwd, 'Assets/Editor')
+
+  if File.directory?(unity_editor_dir)
+    FileUtils.cp_r(unity_build_scripts_dir, unity_editor_dir)
+  else
+    abort("Copy UnityBuildAutomationScripts error! #{unity_editor_dir} doesn't exist!")
+  end
+
+  case unity
+    when 'ios'
+      need_to_build_ios = true
+
+      ios_project_path = File.join(Dir.pwd, 'Builds/iOS')
+
+      p('Generating IOS project from UNITY project ...')
+      unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -batchmode -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)
+
+      Dir.chdir(ios_project_path)
+
+      $project_to_build = 'Unity-iPhone.xcodeproj'
+      $project_target_to_build = 'Unity-iPhone'
+      $infoplist_path = 'Info.plist'
+    when 'android'
+      #TODO: implement me!
+    else
+      abort("Error: Unknown unity target platform '#{unity}'!")
+  end
+
+  return need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir
+end
+
 def backup_info_plist
   p('Backuping Info.plist ...')
 
@@ -592,8 +620,9 @@ def svn_tag_from_jenkins
   tag
 end
 
-def clean_working_copy
+def clean_working_copy(all)
+  clean_all = all ? 'all' : nil
   clean_working_copy = File.join(BUILD_SCRIPTS_PATH, 'CleanWorkingCopy.sh')
-  clean_success = system("#{clean_working_copy}")
+  clean_success = system("#{clean_working_copy} #{clean_all}")
   abort('Clean working copy error!') unless clean_success
 end

data/lib/nixenvironment/version.rb

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

metadata

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