nixenvironment 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa2f98507cfc5e717a474d16adaeac6c4206f1f
-  data.tar.gz: 113800dfc11914fc8cc2a365b4bbecc2f9435950
+  metadata.gz: 15a73175ee07edbc0f5170d24a202e060ce8e40a
+  data.tar.gz: b243443f10988191b70644fed2d8f851a143d6f5
 SHA512:
-  metadata.gz: bbe944c4fd02071dd11211b6d2ef0014512f8aee77fe889da00878a211450b731adb7f025786b985ec6a282f7ff675a428d30fed7c4ade712a9f072bdd802ff1
-  data.tar.gz: 8b806a793a2a35778c1d9607c570956d59e01237af82971fc463a27ced7eb4b4d04dff530e1ede4a1371b3fd4d41091461b84df25ce1ee5cf7864dda82f391c6
+  metadata.gz: 856086dd0722b9fe336935b619b59498de7145f1039af48c9a2945ee7996d87bf1ea162567afb0d9be0d0285cea816fe232db23195e918316b4531f41676ad7f
+  data.tar.gz: 48a96dfc1bf496fdfb93ea58677ae746a4e4b3069a96c3ccf247a50e8ff446e35f824a5f536ee0052c8be122e3d0b096b0ea631828d2191f5971df3408e27965

data/bin/nixenvironment

@@ -70,6 +70,7 @@ command :build do |c|
   c.option '--key_alias_password PASSWORD', String, 'Specify the password for accessing an alias name'
   c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
+  c.option '--ci_build', 'Deprecated' # TODO: remove
   c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
   c.action do |_args, options|
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
@@ -145,19 +146,28 @@ end
 command :test do |c|
   c.syntax = 'nixenvironment test'
   c.description = 'Build xctest unit tests and run them in simulator'
-  c.action { read_config_settings and test }
+  c.action do
+    read_config_settings
+    test
+  end
 end
 
 command :code_coverage do |c|
   c.syntax = 'nixenvironment code_coverage'
   c.description = 'Generate xctest unit tests code coverage report'
-  c.action { read_config_settings and code_coverage }
+  c.action do
+    read_config_settings
+    code_coverage
+  end
 end
 
 command :code_duplication_report do |c|
   c.syntax = 'nixenvironment code_duplication_report'
   c.description = 'Generate code duplication report'
-  c.action { read_config_settings and code_duplication_report }
+  c.action do
+    read_config_settings
+    code_duplication_report
+  end
 end
 
 command :tag do |c|
@@ -466,9 +476,6 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
     success('IOS project was generated.')
 
     clean_working_copy(false)
-
-    $project_to_build = 'Unity-iPhone.xcodeproj'
-    $project_target_to_build = 'Unity-iPhone'
   when 'android'
     development_build_arg  = development_build  ? '--development-build'                        : ''
     keystore_path_arg      = keystore_path      ? "--keystore-path #{keystore_path}"           : ''
@@ -643,20 +650,21 @@ def test
   code_coverage_config = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_CONFIGURATION_KEY])
 
   Xcodebuild.test(@config_settings[SDK_FOR_TESTS_KEY], 'Debug', @config_settings[WORKSPACE_TO_BUILD_KEY],
-                  @config_settings[WORKSPACE_SCHEME_TO_TEST_KEY], code_coverage_config)
+                  @config_settings[WORKSPACE_SCHEME_TO_TEST_KEY], code_coverage_config,
+                  TESTS_AND_COVERAGE_TIMEOUT, @config_settings[XCTEST_DESTINATION_DEVICE_KEY])
 
   error('Run test error!') unless Xcodebuild.last_cmd_success?
 end
 
 def code_coverage
-  code_coverage_configuration = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_CONFIGURATION_KEY])
+  code_coverage_config = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_CONFIGURATION_KEY])
 
   # TODO: move to Xcodebuild class
   report_success = system("#{CODE_COVERAGE_REPORT_SCRIPT_PATH} -workspace \"#{@config_settings[WORKSPACE_TO_BUILD_KEY]}\"\
                                                                -scheme \"#{@config_settings[WORKSPACE_SCHEME_TO_TEST_KEY]}\"\
                                                                -configuration \"Debug\"\
                                                                -sdk \"#{@config_settings[SDK_FOR_TESTS_KEY]}\"\
-                                                               -xcconfig \"#{code_coverage_configuration}\"\
+                                                               -xcconfig \"#{code_coverage_config}\"\
                                                                -exclude \"#{@config_settings[EXCLUDE_PATTERN_FOR_CODE_COVERAGE_KEY]}\"\
                                                                -output \"#{@config_settings[CODE_COVERAGE_OUTPUT_DIRECTORY_KEY]}\"\
                                                                -destination-timeout \"#{TESTS_AND_COVERAGE_TIMEOUT}\"\

data/lib/nixenvironment/archiver.rb

@@ -666,7 +666,8 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
         keychain_name   = 'XCodeKeys'
         keychain_path   = %x[ security list | grep '#{keychain_name}' | sed 's/\"//g' | xargs ].strip
         security_report = %x[ #{IDENTITIESLIST_UTILITY_PATH} -k #{keychain_path} ]
-        entries         = security_report.split(/\n/)
+        # TODO: investigate encoding issues without implicit .encode('UTF-8')
+        entries         = security_report.encode('UTF-8').split(/\n/)
         entries.to_set
       end
 

data/lib/nixenvironment/plist.rb

@@ -8,7 +8,13 @@ module Nixenvironment
     FORMAT_AUTO   = CFPropertyList::List::FORMAT_AUTO
 
     def self.from_file(path)
-      new(CFPropertyList::List.new(:file => path))
+      # FIXME
+      # used instead of new(CFPropertyList::List.new(:file => path))
+      # because of odd <ArgumentError: invalid byte sequence in US-ASCII>
+      plist = CFPropertyList::List.new
+      plist.load_str(File.read(path))
+      plist.filename = path
+      new(plist)
     end
 
     def self.from_hash(hash)

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.60'
+  VERSION = '0.0.61'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -51,13 +51,14 @@ module Nixenvironment
       # set "Precompile Prefix Header" flag to "NO";
       # otherwise it can throw error ".pch.pch has been modified since the precompiled header"
       build_args << 'GCC_PRECOMPILE_PREFIX_HEADER=NO'
+      build_args << 'ENABLE_BITCODE=NO' # need this in order to build unity <= 5.2.0 generated projects. TODO: remove me!
       build_args << other.map { |key, value| "#{key}='#{value}'" }.join(' ')
       build_args << '| xcpretty -c; exit ${PIPESTATUS[0]}'
 
       execute(nil, build_args)
     end
 
-    def self.test(sdk = nil, config = nil, workspace = nil, scheme = nil, code_coverage_config = nil)
+    def self.test(sdk = nil, config = nil, workspace = nil, scheme = nil, code_coverage_config = nil, timeout = nil, destination = nil)
       build_args = []
       build_args << "-sdk '#{sdk}'"                       if sdk.present?
       build_args << "-configuration '#{config}'"          if config.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Karen