branch_io_cli 0.13.0.pre.1 → 0.13.0.pre.2

data/lib/branch_io_cli/helper/tool_helper.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/string"
 require "cocoapods-core"
 require "fileutils"
 require "pathname"
@@ -14,6 +15,10 @@ module BranchIOCLI
           Configuration::Configuration.current
         end
 
+        def env
+          Configuration::Environment
+        end
+
         def helper
           BranchHelper
         end
@@ -23,10 +28,10 @@ module BranchIOCLI
 
           podfile_path = options.podfile_path
 
-          install_command = "pod install"
-          install_command += " --repo-update" if options.pod_repo_update
+          install_command = %w(pod install)
+          install_command << "--repo-update" if options.pod_repo_update
           Dir.chdir(File.dirname(podfile_path)) do
-            sh "pod init"
+            sh %w(pod init)
             PatternPatch::Patch.new(
               regexp: /^(\s*)# Pods for #{options.target.name}$/,
               mode: :append,
@@ -34,7 +39,7 @@ module BranchIOCLI
             ).apply podfile_path
             # Store a Pod::Podfile representation of this file.
             options.open_podfile
-            sh install_command
+            sh(*install_command)
           end
 
           return unless options.commit
@@ -72,7 +77,7 @@ github "BranchMetrics/ios-branch-deep-linking"
           end
 
           # 2. carthage update
-          sh "carthage #{options.carthage_command}", chdir: File.dirname(config.cartfile_path)
+          sh "carthage", options.carthage_command, chdir: File.dirname(config.cartfile_path)
 
           # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
           helper.add_change cartfile_path
@@ -189,10 +194,10 @@ github "BranchMetrics/ios-branch-deep-linking"
 
           # 2. pod install
           # command = "PATH='#{ENV['PATH']}' pod install"
-          command = 'pod install'
-          command += ' --repo-update' if options.pod_repo_update
+          command = %w(pod install)
+          command << '--repo-update' if options.pod_repo_update
 
-          sh command, chdir: File.dirname(config.podfile_path)
+          sh(*command, chdir: File.dirname(config.podfile_path))
 
           # 3. Add Podfile and Podfile.lock to commit (in case :commit param specified)
           helper.add_change podfile_path
@@ -220,9 +225,9 @@ github "BranchMetrics/ios-branch-deep-linking"
           return false unless PatchHelper.patch_cartfile cartfile_path
 
           # 2. carthage bootstrap (or other command)
-          cmd = "carthage #{options.carthage_command}"
-          cmd << " ios-branch-deep-linking" if options.carthage_command =~ /^(update|build)/
-          sh cmd, chdir: File.dirname(config.cartfile_path)
+          cmd = ["carthage", *options.carthage_command.shellsplit]
+          cmd << "ios-branch-deep-linking" if options.carthage_command =~ /^(update|build)/
+          sh(*cmd, chdir: File.dirname(config.cartfile_path))
 
           # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
           helper.add_change cartfile_path
@@ -258,30 +263,51 @@ github "BranchMetrics/ios-branch-deep-linking"
         end
 
         def verify_cocoapods
+          if defined?(Bundler)
+            begin
+              require "cocoapods"
+            rescue LoadError
+              # The only alternative here would be something like patch Gemfile, run bundle install
+              # and then exec %w(bundle exec br) + ARGV, except merge anything inferred or obtained
+              # by asking questions.
+              say %(CocoaPods is required to continue. Please add 'gem "cocoapods"' to your Gemfile, run bundle install and then rerun this command.)
+              exit(-1)
+            end
+          end
+
           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."
+          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."
             exit(-1)
           end
 
-          install = confirm "'pod' command not available in PATH. Install cocoapods (may require a sudo password)?", true
+          sudo = env.from_homebrew? || 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
           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
 
-          gem_home = Gem.dir
-          if gem_home && File.writable?(gem_home)
-            sh "gem install cocoapods"
+          install_cmd = env.from_homebrew? ? "brew" : "gem"
+
+          if sudo.blank?
+            command = [install_cmd.to_s, "install", "cocoapods"]
           else
-            sh "sudo gem install cocoapods"
+            command = [sudo, install_cmd.to_s, "install", "cocoapods"]
           end
 
+          sh(*command)
+
           # Ensure master podspec repo is set up (will update if it exists).
-          sh "pod setup"
+          say "Synching master podspec repo. This may take some time."
+          sh %w(pod setup)
+          say "Done ✅"
         end
 
         def verify_carthage
@@ -300,7 +326,7 @@ github "BranchMetrics/ios-branch-deep-linking"
             exit(-1)
           end
 
-          sh "brew install carthage"
+          sh %w(brew install carthage)
         end
 
         def verify_git
@@ -321,7 +347,7 @@ github "BranchMetrics/ios-branch-deep-linking"
             exit(-1)
           end
 
-          sh "xcode-select --install"
+          sh %w(xcode-select --install)
         end
 
         def pod_install_if_required(report = STDOUT)
@@ -340,10 +366,10 @@ github "BranchMetrics/ios-branch-deep-linking"
 
           verify_cocoapods
 
-          install_command = "pod install"
+          install_command = %w(pod install)
 
           if config.pod_repo_update
-            install_command += " --repo-update"
+            install_command << " --repo-update"
           else
             say <<-EOF
 You have disabled "pod repo update". This can cause "pod install" to fail in
@@ -352,11 +378,12 @@ some cases. If that happens, please rerun without --no-pod-repo-update or run
                 EOF
           end
 
-          say "Running #{install_command.inspect}"
-          if report.sh(install_command).success?
+          # included by sh, but this is to the screen when generating a report.
+          say "Running #{IO.command_from_args(*install_command)}"
+          if report.sh(*install_command).success?
             say "Done ✅"
           else
-            say "#{install_command.inspect} failed. See report for details."
+            say "#{IO.command_from_args(*install_command)} failed. See report for details."
             return false
           end
 
@@ -379,13 +406,25 @@ some cases. If that happens, please rerun without --no-pod-repo-update or run
 
           verify_carthage
 
-          install_command = "carthage checkout && carthage build --platform ios"
+          checkout_command = %w(carthage checkout)
+
+          # included by sh, but this is to the screen when generating a report.
+          say "Running #{IO.command_from_args(*checkout_command)}"
+          if report.sh(*checkout_command).success?
+            say "Done ✅"
+          else
+            say "#{IO.command_from_args(*checkout_command)} failed. See report for details."
+            return false
+          end
+
+          build_command = %w(carthage build --platform ios)
 
-          say "Running #{install_command.inspect}"
-          if report.sh(install_command).success?
+          # included by sh, but this is to the screen when generating a report.
+          say "Running #{IO.command_from_args(*build_command)}"
+          if report.sh(*build_command).success?
             say "Done ✅"
           else
-            say "#{install_command.inspect} failed. See report for details."
+            say "#{IO.command_from_args(*build_command)} failed. See report for details."
             return false
           end
 

data/lib/branch_io_cli/rake_task.rb

@@ -1,13 +1,11 @@
 require "rake"
 require "rake/tasklib"
-require "branch_io_cli"
+require_relative "../branch_io_cli"
 require "highline/import"
 
 module BranchIOCLI
   class RakeTask < Rake::TaskLib
-    attr_reader :defaults
-
-    def initialize(name = :branch, &b)
+    def initialize(name = :branch)
       namespace name do
         add_branch_task :report, "Generate a brief Branch report"
         add_branch_task :setup, "Set a project up with the Branch SDK"

data/lib/branch_io_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.13.0.pre.1
+  version: 0.13.0.pre.2
 platform: ruby
 authors:
 - Branch
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: pattern_patch
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,9 @@ 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
@@ -67,146 +70,191 @@ 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: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: tty-platform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: fastlane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.69'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.69'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -225,16 +273,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
 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:
@@ -293,6 +341,7 @@ files:
 - lib/assets/templates/command.erb
 - lib/assets/templates/completion.bash.erb
 - lib/assets/templates/completion.zsh.erb
+- lib/assets/templates/env_description.erb
 - lib/assets/templates/program_description.erb
 - lib/assets/templates/report_description.erb
 - lib/assets/templates/setup_description.erb
@@ -303,11 +352,15 @@ files:
 - lib/branch_io_cli/cli.rb
 - lib/branch_io_cli/command.rb
 - lib/branch_io_cli/command/command.rb
+- lib/branch_io_cli/command/env_command.rb
 - lib/branch_io_cli/command/report_command.rb
 - lib/branch_io_cli/command/setup_command.rb
 - lib/branch_io_cli/command/validate_command.rb
 - lib/branch_io_cli/configuration.rb
 - lib/branch_io_cli/configuration/configuration.rb
+- lib/branch_io_cli/configuration/env_configuration.rb
+- lib/branch_io_cli/configuration/env_options.rb
+- lib/branch_io_cli/configuration/environment.rb
 - lib/branch_io_cli/configuration/option.rb
 - lib/branch_io_cli/configuration/option_wrapper.rb
 - lib/branch_io_cli/configuration/report_configuration.rb
@@ -320,6 +373,7 @@ files:
 - lib/branch_io_cli/core_ext.rb
 - lib/branch_io_cli/core_ext/io.rb
 - lib/branch_io_cli/core_ext/regexp.rb
+- lib/branch_io_cli/core_ext/tty_platform.rb
 - lib/branch_io_cli/core_ext/xcodeproj.rb
 - lib/branch_io_cli/format.rb
 - lib/branch_io_cli/format/highline_format.rb