branch_io_cli 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96b0f856a2de3dbd4c63841fd112a8477cdb4694eee1201fd862ee653304160b
-  data.tar.gz: abb2546fdb310dea4075e5bc018885974a6e4fd97236c3bc2870a90b61aeab91
+  metadata.gz: dd6157b41fc586526be77da254770b5d85163ec3288927bc61c0c57a56c33bc8
+  data.tar.gz: 79f2102c3254a3eabd933d9cd5b36a9504a86ec1a348fed55c02fbbbf1463dfe
 SHA512:
-  metadata.gz: 9b1a6513a50d3dc45ac060759de51964d51dd51752517b6d7ccb8d77e00922c580cdb76c3384a489766ee57ce59642ee722354f4d298bdee4292f0e04ec8c42b
-  data.tar.gz: fdd5c4d1d8c5c08ce0b2601ed4b413644b5ad7097a32628276733d06fed649de5e6ab8baa95fb236430b5112bb4acd17328b80d480ba4cd4db9f3cd8086357e8
+  metadata.gz: d5b48cdb7b011c4a21a54f80455f0f6780d857d21592d368429079d32921b638b347e38e5eb7bc91eabacae731b033acffb6cc527652789c1dfd6025506ffab5
+  data.tar.gz: a7014ab71338528a7c40f11636ea9c31db09fca6a29ae8f3d8235427cd88512d660d5b30c2d2aa7a920ce6f59a03315bf6d87ae93aebd4b4e2335029560e29a1

data/README.md

@@ -229,10 +229,10 @@ report with additional diagnostic information suitable for opening a support tic
 |--xcodeproj MyProject.xcodeproj|Path to an Xcode project|
 |--target MyAppTarget|Name of a target to modify in the Xcode project|
 |--scheme MyAppScheme|Name of a scheme to build|
-|--configuration Debug/Release/CustomConfig|Name of a build configuration (default: Release)|
+|--configuration Debug/Release/CustomConfig|Name of a build configuration (default: Scheme-dependent)|
 |--sdk iphonesimulator|Name of an SDK to use with xcodebuild (default: iphonesimulator)|
 |--[no-]clean|Clean before building (default: yes)|
-|--[no-]header-only|Show a diagnostic header and exit without cleaning or building (default: no)|
+|-H, --[no-]header-only|Show a diagnostic header and exit without cleaning or building (default: no)|
 |--[no-]pod-repo-update|Update the local podspec repo before installing (default: yes)|
 |--podfile /path/to/Podfile|Path to the Podfile for the project|
 |--cartfile /path/to/Cartfile|Path to the Cartfile for the project|

data/lib/assets/completions/completion.bash

@@ -18,7 +18,7 @@ _branch_io_complete()
 
     validate_opts="$global_opts -D --domains --xcodeproj --target"
 
-    report_opts="$global_opts --xcodeproj --workspace --header-only --no-clean --scheme --target --configuration --sdk --out"
+    report_opts="$global_opts --xcodeproj --workspace -H --header-only --no-clean --scheme --target --configuration --sdk --out"
     report_opts="$report_opts --podfile --cartfile --no-pod-repo-update"
 
     if [[ ${cur} == -* ]] ; then

data/lib/branch_io_cli/cli.rb

@@ -162,12 +162,12 @@ EOF
         c.option "--workspace MyProject.xcworkspace", String, "Path to an Xcode workspace"
         c.option "--scheme MyProjectScheme", String, "A scheme from the project or workspace to build"
         c.option "--target MyProjectTarget", String, "A target to build"
-        c.option "--configuration Debug|Release|CustomConfigName", String, "The build configuration to use (default: Release)"
+        c.option "--configuration Debug|Release|CustomConfigName", String, "The build configuration to use (default: Scheme-dependent)"
         c.option "--sdk iphonesimulator", String, "Passed as -sdk to xcodebuild (default: iphonesimulator)"
         c.option "--podfile /path/to/Podfile", String, "Path to the Podfile for the project"
         c.option "--cartfile /path/to/Cartfile", String, "Path to the Cartfile for the project"
         c.option "--[no-]clean", "Clean before attempting to build (default: yes)"
-        c.option "--[no-]header-only", "Write a report header to standard output and exit"
+        c.option "-H", "--[no-]header-only", "Write a report header to standard output and exit"
         c.option "--[no-]pod-repo-update", "Update the local podspec repo before installing (default: yes)"
         c.option "--out ./report.txt", String, "Report output path (default: ./report.txt)"
 
@@ -175,7 +175,6 @@ EOF
           options.default(
             clean: true,
             header_only: false,
-            configuration: "Release",
             sdk: "iphonesimulator",
             out: "./report.txt",
             pod_repo_update: true

data/lib/branch_io_cli/command/report_command.rb

@@ -1,6 +1,8 @@
 require "cocoapods-core"
 require "branch_io_cli/helper/methods"
+require "open3"
 require "plist"
+require "xcodeproj"
 
 module BranchIOCLI
   module Command
@@ -13,6 +15,10 @@ module BranchIOCLI
       def run!
         say "\n"
 
+        unless load_settings_from_xcode
+          say "Failed to load settings from Xcode. Some information may be missing.\n"
+        end
+
         if config.header_only
           say report_header
           exit 0
@@ -61,15 +67,18 @@ EOF
           end
 
           base_cmd = base_xcodebuild_cmd
-          # Add -scheme option for the rest of the commands if using a workspace
-          base_cmd = "#{base_cmd} -scheme #{config.scheme}" if config.workspace_path
-
-          # xcodebuild -showBuildSettings
-          report.log_command "#{base_cmd} -showBuildSettings"
-
           # Add more options for the rest of the commands
+          base_cmd = "#{base_cmd} -scheme #{config.scheme}"
           base_cmd = "#{base_cmd} -configuration #{config.configuration} -sdk #{config.sdk}"
-          base_cmd = "#{base_cmd} -target #{config.target}" unless config.workspace_path
+
+          # xcodebuild -showBuildSettings
+          report.write "$ #{base_cmd} -showBuildSettings\n\n"
+          report.write @xcodebuild_showbuildsettings_output
+          if @xcodebuild_showbuildsettings_status.success?
+            report.write "Success.\n\n"
+          else
+            report.write "#{@xcodebuild_showbuildsettings_status}.\n\n"
+          end
 
           if config.clean
             say "Cleaning"
@@ -146,7 +155,11 @@ EOF
       def version_from_branch_framework
         framework = config.target.frameworks_build_phase.files.find { |f| f.file_ref.path =~ /Branch.framework$/ }
         return nil unless framework
-        framework_path = framework.file_ref.real_path
+        if framework.file_ref.isa == "PBXFileReference"
+          framework_path = framework.file_ref.real_path
+        elsif framework.file_ref.isa == "PBXReferenceProxy" && @xcode_settings
+          framework_path = File.expand_path framework.file_ref.path, @xcode_settings[framework.file_ref.source_tree]
+        end
         info_plist_path = File.join framework_path.to_s, "Info.plist"
         return nil unless File.exist? info_plist_path
 
@@ -158,9 +171,18 @@ EOF
         version ? "#{version} [Branch.framework/Info.plist]" : nil
       end
 
-      def version_from_bnc_config_m
+      def version_from_bnc_config_m(project = @config.xcodeproj)
         # Look for BNCConfig.m in embedded source
-        bnc_config_m_ref = config.xcodeproj.files.find { |f| f.path =~ /BNCConfig\.m$/ }
+        bnc_config_m_ref = project.files.find { |f| f.path =~ /BNCConfig\.m$/ }
+        unless bnc_config_m_ref
+          subprojects = project.files.select { |f| f.path =~ /\.xcodeproj$/ }
+          subprojects.each do |subproject|
+            p = Xcodeproj::Project.open subproject.real_path
+            version = version_from_bnc_config_m p
+            return version if version
+          end
+        end
+
         return nil unless bnc_config_m_ref
         bnc_config_m = File.read bnc_config_m_ref.real_path
         matches = /BNC_SDK_VERSION\s+=\s+@"(\d+\.\d+\.\d+)"/m.match bnc_config_m
@@ -216,6 +238,7 @@ EOF
         header = "cocoapods-core: #{Pod::CORE_VERSION}\n"
 
         header += `xcodebuild -version`
+        header += "SDK: #{@xcode_settings['SDK_NAME']}\n" if @xcode_settings
 
         bundle_identifier = helper.expanded_build_setting config.target, "PRODUCT_BUNDLE_IDENTIFIER", config.configuration
         dev_team = helper.expanded_build_setting config.target, "DEVELOPMENT_TEAM", config.configuration
@@ -348,6 +371,23 @@ EOF
 
         report
       end
+
+      def load_settings_from_xcode
+        cmd = "#{base_xcodebuild_cmd} -scheme #{config.scheme}"
+        cmd += " -configuration #{config.configuration} -sdk #{config.sdk} -showBuildSettings"
+        @xcodebuild_showbuildsettings_output = ""
+        @xcode_settings = {}
+        Open3.popen2e(cmd) do |stdin, output, thread|
+          while (line = output.gets)
+            @xcodebuild_showbuildsettings_output += line
+            line.strip!
+            next unless (matches = /^(.+)\s+=\s+(.+)$/.match line)
+            @xcode_settings[matches[1]] = matches[2]
+          end
+          @xcodebuild_showbuildsettings_status = thread.value
+          return @xcodebuild_showbuildsettings_status.success?
+        end
+      end
     end
   end
 end

data/lib/branch_io_cli/configuration/report_configuration.rb

@@ -13,14 +13,14 @@ module BranchIOCLI
         @header_only = options.header_only
         @scheme = options.scheme
         @target = options.target
-        @configuration = options.configuration
         @report_path = options.out
         @sdk = options.sdk
         @pod_repo_update = options.pod_repo_update
 
         validate_xcodeproj_and_workspace options
-        validate_target options
         validate_scheme options
+        validate_target options
+        validate_configuration options
 
         # If neither --podfile nor --cartfile is present, arbitrarily look for a Podfile
         # first.
@@ -132,24 +132,32 @@ EOF
 
       def validate_scheme(options)
         schemes = all_schemes
-        # TODO: Prompt if --scheme specified but not found.
+
         if options.scheme && schemes.include?(options.scheme)
           @scheme = options.scheme
         elsif schemes.count == 1
           @scheme = schemes.first
+          say "Scheme #{options.scheme} not found. Using #{@scheme}." if options.scheme
         elsif !schemes.empty?
-          # By default, take a scheme with the same name as the target name.
-          return if (@scheme = schemes.find { |s| s == target.name })
+          # By default, take a scheme with the same name as the project name.
+          return if !options.scheme && (@scheme = schemes.find { |s| s == File.basename(xcodeproj_path, '.xcodeproj') })
 
-          say "Please specify one of the following for the --scheme argument:"
-          schemes.each do |scheme|
-            say " #{scheme}"
+          @scheme = choose do |menu|
+            menu.header = "Schemes from project"
+            schemes.each { |s| menu.choice s }
+            menu.prompt = "Please choose one of the schemes above. "
           end
-          exit 1
         else
           say "No scheme defined in project."
           exit(-1)
         end
+
+        return if options.target || xcscheme.nil?
+
+        # Find the target used when running the scheme if the user didn't specify one.
+        # This will be picked up in #validate_target
+        entry = xcscheme.build_action.entries.select(&:build_for_running?).first
+        options.target = entry.buildable_references.first.target_name
       end
 
       def all_schemes
@@ -159,6 +167,61 @@ EOF
           Xcodeproj::Project.schemes xcodeproj_path
         end
       end
+
+      def xcscheme
+        return @xcscheme if @xcscheme_checked
+        # This may not exist. If it comes back nil once, don't keep checking.
+        @xcscheme_checked = true
+        @xcscheme = scheme_with_name @scheme
+        @xcscheme
+      end
+
+      def scheme_with_name(scheme_name)
+        if workspace_path
+          project_path = workspace.schemes[@scheme]
+        else
+          project_path = xcodeproj_path
+        end
+
+        # Look for a shared scheme.
+        xcshareddata_path = File.join project_path, "xcshareddata", "xcschemes", "#{@scheme}.xcscheme"
+        scheme_path = xcshareddata_path if File.exist?(xcshareddata_path)
+
+        unless scheme_path
+          # Look for a local scheme
+          user = @xcode_settings["USER"] if @xcode_settings
+          user ||= ENV["USER"] || ENV["LOGNAME"]
+          xcuserdata_path = File.join project_path, "xcuserdata", "#{user}.xcuserdatad", "xcschemes", "#{@scheme}.xcscheme"
+          scheme_path = xcuserdata_path if File.exist?(xcuserdata_path)
+        end
+
+        return nil unless scheme_path
+
+        Xcodeproj::XCScheme.new(scheme_path)
+      end
+
+      def validate_configuration(options)
+        all_configs = xcodeproj.build_configurations.map(&:name)
+
+        if options.configuration && all_configs.include?(options.configuration)
+          @configuration = options.configuration
+        elsif options.configuration
+          say "Configuration #{options.configuration} not found."
+          @configuration = choose do |menu|
+            menu.header = "Configurations from project"
+            all_configs.each { |c| menu.choice c }
+            menu.prompt = "Please choose one of the above. "
+          end
+        end
+
+        return if @configuration
+
+        @configuration = "Debug" # Usual default for the launch action
+
+        return unless xcscheme
+
+        @configuration = xcscheme.launch_action.build_configuration
+      end
     end
   end
 end

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -375,18 +375,22 @@ module BranchIOCLI
         setting_value = target.resolved_build_setting(setting_name)[configuration]
         return if setting_value.nil?
 
+        expand_build_settings setting_value, target, configuration
+      end
+
+      def expand_build_settings(string, target, configuration)
         search_position = 0
-        while (matches = /\$\(([^(){}]*)\)|\$\{([^(){}]*)\}/.match(setting_value, search_position))
+        while (matches = /\$\(([^(){}]*)\)|\$\{([^(){}]*)\}/.match(string, search_position))
           macro_name = matches[1] || matches[2]
-          search_position = setting_value.index(macro_name) - 2
+          search_position = string.index(macro_name) - 2
 
           expanded_macro = macro_name == "SRCROOT" ? "." : expanded_build_setting(target, macro_name, configuration)
           search_position += macro_name.length + 3 and next if expanded_macro.nil?
 
-          setting_value.gsub!(/\$\(#{macro_name}\)|\$\{#{macro_name}\}/, expanded_macro)
+          string.gsub!(/\$\(#{macro_name}\)|\$\{#{macro_name}\}/, expanded_macro)
           search_position += expanded_macro.length
         end
-        setting_value
+        string
       end
 
       def add_cocoapods(options)

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList