branch_io_cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df2700adf827fe4870ef19d9125cedf54970f134
-  data.tar.gz: eb840f83b956602b89b0ec30770bc3fe251c7845
+  metadata.gz: 7d162acf761ea219b350dd56f71eeced3220beea
+  data.tar.gz: e1417382cbc30b4d92d94268a7e5eb789492f9b9
 SHA512:
-  metadata.gz: 458c06211c2619714678d29a1986e060dd3437a25b16a50aa4b5500b6c7a9dd95d38e98b577924e6cc3ae6a169b1a82c5aa3c851b775218b9cc2fddb541d98c2
-  data.tar.gz: 6485a940ce0a27f302007d54dfe141fe8b20543b7866e57c8124e2fd892f52dd5bd29d005d01ea1345ebe3d36e81c465dab8cb32d7066b1cbc867988ba1a13b7
+  metadata.gz: 70795421103af48548a3181849b1cc7dc399ed19034522582adcb46442a3654f7931cfeda9a804ace14d5f9aad285f3d10526b65ef1ad8c973022939b316801b
+  data.tar.gz: b53517cf8c3841cd5e6d7ce2531902beed7679dc1426ea4d46697de7c9415ea435c6bbd72192d0b6272ce3310dfe34b3e96b4debe39adf875c611fc78f7a9bc1

data/lib/branch_io_cli/command.rb

@@ -42,8 +42,7 @@ module BranchIOCLI
 
         return unless options.commit
 
-        current_pathname = Pathname.new File.expand_path "."
-        changes = helper.changes.to_a.map { |c| Pathname.new(File.expand_path(c)).relative_path_from(current_pathname).to_s }
+        changes = helper.changes.to_a.map { |c| Pathname.new(File.expand_path(c)).relative_path_from(Pathname.pwd).to_s }
 
         `git commit #{changes.join(" ")} -m '[branch_io_cli] Branch SDK integration'`
       end
@@ -115,8 +114,7 @@ module BranchIOCLI
         helper.add_change "#{podfile_path}.lock"
 
         # 4. Check if Pods folder is under SCM
-        current_pathname = Pathname.new File.expand_path "."
-        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from current_pathname
+        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
         `git ls-files #{pods_folder_path} --error-unmatch > /dev/null 2>&1`
         return true unless $?.exitstatus == 0
 
@@ -143,10 +141,10 @@ module BranchIOCLI
         helper.add_change cartfile_path
         helper.add_change "#{cartfile_path}.resolved"
 
-        # 4. Add to target depependencies
+        # 4. Add to target dependencies
         frameworks_group = project.frameworks_group
         branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = ConfigurationHelper.target
+        target = Helper::ConfigurationHelper.target
         target.frameworks_build_phase.add_file_reference branch_framework
 
         # 5. Add to copy-frameworks build phase
@@ -160,8 +158,7 @@ module BranchIOCLI
         end
 
         # 6. Check if Carthage folder is under SCM
-        current_pathname = Pathname.new File.expand_path "."
-        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from current_pathname
+        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from Pathname.pwd
         `git ls-files #{carthage_folder_path} --error-unmatch > /dev/null 2>&1`
         return true unless $?.exitstatus == 0
 

data/lib/branch_io_cli/helper/configuration_helper.rb

@@ -78,7 +78,7 @@ EOF
 
 <%= color('Xcode project:', BOLD) %> #{@xcodeproj_path}
 <%= color('Target:', BOLD) %> #{@target.name}
-<%= color('Domains:', BOLD) %> #{@all_domains}
+<%= color('Domains:', BOLD) %> #{@all_domains || '(none)'}
 EOF
         end
 
@@ -335,10 +335,9 @@ EOF
           BranchHelper.add_change "#{@podfile_path}.lock"
 
           # For now, add Pods folder to SCM.
-          current_pathname = Pathname.new File.expand_path "."
-          pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from current_pathname
-          workspace_path = Pathname.new(File.expand_path(@xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from current_pathname
-          podfile_pathname = Pathname.new(@podfile_path).relative_path_from current_pathname
+          pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
+          workspace_path = Pathname.new(File.expand_path(@xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
+          podfile_pathname = Pathname.new(@podfile_path).relative_path_from Pathname.pwd
           BranchHelper.add_change pods_folder_path
           BranchHelper.add_change workspace_path
           `git add #{podfile_pathname} #{podfile_pathname}.lock #{pods_folder_path} #{workspace_path}` if options.commit
@@ -364,7 +363,7 @@ EOF
           BranchHelper.add_change cartfile_path
           BranchHelper.add_change "#{cartfile_path}.resolved"
 
-          # 4. Add to target depependencies
+          # 4. Add to target dependencies
           frameworks_group = @xcodeproj.frameworks_group
           branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
           target = BranchHelper.target_from_project @xcodeproj, options.target
@@ -382,9 +381,8 @@ EOF
           # For now, add Carthage folder to SCM
 
           # 6. Add the Carthage folder to the commit (in case :commit param specified)
-          current_pathname = Pathname.new File.expand_path "."
-          carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from(current_pathname)
-          cartfile_pathname = Pathname.new(@cartfile_path).relative_path_from current_pathname
+          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
           BranchHelper.add_change carthage_folder_path
           `git add #{cartfile_pathname} #{cartfile_pathname}.resolved #{carthage_folder_path}` if options.commit
         end
@@ -407,9 +405,7 @@ EOF
           say "Downloading Branch.framework v. #{current_release['tag_name']} (#{framework_asset['size']} bytes zipped)..."
 
           # Download the framework zip
-          File.open("Branch.framework.zip", "w") do |file|
-            file.write fetch framework_url
-          end
+          download framework_url, "Branch.framework.zip"
 
           say "Unzipping Branch.framework..."
 
@@ -458,10 +454,35 @@ EOF
           response = Net::HTTP.get_response URI(url)
 
           case response
+          when Net::HTTPSuccess
+            response.body
           when Net::HTTPRedirection
             fetch response['location']
           else
-            response.body
+            raise "Error fetching #{url}: #{response.code} #{response.message}"
+          end
+        end
+
+        def download(url, dest)
+          uri = URI(url)
+
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+            request = Net::HTTP::Get.new uri
+
+            http.request request do |response|
+              case response
+              when Net::HTTPSuccess
+                File.open dest, 'w' do |io|
+                  response.read_body do |chunk|
+                    io.write chunk
+                  end
+                end
+              when Net::HTTPRedirection
+                download response['location'], dest
+              else
+                raise "Error downloading #{url}: #{response.code} #{response.message}"
+              end
+            end
           end
         end
 

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -382,7 +382,7 @@ module BranchIOCLI
 
         app_delegate_swift_path = app_delegate_swift.real_path.to_s
 
-        app_delegate = File.open(app_delegate_swift_path, &:read)
+        app_delegate = File.read app_delegate_swift_path
         return false if app_delegate =~ /import\s+Branch/
 
         say "Patching #{app_delegate_swift_path}"
@@ -462,7 +462,7 @@ EOF
 
         app_delegate_objc_path = app_delegate_objc.real_path.to_s
 
-        app_delegate = File.open(app_delegate_objc_path, &:read)
+        app_delegate = File.read app_delegate_objc_path
         return false if app_delegate =~ %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch;}
 
         say "Patching #{app_delegate_objc_path}"
@@ -536,7 +536,7 @@ EOF
       end
 
       def patch_open_url_method_swift(app_delegate_swift_path)
-        app_delegate_swift = File.open app_delegate_swift_path, &:read
+        app_delegate_swift = File.read app_delegate_swift_path
         if app_delegate_swift =~ /application.*open\s+url.*options/
           # Has application:openURL:options:
           open_url_text = <<-EOF
@@ -590,7 +590,7 @@ EOF
       end
 
       def patch_open_url_method_objc(app_delegate_objc_path)
-        app_delegate_objc = File.open app_delegate_objc_path, &:read
+        app_delegate_objc = File.read app_delegate_objc_path
         if app_delegate_objc =~ /application:.*openURL:.*options/
           # Has application:openURL:options:
           open_url_text = <<-EOF
@@ -644,7 +644,7 @@ EOF
       end
 
       def patch_podfile(podfile_path)
-        podfile = File.open(podfile_path, &:read)
+        podfile = File.read podfile_path
 
         # Podfile already contains the Branch pod
         return false if podfile =~ /pod\s+('Branch'|"Branch")/
@@ -663,7 +663,7 @@ EOF
       end
 
       def patch_cartfile(cartfile_path)
-        cartfile = File.open(cartfile_path, &:read)
+        cartfile = File.read cartfile_path
 
         # Cartfile already contains the Branch framework
         return false if cartfile =~ /git.+Branch/
@@ -673,7 +673,7 @@ EOF
         apply_patch(
           files: cartfile_path,
           regexp: /\z/,
-          text: "git \"https://github.com/BranchMetrics/ios-branch-deep-linking\"\n",
+          text: "github \"BranchMetrics/ios-branch-deep-linking\"\n",
           mode: :append
         )
 

data/lib/branch_io_cli/version.rb

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

metadata

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