branch_io_cli 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d162acf761ea219b350dd56f71eeced3220beea
-  data.tar.gz: e1417382cbc30b4d92d94268a7e5eb789492f9b9
+  metadata.gz: 7b2291799982aa8205535d5f28f0b4b372c2726b
+  data.tar.gz: 9986e2a7e85b74827fda5c4abd30a6b979d1b137
 SHA512:
-  metadata.gz: 70795421103af48548a3181849b1cc7dc399ed19034522582adcb46442a3654f7931cfeda9a804ace14d5f9aad285f3d10526b65ef1ad8c973022939b316801b
-  data.tar.gz: b53517cf8c3841cd5e6d7ce2531902beed7679dc1426ea4d46697de7c9415ea435c6bbd72192d0b6272ce3310dfe34b3e96b4debe39adf875c611fc78f7a9bc1
+  metadata.gz: e51e2863451a8deebb9fad4046a797893dcc776ec1eaa88c80fc13d2ea2af6f59fd9594fd88dc0a92a5dc1514b27b73d56bad4f0ab0f8f772e6ef5f8d7707e3a
+  data.tar.gz: 06e4ecb04f1c65eee5636eb1d1dc7f6776ac50d73b511bfd7d47b50f415465d7f24d105c419c7506823a00a18039d28f161371bfd6ffc90f6c6f0b733b1c1e85

data/lib/branch_io_cli/helper/configuration_helper.rb

@@ -1,6 +1,7 @@
 require "json"
 require "net/http"
 require "pathname"
+require "tmpdir"
 require "xcodeproj"
 require "zip"
 
@@ -57,7 +58,6 @@ EOF
 
         def print_setup_configuration
           say <<EOF
-
 <%= color('Configuration:', BOLD) %>
 
 <%= color('Xcode project:', BOLD) %> #{@xcodeproj_path}
@@ -291,7 +291,7 @@ EOF
 
           # If no CocoaPods or Carthage, check to see if the framework is linked.
           target = BranchHelper.target_from_project @xcodeproj, options.target
-          return if target.frameworks_build_phase.files.map(&:file_ref).map(&:path).any? { |p| p =~ %r{/Branch.framework$} }
+          return if target.frameworks_build_phase.files.map(&:file_ref).map(&:path).any? { |p| p =~ /Branch.framework$/ }
 
           # --podfile, --cartfile not specified. No Podfile found. No Cartfile found. No Branch.framework in project.
           # Prompt the user:
@@ -388,12 +388,12 @@ EOF
         end
 
         def add_direct(options)
-          # TODO: Put these intermediates in a temp directory until Branch.framework is unzipped
-          # (and validated?). For now dumped in the current directory.
-          File.unlink "Branch.framework.zip" if File.exist? "Branch.framework.zip"
-          remove_directory "Branch.framework"
+          # Put the framework in the path for any existing Frameworks group in the project.
+          frameworks_group = @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..."
+          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"
@@ -402,50 +402,52 @@ EOF
           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)..."
+          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"
 
-          # Download the framework zip
-          download framework_url, "Branch.framework.zip"
+            File.unlink zip_path if File.exist? zip_path
 
-          say "Unzipping Branch.framework..."
+            # Download the framework zip
+            download framework_url, zip_path
 
-          # Unzip
-          Zip::File.open "Branch.framework.zip" 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/}, ""
-              ensure_directory File.dirname filename
-              entry.extract filename
+            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
 
-          # Remove intermediate zip file
-          File.unlink "Branch.framework.zip"
+          # Now the current framework is in framework_path
 
-          # Now the current framework is in ./Branch.framework
-
-          say "Adding to #{@xcodeproj_path}..."
+          say "Adding to #{@xcodeproj_path}"
 
           # Add as a dependency in the Frameworks group
-          frameworks_group = @xcodeproj.frameworks_group
-          framework = frameworks_group.new_file "Branch.framework"
-          target = BranchHelper.target_from_project @xcodeproj, options.target
-          target.frameworks_build_phase.add_file_reference framework, true
-
-          # Make sure this is in the FRAMEWORK_SEARCH_PATHS
-          @xcodeproj.build_configurations.each do |config|
-            setting = config.build_settings["FRAMEWORK_SEARCH_PATHS"] || []
-            setting = [setting] if setting.kind_of? String
-            next if setting.any? { |p| p == "$(SRCROOT)" }
-
-            setting << "$(SRCROOT)"
-            config.build_settings["FRAMEWORK_SEARCH_PATHS"] = setting
+          framework = frameworks_group.new_file "Branch.framework" # relative to frameworks_group.real_path
+          @target.frameworks_build_phase.add_file_reference framework, true
+
+          # Make sure this is in the FRAMEWORK_SEARCH_PATHS if we just added it.
+          if frameworks_group.files.count == 1
+            @target.build_configurations.each do |config|
+              paths = config.build_settings["FRAMEWORK_SEARCH_PATHS"] || []
+              next if paths.any? { |p| p == '$(SRCROOT)' || p == '$(SRCROOT)/**' }
+              paths << '$(SRCROOT)'
+              config.build_settings["FRAMEWORK_SEARCH_PATHS"] = paths
+            end
           end
+          # If it already existed, it's almost certainly already in FRAMEWORK_SEARCH_PATHS.
 
           @xcodeproj.save
 
-          BranchHelper.add_change File.expand_path "Branch.framework"
-          `git add Branch.framework` if options.commit
+          BranchHelper.add_change framework_path
+          `git add #{framework_path}` if options.commit
 
           say "Done. ✅"
         end
@@ -472,11 +474,25 @@ EOF
             http.request request do |response|
               case response
               when Net::HTTPSuccess
+                bytes_downloaded = 0
+                dots_reported = 0
+                # report a dot every 100 kB
+                per_dot = 102_400
+
                 File.open dest, 'w' do |io|
                   response.read_body do |chunk|
                     io.write chunk
+
+                    # print progress
+                    bytes_downloaded += chunk.length
+                    while (bytes_downloaded - per_dot * dots_reported) >= per_dot
+                      print "."
+                      dots_reported += 1
+                    end
+                    STDOUT.flush
                   end
                 end
+                say "\n"
               when Net::HTTPRedirection
                 download response['location'], dest
               else
@@ -494,15 +510,6 @@ EOF
           Dir.mkdir path
         end
 
-        def remove_directory(path)
-          return unless File.exist? path
-
-          Dir["#{path}/*"].each do |file|
-            remove_directory(file) and next if File.directory?(file)
-            File.unlink file
-          end
-        end
-
         SDK_OPTIONS =
           {
             "Set this project up to use CocoaPods and add the Branch SDK." => :cocoapods,

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander