nixenvironment 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3526732db0e17b9f34a822a5b677cf205dbacdb7
-  data.tar.gz: 459bbd9b2d37acd6c521fe8a94e4d94a15724167
+  metadata.gz: 6038c1ba13612621fdf47bea372dcc0967e48e4b
+  data.tar.gz: 41b2f2670e4bbc5ba47910a0370cec404dc103dc
 SHA512:
-  metadata.gz: 4027c122a44ba48f21c42c9923f8450511532a1d32169aa6fa2ae53d663ed94b09a8ccb04070d94dabe2cb929c66e6425d483c832177bcc770f6e77d9b161dba
-  data.tar.gz: 174a76a624f69ac626e4e932a679b327910481ceecb0e920a398ef1836da6e02b7b4c89fa5caf634ccbeca813d73e4f701a7e025636a1ae911cc9277cd5569fb
+  metadata.gz: 57c4ac0d9615bfef6ea692d0b612c4520ba69ba0bf600d13e575c5f11055318ee57b5c78db2e9c72e1ce5cb953a5ce63fe631fba187c7244386221307de7bc3f
+  data.tar.gz: c77c38efa209d4f9fa4c1e097c0544dfb57b51ee27d8b639cda07ed669af5dfb0356ec9df2049852d9f66b53ba7d1d7a593f409111bc3f694b2cf336e39285a2

data/.gitignore

@@ -13,4 +13,5 @@
 *.o
 *.a
 mkmf.log
-.idea/
+.idea/
+*.gem

data/README.md

@@ -15,6 +15,8 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
     clean                    # Remove temp files and clean all targets for xcode project
              
     clean_working_copy       # Make working copy clean
+    
+    code_coverage            # Generate xctest unit tests code coverage report     
                     
     code_duplication_report  # Generate code duplication report
                 
@@ -26,7 +28,7 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
                  
     tag                      # Make SVN/git/mercurial tag, SCM_USERNAME and SCM_PASSWORD must be defined on calling this target
                  
-    test                     # Build unit tests and run them in simulator
+    test                     # Build xctest unit tests and run them in simulator
                  
     update                   # Install or update ninbas and other environment stuff  
 
@@ -61,5 +63,5 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
 
 1. Move project adjuster to this gem.
 2. Implement bunch ipa making and deployment.
-3. Implement xctest and code_coverage_for_xctest commands (https://bitbucket.org/nixsolutions/ninbas/pull-request/1/added-scripts-for-xctests/).
-4. Rewrite XcodeIconTagger/tagIcons.sh and use it in prebuild method.
+3. Rewrite XcodeIconTagger/tagIcons.sh and use it in prebuild method.
+4. Rewrite README for ninbas!

data/bin/Config

@@ -0,0 +1,38 @@
+---
+# set these vars if you have multiple projects in the root directory:
+PROJECT_TO_BUILD:
+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
+
+# for osx projects sdk should be macosx10.8 or macosx10.7
+SDK: iphoneos
+SDK_FOR_TESTS: iphonesimulator
+
+EXCLUDE_PATTERN_FOR_CODE_COVERAGE: ".*/Vendor/.*|.*/Tests/.*"
+EXCLUDE_PATTERN_FOR_CODE_DUPLICATION: "**/Vendor|**/Scripts"
+
+# you shouldn't touch these variables, because they will be defined on the CI server:
+# DEPLOY_HOST: 
+# DEPLOY_PATH:
+# DEPLOY_USERNAME:
+# DEPLOY_PASSWORD:
+
+# set these var if you want to add build number on icon
+ICONS_PATH: Resources/Icons
+
+# Specifies the device to be used as destination
+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_OUTPUT_DIRECTORY: ./Coverage/
+
+ENV_VAR_PREFIX: NIXENV_
+
+INFOPLIST_PATH: Resources/Plists/Info.plist

data/bin/nixenvironment

@@ -26,9 +26,11 @@ command :build do |c|
   c.description = 'Build project for selected configuration and make signed/resigned ipa'
   c.option '--config NAME', String, 'Select configuration'
   c.option '--ipa NAME', String, 'Select sign'
+  c.option '--ci_build VALUE', String, 'Define NIXENV_CI_BUILD environment variable'
   c.action do |args, options|
-    options.default :config => 'Debug', :ipa => 'ipa'
+    options.default :config => 'Debug', :ipa => 'ipa', :ci_build => 'yes'
     read_config
+    enable_ci_build(options.ci_build)
     build_settings = setup(options.config)
     prebuild(build_settings)
     build(options.config, options.ipa)
@@ -55,16 +57,25 @@ end
 
 command :test do |c|
   c.syntax = 'nixenvironment test'
-  c.description = 'Build unit tests and run them in simulator'
+  c.description = 'Build xctest unit tests and run them in simulator'
   c.action do |args, options|
     read_config
     test
   end
 end
 
+command :code_coverage do |c|
+  c.syntax = 'nixenvironment code_coverage'
+  c.description = 'Generate xctest unit tests code coverage report'
+  c.action do |args, options|
+    read_config
+    code_coverage
+  end
+end
+
 command :code_duplication_report do |c|
   c.syntax = 'nixenvironment code_duplication_report'
-  c.description = 'Generate code duplication report'
+  c.description = 'Generate code duplication report for xctest'
   c.action do |args, options|
     read_config
     code_duplication_report
@@ -147,12 +158,22 @@ end
 
 def read_config
   begin
-    @config = YAML.load(File.read('Config'))
+    @config = YAML.load(File.read(File.join(File.dirname(__FILE__), 'Config')))
   rescue
     abort('Config file processing error!')
   end
 end
 
+def enable_ci_build(ci_build)
+  if ci_build == 'yes' or ci_build == 'true' or ci_build == '1' or ci_build == 'on'
+    ENV['NIXENV_CI_BUILD'] = '1'
+    p('CI_BUILD enabled.')
+  else
+    ENV['NIXENV_CI_BUILD'] = nil
+    p('CI_BUILD disabled.')
+  end
+end
+
 def working_copy_is_clean?
   is_clean = system("
   LAST_REVISION_FILE=\"_last_revision.sh\"
@@ -258,7 +279,11 @@ def build(config, ipa)
                                    --configuration \"#{config}\"\
                                    --sdk \"#{@config['SDK']}\"\
                                    --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
-  abort('Build error!') unless build_success
+
+  unless build_success
+    revert_info_plist
+    abort('Build error!')
+  end
 
   case ipa
     # create .ipa file from last built app product
@@ -278,7 +303,11 @@ def build(config, ipa)
   end
 
   make_success = system("#{make}") if defined? make
-  abort("#{make} error!") unless make_success
+
+  unless make_success
+    revert_info_plist
+    abort("#{make} error!")
+  end
 end
 
 def revert_info_plist
@@ -312,24 +341,37 @@ def clean
 end
 
 def test
-  build                         = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
-  run_tests                     = File.join(BUILD_SCRIPTS_PATH, 'RunTests.sh')
-  generate_code_coverage_report = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeCoverageReport.sh')
+  code_coverage_configuration = File.join(@config['CONFIGURATION_FILES_PATH'], @config['CODE_COVERAGE_CONFIGURATION'])
+  timeout = 10
+  ocunit2junit = File.join(BUILD_SCRIPTS_PATH, 'Utils/ocunit2junit')
+
+  run_tests_success = system("xcodebuild -workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
+                                         -scheme \"#{@config['WORKSPACE_SCHEME_TO_TEST']}\"\
+                                         -configuration \"Debug\"\
+                                         -sdk \"#{@config['SDK_FOR_TESTS']}\"\
+                                         -xcconfig \"#{code_coverage_configuration}\"\
+                                         -destination-timeout \"#{timeout}\"\
+                                         -destination \"#{@config['XCTEST_DESTINATION_DEVICE']}\"\
+                                         test 2>&1 | \"#{ocunit2junit}\"")
 
-  build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
-                                   --target \"#{@config['PROJECT_TARGET_TO_TEST']}\"\
-                                   --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
-                                   --scheme \"#{@config['WORKSPACE_SCHEME_TO_TEST']}\"\
-                                   --configuration \"Release\"\
-                                   --sdk \"#{@config['SDK_FOR_TESTS']}\"\
-                                   --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
-  abort('Build for test error!') unless build_success
-
-  run_tests_success = system("#{run_tests}")
   abort('Run test error!') unless run_tests_success
+end
 
-  coverage_success = system("#{generate_code_coverage_report} \"#{@config['EXCLUDE_PATTERN_FOR_CODE_COVERAGE']}\" coverage.xml")
-  abort('Generate code coverage error!') unless coverage_success
+def code_coverage
+  generate_code_coverage_report = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeCoverageForXCTests.sh')
+  code_coverage_configuration = File.join(@config['CONFIGURATION_FILES_PATH'], @config['CODE_COVERAGE_CONFIGURATION'])
+  timeout = 10
+
+  report_success = system("#{generate_code_coverage_report} -workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
+                                                            -scheme \"#{@config['WORKSPACE_SCHEME_TO_TEST']}\"\
+                                                            -configuration \"Debug\"\
+                                                            -sdk \"#{@config['SDK_FOR_TESTS']}\"\
+                                                            -xcconfig \"#{code_coverage_configuration}\"\
+                                                            -exclude \"#{@config['EXCLUDE_PATTERN_FOR_CODE_COVERAGE']}\"\
+                                                            -output \"#{@config['CODE_COVERAGE_OUTPUT_DIRECTORY']}\"\
+                                                            -destination-timeout \"#{timeout}\"\
+                                                            -destination \"#{@config['XCTEST_DESTINATION_DEVICE']}\"")
+  abort('Code coverage error!') unless report_success
 end
 
 def code_duplication_report

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/Config
 - bin/nixenvironment
 - gemify.sh
 - lib/nixenvironment.rb