branch_io_cli 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0daf95d93295d62f31315a658b57fc4907530d6f4a1b6dc1fef5366a18d78e
-  data.tar.gz: 63c2469083e71c37a99ebcaeabc67eb11e76efa2ad2ddf7210c66b2daad1aced
+  metadata.gz: a1614c75a346bfa728be2437d7e729a54c381199c1786699210defc36a33e390
+  data.tar.gz: '0334849b987d626b6e606972c552a1ae2e737aad2746b96519da1402a8a48c85'
 SHA512:
-  metadata.gz: bda3669c526febfb881867e4f583340ee8d3450d2683d7d3631fca1b8719e44ed73b5d2ff9b93ca415243e92c4675e76014e5938b029bf5c2e3276b3a09ed47f
-  data.tar.gz: be88db9e6b26f92a18a9aac27d6004f82fdc9e63cc6cb06c039a1edc97cce206788531c650b9aff4fbb40f94cbd1238551e47c263b2b015b1fadbb8dde7b8121
+  metadata.gz: d6ddacc36d94b84d8fa6f90b7a80c1964915e9a3b174d2d0928b53be0112cc31de7758a0f441e7c89adb1d0ce3baea2cb74ed5d7b4220dc770b43664ccfb512f
+  data.tar.gz: 29f548ba0c9c57583682f80c0f633cd8ef837f342342ba32ba8472a6f55554efe7a92b38e98ab5902c08c5bc39097251436fade3e53e542af8d0a41c52cc6603

data/lib/assets/completions/completion.bash

@@ -1,4 +1,5 @@
 #!/bin/bash
+# This file is generated. Run rake readme to regenerate it.
 
 _branch_io_complete()
 {
@@ -8,19 +9,16 @@ _branch_io_complete()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     cmd="${COMP_WORDS[1]}"
 
-    commands="report setup validate"
+    commands="setup report validate"
     global_opts="-h --help -t --trace -v --version"
 
-    setup_opts="$global_opts -L --live-key -T --test-key -D --domains --app-link-subdomain -U --uri-scheme"
-    setup_opts="$setup_opts --xcodeproj --target --frameworks --podfile --cartfile --carthage-command --setting -s"
-    setup_opts="$setup_opts --test-configurations --no-test-configurations --no-check-repo-changes --no-confirm"
-    # Don't autocomplete the default values here, e.g. --no-force, --pod-repo-update.
-    setup_opts="$setup_opts --no-add-sdk --no-validate --force --no-pod-repo-update --commit --no-patch-source"
 
-    validate_opts="$global_opts -D --domains --xcodeproj --target"
+    setup_opts="-L --live-key -T --test-key -D --domains --app-link-subdomain -U --uri-scheme -s --setting --test-configurations --xcodeproj --target --podfile --cartfile --carthage-command --frameworks --no-pod-repo-update --no-validate --force --no-add-sdk --no-patch-source --commit --no-confirm"
+
+    report_opts="--workspace --xcodeproj --scheme --target --configuration --sdk --podfile --cartfile --no-clean -H --header-only --no-pod-repo-update -o --out"
+
+    validate_opts="-D --domains --xcodeproj --target"
 
-    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
       case "${cmd}" in

data/lib/assets/completions/completion.zsh

@@ -1,14 +1,11 @@
 #!/bin/zsh
+# This file is generated. Run rake readme to regenerate it.
 
 _branch_io_complete() {
   local word opts
   word="$1"
   opts="-h --help -t --trace -v --version"
-  opts="$opts -L --live-key -T --test-key -D --domains --app-link-subdomain -U --uri-scheme"
-  opts="$opts --xcodeproj --target --frameworks --podfile --cartfile --carthage-command --setting -s"
-  opts="$opts --test-configurations --no-test-configurations --no-check-repo-changes --no-confirm"
-  # Don't autocomplete the default values here, e.g. --no-force, --pod-repo-update.
-  opts="$opts --no-add-sdk --no-validate --force --no-pod-repo-update --commit --no-patch-source"
+  opts = "$opts -L --live-key -T --test-key -D --domains --app-link-subdomain -U --uri-scheme -s --setting --test-configurations --xcodeproj --target --podfile --cartfile --carthage-command --frameworks --no-pod-repo-update --no-validate --force --no-add-sdk --no-patch-source --commit --no-confirm"
 
   reply=( "${(ps: :)opts}" )
 }

data/lib/assets/templates/completion.bash.erb

@@ -0,0 +1,42 @@
+#!/bin/bash
+# This file is generated. Run rake readme to regenerate it.
+
+_branch_io_complete()
+{
+    local cur prev opts global_opts setup_opts validate_opts commands cmd
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    cmd="${COMP_WORDS[1]}"
+
+    commands="<%= all_commands.join (' ') %>"
+    global_opts="-h --help -t --trace -v --version"
+
+<% all_commands.each do |command| %>
+    <%= %(#{command}_opts="#{options_for_command command}") %>
+<% end %>
+
+    if [[ ${cur} == -* ]] ; then
+      case "${cmd}" in
+        report)
+          opts=$report_opts
+          ;;
+        setup)
+          opts=$setup_opts
+          ;;
+        validate)
+          opts=$validate_opts
+          ;;
+        *)
+          opts=$global_opts
+          ;;
+      esac
+      COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    elif [[ ${prev} == branch_io ]] ; then
+      COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) )
+    else
+      COMPREPLY=( $(compgen -o default ${cur}) )
+    fi
+    return 0
+}
+complete -F _branch_io_complete branch_io

data/lib/assets/templates/completion.zsh.erb

@@ -0,0 +1,13 @@
+#!/bin/zsh
+# This file is generated. Run rake readme to regenerate it.
+
+_branch_io_complete() {
+  local word opts
+  word="$1"
+  opts="-h --help -t --trace -v --version"
+  <%= %(opts = "$opts #{options_for_command 'setup'}") %>
+
+  reply=( "${(ps: :)opts}" )
+}
+
+compctl -K _branch_io_complete branch_io

data/lib/branch_io_cli/configuration/configuration.rb

@@ -61,10 +61,12 @@ module BranchIOCLI
       attr_reader :workspace
       attr_reader :workspace_path
       attr_reader :pod_repo_update
+      attr_reader :sdk
 
       def initialize(options)
         @options = options
         @pod_repo_update = options.pod_repo_update if self.class.available_options.map(&:name).include?(:pod_repo_update)
+        @sdk = "iphonesimulator" # to load Xcode build settings for commands without a --sdk option
 
         Configuration.current = self
 
@@ -359,7 +361,7 @@ EOF
         return @branch_imports if @branch_imports
 
         source_files = target.source_build_phase.files.map { |f| f.file_ref.real_path.to_s }
-        source_files << bridging_header_path if bridging_header_path
+        source_files << bridging_header_path if bridging_header_path && File.exist?(bridging_header_path)
         @branch_imports = source_files.compact.map do |f|
           imports = branch_imports_from_file f
           next {} if imports.empty?
@@ -377,6 +379,10 @@ EOF
           imports << "#{line_no}: #{line.chomp}"
         end
         imports
+      rescue StandardError
+        # Quietly ignore anything that can't be opened for now.
+        # TODO: Get these errors into report output.
+        []
       end
 
       def method_missing(method_sym, *arguments, &block)

data/lib/branch_io_cli/configuration/xcode_settings.rb

@@ -29,6 +29,7 @@ module BranchIOCLI
 
       def initialize(configuration)
         @configuration = configuration
+
         load_settings_from_xcode
       end
 

data/lib/branch_io_cli/format.rb

@@ -1,5 +1,6 @@
 require "branch_io_cli/format/highline_format"
 require "branch_io_cli/format/markdown_format"
+require "branch_io_cli/format/shell_format"
 
 module BranchIOCLI
   module Format

data/lib/branch_io_cli/format/shell_format.rb

@@ -0,0 +1,34 @@
+module BranchIOCLI
+  module Format
+    module ShellFormat
+      include Format
+
+      def option(opt)
+        o = @configuration.available_options.find { |o1| o1.name == opt.to_sym }
+
+        cli_opt = opt.to_s.gsub(/_/, '-')
+
+        all_opts = o.aliases || []
+
+        if o.nil? || o.default_value.nil? || o.default_value != true
+          all_opts << "--#{cli_opt}"
+        else
+          all_opts << "--no-#{cli_opt}"
+        end
+
+        all_opts.join(" ")
+      end
+
+      def all_commands
+        Dir[File.expand_path(File.join("..", "..", "command", "**_command.rb"), __FILE__)].map { |p| p.sub(%r{^.*/([a-z0-9_]+)_command.rb$}, '\1') }
+      end
+
+      def options_for_command(command)
+        @configuration = Object.const_get("BranchIOCLI")
+                               .const_get("Configuration")
+                               .const_get("#{command.capitalize}Configuration")
+        @configuration.available_options.map { |o| option(o.name) }.join(" ")
+      end
+    end
+  end
+end

data/lib/branch_io_cli/helper/report_helper.rb

@@ -168,11 +168,11 @@ module BranchIOCLI
               report += "  Branch key(s) #{annotation}:\n"
               if branch_key.kind_of? Hash
                 branch_key.each_key do |key|
-                  resolved_key = helper.expand_build_settings branch_key[key], config.target, configuration
+                  resolved_key = config.target.expand_build_settings branch_key[key], configuration
                   report += "   #{key.capitalize}: #{resolved_key}\n"
                 end
               elsif branch_key
-                resolved_key = helper.expand_build_settings branch_key, config.target, configuration
+                resolved_key = config.target.expand_build_settings branch_key, configuration
                 report += "   #{resolved_key}\n"
               else
                 report += "   (none found)\n"

data/lib/branch_io_cli/helper/xcodeproj_ext.rb

@@ -72,7 +72,13 @@ module Xcodeproj
             setting_value = resolved_build_setting(setting_name, false)[configuration]
           end
 
-          return if setting_value.nil?
+          # TODO: What is the correct resolution order here? Which overrides which in
+          # Xcode?
+          if setting_value.nil? && defined?(BranchIOCLI::Configuration::XcodeSettings)
+            setting_value = BranchIOCLI::Configuration::XcodeSettings[configuration][setting_name]
+          end
+
+          return nil if setting_value.nil?
 
           expand_build_settings setting_value, configuration
         end
@@ -89,13 +95,10 @@ module Xcodeproj
           search_position = 0
           string = string.clone
 
-          # HACK: When matching against an xcconfig, as here, sometimes the macro is just returned
-          # without delimiters, e.g. TARGET_NAME or BUILT_PRODUCTS_DIR/Branch.framework. We allow
-          # these two patterns for now.
-          while (matches = %r{\$\(([^(){}]*)\)|\$\{([^(){}]*)\}|^([A-Z_]+)(/.*)?$}.match(string, search_position))
-            original_macro = matches[1] || matches[2] || matches[3]
-            delimiter_length = matches[3] ? 0 : 3 # $() or ${}
-            delimiter_offset = matches[3] ? 0 : 2 # $( or ${
+          while (matches = /\$\(([^(){}]*)\)|\$\{([^(){}]*)\}/.match(string, search_position))
+            original_macro = matches[1] || matches[2]
+            delimiter_length = 3 # $() or ${}
+            delimiter_offset = 2 # $( or ${
             search_position = string.index(original_macro) - delimiter_offset
 
             if (m = /^(.+):(.+)$/.match original_macro)
@@ -118,6 +121,15 @@ module Xcodeproj
             string.gsub!(/\$\(#{original_macro}\)|\$\{#{original_macro}\}|^#{original_macro}/, expanded_macro)
             search_position += expanded_macro.length
           end
+
+          # HACK: When matching against an xcconfig, as here, sometimes the macro is just returned
+          # without delimiters, e.g. TARGET_NAME or PROJECT_DIR/PROJECT_NAME/BridgingHeader.h. We allow
+          # these two patterns for now.
+          string = string.split("/").map do |component|
+            next component unless component =~ /^[A-Z0-9_]+$/
+            expanded_build_setting(component, configuration) || component
+          end.join("/")
+
           string
         end
       end

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -288,6 +288,8 @@ files:
 - lib/assets/patches/open_url_swift.yml
 - lib/assets/patches/swift_import.yml
 - lib/assets/templates/command.erb
+- lib/assets/templates/completion.bash.erb
+- lib/assets/templates/completion.zsh.erb
 - lib/assets/templates/program_description.erb
 - lib/assets/templates/report_description.erb
 - lib/assets/templates/setup_description.erb
@@ -313,6 +315,7 @@ files:
 - lib/branch_io_cli/format.rb
 - lib/branch_io_cli/format/highline_format.rb
 - lib/branch_io_cli/format/markdown_format.rb
+- lib/branch_io_cli/format/shell_format.rb
 - lib/branch_io_cli/helper.rb
 - lib/branch_io_cli/helper/android_helper.rb
 - lib/branch_io_cli/helper/branch_helper.rb