nixenvironment 0.0.26 → 0.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 605b6fa33288d71c7dc907579be0b08b71e7ebb6
4
- data.tar.gz: f1426d8f206151e6ade2101dee8a506dfb615fe0
3
+ metadata.gz: 3bd12ac49d83333b46c6224ca844e7bc9f71fba9
4
+ data.tar.gz: 203348fc5d303e290f296f166aaf4f20066806ef
5
5
  SHA512:
6
- metadata.gz: 59b572fe49855d3313ae13275a8fd0ec5169d85965a18abd5ed691eda19ff2bd8bb297572652c09496eed7c5586acbf07cca14b5594b8165be43bcbc24f587e4
7
- data.tar.gz: 11462788360869cfe945d5a9e8353cb611975e7205d8e8c09bf6c7551edf968a7f2c0c26ad3e2557da0f8f4d9fe26e38dcb0fe45a0c69091f3e5e4c6ac29d69f
6
+ metadata.gz: fad838e3f7ad06064281a3c9ee11718d8ea8f923348a1758c369605e7e38081bd7c0a8947c3959b7eaf2babe866bd9828a69b6ec685802c32e54480622187c0b
7
+ data.tar.gz: 8932f6f7a9b6c347bf90e53d96fd700b4768e0d1893a3ec83b626b31c351e8ba2ced1bb58386bd56c24dce669dd2fb5e49153c8f3751b2da8cb2f79e58089167
data/bin/nixenvironment CHANGED
@@ -75,11 +75,11 @@ command :build do |c|
75
75
  end
76
76
 
77
77
  begin
78
- read_config(options)
78
+ read_config
79
79
  enable_ci_build(options.ci_build)
80
- build_settings = setup(options.config)
81
- prebuild(build_settings, options.config)
82
- build(build_settings, options.config, options.ipa)
80
+ setup(options.config)
81
+ prebuild(options.config)
82
+ build(options.config, options.ipa)
83
83
  restore_info_plist
84
84
  rescue
85
85
  raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
@@ -102,7 +102,7 @@ command :deploy do |c|
102
102
  end
103
103
 
104
104
  begin
105
- read_config(options)
105
+ read_config
106
106
  deploy
107
107
  rescue
108
108
  raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
@@ -126,7 +126,7 @@ command :test do |c|
126
126
  c.syntax = 'nixenvironment test'
127
127
  c.description = 'Build xctest unit tests and run them in simulator'
128
128
  c.action do |args, options|
129
- read_config(options)
129
+ read_config
130
130
  test
131
131
  end
132
132
  end
@@ -135,7 +135,7 @@ command :code_coverage do |c|
135
135
  c.syntax = 'nixenvironment code_coverage'
136
136
  c.description = 'Generate xctest unit tests code coverage report'
137
137
  c.action do |args, options|
138
- read_config(options)
138
+ read_config
139
139
  code_coverage
140
140
  end
141
141
  end
@@ -144,7 +144,7 @@ command :code_duplication_report do |c|
144
144
  c.syntax = 'nixenvironment code_duplication_report'
145
145
  c.description = 'Generate code duplication report for xctest'
146
146
  c.action do |args, options|
147
- read_config(options)
147
+ read_config
148
148
  code_duplication_report
149
149
  end
150
150
  end
@@ -224,9 +224,9 @@ def update(ninbas)
224
224
  end
225
225
  end
226
226
 
227
- def read_config(options)
227
+ def read_config
228
228
  begin
229
- @config = YAML.load(File.read(File.join(File.dirname(__FILE__), 'Config')))
229
+ @config_settings = YAML.load(File.read(File.join(File.dirname(__FILE__), 'Config')))
230
230
  rescue
231
231
  abort('Config file processing error!')
232
232
  end
@@ -260,10 +260,10 @@ end
260
260
 
261
261
  def update_config(key, value)
262
262
  if value
263
- @config[key] = value
263
+ @config_settings[key] = value
264
264
  p("#{key} |SPECIFIED| directly: #{value}")
265
265
  else
266
- p("#{key} |NOT specified| directly. Used from Config: #{@config[key]}")
266
+ p("#{key} |NOT specified| directly. Used from Config: #{@config_settings[key]}")
267
267
  end
268
268
  end
269
269
 
@@ -310,25 +310,25 @@ def setup(config)
310
310
 
311
311
  abort("Build error! Configuration #{config} doesn't exist") unless info['Build Configurations'].include?(config)
312
312
 
313
- if @config['PROJECT_TO_BUILD'] and @config['PROJECT_TO_BUILD'].length > 0
314
- if @config['PROJECT_TARGET_TO_BUILD'] and @config['PROJECT_TARGET_TO_BUILD'].length > 0
315
- cmd_output = %x[ xcodebuild -project #{@config['PROJECT_TO_BUILD']}\
316
- -target #{@config['PROJECT_TARGET_TO_BUILD']}\
313
+ if @config_settings['PROJECT_TO_BUILD'] and @config_settings['PROJECT_TO_BUILD'].length > 0
314
+ if @config_settings['PROJECT_TARGET_TO_BUILD'] and @config_settings['PROJECT_TARGET_TO_BUILD'].length > 0
315
+ cmd_output = %x[ xcodebuild -project #{@config_settings['PROJECT_TO_BUILD']}\
316
+ -target #{@config_settings['PROJECT_TARGET_TO_BUILD']}\
317
317
  -configuration #{config}\
318
- -sdk #{@config['SDK']}\
318
+ -sdk #{@config_settings['SDK']}\
319
319
  -showBuildSettings ]
320
320
  else
321
- cmd_output = %x[ xcodebuild -project #{@config['PROJECT_TO_BUILD']}\
322
- -scheme #{@config['WORKSPACE_SCHEME_TO_BUILD']}\
321
+ cmd_output = %x[ xcodebuild -project #{@config_settings['PROJECT_TO_BUILD']}\
322
+ -scheme #{@config_settings['WORKSPACE_SCHEME_TO_BUILD']}\
323
323
  -configuration #{config}\
324
- -sdk #{@config['SDK']}\
324
+ -sdk #{@config_settings['SDK']}\
325
325
  -showBuildSettings ]
326
326
  end
327
- elsif @config['WORKSPACE_TO_BUILD'] and @config['WORKSPACE_TO_BUILD'].length > 0
328
- cmd_output = %x[ xcodebuild -workspace #{@config['WORKSPACE_TO_BUILD']}\
329
- -scheme #{@config['WORKSPACE_SCHEME_TO_BUILD']}\
327
+ elsif @config_settings['WORKSPACE_TO_BUILD'] and @config_settings['WORKSPACE_TO_BUILD'].length > 0
328
+ cmd_output = %x[ xcodebuild -workspace #{@config_settings['WORKSPACE_TO_BUILD']}\
329
+ -scheme #{@config_settings['WORKSPACE_SCHEME_TO_BUILD']}\
330
330
  -configuration #{config}\
331
- -sdk #{@config['SDK']}\
331
+ -sdk #{@config_settings['SDK']}\
332
332
  -showBuildSettings ]
333
333
  else
334
334
  abort('Build error! Either PROJECT_TO_BUILD or WORKSPACE_TO_BUILD must be specified!')
@@ -336,53 +336,49 @@ def setup(config)
336
336
 
337
337
  env_vars_list = cmd_output.split(/\n/).reject(&:empty?)
338
338
 
339
- build_settings = Hash.new
340
-
341
339
  if env_vars_list and env_vars_list.length > 0
342
340
  build_settings_to_strip = Hash[env_vars_list.map { |it| it.split('=', 2) }]
343
341
  build_settings_to_strip.each do |key, value|
344
342
  if key and value
345
343
  stripped_key = key.strip
346
344
  stripped_value = value.strip
347
- build_settings[stripped_key] = stripped_value.shellescape
345
+ @config_settings[stripped_key] ||= stripped_value.shellescape # assign new value only if @config_settings[stripped_key] is nil
348
346
  end
349
347
  end
350
348
  end
351
349
 
352
350
  build_directory = File.join(Dir.pwd, 'build').shellescape
353
- build_settings['CONFIGURATION_BUILD_DIR'] = build_directory
354
- build_settings['BUILT_PRODUCTS_DIR'] = build_directory
355
- build_settings['DWARF_DSYM_FOLDER_PATH'] = build_directory
356
-
357
- return build_settings
351
+ @config_settings['CONFIGURATION_BUILD_DIR'] = build_directory
352
+ @config_settings['BUILT_PRODUCTS_DIR'] = build_directory
353
+ @config_settings['DWARF_DSYM_FOLDER_PATH'] = build_directory
358
354
  end
359
355
 
360
- def save_build_env_vars(build_settings)
361
- app_product = File.join(build_settings['BUILT_PRODUCTS_DIR'], build_settings['EXECUTABLE_NAME']) + '.app'
356
+ def save_build_env_vars
357
+ app_product = File.join(@config_settings['BUILT_PRODUCTS_DIR'], @config_settings['EXECUTABLE_NAME']) + '.app'
362
358
 
363
359
  system("
364
360
  echo \"#!/bin/sh\
365
361
  ### AUTOGENERATED BY Nixenvironment; DO NOT EDIT ###
366
- PROJECT=#{build_settings['PROJECT']}
367
- BUILT_PRODUCTS_DIR=#{build_settings['BUILT_PRODUCTS_DIR']}
368
- OBJECTS_NORMAL_DIR=#{build_settings['OBJECT_FILE_DIR_normal']}
369
- EXECUTABLE_NAME=#{build_settings['EXECUTABLE_NAME']}
362
+ PROJECT=#{@config_settings['PROJECT']}
363
+ BUILT_PRODUCTS_DIR=#{@config_settings['BUILT_PRODUCTS_DIR']}
364
+ OBJECTS_NORMAL_DIR=#{@config_settings['OBJECT_FILE_DIR_normal']}
365
+ EXECUTABLE_NAME=#{@config_settings['EXECUTABLE_NAME']}
370
366
  APP_PRODUCT=#{app_product}
371
367
  APP_DSYM=#{app_product}.dSYM
372
- APP_INFOPLIST_FILE=#{@config['INFOPLIST_PATH']}
373
- EMBEDDED_PROFILE=#{app_product}/#{build_settings['EMBEDDED_PROFILE_NAME']}
374
- TARGET_NAME=#{build_settings['TARGET_NAME']}
375
- CONFIGURATION=#{build_settings['CONFIGURATION']}
376
- SDK_NAME=#{build_settings['SDK_NAME']}
377
- RESIGNED_BUNDLE_ID=#{build_settings['RESIGNED_BUNDLE_ID']}
378
- RESIGNED_BUNDLE_NAME=#{build_settings['RESIGNED_BUNDLE_NAME']}
379
- RESIGNED_ENTITLEMENTS_PATH=#{build_settings['RESIGNED_ENTITLEMENTS_PATH']}\" > _last_build_vars.sh
368
+ APP_INFOPLIST_FILE=#{@config_settings['INFOPLIST_PATH']}
369
+ EMBEDDED_PROFILE=#{app_product}/#{@config_settings['EMBEDDED_PROFILE_NAME']}
370
+ TARGET_NAME=#{@config_settings['TARGET_NAME']}
371
+ CONFIGURATION=#{@config_settings['CONFIGURATION']}
372
+ SDK_NAME=#{@config_settings['SDK_NAME']}
373
+ RESIGNED_BUNDLE_ID=#{@config_settings['RESIGNED_BUNDLE_ID']}
374
+ RESIGNED_BUNDLE_NAME=#{@config_settings['RESIGNED_BUNDLE_NAME']}
375
+ RESIGNED_ENTITLEMENTS_PATH=#{@config_settings['RESIGNED_ENTITLEMENTS_PATH']}\" > _last_build_vars.sh
380
376
  ")
381
377
  end
382
378
 
383
- def prebuild(build_settings, config)
384
- save_revision = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
385
- tag_icons = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
379
+ def prebuild(config)
380
+ save_revision = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
381
+ tag_icons = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
386
382
 
387
383
  system("#{save_revision}")
388
384
 
@@ -390,51 +386,51 @@ def prebuild(build_settings, config)
390
386
 
391
387
  backup_info_plist
392
388
 
393
- save_build_env_vars(build_settings)
389
+ save_build_env_vars
394
390
 
395
391
  update_info_plist(config)
396
392
 
397
393
  # TODO: rewrite tagIcons.sh
398
- # system("#{tag_icons} @config['ICONS_PATH']")
394
+ # system("#{tag_icons} @@config_settings['ICONS_PATH']")
399
395
  end
400
396
 
401
- def build(build_settings, config, ipa)
397
+ def build(config, ipa)
402
398
  build = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
403
399
 
404
400
  build_success = nil
405
401
 
406
- configuration_build_dir = build_settings['CONFIGURATION_BUILD_DIR']
407
- dwarf_dsym_folder_path = build_settings['DWARF_DSYM_FOLDER_PATH']
408
- built_products_dir = build_settings['BUILT_PRODUCTS_DIR']
402
+ configuration_build_dir = @config_settings['CONFIGURATION_BUILD_DIR']
403
+ dwarf_dsym_folder_path = @config_settings['DWARF_DSYM_FOLDER_PATH']
404
+ built_products_dir = @config_settings['BUILT_PRODUCTS_DIR']
409
405
 
410
- if @config['PROJECT_TO_BUILD'] and @config['PROJECT_TO_BUILD'].length > 0
411
- if @config['PROJECT_TARGET_TO_BUILD'] and @config['PROJECT_TARGET_TO_BUILD'].length > 0
412
- build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
413
- --target \"#{@config['PROJECT_TARGET_TO_BUILD']}\"\
406
+ if @config_settings['PROJECT_TO_BUILD'] and @config_settings['PROJECT_TO_BUILD'].length > 0
407
+ if @config_settings['PROJECT_TARGET_TO_BUILD'] and @config_settings['PROJECT_TARGET_TO_BUILD'].length > 0
408
+ build_success = system("#{build} --project \"#{@config_settings['PROJECT_TO_BUILD']}\"\
409
+ --target \"#{@config_settings['PROJECT_TARGET_TO_BUILD']}\"\
414
410
  --configuration \"#{config}\"\
415
- --sdk \"#{@config['SDK']}\"\
416
- --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
411
+ --sdk \"#{@config_settings['SDK']}\"\
412
+ --env-var-prefix \"#{@config_settings['ENV_VAR_PREFIX']}\"\
417
413
  DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
418
414
  DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
419
415
  CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
420
416
  BUILT_PRODUCTS_DIR=\"#{built_products_dir}\"")
421
417
  else
422
- build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
423
- --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
418
+ build_success = system("#{build} --project \"#{@config_settings['PROJECT_TO_BUILD']}\"\
419
+ --scheme \"#{@config_settings['WORKSPACE_SCHEME_TO_BUILD']}\"\
424
420
  --configuration \"#{config}\"\
425
- --sdk \"#{@config['SDK']}\"\
426
- --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
421
+ --sdk \"#{@config_settings['SDK']}\"\
422
+ --env-var-prefix \"#{@config_settings['ENV_VAR_PREFIX']}\"\
427
423
  DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
428
424
  DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
429
425
  CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
430
426
  BUILT_PRODUCTS_DIR=\"#{built_products_dir}\"")
431
427
  end
432
- elsif @config['WORKSPACE_TO_BUILD'] and @config['WORKSPACE_TO_BUILD'].length > 0
433
- build_success = system("#{build} --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
434
- --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
428
+ elsif @config_settings['WORKSPACE_TO_BUILD'] and @config_settings['WORKSPACE_TO_BUILD'].length > 0
429
+ build_success = system("#{build} --workspace \"#{@config_settings['WORKSPACE_TO_BUILD']}\"\
430
+ --scheme \"#{@config_settings['WORKSPACE_SCHEME_TO_BUILD']}\"\
435
431
  --configuration \"#{config}\"\
436
- --sdk \"#{@config['SDK']}\"\
437
- --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
432
+ --sdk \"#{@config_settings['SDK']}\"\
433
+ --env-var-prefix \"#{@config_settings['ENV_VAR_PREFIX']}\"\
438
434
  DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
439
435
  DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
440
436
  CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
@@ -522,8 +518,8 @@ end
522
518
  def backup_info_plist
523
519
  p('Backuping Info.plist ...')
524
520
 
525
- @info_plist_backup_name = @config['INFOPLIST_PATH'] + '.backup'
526
- FileUtils.cp(@config['INFOPLIST_PATH'], @info_plist_backup_name)
521
+ @info_plist_backup_name = @config_settings['INFOPLIST_PATH'] + '.backup'
522
+ FileUtils.cp(@config_settings['INFOPLIST_PATH'], @info_plist_backup_name)
527
523
 
528
524
  p('Info.plist was backuped.')
529
525
  end
@@ -534,10 +530,10 @@ def update_info_plist(config)
534
530
  revision = %x[ source _last_revision.sh && echo ${REVISION} ].strip!
535
531
  monotonic_revision = %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
536
532
 
537
- update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleIdentifier \"#{@config['BUNDLE_ID']}\"' \"#{@config['INFOPLIST_PATH']}\"")
538
- update_success &&= system("/usr/libexec/PlistBuddy -c 'Set :CFBundleVersion \"#{monotonic_revision}\"' \"#{@config['INFOPLIST_PATH']}\"")
539
- update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :Configuration string \"#{config}\"' \"#{@config['INFOPLIST_PATH']}\"")
540
- update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :RevisionNumber string \"#{revision}\"' \"#{@config['INFOPLIST_PATH']}\"")
533
+ update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleIdentifier \"#{@config_settings['BUNDLE_ID']}\"' \"#{@config_settings['INFOPLIST_PATH']}\"")
534
+ update_success &&= system("/usr/libexec/PlistBuddy -c 'Set :CFBundleVersion \"#{monotonic_revision}\"' \"#{@config_settings['INFOPLIST_PATH']}\"")
535
+ update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :Configuration string \"#{config}\"' \"#{@config_settings['INFOPLIST_PATH']}\"")
536
+ update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :RevisionNumber string \"#{revision}\"' \"#{@config_settings['INFOPLIST_PATH']}\"")
541
537
 
542
538
  unless update_success
543
539
  restore_info_plist
@@ -550,8 +546,8 @@ end
550
546
  def restore_info_plist
551
547
  p('Restoring Info.plist ...')
552
548
 
553
- File.delete(@config['INFOPLIST_PATH'])
554
- File.rename(@info_plist_backup_name, @config['INFOPLIST_PATH'])
549
+ File.delete(@config_settings['INFOPLIST_PATH'])
550
+ File.rename(@info_plist_backup_name, @config_settings['INFOPLIST_PATH'])
555
551
 
556
552
  p('Info.plist was restored.')
557
553
  end
@@ -559,10 +555,10 @@ end
559
555
  def deploy
560
556
  deploy = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
561
557
 
562
- deploy_host = @config['DEPLOY_HOST'].nil? || @config['DEPLOY_HOST'].empty? ? ENV['DEPLOY_HOST'] : @config['DEPLOY_HOST']
563
- deploy_path = @config['DEPLOY_PATH'].nil? || @config['DEPLOY_PATH'].empty? ? ENV['DEPLOY_PATH'] : @config['DEPLOY_PATH']
564
- deploy_username = @config['DEPLOY_USERNAME'].nil? || @config['DEPLOY_USERNAME'].empty? ? ENV['DEPLOY_USERNAME'] : @config['DEPLOY_USERNAME']
565
- deploy_password = @config['DEPLOY_PASSWORD'].nil? || @config['DEPLOY_PASSWORD'].empty? ? ENV['DEPLOY_PASSWORD'] : @config['DEPLOY_PASSWORD']
558
+ deploy_host = @config_settings['DEPLOY_HOST'].nil? || @config_settings['DEPLOY_HOST'].empty? ? ENV['DEPLOY_HOST'] : @config_settings['DEPLOY_HOST']
559
+ deploy_path = @config_settings['DEPLOY_PATH'].nil? || @config_settings['DEPLOY_PATH'].empty? ? ENV['DEPLOY_PATH'] : @config_settings['DEPLOY_PATH']
560
+ deploy_username = @config_settings['DEPLOY_USERNAME'].nil? || @config_settings['DEPLOY_USERNAME'].empty? ? ENV['DEPLOY_USERNAME'] : @config_settings['DEPLOY_USERNAME']
561
+ deploy_password = @config_settings['DEPLOY_PASSWORD'].nil? || @config_settings['DEPLOY_PASSWORD'].empty? ? ENV['DEPLOY_PASSWORD'] : @config_settings['DEPLOY_PASSWORD']
566
562
 
567
563
  deploy_success = system("#{deploy} #{deploy_host} #{deploy_path} #{deploy_username} #{deploy_password}")
568
564
  abort('Deploy error!') unless deploy_success
@@ -600,17 +596,17 @@ def clean
600
596
  end
601
597
 
602
598
  def test
603
- code_coverage_configuration = File.join(@config['CONFIGURATION_FILES_PATH'], @config['CODE_COVERAGE_CONFIGURATION'])
599
+ code_coverage_configuration = File.join(@config_settings['CONFIGURATION_FILES_PATH'], @config_settings['CODE_COVERAGE_CONFIGURATION'])
604
600
  timeout = 10
605
601
  ocunit2junit = File.join(BUILD_SCRIPTS_PATH, 'Utils/ocunit2junit')
606
602
 
607
- run_tests_success = system("xcodebuild -workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
608
- -scheme \"#{@config['WORKSPACE_SCHEME_TO_TEST']}\"\
603
+ run_tests_success = system("xcodebuild -workspace \"#{@config_settings['WORKSPACE_TO_BUILD']}\"\
604
+ -scheme \"#{@config_settings['WORKSPACE_SCHEME_TO_TEST']}\"\
609
605
  -configuration \"Debug\"\
610
- -sdk \"#{@config['SDK_FOR_TESTS']}\"\
606
+ -sdk \"#{@config_settings['SDK_FOR_TESTS']}\"\
611
607
  -xcconfig \"#{code_coverage_configuration}\"\
612
608
  -destination-timeout \"#{timeout}\"\
613
- -destination \"#{@config['XCTEST_DESTINATION_DEVICE']}\"\
609
+ -destination \"#{@config_settings['XCTEST_DESTINATION_DEVICE']}\"\
614
610
  test 2>&1 | \"#{ocunit2junit}\"")
615
611
 
616
612
  abort('Run test error!') unless run_tests_success
@@ -618,24 +614,24 @@ end
618
614
 
619
615
  def code_coverage
620
616
  generate_code_coverage_report = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeCoverageForXCTests.sh')
621
- code_coverage_configuration = File.join(@config['CONFIGURATION_FILES_PATH'], @config['CODE_COVERAGE_CONFIGURATION'])
617
+ code_coverage_configuration = File.join(@config_settings['CONFIGURATION_FILES_PATH'], @config_settings['CODE_COVERAGE_CONFIGURATION'])
622
618
  timeout = 10
623
619
 
624
- report_success = system("#{generate_code_coverage_report} -workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
625
- -scheme \"#{@config['WORKSPACE_SCHEME_TO_TEST']}\"\
620
+ report_success = system("#{generate_code_coverage_report} -workspace \"#{@config_settings['WORKSPACE_TO_BUILD']}\"\
621
+ -scheme \"#{@config_settings['WORKSPACE_SCHEME_TO_TEST']}\"\
626
622
  -configuration \"Debug\"\
627
- -sdk \"#{@config['SDK_FOR_TESTS']}\"\
623
+ -sdk \"#{@config_settings['SDK_FOR_TESTS']}\"\
628
624
  -xcconfig \"#{code_coverage_configuration}\"\
629
- -exclude \"#{@config['EXCLUDE_PATTERN_FOR_CODE_COVERAGE']}\"\
630
- -output \"#{@config['CODE_COVERAGE_OUTPUT_DIRECTORY']}\"\
625
+ -exclude \"#{@config_settings['EXCLUDE_PATTERN_FOR_CODE_COVERAGE']}\"\
626
+ -output \"#{@config_settings['CODE_COVERAGE_OUTPUT_DIRECTORY']}\"\
631
627
  -destination-timeout \"#{timeout}\"\
632
- -destination \"#{@config['XCTEST_DESTINATION_DEVICE']}\"")
628
+ -destination \"#{@config_settings['XCTEST_DESTINATION_DEVICE']}\"")
633
629
  abort('Code coverage error!') unless report_success
634
630
  end
635
631
 
636
632
  def code_duplication_report
637
633
  generate_code_duplication_report = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeDuplicationReport.sh')
638
- duplication_success = system("#{generate_code_duplication_report} \"#{@config['EXCLUDE_PATTERN_FOR_CODE_DUPLICATION']}\" duplication.xml")
634
+ duplication_success = system("#{generate_code_duplication_report} \"#{@config_settings['EXCLUDE_PATTERN_FOR_CODE_DUPLICATION']}\" duplication.xml")
639
635
  abort('Generate code duplication error!') unless duplication_success
640
636
  end
641
637
 
@@ -1,3 +1,3 @@
1
1
  module Nixenvironment
2
- VERSION = '0.0.26'
2
+ VERSION = '0.0.27'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nixenvironment
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.26
4
+ version: 0.0.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karen Arzumanian
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-20 00:00:00.000000000 Z
11
+ date: 2014-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler