nixenvironment 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb46f15cc9b3336e295e430809edbe5094502733
-  data.tar.gz: cfd5f3224cb1f4700d87778cf9e4871f5cd34276
+  metadata.gz: 3526732db0e17b9f34a822a5b677cf205dbacdb7
+  data.tar.gz: 459bbd9b2d37acd6c521fe8a94e4d94a15724167
 SHA512:
-  metadata.gz: 43064f58d004c8498a7adf8ab12a40b576b2d15e07be2c52fca0d2e834c55ff6dd639d8c9b0bf02483562f5d827aab5e2b4a69af0a2b4517d35cac3631c3a28d
-  data.tar.gz: 2859e5496959b3064ff010fb9fcffd224a1378aa9d75723be1ffdca01526a999c00d0b2ff60717f03b977f5f5d95e89aeaf75e500fc1428d6d1b552c25a2e128
+  metadata.gz: 4027c122a44ba48f21c42c9923f8450511532a1d32169aa6fa2ae53d663ed94b09a8ccb04070d94dabe2cb929c66e6425d483c832177bcc770f6e77d9b161dba
+  data.tar.gz: 174a76a624f69ac626e4e932a679b327910481ceecb0e920a398ef1836da6e02b7b4c89fa5caf634ccbeca813d73e4f701a7e025636a1ae911cc9277cd5569fb

data/README.md

@@ -4,17 +4,31 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
 
 ## Installation
 
-    $ gem install nixenvironment
+    $ [sudo] gem install nixenvironment
 
 ## Usage
 
   COMMANDS:
 
-    build                Build project for selected configuration and make signed/resigned ipa
-    clean                Remove temp files and clean all targets for xcode project
-    deploy               Deploy build to mds
-    help                 Display global or [command] help documentation
-    update               Install or update ninbas and other environment stuff
+    build                    # Build project for selected configuration and make signed/resigned ipa
+                 
+    clean                    # Remove temp files and clean all targets for xcode project
+             
+    clean_working_copy       # Make working copy clean
+                    
+    code_duplication_report  # Generate code duplication report
+                
+    deploy                   # Deploy built artifacts to given server
+             
+    help                     # Display global or [command] help documentation
+             
+    svn_tag_from_jenkins     # Make tag by finding the first credential in local credential storage
+                 
+    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
+                 
+    update                   # Install or update ninbas and other environment stuff  
 
   GLOBAL OPTIONS:
 
@@ -26,9 +40,26 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
 
     -t, --trace
         Display backtrace when an error occurs
+        
+  EXAMPLES:
+  
+    nixenvironment -h
+    
+    nixenvironment update # Update all environment stuff from last tags 
+    
+    nixenvironment update --ninbas feature/nixenv
+    
+    nixenvironment build # Make Debug build and create .ipa file from last built app product by default
+    
+    nixenvironment build --config Release --ipa resigned_ipa_for_device
+    
+    nixenvironment deploy
+    
+    ...
 
 ## TODO:
 
 1. Move project adjuster to this gem.
 2. Implement bunch ipa making and deployment.
-3. Implement next commands: |test|, |code_duplication_report|, |tag|, |svn_tag_from_jenkins|, |clean_working_copy|, etc.
+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.

data/bin/nixenvironment

@@ -38,7 +38,7 @@ end
 
 command :deploy do |c|
   c.syntax = 'nixenvironment deploy'
-  c.description = 'Deploy build to mds'
+  c.description = 'Deploy built artifacts to given server'
   c.action do |args, options|
     read_config
     deploy
@@ -53,6 +53,48 @@ command :clean do |c|
   end
 end
 
+command :test do |c|
+  c.syntax = 'nixenvironment test'
+  c.description = 'Build unit tests and run them in simulator'
+  c.action do |args, options|
+    read_config
+    test
+  end
+end
+
+command :code_duplication_report do |c|
+  c.syntax = 'nixenvironment code_duplication_report'
+  c.description = 'Generate code duplication report'
+  c.action do |args, options|
+    read_config
+    code_duplication_report
+  end
+end
+
+command :tag do |c|
+  c.syntax = 'nixenvironment tag'
+  c.description = 'Make SVN/git/mercurial tag, SCM_USERNAME and SCM_PASSWORD must be defined on calling this target'
+  c.action do |args, options|
+    tag
+  end
+end
+
+command :svn_tag_from_jenkins do |c|
+  c.syntax = 'nixenvironment svn_tag_from_jenkins'
+  c.description = 'Make tag by finding the first credential in local credential storage'
+  c.action do |args, options|
+    svn_tag_from_jenkins
+  end
+end
+
+command :clean_working_copy do |c|
+  c.syntax = 'nixenvironment clean_working_copy'
+  c.description = 'Make working copy clean'
+  c.action do |args, options|
+    clean_working_copy
+  end
+end
+
 def update(ninbas)
   root_working_directory = Dir.pwd
   target_directory = File.join(Dir.home, NIXENV_ROOT)
