pod-builder 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5281c507a89f44af31e4f826d10c45cfd5c68e7b62ed3b3c66d840181909f95d
-  data.tar.gz: 139f7835eedc3030378a5fa53fd7cd80fec8739fc5c0bccec9e654fc8199d711
+  metadata.gz: 75c011fa869888a095f17bcabcc5f6130cf19d43be6d67794c75ff4232cb5740
+  data.tar.gz: 53d8c8304e9d1ee6e192fa6df5149260b12c302fea43075b0bd84ee35a5ed95a
 SHA512:
-  metadata.gz: e7468475cbaf61dd82f5360b41678377b12aac63f6637e794777a1064dcbcaf194ad56ad966eeaf19d0f79be28475f52c9314b6fa9773bd52d7dc944d8587cdd
-  data.tar.gz: f8522731ffaa190fe6024dc7675d2a2231c064189557cfb352e3ef363c975213379c54d02b9385fd5605fdfde33b4bb6dca108517edfa8bc88ef9767761c9f55
+  metadata.gz: b9d50554ec87bb186b8e79af81b03fd10c555550db5005f9e9a5b5793562276f6ee9a6c11ecac06698aa2b35585114b385ba5fdb08d22d4742a81040e9c7a9de
+  data.tar.gz: 97c02d867c3ac4e007b6a21671c22a68e6ddbbfd863e4a6950ca3813a237b26b059b0cd6fe63e50914ba96e6c4280064e23b4ea49a24cc2265bebe687b8944a2

data/exe/pod_builder

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
 
+require 'pod_builder/version'
+
+show_version = ARGV.include?("version") && ARGV.count == 1
+if show_version
+  puts PodBuilder::VERSION
+  exit(0)
+end
+
 if ENV['DEBUGGING']
   puts "Running in debug, injecting $LOAD_PATH"
   libdir = File.expand_path("#{File.dirname(__FILE__)}/../lib")
@@ -8,7 +16,6 @@ end
 
 require 'optparse'
 require 'pod_builder/core'
-require 'pod_builder/version'
 require 'pod_builder/command'
 
 OPTIONS = {}  

data/lib/pod_builder/command/update_lldbinit.rb

@@ -1,11 +1,11 @@
 require 'pod_builder/core'
+require 'digest'
 
 module PodBuilder
   module Command
     class UpdateLldbInit
       def self.call(options)
         Configuration.check_inited
-        PodBuilder::prepare_basepath
         
         argument_pods = ARGV.dup
         
@@ -15,8 +15,17 @@ module PodBuilder
         unless argument_pods.count == 1
           raise "\n\nSpecify a single PATH to the folder containing the prebuilt framework's source code\n\n".red 
         end
-        
+            
         base_path = PodBuilder::basepath("")
+
+        lldbinit_path = File.expand_path('~/.lldbinit-Xcode')
+        lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
+        restore_hash = podfile_restore_hash()
+        if lldbinit_content.include?("<pb_md5:#{base_path}:#{restore_hash}")
+          puts "\n\n🎉 already in sync!\n".green
+          return 0
+        end
+
         path = argument_pods[0]
         
         is_absolute = ["~", "/"].include?(path[0])
@@ -78,12 +87,8 @@ module PodBuilder
         
         replace_paths.uniq!
 
-        source_map_lines = replace_paths.flat_map { |t| ["# <pb>", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'"] }
-        if source_map_lines.count > 1
-          # first occurrance should be a set
-          source_map_lines[1] = source_map_lines[1].gsub("settings append target.source-map", "settings set target.source-map")
-        end
-        rewrite_lldinit(source_map_lines)
+        source_map_lines = replace_paths.flat_map { |t| ["# <pb:#{base_path}>", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'"] }
+        rewrite_lldinit(source_map_lines, base_path)
         
         puts "\n\n🎉 done!\n".green
         return 0
@@ -105,7 +110,11 @@ module PodBuilder
         end
       end
 
-      def self.rewrite_lldinit(source_map_lines)
+      def self.podfile_restore_hash()
+        Digest::MD5.hexdigest(File.read(PodBuilder::basepath("Podfile.restore")))
+      end
+
+      def self.rewrite_lldinit(source_map_lines, base_path)
         puts "Writing ~/.lldbinit-Xcode".yellow
 
         lldbinit_path = File.expand_path('~/.lldbinit-Xcode')
@@ -114,7 +123,7 @@ module PodBuilder
         lldbinit_lines = []
         skipNext = false
         File.read(lldbinit_path).each_line do |line|
-          if line.include?("# <pb>")
+          if line.include?("# <pb:#{base_path}>")
             skipNext = true
             next
           elsif skipNext
@@ -128,6 +137,10 @@ module PodBuilder
           end
         end
 
+        restore_hash = podfile_restore_hash()
+        source_map_lines.insert(0, "<pb_md5:#{base_path}:#{restore_hash}>")
+        source_map_lines.insert(0, "<pb:#{base_path}>")
+
         lldbinit_lines += source_map_lines
       
         File.write(lldbinit_path, lldbinit_lines.join("\n"))

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler