nixenvironment 0.0.127 → 0.0.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29924ea82a75b6fbbc3b53464c83540949f57b1
-  data.tar.gz: 21d00b89258e1ab131241099ad635df54e7fe34b
+  metadata.gz: 723841607a535415566ae0a2cb6d65ec4bd2b8b3
+  data.tar.gz: ecc605d3637afb50fa95824b68225686026f5254
 SHA512:
-  metadata.gz: cc02430d8f9966c2a8eed56137583049501e88c3ac18447d06e93e9a960153792ae829512dde8c1b4c54ec2ac64f9237107f116409906ed923bc877e1b527e96
-  data.tar.gz: 8b4788481b1eaa572e627f53f63a61f11e73fd62b4c81d8f7b027740b05d9081c7ce671c4fceb3caca988ad5689db18d181ad862627eae209eae67e523eba783
+  metadata.gz: 4281a4ddc308cd9d8664797de1218ccf52d28398fc0202c65e440aae9d40ffd6bf5d4d39846ea6be998d3a85194f4c0bcf814a0bc8f247c1dcbb77bbdcea57a3
+  data.tar.gz: 69109ee9082bd7ca762eca8c3e8185c85b4dc63af0969ae8566ab48e5d01a7cc2c755b68ea1b762fb747f6f7033a15941de81f814a7f8b90e9f3d943954376bd

data/bin/Config

@@ -1,17 +1,13 @@
 ---
 # set these vars if you have multiple projects in the root directory:
-PROJECT_TO_BUILD: NIXProject.xcodeproj
-PROJECT_TARGET_TO_BUILD:
-PROJECT_TARGET_TO_TEST:
+PROJECT: NIXProject.xcodeproj
 
 # 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: Application
+WORKSPACE: NIXProject.xcworkspace
+SCHEME: 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_DUPLICATION: "**/Vendor|**/Scripts|**/Pods"
 

data/bin/nixenvironment

@@ -22,14 +22,6 @@ program :description, 'NIX projects build and deploy utility'
 
 default_command :help
 
-global_option ('--project_to_build VALUE')                              { |value| $project_to_build                              = value }
-global_option ('--project_target_to_build VALUE')                       { |value| $project_target_to_build                       = value }
-global_option ('--project_target_to_test VALUE')                        { |value| $project_target_to_test                        = value }
-global_option ('--workspace_to_build VALUE')                            { |value| $workspace_to_build                            = value }
-global_option ('--workspace_scheme_to_build VALUE')                     { |value| $workspace_scheme_to_build                     = 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_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 }
@@ -63,6 +55,12 @@ end
 command :build do |c|
   c.syntax = 'nixenvironment build [options]'
   c.description = 'Build project for selected configuration and make signed/resigned ipa'
+
+  c.option '--project VALUE', String, 'Project name'
+  c.option '--workspace VALUE', String, 'Workspace name'
+  c.option '--scheme VALUE', String, 'Scheme name'
+  c.option '--sdk VALUE', String, 'SDK name'
+
   c.option '--config NAME', String, 'Select configuration'
   c.option '--xcconfig PATH', String, 'Specify the path to .xcconfig file'
   c.option '--ipa TYPES', String, 'Select sign (device, resigned_device, resigned_adhoc, resigned_appstore)'
@@ -75,7 +73,6 @@ command :build do |c|
   c.option '--key_alias_password PASSWORD', String, 'Specify the password for accessing an alias name'
   c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios | macos | android | winphone | webgl)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
-  c.option '--ci_build', 'Deprecated' # TODO: remove
   c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
   c.option '--app_version VERSION', String, 'Specify the version of the app (not implemented for unity-android)' # TODO: implement for unity-android
   c.option '--build_number BUILD_NUMBER', String, 'Specify the build number of the app (not implemented for unity-android)' # TODO: implement for unity-android
@@ -84,6 +81,11 @@ command :build do |c|
   c.option '--share_schemes', 'Share schemes for xcode project'
   c.option '--xc_args ARGS', String, 'Pass arguments to xcodebuild'
   c.action do |_args, options|
+    $workspace = options.workspace
+    $project = options.project
+    $scheme = options.scheme
+    $sdk = options.sdk
+
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
     unity_platform    = options.unity_platform
     is_unity_platform = unity_platform.present?
@@ -141,24 +143,23 @@ command :build do |c|
       @config_settings[CONFIGURATION_KEY] = options.config
 
       if is_unity_platform
-        @config_settings[WORKSPACE_TO_BUILD_KEY]        = nil
-        @config_settings[PROJECT_TO_BUILD_KEY]          = UNITY_BUILDS_IOS_PROJECT
-        @config_settings[WORKSPACE_SCHEME_TO_BUILD_KEY] = UNITY_BUILDS_IOS_SCHEME
-        @config_settings[PROJECT_TARGET_TO_BUILD_KEY]   = nil
-        @config_settings[ICONS_PATH_KEY]                = UNITY_BUILDS_ICONS_PATH
+        @config_settings[WORKSPACE_KEY]   = nil
+        @config_settings[PROJECT_KEY]     = UNITY_BUILDS_IOS_PROJECT
+        @config_settings[SCHEME_KEY]      = UNITY_BUILDS_IOS_SCHEME
+        @config_settings[ICONS_PATH_KEY]  = UNITY_BUILDS_ICONS_PATH
       end
 
       begin
         # Phonegap hotfix (http://mgrebenets.github.io/xcode/2014/05/29/share-xcode-schemes)
         # TODO: rework this!
         if options.share_schemes
-          xcproj = Xcodeproj::Project.open(@config_settings[PROJECT_TO_BUILD_KEY])
+          xcproj = Xcodeproj::Project.open(@config_settings[PROJECT_KEY])
           xcproj.recreate_user_schemes
           xcproj.save
         end
 
-        Xcodebuild.read_config_settings(@config_settings[WORKSPACE_TO_BUILD_KEY], @config_settings[PROJECT_TO_BUILD_KEY],
-                                        @config_settings[WORKSPACE_SCHEME_TO_BUILD_KEY], @config_settings[PROJECT_TARGET_TO_BUILD_KEY],
+        Xcodebuild.read_config_settings(@config_settings[WORKSPACE_KEY], @config_settings[PROJECT_KEY],
+                                        @config_settings[SCHEME_KEY],
                                         @config_settings[SDK_KEY], @config_settings[CONFIGURATION_KEY], options.xcconfig)
 
         raise 'Failed read_config_settings!' unless Xcodebuild.last_cmd_success?
@@ -233,7 +234,21 @@ end
 command :test do |c|
   c.syntax = 'nixenvironment test'
   c.description = 'Build xctest unit tests and run them in simulator'
-  c.action do
+
+  c.option '--project VALUE', String, 'Project name'
+  c.option '--workspace VALUE', String, 'Workspace name'
+  c.option '--scheme VALUE', String, 'Scheme name'
+  c.option '--sdk VALUE', String, 'SDK name'
+
+  c.action do |_args, options|
+    $workspace = options.workspace
+    $project = options.project
+    $scheme = options.scheme
+
+    #own default value
+    $sdk = 'iphonesimulator'
+    $sdk = options.sdk if options.sdk.present?
+
     read_config_settings
     test
   end
@@ -242,7 +257,16 @@ end
 command :code_coverage do |c|
   c.syntax = 'nixenvironment code_coverage'
   c.description = 'Generate xctest unit tests code coverage report'
-  c.action do
+
+  c.option '--project VALUE', String, 'Project name'
+  c.option '--workspace VALUE', String, 'Workspace name'
+  c.option '--scheme VALUE', String, 'Scheme name'
+
+  c.action do |_args, options|
+    $workspace = options.workspace
+    $project = options.project
+    $scheme = options.scheme
+
     read_config_settings
     code_coverage
   end
@@ -430,14 +454,10 @@ def read_config_settings
                     {:value => 'Specification', :alignment => :center},
                     {:value => 'Value',         :alignment => :center}]
 
-  update_config_settings(PROJECT_TO_BUILD_KEY,                              $project_to_build,                              table, true)
-  update_config_settings(PROJECT_TARGET_TO_BUILD_KEY,                       $project_target_to_build,                       table, true)
-  update_config_settings(PROJECT_TARGET_TO_TEST_KEY,                        $project_target_to_test,                        table, true)
-  update_config_settings(WORKSPACE_TO_BUILD_KEY,                            $workspace_to_build,                            table, true)
-  update_config_settings(WORKSPACE_SCHEME_TO_BUILD_KEY,                     $workspace_scheme_to_build,                     table, true)
-  update_config_settings(WORKSPACE_SCHEME_TO_TEST_KEY,                      $workspace_scheme_to_test,                      table, true)
+  update_project_and_workspace(table)
+
+  update_config_settings(SCHEME_KEY,                                        $scheme,                                        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_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)
@@ -465,6 +485,31 @@ def read_config_settings
   puts table
 end
 
+def update_project_and_workspace(table)
+  # try to find automatically if not set (will work only in case of single project/workspace in dir)
+  if !$project.present? && !$workspace.present?
+    projects_in_dir = Dir.glob("*.xcodeproj")
+    workspaces_in_dir = Dir.glob("*.xcworkspace")
+
+    if workspaces_in_dir.count == 1
+      $workspace = workspaces_in_dir.first
+    elsif workspaces_in_dir.count == 0 && projects_in_dir.count == 1
+      $project = projects_in_dir.first
+
+      #reset defaults
+      @config_settings[WORKSPACE_KEY] = nil
+    end
+  end
+
+  if $project.present? && !$workspace.present?
+    #reset defaults
+    @config_settings[WORKSPACE_KEY] = nil
+  end
+
+  update_config_settings(PROJECT_KEY,       $project,   table, true)
+  update_config_settings(WORKSPACE_KEY,     $workspace, table, true)
+end
+
 def update_config_settings(key, value, table, need_separator)
   if value
     @config_settings[key] = value
@@ -502,10 +547,9 @@ def prebuild(config, app_version, requires_fullscreen, skip_working_copy_check)
 end
 
 def build(config, xcconfig, ipa, ndsym, icon_tagger, xc_args)
-  project_to_build          = @config_settings[PROJECT_TO_BUILD_KEY]
-  project_target_to_build   = @config_settings[PROJECT_TARGET_TO_BUILD_KEY]
-  workspace_to_build        = @config_settings[WORKSPACE_TO_BUILD_KEY]
-  workspace_scheme_to_build = @config_settings[WORKSPACE_SCHEME_TO_BUILD_KEY]
+  project                   = @config_settings[PROJECT_KEY]
+  workspace                 = @config_settings[WORKSPACE_KEY]
+  scheme                    = @config_settings[SCHEME_KEY]
   sdk                       = @config_settings[SDK_KEY]
   configuration_build_dir   = @config_settings[CONFIGURATION_BUILD_DIR_KEY]
   dwarf_dsym_folder_path    = @config_settings[DWARF_DSYM_FOLDER_PATH_KEY]
@@ -528,7 +572,7 @@ def build(config, xcconfig, ipa, ndsym, icon_tagger, xc_args)
     xc_args = other_args_str
   end
 
-  Xcodebuild.build(sdk, config, xcconfig, project_to_build, project_target_to_build, workspace_to_build, workspace_scheme_to_build, env_var_prefix, xc_args)
+  Xcodebuild.build(sdk, config, xcconfig, project, workspace, scheme, env_var_prefix, xc_args)
 
   error('Build error!') unless Xcodebuild.last_cmd_success?
 
@@ -752,8 +796,9 @@ end
 def test
   code_coverage_config = File.join(@config_settings[CONFIGURATION_FILES_PATH_KEY], @config_settings[CODE_COVERAGE_CONFIGURATION_KEY])
 
-  Xcodebuild.test(@config_settings[SDK_FOR_TESTS_KEY], 'Debug', @config_settings[WORKSPACE_TO_BUILD_KEY],
-                  @config_settings[WORKSPACE_SCHEME_TO_TEST_KEY], code_coverage_config,
+  Xcodebuild.test(@config_settings[SDK_KEY], 'Debug', @config_settings[WORKSPACE_KEY],
+                  @config_settings[PROJECT_KEY], @config_settings[SCHEME_KEY],
+                  code_coverage_config,
                   TESTS_AND_COVERAGE_TIMEOUT, @config_settings[XCTEST_DESTINATION_DEVICE_KEY])
 
   error('Run test error!') unless Xcodebuild.last_cmd_success?
@@ -763,8 +808,8 @@ def code_coverage
   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])
+  Slather.coverage(@config_settings[WORKSPACE_KEY], @config_settings[SCHEME_KEY], "Debug",
+                   @config_settings[CODE_COVERAGE_OUTPUT_DIRECTORY_KEY], code_coverage_ignore_lines, @config_settings[PROJECT_KEY])
 
   error('Code coverage error!') unless Slather.last_cmd_success?
 end

data/lib/nixenvironment/archiver.rb

@@ -140,9 +140,9 @@ module Nixenvironment
         ipa_bundle_id = (is_resigned && resigned_bundle_id.present?) ? resigned_bundle_id : get_bundle_id(app_product)
 
         if is_appstore
-          name_for_deployment = 'Appstore'
+          name_for_deployment = "Appstore (#{configuration})"
         elsif is_adhoc
-          name_for_deployment = 'AdHoc'
+          name_for_deployment = "AdHoc (#{configuration})"
         else
           name_for_deployment = configuration
         end

data/lib/nixenvironment/config.rb

@@ -90,16 +90,12 @@ module Nixenvironment
   TESTS_AND_COVERAGE_TIMEOUT = 10
 
   # config keys
-  PROJECT_TO_BUILD_KEY                              = 'PROJECT_TO_BUILD'
-  PROJECT_TARGET_TO_BUILD_KEY                       = 'PROJECT_TARGET_TO_BUILD'
-  PROJECT_TARGET_TO_TEST_KEY                        = 'PROJECT_TARGET_TO_TEST'
+  PROJECT_KEY                                       = 'PROJECT'
 
-  WORKSPACE_TO_BUILD_KEY                            = 'WORKSPACE_TO_BUILD'
-  WORKSPACE_SCHEME_TO_BUILD_KEY                     = 'WORKSPACE_SCHEME_TO_BUILD'
-  WORKSPACE_SCHEME_TO_TEST_KEY                      = 'WORKSPACE_SCHEME_TO_TEST'
+  WORKSPACE_KEY                                     = 'WORKSPACE'
+  SCHEME_KEY                                        = 'SCHEME'
 
   SDK_KEY                                           = 'SDK'
-  SDK_FOR_TESTS_KEY                                 = 'SDK_FOR_TESTS'
 
   EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY          = 'EXCLUDE_PATTERN_FOR_CODE_DUPLICATION'
 
@@ -136,7 +132,6 @@ module Nixenvironment
   DWARF_DSYM_FOLDER_PATH_KEY                        = 'DWARF_DSYM_FOLDER_PATH'
   BUILT_PRODUCTS_DIR_KEY                            = 'BUILT_PRODUCTS_DIR'
   EXECUTABLE_NAME_KEY                               = 'EXECUTABLE_NAME'
-  PROJECT_KEY                                       = 'PROJECT'
   OBJECT_FILE_DIR_NORMAL_KEY                        = 'OBJECT_FILE_DIR_normal'
   EMBEDDED_PROFILE_NAME_KEY                         = 'EMBEDDED_PROFILE_NAME'
   TARGET_NAME_KEY                                   = 'TARGET_NAME'

data/lib/nixenvironment/version.rb

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

data/lib/nixenvironment/xcodebuild.rb

@@ -26,24 +26,13 @@ module Nixenvironment
     end
 
     # other => other args to be passed to xcodebuild
-    def self.build(sdk = nil, config = nil, xcconfig = nil, project = nil, target = nil, workspace = nil, scheme = nil, env_var_prefix = nil, xc_args = nil)
+    def self.build(sdk = nil, config = nil, xcconfig = nil, project = nil, workspace = nil, scheme = nil, env_var_prefix = nil, xc_args = nil)
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
       build_args << "-xcconfig '#{xcconfig}'"    if xcconfig.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 scheme.present?
-        build_args << "-scheme '#{scheme}'"
-      elsif target.present?
-        build_args << "-target '#{target}'"
-      end
+      define_workspace_or_project(build_args, workspace, project, scheme)
 
       if env_var_prefix.present?
         vars_to_define = ''
@@ -64,12 +53,13 @@ module Nixenvironment
       execute(nil, build_args)
     end
 
-    def self.test(sdk = nil, config = nil, workspace = nil, scheme = nil, code_coverage_config = nil, timeout = nil, destination = nil)
+    def self.test(sdk = nil, config = nil, workspace = nil, project = nil, scheme = nil, code_coverage_config = nil, timeout = nil, destination = nil)
       build_args = []
       build_args << "-sdk '#{sdk}'"                       if sdk.present?
       build_args << "-configuration '#{config}'"          if config.present?
-      build_args << "-workspace '#{workspace}'"           if workspace.present?
-      build_args << "-scheme '#{scheme}'"                 if scheme.present?
+
+      define_workspace_or_project(build_args, workspace, project, scheme)
+
       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?
@@ -78,31 +68,20 @@ module Nixenvironment
       execute('test', build_args)
     end
 
-    def self.read_config_settings(workspace = nil, project = nil, scheme = nil, target = nil, sdk = nil, config = nil, xcconfig = nil)
+    def self.read_config_settings(workspace = nil, project = nil, scheme = nil, sdk = nil, config = nil, xcconfig = nil)
       @config_settings = {}
-      read_info
+      read_info(workspace, project)
 
-      raise "Scheme #{scheme} doesn't exist!"                                                 if target.blank? && scheme.present? && !contains_scheme?(scheme)
+      raise "Scheme #{scheme} doesn't exist!"                                                 if 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?
+      raise "Either #{PROJECT_KEY} or #{WORKSPACE_KEY} must be specified!"  if project.blank?  && workspace.blank?
 
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
       build_args << "-xcconfig '#{xcconfig}'"    if xcconfig.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 scheme.present?
-        build_args << "-scheme '#{scheme}'"
-      elsif target.present?
-        build_args << "-target '#{target}'"
-      end
+      define_workspace_or_project(build_args, workspace, project, scheme)
 
       build_args << 'clean'
       build_args << '-showBuildSettings'
@@ -136,6 +115,18 @@ module Nixenvironment
       @config_settings[RESIGNED_BUNDLE_NAME_KEY] ||= info_plist['CFBundleDisplayName']
     end
 
+    def self.define_workspace_or_project(build_args, workspace = nil, project = nil, scheme = nil, target = nil)
+      if workspace.present?
+        build_args << "-workspace '#{workspace}'"
+      elsif project.present?
+        build_args << "-project '#{project}'"
+      end
+
+      if scheme.present?
+        build_args << "-scheme '#{scheme}'"
+      end
+    end
+
     def self.product_settings_path(workspace, scheme, scheme_suffix)
       scheme += scheme_suffix
       if contains_scheme?(scheme)
@@ -169,7 +160,7 @@ module Nixenvironment
       nil
     end
 
-    def self.read_info
+    def self.read_info(workspace = nil, project = nil)
       @info = {}
 
       puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.127
+  version: 0.0.129
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: NIX projects build and deploy utility