nixenvironment 0.0.125 → 0.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c61f405fc82491fdca4a95dba2e58e4513dc6bf
-  data.tar.gz: ba7714d6220778c988bcb460b6f55ec825205477
+  metadata.gz: c29924ea82a75b6fbbc3b53464c83540949f57b1
+  data.tar.gz: 21d00b89258e1ab131241099ad635df54e7fe34b
 SHA512:
-  metadata.gz: 43504764a7f9ae196771b7277a3327ac885058e654fbd38bf94e1c4238de9abd1309750a295f458e1f7b8a0c44fa578ec11241fd97f197bb037fd33da8374231
-  data.tar.gz: 31253ad8f3d7c55e781ede832ebe98bf48e682b0b01318889297cf732e3a273f2e685f3640143a9ea7daddfde770792ff2b82ec0fd1df67efa546d4e4e5495da
+  metadata.gz: cc02430d8f9966c2a8eed56137583049501e88c3ac18447d06e93e9a960153792ae829512dde8c1b4c54ec2ac64f9237107f116409906ed923bc877e1b527e96
+  data.tar.gz: 8b4788481b1eaa572e627f53f63a61f11e73fd62b4c81d8f7b027740b05d9081c7ce671c4fceb3caca988ad5689db18d181ad862627eae209eae67e523eba783

data/bin/Config

@@ -1,19 +1,18 @@
 ---
 # set these vars if you have multiple projects in the root directory:
-PROJECT_TO_BUILD:
+PROJECT_TO_BUILD: NIXProject.xcodeproj
 PROJECT_TARGET_TO_BUILD:
 PROJECT_TARGET_TO_TEST:
 
 # OR set these vars if you want to build the workspace instead of the project:
 WORKSPACE_TO_BUILD: NIXProject.xcworkspace
 WORKSPACE_SCHEME_TO_BUILD: Application
-WORKSPACE_SCHEME_TO_TEST: Tests
+WORKSPACE_SCHEME_TO_TEST: Application
 
 # for osx projects sdk should be macosx (or more specific, f. e.: macosx10.10)
 SDK: iphoneos
 SDK_FOR_TESTS: iphonesimulator
 
-EXCLUDE_PATTERN_FOR_CODE_COVERAGE: ".*/Vendor/.*|.*/Tests/.*"
 EXCLUDE_PATTERN_FOR_CODE_DUPLICATION: "**/Vendor|**/Scripts|**/Pods"
 
 # you shouldn't touch these variables, because they will be defined on the CI server:
@@ -31,6 +30,7 @@ XCTEST_DESTINATION_DEVICE: platform=iOS Simulator,name=iPhone 5,OS=latest
 # configuration of code coverage
 CONFIGURATION_FILES_PATH: ./Scripts/ConfigurationFiles
 CODE_COVERAGE_CONFIGURATION: /CodeCoverage/CodeCoverageConfiguration.xcconfig
+CODE_COVERAGE_IGNORE_FILE: /CodeCoverage/ignore
 CODE_COVERAGE_OUTPUT_DIRECTORY: ./Coverage/
 
 ENV_VAR_PREFIX: NIXENV_

data/bin/nixenvironment

@@ -30,7 +30,6 @@ global_option ('--workspace_scheme_to_build VALUE')                     { |value
 global_option ('--workspace_scheme_to_test VALUE')                      { |value| $workspace_scheme_to_test                      = value }
 global_option ('--sdk VALUE')                                           { |value| $sdk                                           = value }
 global_option ('--sdk_for_tests VALUE')                                 { |value| $sdk_for_tests                                 = value }
-global_option ('--exclude_pattern_for_code_coverage VALUE')             { |value| $exclude_pattern_for_code_coverage             = value }
 global_option ('--exclude_pattern_for_code_duplication VALUE')          { |value| $exclude_pattern_for_code_duplication          = value }
 global_option ('--deploy_host VALUE')                                   { |value| $deploy_host                                   = value }
 global_option ('--deploy_path VALUE')                                   { |value| $deploy_path                                   = value }
@@ -42,6 +41,7 @@ global_option ('--icons_path VALUE')                                    { |value
 global_option ('--xctest_destination_device VALUE')                     { |value| $xctest_destination_device                     = value }
 global_option (['-cfp', '--configuration_files_path VALUE'])            { |value| $configuration_files_path                      = value }
 global_option ('--code_coverage_configuration VALUE')                   { |value| $code_coverage_configuration                   = value }
+global_option ('--code_coverage_ignore_file VALUE')                     { |value| $code_coverage_ignore_file                     = value }
 global_option ('--code_coverage_output_directory VALUE')                { |value| $code_coverage_output_directory                = value }
 global_option ('--env_var_prefix VALUE')                                { |value| $env_var_prefix                                = value }
 global_option ('--bundle_id VALUE')                                     { |value| $bundle_id                                     = value }
@@ -438,7 +438,6 @@ def read_config_settings
   update_config_settings(WORKSPACE_SCHEME_TO_TEST_KEY,                      $workspace_scheme_to_test,                      table, true)
   update_config_settings(SDK_KEY,                                           $sdk,                                           table, true)
   update_config_settings(SDK_FOR_TESTS_KEY,                                 $sdk_for_tests,                                 table, true)
-  update_config_settings(EXCLUDE_PATTERN_FOR_CODE_COVERAGE_KEY,             $exclude_pattern_for_code_coverage,             table, true)
   update_config_settings(EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY,          $exclude_pattern_for_code_duplication,          table, true)
   update_config_settings(DEPLOY_HOST_KEY,                                   $deploy_host,                                   table, true)
   update_config_settings(DEPLOY_PATH_KEY,                                   $deploy_path,                                   table, true)
@@ -450,6 +449,7 @@ def read_config_settings
   update_config_settings(XCTEST_DESTINATION_DEVICE_KEY,                     $xctest_destination_device,                     table, true)
   update_config_settings(CONFIGURATION_FILES_PATH_KEY,                      $configuration_files_path,                      table, true)
   update_config_settings(CODE_COVERAGE_CONFIGURATION_KEY,                   $code_coverage_configuration,                   table, true)
+  update_config_settings(CODE_COVERAGE_IGNORE_FILE_KEY,                     $code_coverage_ignore_file,                     table, true)
   update_config_settings(CODE_COVERAGE_OUTPUT_DIRECTORY_KEY,                $code_coverage_output_directory,                table, true)
   update_config_settings(ENV_VAR_PREFIX_KEY,                                $env_var_prefix,                                table, true)
   update_config_settings(BUNDLE_ID_KEY,                                     $bundle_id,                                     table, true)
@@ -760,19 +760,13 @@ def test
 end
 
 def code_coverage
-  code_coverage_config = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_CONFIGURATION_KEY])
+  code_coverage_ignore_file = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_IGNORE_FILE_KEY])
+  code_coverage_ignore_lines = File.readlines(code_coverage_ignore_file)
+
+  Slather.coverage(@config_settings[WORKSPACE_TO_BUILD_KEY], @config_settings[WORKSPACE_SCHEME_TO_TEST_KEY], "Debug",
+                   @config_settings[CODE_COVERAGE_OUTPUT_DIRECTORY_KEY], code_coverage_ignore_lines, @config_settings[PROJECT_TO_BUILD_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_config}\"\
-                                                               -exclude \"#{@config_settings[EXCLUDE_PATTERN_FOR_CODE_COVERAGE_KEY]}\"\
-                                                               -output \"#{@config_settings[CODE_COVERAGE_OUTPUT_DIRECTORY_KEY]}\"\
-                                                               -destination-timeout \"#{TESTS_AND_COVERAGE_TIMEOUT}\"\
-                                                               -destination \"#{@config_settings[XCTEST_DESTINATION_DEVICE_KEY]}\"")
-  error('Code coverage error!') unless report_success
+  error('Code coverage error!') unless Slather.last_cmd_success?
 end
 
 def code_duplication_report

data/lib/nixenvironment/config.rb

@@ -13,7 +13,6 @@ module Nixenvironment
   # ninbas legacy
   BUILD_SCRIPTS_PATH                  = File.expand_path('../../../legacy', __FILE__)
   UNITY_BUILD_ANDROID_SCRIPT_PATH     = File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py')
-  CODE_COVERAGE_REPORT_SCRIPT_PATH    = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeCoverageForXCTests.sh')
   CODE_DUPLICATION_REPORT_SCRIPT_PATH = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeDuplicationReport.sh')
   DEPLOY_SCRIPT_PATH                  = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
   DEPLOY_APK_SCRIPT_PATH              = File.join(BUILD_SCRIPTS_PATH, 'DeployAPK.py')
@@ -102,7 +101,6 @@ module Nixenvironment
   SDK_KEY                                           = 'SDK'
   SDK_FOR_TESTS_KEY                                 = 'SDK_FOR_TESTS'
 
-  EXCLUDE_PATTERN_FOR_CODE_COVERAGE_KEY             = 'EXCLUDE_PATTERN_FOR_CODE_COVERAGE'
   EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY          = 'EXCLUDE_PATTERN_FOR_CODE_DUPLICATION'
 
   DEPLOY_HOST_KEY                                   = 'DEPLOY_HOST'
@@ -117,6 +115,7 @@ module Nixenvironment
   CONFIGURATION_FILES_PATH_KEY                      = 'CONFIGURATION_FILES_PATH'
 
   CODE_COVERAGE_CONFIGURATION_KEY                   = 'CODE_COVERAGE_CONFIGURATION'
+  CODE_COVERAGE_IGNORE_FILE_KEY                     = 'CODE_COVERAGE_IGNORE_FILE'
   CODE_COVERAGE_OUTPUT_DIRECTORY_KEY                = 'CODE_COVERAGE_OUTPUT_DIRECTORY'
 
   ENV_VAR_PREFIX_KEY                                = 'ENV_VAR_PREFIX'

data/lib/nixenvironment/slather.rb