@@ -64,7 +106,6 @@ def update(ninbas)
     REPO_LIST.each do |repo_name, repo_url|
       unless Dir.exist?(repo_name)
         clone_success = system("git clone #{repo_url} --recursive")
-
         unless clone_success
           p("Authentication failed for #{repo_name} project!")
           next
@@ -75,7 +116,6 @@ def update(ninbas)
 
       if repo_name == BUILD_SCRIPTS
         if ninbas
-          #TODO: rework me please!
           system("git checkout #{ninbas}")
           Dir.chdir('..')
           next
@@ -89,8 +129,9 @@ def update(ninbas)
       if tags.size > 0
         p("Checkout newest #{repo_name} tag...")
         system("git checkout #{tags.last}")
+      else
+        abort("Error checkout #{repo_name}! There is no tags!")
       end
-      #TODO: hadle tags.size == 0
 
       p("Checkout #{repo_name} #{tags.last} tag success!")
 
@@ -147,8 +188,6 @@ def setup(config)
                                 -showBuildSettings ]
   end
 
-  #TODO: handle if cmd_output still nil
-
   env_vars_list = cmd_output.split(/\n/).reject(&:empty?)
 
   build_settings = Hash.new
@@ -167,33 +206,20 @@ def setup(config)
   return build_settings
 end
 
-def prebuild(build_settings)
-  save_revision_script_path          = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
-  save_build_env_vars_script_path    = File.join(BUILD_SCRIPTS_PATH, 'SaveBuildEnvVars.sh')
-  tag_icons_script_path              = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
-  update_build_number_script_path    = File.join(BUILD_SCRIPTS_PATH, 'UpdateBuildNumber.sh')
-  update_revision_number_script_path = File.join(BUILD_SCRIPTS_PATH, 'UpdateRevisionNumber.sh')
-
-  icon_path = @config['ICONS_PATH']
-
-  system("#{save_revision_script_path}")
-
-  abort unless working_copy_is_clean?
-
-  # TODO: rewrite SaveBuildEnvVars.sh
-  #system("#{save_build_env_vars_script_path}")
+def save_build_env_vars(build_settings)
+  app_product = "#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app"
 
   system("
 echo \"#!/bin/sh\
-### AUTOGENERATED BY SaveBuildEnvVars.sh; DO NOT EDIT ###
+### AUTOGENERATED BY Nixenvironment; DO NOT EDIT ###
             PROJECT=\"#{build_settings['PROJECT']}\"
 BUILT_PRODUCTS_DIR=\"#{build_settings['BUILT_PRODUCTS_DIR']}\"
 OBJECTS_NORMAL_DIR=\"#{build_settings['OBJECT_FILE_DIR_normal']}\"
     EXECUTABLE_NAME=\"#{build_settings['EXECUTABLE_NAME']}\"
-        APP_PRODUCT=\"#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app\"
-           APP_DSYM=\"#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app.dSYM\"
+        APP_PRODUCT=\"#{app_product}\"
+           APP_DSYM=\"#{app_product}.dSYM\"
 APP_INFOPLIST_FILE=\"#{@config['INFOPLIST_PATH']}\"
-   EMBEDDED_PROFILE=\"#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app/#{build_settings['EMBEDDED_PROFILE_NAME']}\"
+   EMBEDDED_PROFILE=\"##{app_product}/#{build_settings['EMBEDDED_PROFILE_NAME']}\"
         TARGET_NAME=\"#{build_settings['TARGET_NAME']}\"
       CONFIGURATION=\"#{build_settings['CONFIGURATION']}\"
            SDK_NAME=\"#{build_settings['SDK_NAME']}\"
@@ -201,103 +227,135 @@ RESIGNED_BUNDLE_ID=\"#{build_settings['RESIGNED_BUNDLE_ID']}\"
 RESIGNED_BUNDLE_NAME=\"#{build_settings['RESIGNED_BUNDLE_NAME']}\"
 RESIGNED_ENTITLEMENTS_PATH=\"#{build_settings['RESIGNED_ENTITLEMENTS_PATH']}\"\" > _last_build_vars.sh
   ")
+end
+
+def prebuild(build_settings)
+  save_revision          = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
+  tag_icons              = File.join(BUILD_SCRIPTS_PATH, 'XcodeIconTagger/tagIcons.sh')
+  update_build_number    = File.join(BUILD_SCRIPTS_PATH, 'UpdateBuildNumber.sh')
+  update_revision_number = File.join(BUILD_SCRIPTS_PATH, 'UpdateRevisionNumber.sh')
+
+  system("#{save_revision}")
+
+  abort unless working_copy_is_clean?
+
+  save_build_env_vars(build_settings)
 
   # TODO: rewrite tagIcons.sh
-  # system("#{tag_icons_script_path} #{icon_path}")
+  # system("#{tag_icons} @config['ICONS_PATH']")
 
-  # Implement all modify things in one script
-  system("#{update_build_number_script_path}")
-  system("#{update_revision_number_script_path}")
+  system("#{update_build_number}")
+  system("#{update_revision_number}")
 end
 
 def build(config, ipa)
-  build_script_path = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
+  build = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
 
-  system("#{build_script_path} --project \"#{@config['PROJECT_TO_BUILD']}\"\
-                               --target \"#{@config['PROJECT_TARGET_TO_BUILD']}\"\
-                               --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
-                               --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
-                               --configuration \"#{config}\"\
-                               --sdk \"#{@config['SDK']}\"\
-                               --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
+  build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
+                                   --target \"#{@config['PROJECT_TARGET_TO_BUILD']}\"\
+                                   --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
+                                   --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
+                                   --configuration \"#{config}\"\
+                                   --sdk \"#{@config['SDK']}\"\
+                                   --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"")
+  abort('Build error!') unless build_success
 
   case ipa
     # create .ipa file from last built app product
     when 'ipa'
-      make_script_path = File.join(BUILD_SCRIPTS_PATH, 'MakeIPA.sh')
+      make = File.join(BUILD_SCRIPTS_PATH, 'MakeIPA.sh')
     # resign last built app product with iPhone Developer profile and package it into .ipa file
     when 'resigned_ipa_for_device'
-      make_script_path = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForDevice.sh')
+      make = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForDevice.sh')
     # resign last built app product with iPhone Distribution AdHoc profile and package it into .ipa file
     when 'resigned_ipa_for_adhoc_distribution'
-      make_script_path = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForAdHocDistribution.sh')
+      make = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForAdHocDistribution.sh')
     # resign last built app product with Appstore distribution profile and package it into .ipa file
     when 'resigned_ipa_for_appstore'
-      make_script_path = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForAppstore.sh')
+      make = File.join(BUILD_SCRIPTS_PATH, 'MakeResignedIPAForAppstore.sh')
     else
-      p("Error: Unknown ipa '#{ipa}'!")
+      abort("Error: Unknown ipa '#{ipa}'!")
   end
 
-  system("#{make_script_path}") if defined? make_script_path
+  make_success = system("#{make}") if defined? make
+  abort("#{make} error!") unless make_success
 end
 
 def revert_info_plist
   p('Reverting Info.plist ...')
-  system("git checkout #{@config['INFOPLIST_PATH']}")
-  p('Done.')
+
+  revert_success = system("git checkout #{@config['INFOPLIST_PATH']}")
+  abort('Reverting Info.plist error!') unless revert_success
+
+  p('Info.plist was reverted.')
 end
 
-# deploys built artifacts to given server
 def deploy
-  deploy_script_path = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
+  deploy = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
 
   deploy_host = @config['DEPLOY_HOST'].nil? || @config['DEPLOY_HOST'].empty? ? ENV['DEPLOY_HOST'] : @config['DEPLOY_HOST']
   deploy_path = @config['DEPLOY_PATH'].nil? || @config['DEPLOY_PATH'].empty? ? ENV['DEPLOY_PATH'] : @config['DEPLOY_PATH']
   deploy_username = @config['DEPLOY_USERNAME'].nil? || @config['DEPLOY_USERNAME'].empty? ? ENV['DEPLOY_USERNAME'] : @config['DEPLOY_USERNAME']
   deploy_password = @config['DEPLOY_PASSWORD'].nil? || @config['DEPLOY_PASSWORD'].empty? ? ENV['DEPLOY_PASSWORD'] : @config['DEPLOY_PASSWORD']
 
-  system("#{deploy_script_path} #{deploy_host}\
-                                #{deploy_path}\
-                                #{deploy_username}\
-                                #{deploy_password}")
+  deploy_success = system("#{deploy} #{deploy_host} #{deploy_path} #{deploy_username} #{deploy_password}")
+  abort('Deploy error!') unless deploy_success
 end
 
 def clean
-  remove_temporary_files_script_path = File.join(BUILD_SCRIPTS_PATH, 'RemoveTemporaryFiles.sh')
+  remove_temporary_files = File.join(BUILD_SCRIPTS_PATH, 'RemoveTemporaryFiles.sh')
 
-  system("#{remove_temporary_files_script_path}")
+  system("#{remove_temporary_files}")
   system('rm -rf test-results/')
   system("find . -name \"*.pyc\" -exec rm -rf {} \;")
   system('xcodebuild -alltargets clean')
 end
 
-# # build unit tests and run them in simulator
-# def test
-#   ${BUILD_SCRIPTS_PATH}Build.py --project "${PROJECT_TO_BUILD}" --target "${PROJECT_TARGET_TO_TEST}" --workspace "${WORKSPACE_TO_BUILD}" --scheme "${WORKSPACE_SCHEME_TO_TEST}" --configuration "Release" --sdk "${SDK_FOR_TESTS}" --env-var-prefix "${ENV_VAR_PREFIX}"
-#   ${BUILD_SCRIPTS_PATH}RunTests.sh
-#   ${BUILD_SCRIPTS_PATH}GenerateCodeCoverageReport.sh "${EXCLUDE_PATTERN_FOR_CODE_COVERAGE}" coverage.xml
-# end
-#
-# # generates code duplication report
-# def code_duplication_report
-#   ${BUILD_SCRIPTS_PATH}GenerateCodeDuplicationReport.sh "${EXCLUDE_PATTERN_FOR_CODE_DUPLICATION}" duplication.xml
-# end
-#
-# # make SVN/git/mercurial tag, SCM_USERNAME and SCM_PASSWORD must be defined on calling this target
-# def tag
-#   ${BUILD_SCRIPTS_PATH}MakeTag.sh "${SCM_USERNAME}" "${SCM_PASSWORD}"
-# end
-#
-# # Jenkins stores SVN credentials locally in XML, so this target gets and uses them on making tag by finding the first credential in local credential storage
-# # additional |echo| is needed in order to add newline, otherwise base64 encoding doesn't work
-# # ATTENTION: if this script picks up wrong credentials, then you should manually edit subversion.credentials file on Jenkins in order to remove the wrong credential
-# def svn_tag_from_jenkins:
-#   SCM_USERNAME="$(shell xpath ../subversion.credentials \(//userName\)[1]/text\(\))"\
-#   SCM_PASSWORD="$(shell echo $$(xpath ../subversion.credentials \(//password\)[1]/text\(\) 2>/dev/null && echo) | openssl base64 -d)"
-#
-#   tag
-# end
-#
-# def clean_working_copy
-#   ${BUILD_SCRIPTS_PATH}CleanWorkingCopy.sh
-# 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')
+
+  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
+
+  coverage_success = system("#{generate_code_coverage_report} \"#{@config['EXCLUDE_PATTERN_FOR_CODE_COVERAGE']}\" coverage.xml")
+  abort('Generate code coverage error!') unless coverage_success
+end
+
+def code_duplication_report
+  generate_code_duplication_report = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeDuplicationReport.sh')
+  duplication_success = system("#{generate_code_duplication_report} \"#{@config['EXCLUDE_PATTERN_FOR_CODE_DUPLICATION']}\" duplication.xml")
+  abort('Generate code duplication error!') unless duplication_success
+end
+
+def tag
+  make_tag = File.join(BUILD_SCRIPTS_PATH, 'MakeTag.sh ')
+  tag_success = system("#{make_tag} \"#{ENV['SCM_USERNAME']}\" \"#{ENV['SCM_PASSWORD']}\"")
+  abort('Make tag error!') unless tag_success
+end
+
+# Jenkins stores SVN credentials locally in XML, so this command gets and uses them on making tag by finding the first credential in local credential storage
+# ATTENTION: if this command picks up wrong credentials, then you should manually edit subversion.credentials file on Jenkins in order to remove the wrong credential
+# Additional |echo| is needed in order to add newline, otherwise base64 encoding doesn't work
+def svn_tag_from_jenkins
+  ENV['SCM_USERNAME']=%x[ $(shell xpath ../subversion.credentials \(//userName\)[1]/text\(\)) ]
+  ENV['SCM_PASSWORD']=%x[ $(shell echo $$(xpath ../subversion.credentials \(//password\)[1]/text\(\) 2>/dev/null && echo) | openssl base64 -d) ]
+
+  tag
+end
+
+def clean_working_copy
+  clean_working_copy = File.join(BUILD_SCRIPTS_PATH, 'CleanWorkingCopy.sh')
+  clean_success = system("#{clean_working_copy}")
+  abort('Clean working copy error!') unless clean_success
+end

data/lib/nixenvironment/version.rb

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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.34'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 description: Installs, updates and manages inner environment stuff to make build and
@@ -76,7 +76,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility