nixenvironment 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1906202875cba18a757ba4d864e3551fd2ccbc
-  data.tar.gz: 717a97c9c607fdfe10193ed3c99c6ec7a7378964
+  metadata.gz: c8e10a7d9686670b1093431a67d39ddd963dc8d0
+  data.tar.gz: 80d645f70b7b7427537c920ee38c9d0c950162df
 SHA512:
-  metadata.gz: b45796f9c38ea46ecb0612866fe013f3c74a132643485d6319789cb9f1cfa7bef279920e4034d1f0f841a67513808324146ce26d15761a948cb60f4b6fa41215
-  data.tar.gz: 0cdc033a109e7894b4f824b2c63967fd496e27be63d9b61f87f3243248d46995eaee779194ddf08e247487d4070e6b3790669c441cc0757edfd2481a53da2676
+  metadata.gz: 63256541ce4ef7749110e819e2e2e0334ed2d8fcec75590fdbc90618ae6ed0c29df114453d39be5ba668d41a7f72882e6f4f7ecbae7ae18614c984af13d0956f
+  data.tar.gz: d5701088f788ace9216aed0b0a30371da673ae56ec28b1820362429c60d3831dbd731fba8d2d921d62d4f2cd8baa6263f39103fa486cbcfe867572cb25682a50

data/bin/nixenvironment

@@ -5,6 +5,7 @@ require 'nixenvironment'
 require 'commander/import'
 require 'yaml'
 require 'fileutils'
+require 'shellwords'
 
 include Nixenvironment
 
@@ -75,12 +76,12 @@ command :build do |c|
     if unity and unity.length > 0
       case unity
         when 'ios'
-          ios_project_path = File.join(Dir.pwd, 'Builds/iOS')
+          ios_project_path = File.join(Dir.pwd, 'Builds/iOS').shellescape
 
           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
+          root_working_directory = Dir.pwd.shellescape
           need_chdir_to_root_working_directory = true
 
           Dir.chdir(ios_project_path)
@@ -181,7 +182,7 @@ command :clean_working_copy do |c|
 end
 
 def update(ninbas)
-  root_working_directory = Dir.pwd
+  root_working_directory = Dir.pwd.shellescape
   target_directory = File.join(Dir.home, NIXENV_ROOT)
 
   begin
@@ -304,7 +305,7 @@ end
 def setup(config)
   # Parse information about project
   cmd_output = %x[ xcodebuild -list ]
-  cmd_output = cmd_output.lines.to_a[1..-1].join
+  cmd_output = cmd_output.lines.to_a[1..-1].join # TODO: handle if to_a returns 0 or count less than expected
   info = {}
   cmd_output.split(/\n\n/).each do |pair|
     key,value = pair.split(/:/)
@@ -350,12 +351,12 @@ def setup(config)
       if key and value
         stripped_key = key.strip
         stripped_value = value.strip
-        build_settings[stripped_key] = stripped_value
+        build_settings[stripped_key] = stripped_value.shellescape
       end
     end
   end
 
-  build_directory = File.join(Dir.pwd, 'build')
+  build_directory = File.join(Dir.pwd, 'build').shellescape
   build_settings['CONFIGURATION_BUILD_DIR'] = build_directory
   build_settings['BUILT_PRODUCTS_DIR'] = build_directory
   build_settings['DWARF_DSYM_FOLDER_PATH'] = build_directory
@@ -364,25 +365,25 @@ def setup(config)
 end
 
 def save_build_env_vars(build_settings)
-  app_product = "#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app"
+  app_product = File.join(build_settings['BUILT_PRODUCTS_DIR'], build_settings['EXECUTABLE_NAME']) + '.app'
 
   system("
 echo \"#!/bin/sh\
 ### AUTOGENERATED BY Nixenvironment; DO NOT EDIT ###
-            PROJECT=\"#{build_settings['PROJECT']}\"
-BUILT_PRODUCTS_DIR=\"#{build_settings['BUILT_PRODUCTS_DIR']}\"
-OBJECTS_NORMAL_DIR=\"#{build_settings['OBJECT_FILE_DIR_normal']}\"
-    EXECUTABLE_NAME=\"#{build_settings['EXECUTABLE_NAME']}\"
-        APP_PRODUCT=\"#{app_product}\"
-           APP_DSYM=\"#{app_product}.dSYM\"
-APP_INFOPLIST_FILE=\"#{@config['INFOPLIST_PATH']}\"
-   EMBEDDED_PROFILE=\"##{app_product}/#{build_settings['EMBEDDED_PROFILE_NAME']}\"
-        TARGET_NAME=\"#{build_settings['TARGET_NAME']}\"
-      CONFIGURATION=\"#{build_settings['CONFIGURATION']}\"
-           SDK_NAME=\"#{build_settings['SDK_NAME']}\"
-RESIGNED_BUNDLE_ID=\"#{build_settings['RESIGNED_BUNDLE_ID']}\"
-RESIGNED_BUNDLE_NAME=\"#{build_settings['RESIGNED_BUNDLE_NAME']}\"
-RESIGNED_ENTITLEMENTS_PATH=\"#{build_settings['RESIGNED_ENTITLEMENTS_PATH']}\"\" > _last_build_vars.sh
+            PROJECT=#{build_settings['PROJECT']}
+BUILT_PRODUCTS_DIR=#{build_settings['BUILT_PRODUCTS_DIR']}
+OBJECTS_NORMAL_DIR=#{build_settings['OBJECT_FILE_DIR_normal']}
+    EXECUTABLE_NAME=#{build_settings['EXECUTABLE_NAME']}
+        APP_PRODUCT=#{app_product}
+           APP_DSYM=#{app_product}.dSYM
+APP_INFOPLIST_FILE=#{@config['INFOPLIST_PATH']}
+   EMBEDDED_PROFILE=#{app_product}/#{build_settings['EMBEDDED_PROFILE_NAME']}
+        TARGET_NAME=#{build_settings['TARGET_NAME']}
+      CONFIGURATION=#{build_settings['CONFIGURATION']}
+           SDK_NAME=#{build_settings['SDK_NAME']}
+RESIGNED_BUNDLE_ID=#{build_settings['RESIGNED_BUNDLE_ID']}
+RESIGNED_BUNDLE_NAME=#{build_settings['RESIGNED_BUNDLE_NAME']}
+RESIGNED_ENTITLEMENTS_PATH=#{build_settings['RESIGNED_ENTITLEMENTS_PATH']}\" > _last_build_vars.sh
   ")
 end
 
@@ -576,7 +577,7 @@ def code_duplication_report
 end
 
 def tag
-  make_tag = File.join(BUILD_SCRIPTS_PATH, 'MakeTag.sh ')
+  make_tag = File.join(BUILD_SCRIPTS_PATH, 'MakeTag.sh')
   tag_success = system("#{make_tag} \"#{ENV['SCM_USERNAME']}\" \"#{ENV['SCM_PASSWORD']}\"")
   abort('Make tag error!') unless tag_success
 end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

metadata

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