@@ -0,0 +1,29 @@
+
+require_relative 'cmd_executor'
+
+module Nixenvironment
+  class Slather < CmdExecutor
+    @binary_name     = 'slather'
+
+    @config_settings = {}
+    @info            = {}
+
+    def self.coverage(workspace = nil, scheme = nil, config = nil, destination = nil, ignore_paths = nil, project = nil)
+      build_args = []
+      build_args << "--workspace '#{workspace}'"           if workspace.present?
+      build_args << "--scheme '#{scheme}'"                 if scheme.present?
+      build_args << "--configuration '#{config}'"          if config.present?
+      build_args << "--output-directory '#{destination}'"  if destination.present?
+
+      ignore_paths.each { |path|
+        build_args << "--ignore \"#{path.rstrip}\"" # path contains \n at the end, we need to get rid of it
+      }
+
+      build_args << "--cobertura-xml"
+      build_args << "--jenkins"
+      build_args << "'#{project}'"
+
+      execute('coverage', build_args)
+    end
+  end
+end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.125'
+  VERSION = '0.0.127'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -32,16 +32,17 @@ module Nixenvironment
       build_args << "-configuration '#{config}'" if config.present?
       build_args << "-xcconfig '#{xcconfig}'"    if xcconfig.present?
 
-      if project.present?
-        build_args << "-project '#{project}'"
-      elsif workspace.present?
+      if workspace.present?
         build_args << "-workspace '#{workspace}'"
+      elsif project.present?
+        build_args << "-project '#{project}'"
       end
+      # TODO: if not workspace or project present, search automatically. Probably not in this class
 
-      if target.present?
-        build_args << "-target '#{target}'"
-      elsif scheme.present?
+      if scheme.present?
         build_args << "-scheme '#{scheme}'"
+      elsif target.present?
+        build_args << "-target '#{target}'"
       end
 
       if env_var_prefix.present?
@@ -72,7 +73,7 @@ module Nixenvironment
       build_args << "-xcconfig '#{code_coverage_config}'" if code_coverage_config.present?
       build_args << "-destination-timeout '#{timeout}'"   if timeout.present?
       build_args << "-destination '#{destination}'"       if destination.present?
-      build_args << "| ocunit2junit"
+      build_args << "| ocunit2junit" # generates test result xmls
 
       execute('test', build_args)
     end
@@ -90,16 +91,17 @@ module Nixenvironment
       build_args << "-configuration '#{config}'" if config.present?
       build_args << "-xcconfig '#{xcconfig}'"    if xcconfig.present?
 
-      if project.present?
-        build_args << "-project '#{project}'"
-      elsif workspace.present?
+      if workspace.present?
         build_args << "-workspace '#{workspace}'"
+      elsif project.present?
+        build_args << "-project '#{project}'"
       end
+      # TODO: if not workspace or project present, search automatically. Probably not in this class
 
-      if target.present?
-        build_args << "-target '#{target}'"
-      elsif scheme.present?
+      if scheme.present?
         build_args << "-scheme '#{scheme}'"
+      elsif target.present?
+        build_args << "-target '#{target}'"
       end
 
       build_args << 'clean'

data/lib/nixenvironment.rb

@@ -2,6 +2,7 @@ require 'nixenvironment/version'
 require 'nixenvironment/config'
 require 'nixenvironment/git'
 require 'nixenvironment/xcodebuild'
+require 'nixenvironment/slather'
 require 'nixenvironment/archiver'
 require 'nixenvironment/build_env_vars_loader'
 require 'nixenvironment/plist'

data/nixenvironment.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'commander'
   spec.add_dependency 'fuzzy_match'
   spec.add_dependency 'fastlane_core'
+  spec.add_dependency 'slather', '~> 2.4.2'
 
   # Development only
   spec.add_development_dependency 'bundler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.125
+  version: 0.0.127
 platform: ruby
 authors:
 - Karen
@@ -9,230 +9,244 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ocunit2junit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pilot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fastlane_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slather
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Installs, updates and manages inner environment stuff to make build and
@@ -245,7 +259,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -255,7 +269,6 @@ files:
 - gemify.sh
 - legacy/Deploy.sh
 - legacy/DeployAPK.py
-- legacy/GenerateCodeCoverageForXCTests.sh
 - legacy/GenerateCodeDuplicationReport.sh
 - legacy/UnityBuildAndroid.py
 - legacy/UnityBuildAutomationScripts/CommandLineReader.cs
@@ -295,6 +308,7 @@ files:
 - lib/nixenvironment/jenkins/slave/slave_starter.rb
 - lib/nixenvironment/plist.rb
 - lib/nixenvironment/scm.rb
+- lib/nixenvironment/slather.rb
 - lib/nixenvironment/version.rb
 - lib/nixenvironment/xcodebuild.rb
 - nixenvironment.gemspec
@@ -303,7 +317,6 @@ files:
 - utils/XcodeIconTagger/masks/OneLineMask.png
 - utils/XcodeIconTagger/masks/TwoLineMask.png
 - utils/aapt
-- utils/gcovr
 - utils/identitieslist
 - utils/simian-2.3.33.jar
 homepage: https://rubygems.org/gems/nixenvironment
@@ -316,17 +329,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility