branch_io_cli 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12805e82fb366c82741249dfbe0b186dd453cd6
-  data.tar.gz: beed4c107749da36ab0c36d31dfb77d544a083e8
+  metadata.gz: 6d6d029c93a40885ef2c8f619c45d550cd49a680
+  data.tar.gz: 3553f1e6241a02f8329f30d4ac9ab65057a78ac0
 SHA512:
-  metadata.gz: 88ce57d3ee76c932ec1df8fea6befa753a864753f9d741d4b779b5d545e840b89af98a921e238f345a00878375678f707576185d9f22c14bdbd356c250e3057f
-  data.tar.gz: b5a0b49080a5213523461e43ee3595bfa7a874d7de528ce4eca98e6b15efa0d240d062ad475f33e35229efb9cdad5dadcf5e5fae32d7fa24bb808bd38ca9ef55
+  metadata.gz: 738daf6516afbdde4902e7be83865a856031b28b565d07d1c244b5c53cc817795d3a20ecf48c2ebf9f52f306903405fbdc4784039d6b25625d4109858c3a1c3f
+  data.tar.gz: e861e2ceb053c93cf2ab57605856386e07767f8c36b683cb4387b3fd118cc882026a24a41d436e3840bbd13e20155df025612128771f56d2e85e97638bd75f2f

data/lib/branch_io_cli.rb

@@ -1,4 +1,5 @@
 require "branch_io_cli/cli"
 require "branch_io_cli/commands"
+require "branch_io_cli/core_ext"
 require "branch_io_cli/helper"
 require "branch_io_cli/version"

data/lib/branch_io_cli/commands/report_command.rb

@@ -17,28 +17,25 @@ module BranchIOCLI
         end
 
         File.open config_helper.report_path, "w" do |report|
-          report.write "Branch.io Xcode build report v #{VERSION}\n\n"
+          report.write "Branch.io Xcode build report v #{VERSION} #{DateTime.now}\n\n"
           # TODO: Write out command-line options or configuration from helper
           report.write "#{report_header}\n"
 
-          show_build_settings_cmd = "#{base_xcodebuild_cmd} -showBuildSettings"
-          report.write "$ #{show_build_settings_cmd}\n\n"
-          report.write `#{show_build_settings_cmd}`
+          report.report_command "#{base_xcodebuild_cmd} -list"
+          report.report_command "#{base_xcodebuild_cmd} -showBuildSettings"
 
           if config_helper.clean
             say "Cleaning"
-            clean_cmd = "#{base_xcodebuild_cmd} clean"
-            report.write "$ #{clean_cmd}\n\n"
-            report.write `#{clean_cmd}`
+            report.report_command "#{base_xcodebuild_cmd} clean"
           end
 
           say "Building"
-          build_cmd = "#{base_xcodebuild_cmd} -verbose"
-          report.write "$ #{build_cmd}\n\n"
-          report.write `#{build_cmd}`
+          report.report_command "#{base_xcodebuild_cmd} -verbose"
 
           say "Done ✅"
         end
+        @report = nil
+
         say "Report generated in #{config_helper.report_path}"
       end
 

data/lib/branch_io_cli/core_ext.rb

@@ -0,0 +1 @@
+require "branch_io_cli/core_ext/io.rb"

data/lib/branch_io_cli/core_ext/io.rb

@@ -0,0 +1,48 @@
+require "open3"
+
+class IO
+  # Report the command. Execute the command, capture stdout
+  # and stderr and report line by line. Report the exit
+  # status at the end in case of error. Returns a Process::Status
+  # object.
+  #
+  # :command: [String] a shell command to execute and report
+  def report_command(command)
+    write "$ #{command}\n\n"
+
+    Open3.popen2e(command) do |stdin, output, thread|
+      # output is stdout and stderr merged
+      while (line = output.gets)
+        puts line
+      end
+
+      status = thread.value
+      if status == 0
+        write "Success.\n\n"
+      else
+        write "#{status}\n\n"
+      end
+      return status
+    end
+  end
+end
+
+# Report the command. Execute the command. Stdout and stderr are
+# not redirected. Report the exit status at the end if nonzero.
+# Returns a Process::Status object.
+#
+# :command: [String] a shell command to execute and report
+def STDOUT.report_command(command)
+  # TODO: Improve this?
+  say "<%= color('$ #{command}', BOLD) %>\n\n"
+  # May also write to stderr
+  # Could try system "#{command} 2>&1", but that might depend on the shell.
+  system command
+
+  status = $?
+  if status == 0
+    write "Success.\n\n"
+  else
+    write "#{status}\n\n"
+  end
+end

data/lib/branch_io_cli/helper.rb

@@ -1,2 +1,3 @@
 require "branch_io_cli/helper/branch_helper"
 require "branch_io_cli/helper/configuration_helper"
+require "branch_io_cli/helper/methods"

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -6,9 +6,13 @@ require "plist"
 require "tmpdir"
 require "zip"
 
+require "branch_io_cli/helper/methods"
+
 module BranchIOCLI
   module Helper
     module IOSHelper
+      include Methods
+
       APPLINKS = "applinks"
       ASSOCIATED_DOMAINS = "com.apple.developer.associated-domains"
       CODE_SIGN_ENTITLEMENTS = "CODE_SIGN_ENTITLEMENTS"
@@ -789,7 +793,7 @@ EOF
         install_command = "pod install"
         install_command += " --repo-update" if options.pod_repo_update
         Dir.chdir(File.dirname(podfile_path)) do
-          system_command "pod init"
+          report_command "pod init"
           apply_patch(
             files: podfile_path,
             regexp: /^(\s*)# Pods for #{ConfigurationHelper.target.name}$/,
@@ -797,7 +801,7 @@ EOF
             text: "\n\\1pod \"Branch\"",
             global: false
           )
-          system_command install_command
+          report_command install_command
         end
 
         add_change podfile_path
@@ -826,7 +830,7 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          system_command "carthage #{ConfigurationHelper.carthage_command}"
+          report_command "carthage #{ConfigurationHelper.carthage_command}"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
@@ -939,7 +943,7 @@ EOF
         command += ' --repo-update' if options.pod_repo_update
 
         Dir.chdir(File.dirname(podfile_path)) do
-          system_command command
+          report_command command
         end
 
         # 3. Add Podfile and Podfile.lock to commit (in case :commit param specified)
@@ -969,7 +973,7 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          system_command "carthage #{ConfigurationHelper.carthage_command}"
+          report_command "carthage #{ConfigurationHelper.carthage_command}"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
@@ -1027,13 +1031,13 @@ EOF
 
         gem_home = ENV["GEM_HOME"]
         if gem_home && File.writable?(gem_home)
-          system_command "gem install cocoapods"
+          report_command "gem install cocoapods"
         else
-          system_command "sudo gem install cocoapods"
+          report_command "sudo gem install cocoapods"
         end
 
         # Ensure master podspec repo is set up (will update if it exists).
-        system_command "pod setup"
+        report_command "pod setup"
       end
 
       def verify_carthage
@@ -1052,7 +1056,7 @@ EOF
           exit(-1)
         end
 
-        system_command "brew install carthage"
+        report_command "brew install carthage"
       end
 
       def verify_git
@@ -1073,13 +1077,7 @@ EOF
           exit(-1)
         end
 
-        system_command "xcode-select --install"
-      end
-
-      def system_command(command)
-        # TODO: Not working well with bundle exec atm.
-        say "<%= color(\"$ #{command}\", BOLD) %>"
-        system command
+        report_command "xcode-select --install"
       end
     end
   end

data/lib/branch_io_cli/helper/methods.rb

@@ -0,0 +1,9 @@
+module BranchIOCLI
+  module Helper
+    module Methods
+      def report_command(command)
+        STDOUT.report_command command
+      end
+    end
+  end
+end

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -257,11 +257,14 @@ files:
 - lib/branch_io_cli/commands/report_command.rb
 - lib/branch_io_cli/commands/setup_command.rb
 - lib/branch_io_cli/commands/validate_command.rb
+- lib/branch_io_cli/core_ext.rb
+- lib/branch_io_cli/core_ext/io.rb
 - lib/branch_io_cli/helper.rb
 - lib/branch_io_cli/helper/android_helper.rb
 - lib/branch_io_cli/helper/branch_helper.rb
 - lib/branch_io_cli/helper/configuration_helper.rb
 - lib/branch_io_cli/helper/ios_helper.rb
+- lib/branch_io_cli/helper/methods.rb
 - lib/branch_io_cli/version.rb
 homepage: http://github.com/BranchMetrics/branch_io_cli
 licenses: