branch_io_cli 0.12.10 → 0.13.0.pre.1

data/lib/branch_io_cli/helper/report_helper.rb

@@ -213,70 +213,6 @@ module BranchIOCLI
 
           report
         end
-
-        def pod_install_if_required(report)
-          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."
-          if config.confirm
-            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
-          end
-
-          ToolHelper.verify_cocoapods
-
-          install_command = "pod install"
-
-          if config.pod_repo_update
-            install_command += " --repo-update"
-          else
-            say <<-EOF
-You have disabled "pod repo update". This can cause "pod install" to fail in
-some cases. If that happens, please rerun without --no-pod-repo-update or run
-"pod install --repo-update" manually.
-        EOF
-          end
-
-          say "Running #{install_command.inspect}"
-          if report.sh(install_command).success?
-            say "Done ✅"
-          else
-            say "#{install_command.inspect} failed. See report for details."
-            exit(-1)
-          end
-        end
-
-        def carthage_bootstrap_if_required(report)
-          return unless config.cartfile_path
-          return if Dir.exist?(File.join(File.dirname(config.cartfile_path), "Carthage", "Build", "iOS"))
-
-          say "carthage checkout required in order to build."
-          if config.confirm
-            install = confirm 'Run "carthage checkout && carthage build --platform ios" now?', true
-
-            unless install
-              say 'Please build your Carthage dependencies first in order to continue.'
-              exit(-1)
-            end
-          end
-
-          ToolHelper.verify_carthage
-
-          install_command = "carthage checkout && carthage build --platform ios"
-
-          say "Running #{install_command.inspect}"
-          if report.sh(install_command).success?
-            say "Done ✅"
-          else
-            say "#{install_command.inspect} failed. See report for details."
-            exit(-1)
-          end
-        end
       end
     end
   end

data/lib/branch_io_cli/helper/tool_helper.rb

@@ -257,31 +257,28 @@ github "BranchMetrics/ios-branch-deep-linking"
           true
         end
 
-        def install_cmd
-          ENV["BRANCH_IO_CLI_INSTALLED_FROM_HOMEBREW"] == "true" ? :brew : :gem
-        end
-
         def verify_cocoapods
           pod_cmd = `which pod`
           return unless pod_cmd.empty?
 
-          cmd = `which #{install_cmd}`
-          if cmd.empty?
-            say "'pod' command not available in PATH and '#{install_command}' command not available in PATH to install cocoapods."
+          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
 
-          sudo = install_cmd == :brew || File.writable?(Gem.dir) ? "" : "sudo "
-          sudo_warning = sudo.blank? ? "" : " (requires a sudo password)"
-
-          install = confirm "'pod' command not available in PATH. Install cocoapods#{sudo_warning}?", true
+          install = confirm "'pod' command not available in PATH. Install cocoapods (may require a sudo password)?", true
           unless install
-            # TODO: There are times that --no-add-sdk is not available or doesn't avoid the need.
             say "Please install cocoapods or use --no-add-sdk to continue."
             exit(-1)
           end
 
-          sh "#{sudo}#{install_cmd} install cocoapods"
+          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"
@@ -326,6 +323,74 @@ github "BranchMetrics/ios-branch-deep-linking"
 
           sh "xcode-select --install"
         end
+
+        def pod_install_if_required(report = STDOUT)
+          return true unless config.pod_install_required?
+          # Only if a Podfile is detected/supplied at the command line.
+
+          say "pod install required in order to build."
+          if config.confirm
+            install = confirm 'Run "pod install" now?', true
+
+            unless install
+              say 'Please run "pod install" or "pod update" first in order to continue.'
+              return false
+            end
+          end
+
+          verify_cocoapods
+
+          install_command = "pod install"
+
+          if config.pod_repo_update
+            install_command += " --repo-update"
+          else
+            say <<-EOF
+You have disabled "pod repo update". This can cause "pod install" to fail in
+some cases. If that happens, please rerun without --no-pod-repo-update or run
+"pod install --repo-update" manually.
+                EOF
+          end
+
+          say "Running #{install_command.inspect}"
+          if report.sh(install_command).success?
+            say "Done ✅"
+          else
+            say "#{install_command.inspect} failed. See report for details."
+            return false
+          end
+
+          true
+        end
+
+        def carthage_bootstrap_if_required(report = STDOUT)
+          return true unless config.cartfile_path
+          return true if Dir.exist?(File.join(File.dirname(config.cartfile_path), "Carthage", "Build", "iOS"))
+
+          say "carthage checkout required in order to build."
+          if config.confirm
+            install = confirm 'Run "carthage checkout && carthage build --platform ios" now?', true
+
+            unless install
+              say 'Please build your Carthage dependencies first in order to continue.'
+              return false
+            end
+          end
+
+          verify_carthage
+
+          install_command = "carthage checkout && carthage build --platform ios"
+
+          say "Running #{install_command.inspect}"
+          if report.sh(install_command).success?
+            say "Done ✅"
+          else
+            say "#{install_command.inspect} failed. See report for details."
+            return false
+          end
+
+          true
+        end
       end
     end
   end

data/lib/branch_io_cli/rake_task.rb

@@ -11,7 +11,7 @@ module BranchIOCLI
       namespace name do
         add_branch_task :report, "Generate a brief Branch report"
         add_branch_task :setup, "Set a project up with the Branch SDK"
-        add_branch_task :validate, "Validate universal links in one or more projects"
+        add_branch_task :validate, "Validate Universal Links in one or more projects"
       end
     end
 
@@ -23,13 +23,15 @@ module BranchIOCLI
       task task_name, %i{paths options} do |task, args|
         paths = args[:paths]
         paths = [paths] unless paths.respond_to?(:each)
+        options = args[:options] || {}
 
         paths.each do |path|
           Dir.chdir(path) do
             begin
-              command_class.new(configuration_class.wrapper(args[:options] || {})).run!
+              command_class.new(configuration_class.wrapper(options)).run!
             rescue StandardError => e
               say "Error from #{task_name} task in #{path}: #{e.message}"
+              say e.backtrace if options[:trace]
             end
           end
         end

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.12.10"
+  VERSION = "0.13.0.pre.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.13.0.pre.1
 platform: ruby
 authors:
 - Branch
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pattern_patch
   requirement: !ruby/object:Gem::Requirement
@@ -60,9 +60,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,149 +67,146 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -231,16 +225,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 description: Set up mobile app projects (currently iOS only) to use the Branch SDK
   without opening Xcode. Validate the Universal Link settings for any project.
 email:
@@ -305,6 +299,7 @@ files:
 - lib/assets/templates/validate_description.erb
 - lib/branch_io_cli.rb
 - lib/branch_io_cli/ascii_art.rb
+- lib/branch_io_cli/branch_app.rb
 - lib/branch_io_cli/cli.rb
 - lib/branch_io_cli/command.rb
 - lib/branch_io_cli/command/command.rb
@@ -356,9 +351,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.4