nixenvironment 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7af3de08aa524c27d0c8bbf905e3c5cb153c15
-  data.tar.gz: eb41458df4e6085ac8f64119654ab451355978c1
+  metadata.gz: 75c1eef3f33d03ebe3e67692aee6967fb28701fc
+  data.tar.gz: 0200541c06f63d158ab537150c4abf6386e1480c
 SHA512:
-  metadata.gz: 80b9a44cd70a98690058cefa4538095eb0059c12584584af0abf4c7cc4fefbe129e875e36eeb32657177274cf9fa9edcd94a8a5784d388e2391deffbecd89f85
-  data.tar.gz: c83169a8e4ccca18961b649274fd53edc653d9c5b1959f36fb58d73a66b3c277033583b3eef48ecf953099d514998296791271d20af799d1df64ed7fc970b3bc
+  metadata.gz: b24e313955f68c4985aca1b1774a0cfca3cfc0b270f3c6278b82e78c77deabd2b3bd255711adb9463c84dbf99a5820cdcb7183d3237bb329ab3a0de3583e547b
+  data.tar.gz: e2c2527f139ff86921fa711f9d6294106570cfbddaa91c81b119514131610133e72d4ba80f2f6fabbcbcef6275e7078589a03ab7d3c102bfe5b738ae0d5869bb

data/bin/nixenvironment

@@ -107,7 +107,7 @@ command :build do |c|
         error('Build error!', e)
       end
 
-      @config_settings.merge!(Xcodebuild.config_settings)
+      @config_settings.merge!(Xcodebuild.config_settings) { |_key, v1, v2| v1 || v2 }
 
       begin
         prebuild(options.config)
@@ -709,5 +709,5 @@ def error(msg, e = nil)
 end
 
 def success(msg)
-  puts msg.green.on_blue.bold
+  puts msg.green.bold
 end

data/legacy/GenerateCodeCoverageForXCTests.sh

@@ -76,7 +76,7 @@ function GenerateCoverage()
 	mkdir -p $outputPath
 	
 	printf "  Generating coverage for '$productName'... "
-	"${currentScriptDir}/Utils/gcovr" -r "$(PWD)" --object-directory="${objectsDir}" "${exclude}" --xml > "$outputPath${productName}.xml"
+	"${currentScriptDir}/../utils/gcovr" -r "$(PWD)" --object-directory="${objectsDir}" "${exclude}" --xml > "$outputPath${productName}.xml"
 	
 	if [ $? -ne 0 ]; then
 		exit 1

data/legacy/GenerateCodeDuplicationReport.sh

@@ -21,4 +21,4 @@ done
 currentScriptDir="$(dirname "$0")"
 source "${currentScriptDir}/LoadBuildEnvVars.sh"
 
-java -jar "${currentScriptDir}/Utils/simian-2.3.33.jar" "**/*.m" "**/*.h" ${excludes} -threshold=5 -failOnDuplication- -formatter=xml:${output}
+java -jar "${currentScriptDir}/../utils/simian-2.3.33.jar" "**/*.m" "**/*.h" ${excludes} -threshold=5 -failOnDuplication- -formatter=xml:${output}

data/lib/nixenvironment/archiver.rb

@@ -109,15 +109,14 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
         watchkit_extension_relative_product  = build_env_vars['WATCHKIT_EXTENSION_RELATIVE_PRODUCT'].presence
         widget_relative_product              = build_env_vars['WIDGET_RELATIVE_PRODUCT'].presence
 
-        resigned_bundle_id                    = build_env_vars[RESIGNED_BUNDLE_ID_KEY].presence
-        resigned_watchkit_app_bundle_id       = build_env_vars[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].presence
-        resigned_watchkit_extension_bundle_id = build_env_vars[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].presence
-        resigned_widget_bundle_id             = build_env_vars[RESIGNED_WIDGET_BUNDLE_ID_KEY].presence
-
-        resigned_bundle_name                          = build_env_vars[RESIGNED_BUNDLE_NAME_KEY].presence
-        resigned_entitlements_path                    = build_env_vars[RESIGNED_ENTITLEMENTS_PATH_KEY].presence
-        resigned_watchkit_extension_entitlements_path = build_env_vars[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].presence
-        resigned_widget_entitlements_path             = build_env_vars[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].presence
+        resigned_bundle_id                            = is_resigned ? build_env_vars[RESIGNED_BUNDLE_ID_KEY].presence                            : nil
+        resigned_watchkit_app_bundle_id               = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].presence               : nil
+        resigned_watchkit_extension_bundle_id         = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].presence         : nil
+        resigned_widget_bundle_id                     = is_resigned ? build_env_vars[RESIGNED_WIDGET_BUNDLE_ID_KEY].presence                     : nil
+        resigned_bundle_name                          = is_resigned ? build_env_vars[RESIGNED_BUNDLE_NAME_KEY].presence                          : nil
+        resigned_entitlements_path                    = is_resigned ? build_env_vars[RESIGNED_ENTITLEMENTS_PATH_KEY].presence                    : nil
+        resigned_watchkit_extension_entitlements_path = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].presence : nil
+        resigned_widget_entitlements_path             = is_resigned ? build_env_vars[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].presence             : nil
 
         ipa_product = "#{built_products_dir}/#{executable_name}-#{target_name}-#{configuration}#{ipa_product_suffix}.ipa"
         puts "#{ipa_product_key} = #{ipa_product}"
@@ -339,7 +338,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
 
             # leave only plist data in file
             plist = get_plist_from_file(selected_entitlements_path)
-            plist.save
+            plist.save(selected_entitlements_path)
 
             puts_header '--> Using existing entitlements'
           else
@@ -666,7 +665,7 @@ 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.lines.collect(&:strip)
+        entries         = security_report.lines.map(&:strip).reject(&:empty?)
         entries.to_set
       end
 
@@ -683,7 +682,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       end
 
       def puts_warning(msg)
-        puts_bold msg.yellow.on_black
+        puts_bold msg.yellow
       end
     end
   end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.64'
+  VERSION = '0.0.65'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -73,9 +73,10 @@ module Nixenvironment
     end
 
     def self.read_config_settings(workspace = nil, project = nil, scheme = nil, target = nil, sdk = nil, config = nil)
+      @config_settings = {}
       read_info
 
-      raise "Scheme #{scheme} doesn't exist!"                                                 if scheme.present? && !contains_scheme?(scheme)
+      raise "Scheme #{scheme} doesn't exist!"                                                 if target.blank? && scheme.present? && !contains_scheme?(scheme)
       raise "Configuration #{config} doesn't exist!"                                          if config.present? && !contains_config?(config)
       raise "Either #{PROJECT_TO_BUILD_KEY} or #{WORKSPACE_TO_BUILD_KEY} must be specified!"  if project.blank?  && workspace.blank?
 
@@ -148,6 +149,7 @@ module Nixenvironment
     end
 
     def self.read_info
+      @info      = {}
       cmd_output = execute(nil, %w(-list 2>&1))
       raise "Getting xcode_project_info error! #{cmd_output}" if cmd_output.include?('error')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods