branch_io_cli 0.11.0 → 0.12.0

data/lib/branch_io_cli/helper/methods.rb

@@ -25,8 +25,24 @@ module BranchIOCLI
         status = output.log_command command
         raise CommandError, [%{Error executing "#{command}": #{status}.}, status] unless status.success?
       end
+
+      # Clear the screen and move the cursor to the top using highline
+      def clear
+        say "\e[2J\e[H"
+      end
+
+      # Ask a yes/no question with a default
+      def confirm(question, default_value)
+        yn_opts = default_value ? "Y/n" : "y/N"
+        value = ask "#{question} (#{yn_opts}) ", nil
+
+        # Convert to true/false
+        dummy_option = Configuration::Option.new({})
+        value = dummy_option.convert(value)
+
+        return default_value if value.nil? || value.kind_of?(String)
+        value
+      end
     end
   end
 end
-
-include BranchIOCLI::Helper::Methods

data/lib/branch_io_cli/helper/report_helper.rb

@@ -6,6 +6,8 @@ module BranchIOCLI
   module Helper
     class ReportHelper
       class << self
+        include Methods
+
         def report_imports
           report = "Branch imports:\n"
           config.branch_imports.each_key do |path|
@@ -57,9 +59,9 @@ module BranchIOCLI
           configuration = config.configuration || config.configurations_from_scheme.first
           configurations = config.configuration ? [config.configuration] : config.configurations_from_scheme
 
-          bundle_identifier = helper.expanded_build_setting config.target, "PRODUCT_BUNDLE_IDENTIFIER", configuration
-          dev_team = helper.expanded_build_setting config.target, "DEVELOPMENT_TEAM", configuration
-          entitlements_path = helper.expanded_build_setting config.target, "CODE_SIGN_ENTITLEMENTS", configuration
+          bundle_identifier = config.target.expanded_build_setting "PRODUCT_BUNDLE_IDENTIFIER", configuration
+          dev_team = config.target.expanded_build_setting "DEVELOPMENT_TEAM", configuration
+          entitlements_path = config.target.expanded_build_setting "CODE_SIGN_ENTITLEMENTS", configuration
 
           header += "\nTarget #{config.target.name}:\n"
           header += " Bundle identifier: #{bundle_identifier || '(none)'}\n"
@@ -71,7 +73,7 @@ module BranchIOCLI
 
           header += " Info.plist\n"
           configurations.each do |c|
-            header += "  #{c}: #{helper.expanded_build_setting config.target, 'INFOPLIST_FILE', c}\n"
+            header += "  #{c}: #{config.target.expanded_build_setting 'INFOPLIST_FILE', c}\n"
           end
 
           header += " Entitlements file: #{config.relative_path(entitlements_path) || '(none)'}\n"
@@ -151,7 +153,7 @@ module BranchIOCLI
 
           configurations.each do |configuration|
             report += " #{configuration}:\n"
-            infoplist_path = helper.expanded_build_setting config.target, "INFOPLIST_FILE", configuration
+            infoplist_path = config.target.expanded_build_setting "INFOPLIST_FILE", configuration
             infoplist_path = File.expand_path infoplist_path, File.dirname(config.xcodeproj_path)
 
             begin
@@ -215,9 +217,10 @@ module BranchIOCLI
           return unless config.pod_install_required?
           # Only if a Podfile is detected/supplied at the command line.
           say "pod install required in order to build."
-          install = ask %{Run "pod install" now (Y/n)? }
-          if install.downcase =~ /^n/
-            say %{Please run "pod install" or "pod update" first in order to continue.}
+          install = confirm 'Run "pod install" now?', true
+
+          unless install
+            say 'Please run "pod install" or "pod update" first in order to continue.'
             exit(-1)
           end
 

data/lib/branch_io_cli/helper/util.rb

@@ -0,0 +1,7 @@
+module BranchIOCLI
+  module Helper
+    class Util
+      extend Methods
+    end
+  end
+end

data/lib/branch_io_cli/helper/xcodeproj_ext.rb

@@ -0,0 +1,126 @@
+require "xcodeproj"
+
+module Xcodeproj
+  class Project
+    # Local override to allow for user schemes.
+    #
+    # Get list of shared and user schemes in project
+    #
+    # @param [String] path
+    #         project path
+    #
+    # @return [Array]
+    #
+    def self.schemes(project_path)
+      base_dirs = [File.join(project_path, 'xcshareddata', 'xcschemes'),
+                   File.join(project_path, 'xcuserdata', "#{ENV['USER']}.xcuserdatad", 'xcschemes')]
+
+      # Take any .xcscheme file from base_dirs
+      schemes = base_dirs.inject([]) { |memo, dir| memo + Dir[File.join dir, '*.xcscheme'] }
+                         .map { |f| File.basename(f, '.xcscheme') }
+
+      # Include any scheme defined in the xcschememanagement.plist, if it exists.
+      base_dirs.map { |d| File.join d, 'xcschememanagement.plist' }
+               .select { |f| File.exist? f }.each do |plist_path|
+        plist = File.open(plist_path) { |f| ::Plist.parse_xml f }
+        scheme_user_state = plist["SchemeUserState"]
+        schemes += scheme_user_state.keys.map { |k| File.basename k, '.xcscheme' }
+      end
+
+      schemes.uniq!
+      if schemes.empty? && File.exist?(project_path)
+        # Open the project, get all targets. Add one scheme per target.
+        project = self.open project_path
+        schemes += project.targets.reject(&:test_target_type?).map(&:name)
+      elsif schemes.empty?
+        schemes << File.basename(project_path, '.xcodeproj')
+      end
+      schemes
+    end
+
+    module Object
+      class PBXNativeTarget
+        # List of build settings with values not present in the configuration.
+        #
+        # @return [Hash] A hash of fixed build settings
+        def fixed_build_settings
+          {
+            "SRCROOT" => ".",
+            "TARGET_NAME" => name
+          }
+        end
+
+        # Layer on top of #resolved_build_setting to recursively expand all
+        # build settings as they would be resolved in Xcode. Calls
+        # #expand_build_settings on the value returned by
+        # #resolved_build_setting, with the exception of anything defined
+        # in #fixed_build_settings. Those settings are returned directly.
+        #
+        # @param setting_name [String] Name of any valid build setting for this target
+        # @param configuration [String] Name of any valid configuration for this target
+        # @return [String, nil] The build setting value with all embedded settings expanded or nil if not found
+        def expanded_build_setting(setting_name, configuration)
+          fixed_setting = fixed_build_settings[setting_name]
+          return fixed_setting.clone if fixed_setting
+
+          # second arg true means if there is an xcconfig, also consult that
+          begin
+            setting_value = resolved_build_setting(setting_name, true)[configuration]
+          rescue Errno::ENOENT
+            # If not found, look up without it. Unresolved settings will be passed
+            # unmodified, e.g. $(UNRESOLVED_SETTING_NAME).
+            setting_value = resolved_build_setting(setting_name, false)[configuration]
+          end
+
+          return if setting_value.nil?
+
+          expand_build_settings setting_value, configuration
+        end
+
+        # Recursively resolves build settings in any string for the given
+        # configuration. This includes xcconfig expansion and handling for the
+        # :rfc1034identifier. Unresolved settings are passed unchanged, e.g.
+        # $(UNRESOLVED_SETTING_NAME).
+        #
+        # @param string [String] Any string that may include build settings to be resolved
+        # @param configuration [String] Name of any valid configuration for this target
+        # @return [String] A copy of the original string with all embedded build settings expanded
+        def expand_build_settings(string, configuration)
+          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 ${
+            search_position = string.index(original_macro) - delimiter_offset
+
+            if (m = /^(.+):(.+)$/.match original_macro)
+              macro_name = m[1]
+              modifier = m[2]
+            else
+              macro_name = original_macro
+            end
+
+            expanded_macro = expanded_build_setting macro_name, configuration
+
+            search_position += original_macro.length + delimiter_length and next if expanded_macro.nil?
+
+            # From the Apple dev portal when creating a new app ID:
+            # You cannot use special characters such as @, &, *, ', "
+            # From trial and error with Xcode, it appears that only letters, digits and hyphens are allowed.
+            # Everything else becomes a hyphen, including underscores.
+            expanded_macro.gsub!(/[^A-Za-z0-9-]/, '-') if modifier == "rfc1034identifier"
+
+            string.gsub!(/\$\(#{original_macro}\)|\$\{#{original_macro}\}|^#{original_macro}/, expanded_macro)
+            search_position += expanded_macro.length
+          end
+          string
+        end
+      end
+    end
+  end
+end

data/lib/branch_io_cli/rake_task.rb

@@ -23,7 +23,7 @@ module BranchIOCLI
 
         paths.each do |path|
           Dir.chdir(path) do |p|
-            Command::ReportCommand.new(Configuration::ReportConfiguration.wrapper(args[:options] || {})).run!
+            Command::ReportCommand.new(Configuration::ReportConfiguration.wrapper(args[:options])).run!
           end
         end
       end
@@ -37,7 +37,7 @@ module BranchIOCLI
 
         paths.each do |path|
           Dir.chdir(path) do |p|
-            Command::SetupCommand.new(Configuration::SetupConfiguration.wrapper(args[:options] || {})).run!
+            Command::SetupCommand.new(Configuration::SetupConfiguration.wrapper(args[:options])).run!
           end
         end
       end

data/lib/branch_io_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -311,7 +311,7 @@ files:
 - lib/branch_io_cli/core_ext/io.rb
 - lib/branch_io_cli/core_ext/regexp.rb
 - lib/branch_io_cli/format.rb
-- lib/branch_io_cli/format/commander_format.rb
+- lib/branch_io_cli/format/highline_format.rb
 - lib/branch_io_cli/format/markdown_format.rb
 - lib/branch_io_cli/helper.rb
 - lib/branch_io_cli/helper/android_helper.rb
@@ -320,6 +320,8 @@ files:
 - lib/branch_io_cli/helper/methods.rb
 - lib/branch_io_cli/helper/patch_helper.rb
 - lib/branch_io_cli/helper/report_helper.rb
+- lib/branch_io_cli/helper/util.rb
+- lib/branch_io_cli/helper/xcodeproj_ext.rb
 - lib/branch_io_cli/rake_task.rb
 - lib/branch_io_cli/version.rb
 homepage: http://github.com/BranchMetrics/branch_io_cli