branch_io_cli 0.12.2 → 0.12.3

data/lib/branch_io_cli/core_ext/regexp.rb

@@ -11,4 +11,8 @@ class Regexp
 
     match contents
   end
+
+  def match_file?(file)
+    !match_file(file).nil?
+  end
 end

data/lib/branch_io_cli/format/markdown_format.rb

@@ -54,9 +54,7 @@ module BranchIOCLI
       end
 
       def render_command(name)
-        @command = Object.const_get("BranchIOCLI")
-                         .const_get("Command")
-                         .const_get("#{name.to_s.capitalize}Command")
+        @command = BranchIOCLI::Command.const_get("#{name.to_s.capitalize}Command")
         render :command
       end
     end

data/lib/branch_io_cli/format/shell_format.rb

@@ -24,9 +24,7 @@ module BranchIOCLI
       end
 
       def options_for_command(command)
-        @configuration = Object.const_get("BranchIOCLI")
-                               .const_get("Configuration")
-                               .const_get("#{command.capitalize}Configuration")
+        @configuration = BranchIOCLI::Configuration.const_get("#{command.capitalize}Configuration")
         @configuration.available_options.map { |o| option(o.name) }.join(" ")
       end
     end

data/lib/branch_io_cli/helper.rb

@@ -2,5 +2,5 @@ require "branch_io_cli/helper/branch_helper"
 require "branch_io_cli/helper/methods"
 require "branch_io_cli/helper/patch_helper"
 require "branch_io_cli/helper/report_helper"
+require "branch_io_cli/helper/tool_helper"
 require "branch_io_cli/helper/util"
-require "branch_io_cli/helper/xcodeproj_ext"

data/lib/branch_io_cli/helper/branch_helper.rb

@@ -67,14 +67,6 @@ module BranchIOCLI
             end
           end
         end
-
-        def ensure_directory(path)
-          return if path == "/" || path == "."
-          parent = File.dirname path
-          ensure_directory parent
-          return if Dir.exist? path
-          Dir.mkdir path
-        end
       end
     end
   end

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -1,13 +1,6 @@
-require "cocoapods-core"
 require "json"
-require "net/http"
 require "openssl"
-require "pathname"
-require "pattern_patch"
 require "plist"
-require "shellwords"
-require "tmpdir"
-require "zip"
 
 require "branch_io_cli/configuration"
 require "branch_io_cli/helper/methods"
@@ -397,318 +390,6 @@ module BranchIOCLI
 
         associated_domains.select { |d| d =~ /^applinks:/ }.map { |d| d.sub(/^applinks:/, "") }
       end
-
-      def add_cocoapods(options)
-        verify_cocoapods
-
-        podfile_path = options.podfile_path
-
-        install_command = "pod install"
-        install_command += " --repo-update" if options.pod_repo_update
-        Dir.chdir(File.dirname(podfile_path)) do
-          sh "pod init"
-          PatternPatch::Patch.new(
-            regexp: /^(\s*)# Pods for #{options.target.name}$/,
-            mode: :append,
-            text: "\n\\1pod \"Branch\""
-          ).apply podfile_path
-          # Store a Pod::Podfile representation of this file.
-          options.open_podfile
-          sh install_command
-        end
-
-        return unless options.commit
-
-        add_change podfile_path
-        add_change "#{podfile_path}.lock"
-
-        # For now, add Pods folder to SCM.
-        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
-        workspace_path = Pathname.new(File.expand_path(options.xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
-        podfile_pathname = Pathname.new(podfile_path).relative_path_from Pathname.pwd
-        add_change pods_folder_path
-        add_change workspace_path
-
-        sh [
-          "git",
-          "add",
-          podfile_pathname,
-          "#{podfile_pathname}.lock",
-          pods_folder_path,
-          workspace_path
-        ]
-      end
-
-      def add_carthage(options)
-        # TODO: Collapse this and Command::update_cartfile
-        verify_carthage
-
-        # 1. Generate Cartfile
-        cartfile_path = options.cartfile_path
-        File.open(cartfile_path, "w") do |file|
-          file.write <<EOF
-github "BranchMetrics/ios-branch-deep-linking"
-EOF
-        end
-
-        # 2. carthage update
-        Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{options.carthage_command}"
-        end
-
-        # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
-        add_change cartfile_path
-        add_change "#{cartfile_path}.resolved"
-        add_change options.xcodeproj_path
-
-        # 4. Add to target dependencies
-        frameworks_group = options.xcodeproj.frameworks_group
-        branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = options.target
-        target.frameworks_build_phase.add_file_reference branch_framework
-
-        # 5. Create a copy-frameworks build phase
-        carthage_build_phase = target.new_shell_script_build_phase "carthage copy-frameworks"
-        carthage_build_phase.shell_script = "/usr/local/bin/carthage copy-frameworks"
-
-        carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
-        carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
-
-        update_framework_search_paths "$(SRCROOT)/Carthage/Build/iOS"
-
-        options.xcodeproj.save
-
-        return unless options.commit
-
-        # For now, add Carthage folder to SCM
-
-        # 6. Add the Carthage folder to the commit (in case :commit param specified)
-        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from(Pathname.pwd)
-        cartfile_pathname = Pathname.new(cartfile_path).relative_path_from Pathname.pwd
-        add_change carthage_folder_path
-        sh ["git", "add", cartfile_pathname, "#{cartfile_pathname}.resolved", carthage_folder_path]
-      end
-
-      def add_direct(options)
-        # Put the framework in the path for any existing Frameworks group in the project.
-        frameworks_group = options.xcodeproj.frameworks_group
-        framework_path = File.join frameworks_group.real_path, "Branch.framework"
-        raise "#{framework_path} exists." if File.exist? framework_path
-
-        say "Finding current framework release"
-
-        # Find the latest release from GitHub.
-        releases = JSON.parse fetch "https://api.github.com/repos/BranchMetrics/ios-branch-deep-linking/releases"
-        current_release = releases.first
-        # Get the download URL for the framework.
-        framework_asset = current_release["assets"][0]
-        framework_url = framework_asset["browser_download_url"]
-
-        say "Downloading Branch.framework v. #{current_release['tag_name']} (#{framework_asset['size']} bytes zipped)"
-
-        Dir.mktmpdir do |download_folder|
-          zip_path = File.join download_folder, "Branch.framework.zip"
-
-          File.unlink zip_path if File.exist? zip_path
-
-          # Download the framework zip
-          download framework_url, zip_path
-
-          say "Unzipping Branch.framework"
-
-          # Unzip
-          Zip::File.open zip_path do |zip_file|
-            # Start with just the framework and add dSYM, etc., later
-            zip_file.glob "Carthage/Build/iOS/Branch.framework/**/*" do |entry|
-              filename = entry.name.sub %r{^Carthage/Build/iOS}, frameworks_group.real_path.to_s
-              ensure_directory File.dirname filename
-              entry.extract filename
-            end
-          end
-        end
-
-        # Now the current framework is in framework_path
-
-        say "Adding to #{options.xcodeproj_path}"
-
-        # Add as a dependency in the Frameworks group
-        framework = frameworks_group.new_file "Branch.framework" # relative to frameworks_group.real_path
-        options.target.frameworks_build_phase.add_file_reference framework, true
-
-        update_framework_search_paths "$(SRCROOT)"
-
-        options.xcodeproj.save
-
-        add_change options.xcodeproj_path
-        add_change framework_path
-        sh ["git", "add", framework_path] if options.commit
-
-        say "Done. ✅"
-      end
-
-      def update_framework_search_paths(path)
-        # Make sure this is in the FRAMEWORK_SEARCH_PATHS if we just added it.
-        if config.xcodeproj.frameworks_group.files.count == 1
-          target = config.target
-          target.build_configurations.each do |c|
-            # this accounts for project-level settings as well
-            setting = target.resolved_build_setting("FRAMEWORK_SEARCH_PATHS")[c.name] || []
-            next if setting.include?(path) || setting.include?("#{path}/**")
-            setting << path
-
-            c.build_settings["FRAMEWORK_SEARCH_PATHS"] = setting
-          end
-        end
-        # If it already existed, it's almost certainly already in FRAMEWORK_SEARCH_PATHS.
-      end
-
-      def update_podfile(options)
-        verify_cocoapods
-
-        podfile_path = options.podfile_path
-        return false if podfile_path.nil?
-
-        # 1. Patch Podfile. Return if no change (Branch pod already present).
-        return false unless PatchHelper.patch_podfile podfile_path
-
-        # 2. pod install
-        # command = "PATH='#{ENV['PATH']}' pod install"
-        command = 'pod install'
-        command += ' --repo-update' if options.pod_repo_update
-
-        Dir.chdir(File.dirname(podfile_path)) do
-          sh command
-        end
-
-        # 3. Add Podfile and Podfile.lock to commit (in case :commit param specified)
-        add_change podfile_path
-        add_change "#{podfile_path}.lock"
-
-        # 4. Check if Pods folder is under SCM
-        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
-        `git ls-files #{pods_folder_path.to_s.shellescape} --error-unmatch > /dev/null 2>&1`
-        return true unless $?.exitstatus == 0
-
-        # 5. If so, add the Pods folder to the commit (in case :commit param specified)
-        add_change pods_folder_path
-        sh ["git", "add", pods_folder_path] if options.commit
-
-        true
-      end
-
-      def update_cartfile(options, project)
-        verify_carthage
-
-        cartfile_path = options.cartfile_path
-        return false if cartfile_path.nil?
-
-        # 1. Patch Cartfile. Return if no change (Branch already present).
-        return false unless PatchHelper.patch_cartfile cartfile_path
-
-        # 2. carthage update
-        Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{options.carthage_command} ios-branch-deep-linking"
-        end
-
-        # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
-        add_change cartfile_path
-        add_change "#{cartfile_path}.resolved"
-        add_change options.xcodeproj_path
-
-        # 4. Add to target dependencies
-        frameworks_group = project.frameworks_group
-        branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = options.target
-        target.frameworks_build_phase.add_file_reference branch_framework
-
-        # 5. Add to copy-frameworks build phase
-        carthage_build_phase = target.build_phases.find do |phase|
-          phase.respond_to?(:shell_script) && phase.shell_script =~ /carthage\s+copy-frameworks/
-        end
-
-        if carthage_build_phase
-          carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
-          carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
-        end
-
-        # 6. Check if Carthage folder is under SCM
-        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from Pathname.pwd
-        `git ls-files #{carthage_folder_path.to_s.shellescape} --error-unmatch > /dev/null 2>&1`
-        return true unless $?.exitstatus == 0
-
-        # 7. If so, add the Carthage folder to the commit (in case :commit param specified)
-        add_change carthage_folder_path
-        sh ["git", "add", carthage_folder_path] if options.commit
-
-        true
-      end
-
-      def verify_cocoapods
-        pod_cmd = `which pod`
-        return unless pod_cmd.empty?
-
-        gem_cmd = `which gem`
-        if gem_cmd.empty?
-          say "'pod' command not available in PATH and 'gem' command not available in PATH to install cocoapods."
-          exit(-1)
-        end
-
-        install = confirm "'pod' command not available in PATH. Install cocoapods (may require a sudo password)?", true
-        unless install
-          say "Please install cocoapods or use --no-add-sdk to continue."
-          exit(-1)
-        end
-
-        gem_home = Gem.dir
-        if gem_home && File.writable?(gem_home)
-          sh "gem install cocoapods"
-        else
-          sh "sudo gem install cocoapods"
-        end
-
-        # Ensure master podspec repo is set up (will update if it exists).
-        sh "pod setup"
-      end
-
-      def verify_carthage
-        carthage_cmd = `which carthage`
-        return unless carthage_cmd.empty?
-
-        brew_cmd = `which brew`
-        if brew_cmd.empty?
-          say "'carthage' command not available in PATH and 'brew' command not available in PATH to install 'carthage'."
-          exit(-1)
-        end
-
-        install = confirm "'carthage' command not available in PATH. Use Homebrew to install carthage?", true
-        unless install
-          say "Please install carthage or use --no-add-sdk to continue."
-          exit(-1)
-        end
-
-        sh "brew install carthage"
-      end
-
-      def verify_git
-        return unless config.commit
-
-        git_cmd = `which git`
-        return unless git_cmd.empty?
-
-        xcode_select_path = `which xcode-select`
-        if xcode_select_path.empty?
-          say "'git' command not available in PATH and 'xcode-select' command not available in PATH to install 'git'."
-          exit(-1)
-        end
-
-        install = confirm "'git' command not available in PATH. Install Xcode command-line tools (requires password)?", true
-        unless install
-          say "Please install Xcode command tools or leave out the --commit option to continue."
-          exit(-1)
-        end
-
-        sh "xcode-select --install"
-      end
     end
   end
 end

data/lib/branch_io_cli/helper/methods.rb

@@ -3,9 +3,18 @@ module BranchIOCLI
     class CommandError < RuntimeError
       attr_reader :status
       def initialize(args)
-        message, status = *args
+        @args = args.first
+        @status = args.second
         super message
-        @status = status
+      end
+
+      def message
+        if @args.count == 1
+          return @args.first.shelljoin if @args.first.kind_of?(Array)
+          return @args.first.to_s
+        else
+          return @args.shelljoin
+        end
       end
     end
 
@@ -13,17 +22,12 @@ module BranchIOCLI
       # Execute a shell command with reporting.
       # The command itself is logged, then output from
       # both stdout and stderr, then a success or failure
-      # message. Raises CommandError on error.
-      #
-      # If output is STDOUT (the default), no redirection occurs. In all
-      # other cases, both stdout and stderr are redirected to output.
-      # In these cases, formatting (colors, highlights) may be lost.
+      # message. Raises CommandError on error. No redirection occurs.
       #
       # @param command [String, Array] A shell command to execute
-      # @param output [IO] An optional IO object to receive stdout and stderr from the command
-      def sh(command, output = STDOUT)
-        status = output.log_command command
-        raise CommandError, [%{Error executing "#{command}": #{status}.}, status] unless status.success?
+      def sh(*command)
+        status = STDOUT.sh(*command)
+        raise CommandError, [command, status] unless status.success?
       end
 
       # Clear the screen and move the cursor to the top using highline

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -31,7 +31,7 @@ module BranchIOCLI
           # Can't just check for the import here, since there may be a bridging header.
           # This may match branch.initSession (if the Branch instance is stored) or
           # Branch.getInstance().initSession, etc.
-          !/branch.*initsession|^\s*import\s+branch/i.match_file(path).nil?
+          /branch.*initsession|^\s*import\s+branch/i.match_file? path
         end
 
         def patch_bridging_header
@@ -53,10 +53,10 @@ module BranchIOCLI
 
           say "Patching #{config.bridging_header_path}"
 
-          if /^\s*(#import|#include|@import)/.match_file config.bridging_header_path
+          if /^\s*(#import|#include|@import)/.match_file? config.bridging_header_path
             # Add among other imports
             patch(:objc_import).apply config.bridging_header_path
-          elsif /\n\s*#ifndef\s+(\w+).*\n\s*#define\s+\1.*?\n/m.match_file config.bridging_header_path
+          elsif /\n\s*#ifndef\s+(\w+).*\n\s*#define\s+\1.*?\n/m.match_file? config.bridging_header_path
             # Has an include guard. Add inside.
             patch(:objc_import_include_guard).apply config.bridging_header_path
           else
@@ -202,14 +202,14 @@ module BranchIOCLI
               patch(:swift_import).apply path
             end
 
-            is_new_method = !/didBecomeActive\(with.*?\{[^\n]*\n/m.match_file(path)
+            is_new_method = !/didBecomeActive\(with.*?\{[^\n]*\n/m.match_file?(path)
             patch_name += "#{is_new_method ? 'new_' : ''}swift"
           else
-            return false if %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch\s*;}.match_file(path)
+            return false if %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch\s*;}.match_file?(path)
 
             patch(:objc_import).apply path
 
-            is_new_method = !/didBecomeActiveWithConversation.*?\{[^\n]*\n/m.match_file(path)
+            is_new_method = !/didBecomeActiveWithConversation.*?\{[^\n]*\n/m.match_file?(path)
             patch_name += "#{is_new_method ? 'new_' : ''}objc"
           end