pod-builder 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cded05bfcf9315ed900e6ed9192277be561abdfc65676f7f7f3e18e8d94faeb
-  data.tar.gz: 58cd8fed676594d96f9bee43565dcb02348611420c8cd6dcb4606d4716613c80
+  metadata.gz: 4482b9b27c940312353d43961f6f6295d10690bcdf1c13cad503058ed09b6db3
+  data.tar.gz: c95ecae1dcbef118f09bf0409050d6a7e8fcb9549f63d453d021099c4b6b0391
 SHA512:
-  metadata.gz: bf11ab141dc7134f3286bdf3334a0660aaa49e58e42326a2dfa4b361d7b4fa065445974370e2c061a4565a8d989d10de512463c678d70637e02d16d5771a52c7
-  data.tar.gz: a79759fc5a4147ebbc80831a40c9f4665aaae3292e850585fe2adc073e53507d9adc508fc908d1197e68c38780d123af0f8b5d6141633b94c43d35d9027ac5b8
+  metadata.gz: f6bca5110b2ece5df63e49cb105034b7494ebbedf0206dca8b9e6c4a2cf043659683347c03e20c84de5b5645b7dbe38cfed9acdbf641e9a6e41bccfed3a21eb0
+  data.tar.gz: fe8f9450bd522f13161d8cdd56f37a4dd134d029b1390c2457574e4bad8dfa82d501f485e48227c0cad4709c98f3e39f8cad66ae5a6730db90edfeefa12373ce

data/README.md

@@ -49,6 +49,7 @@ Podbuilder comes with a set of commands:
 - `switch`: switch between prebuilt, development or standard pod in the Application-Podfile
 - `clean`: removes unused prebuilt frameworks, dSYMs and source files added by install_sources
 - `sync_podfile`: updates the Application with all pods declared in the PodBuilder-Podfile file
+- `info`: outputs json-formatted information reflecting the current status of prebuilt pods
 
 Commands can be run from anywhere in your project's repo that is **required to be under git**. 
 
@@ -124,6 +125,28 @@ Deletes all unused files by PodBuilder, including .frameworks, .dSYMs and _Sourc
 
 Updates the Application with all pods declared in the PodBuilder-Podfile file. This can come in handy when adding a new pod to the PodBuilder-Podfile file you don't won't to prebuild straight away.
 
+#### `info` command
+
+Outputs json-formatted information reflecting the current status of prebuilt pods.
+
+The output hash contains one key for each pod containing the following keys:
+
+- `framework_path`: the expected path for the prebuilt framework
+- `restore_info.version`: the expected version for the pod
+- `restore_info.specs`: the expected list of specs for the pod
+- `prebuilt_info`: some additional information about the the prebuilt framework, if it exists on disk
+- `prebuilt_info.version`: the version of the pod that produced the current prebuilt framework
+- `prebuilt_info.specs`: the specs of the pod that produced the current prebuilt framework (there might be multiple subspec that produce a single .framework)
+- `podbuilder_name`: this is an internal name used by PodBuilder. It's equal to the pod name except for subspec pods
+
+**Version format**
+
+`restore_version` and `prebuilt_info.version` are hashes containing the following keys:
+- `tag`: pods pinned to a specific tag of the CocoaPods official Specs
+- `repo`, `hash`: pods pointing to an external repo + commit
+- `repo`, `branch`: pods pointing to an external repo + branch
+- `repo`, `tag`: pods pointing to an external repo + tag
+
 
 # Configuration file
 

data/exe/pod_builder

@@ -35,6 +35,7 @@ Command:
     + switch                         Switch between prebuilt/development/standard pod in the Application-Podfile
     + clean                          Remove prebuild frameworks, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
     + sync_podfile                   Update your Application-Podfile with all pods declared in the PodBuilder-Podfile
+    + info                           Print json-formatted informations about prebuilt frameworks
 
 Options:
 "
@@ -282,6 +283,21 @@ Usage:
       :call => [        
         PodBuilder::Command::SyncPodfile
       ]
+    },
+    
+    "info" => {      
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder info
+
+      Output dependencies and prebuilt informations
+        
+"      end,
+      :call => [        
+        PodBuilder::Command::Info
+      ]
     }      
   }
    

data/lib/pod_builder/command.rb

@@ -11,3 +11,4 @@ require 'pod_builder/command/install_sources'
 require 'pod_builder/command/switch'
 require 'pod_builder/command/generate_lfs'
 require 'pod_builder/command/sync_podfile'
+require 'pod_builder/command/info'

data/lib/pod_builder/command/info.rb

@@ -0,0 +1,18 @@
+require 'pod_builder/core'
+require 'json'
+
+module PodBuilder
+  module Command
+    class Info
+      def self.call(options)          
+        Configuration.check_inited
+
+        info = PodBuilder::Info.generate_info()
+        
+        puts JSON.pretty_generate(info)
+        
+        return true
+      end      
+    end
+  end  
+end

data/lib/pod_builder/command/update.rb

@@ -7,88 +7,36 @@ module PodBuilder
       def self.call(options)          
         Configuration.check_inited
         PodBuilder::prepare_basepath
-        
-        podfile_path = PodBuilder::basepath("Podfile.restore")
-        podfile_content = File.read(podfile_path)
-
-        podspec_path = PodBuilder::basepath("PodBuilder.podspec")
-        podspec_content = File.read(podspec_path).split("\n")
 
-        pod_entries = []
-        podfile_content.each_line do |line|
-          if pod_entry = pod_entry_in(line)
-            if (matches = line.match(/(pb<)(.*?)(>)/)) && matches.size == 4 # is not prebuilt
-              # we make sure that the podname is contained in PodBuilder's podspec
-              # which guarantees that the pod was precompiled with PodBuilder
-              podspec_line = "  s.subspec '#{matches[2]}' do |p|"
-              if podspec_content.include?(podspec_line)
-                pod_entries.push(pod_entry)
-              end
-            end
-          end
-        end
-        
-        pod_entries.uniq!
-        
-        # inspect existing .framework files removing valid pod_entries from the array (those with matching pod version and swift compiler)
-        Dir.glob(PodBuilder::basepath("Rome/**/*.framework")) do |framework_path|
-          framework_name = File.basename(framework_path)
-          plist_filename = File.join(framework_path, Configuration.framework_plist_filename)
-          unless File.exist?(plist_filename)
-            raise "Unable to extract item info for framework #{framework_name}. Please rebuild the framework manually!\n".red
-          end
-          
-          plist = CFPropertyList::List.new(:file => plist_filename)
-          data = CFPropertyList.native_types(plist.value)
+        info = PodBuilder::Info.generate_info()
 
-          matches = data['entry'].gsub(" ", "").match(/(^pod')(.*?)(')(.*)/)
-          raise "Unexpected error\n".red if matches&.size != 5          
-          delete_regex = matches[1] + matches[2].split("/").first + matches[3]
+        swift_version = PodBuilder::system_swift_version
 
-          if data['is_prebuilt'] == false
-            delete_regex += matches[4] 
+        pods_to_update = []
+        info.each do |pod_name, info|
+          if info.dig(:restore_info, :version) != info.dig(:prebuilt_info, :version)
+            pods_to_update.append(pod_name)
           end
-          if (swift_version = data['swift_version']) && swift_version != PodBuilder::system_swift_version
-            next
+          if (prebuilt_swift_version = info.dig(:prebuilt_info, :swift_version)) && prebuilt_swift_version != swift_version
+            pods_to_update.append(pod_name)
           end
-
-          pod_entries.select! { |x| x.match(delete_regex) == nil }
         end
         
-        unless pod_entries.count > 0
+        unless pods_to_update.count > 0
           puts "Frameworks in sync!\n".green
           return 0
         end
         if options.has_key?(:dry_run)
-          rebuilding_pods = pod_entries.map { |x| x.match(/(^pod')(.*?)(')/)[2] }.compact
-          puts "`#{rebuilding_pods.join("`, `")}` need to be rebuilt!\n".red
+          puts "`#{pods_to_update.join("`, `")}` need to be rebuilt!\n".red
           return -2
         end
 
         ARGV.clear
-        pod_entries.each { |x|
-          matches = x.match(/(^pod')(.*?)(')/)
-          raise "Unexpected error\n".red if matches&.size != 4          
-          ARGV << matches[2]
-        }
+        pods_to_update.each { |x| ARGV << x }
 
         options[:auto_resolve_dependencies] = true
         return PodBuilder::Command::Build.call(options)
-      end        
-      
-     private
-      
-      def self.pod_entry_in(line)
-        stripped_line = line.gsub("\"", "'").gsub(" ", "").gsub("\t", "").gsub("\n", "")
-        matches = stripped_line.match(/(^pod')(.*?)(')(.*)/)
-        
-        if matches&.size == 5
-          entry = matches[1] + matches[2].split("/").first + matches[3] + matches[4]
-          return entry.split("#pb<").first
-        else
-          return nil
-        end
-      end
+      end              
     end
   end
 end

data/lib/pod_builder/core.rb

@@ -6,6 +6,7 @@ require 'pod_builder/podfile'
 require 'pod_builder/podfile_item'
 require 'pod_builder/analyze'
 require 'pod_builder/install'
+require 'pod_builder/info'
 require 'pod_builder/configuration'
 require 'pod_builder/podspec'
 require 'pod_builder/licenses'

data/lib/pod_builder/info.rb

@@ -0,0 +1,129 @@
+require 'cfpropertylist'
+
+module PodBuilder
+  class Info
+    def self.generate_info
+      restore_path = PodBuilder::basepath("Podfile.restore")
+      unless File.exist?(restore_path)
+        raise "No Podfile.restore file found"
+        return false
+      end
+      
+      podspec_path = PodBuilder::basepath("PodBuilder.podspec")
+      unless File.exist?(podspec_path)
+        raise "No PodBuilder.podspec file found"
+        return false
+      end
+      
+      restore_content = File.read(restore_path)
+      
+      swift_version = PodBuilder::system_swift_version
+      result = {}
+      podbuilder_name = nil
+      File.read(podspec_path).each_line do |line|
+        if (matches = line.match(/s.subspec '(.*)' do \|p\|/)) && matches.size == 2
+          podbuilder_name = matches[1]
+        elsif (matches = line.match(/p.vendored_frameworks = '(.*)'/)) && matches.size == 2
+          path = matches[1].split("'").first
+          plist_path = File.join(PodBuilder::basepath(path), Configuration.framework_plist_filename)
+          
+          name = podbuilder_name
+          
+          # check if it's a subspec
+          if (subspec_items = podbuilder_name.split("_")) && (subspec = subspec_items.last) && subspec_items.count > 1
+            if path.include?("/#{subspec}")
+              name = podbuilder_name.sub(/_#{subspec}$/, "/#{subspec}")
+            end
+          end
+          result[name] = { "podbuilder_name": podbuilder_name, framework_path: path }
+
+          specs = restore_podspecs(name.split("/").first, restore_content)
+          unless specs.count > 0
+            raise "pod `#{name}` not found in restore file"
+          end
+
+          restore_line = restore_line(name, restore_content)
+          version = version_info(restore_line)
+          result[name].merge!({ "restore_info": { "version": version, "specs": specs }})
+          
+          prebuilt_info = prebuilt_info(plist_path)
+          if prebuilt_info.count > 0 
+            result[name].merge!({ "prebuilt_info": prebuilt_info })
+          end
+        end
+      end
+
+      return result
+    end
+    
+    private
+    
+    def self.version_info(line)
+      if (matches = line&.match(/pod '(.*)', '=(.*)'/)) && matches.size == 3
+        pod_name = matches[1]
+        tag = matches[2]
+        
+        return { "tag": tag }
+      elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :commit => '(.*)'/)) && matches.size == 4
+        pod_name = matches[1]
+        repo = matches[2]
+        hash = matches[3]
+        
+        return { "repo": repo, "hash": hash }
+      elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :branch => '(.*)'/)) && matches.size == 4
+        pod_name = matches[1]
+        repo = matches[2]
+        branch = matches[3]
+        
+        return { "repo": repo, "branch": branch }
+      elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :tag => '(.*)'/)) && matches.size == 4
+        pod_name = matches[1]
+        repo = matches[2]
+        tag = matches[3]
+        
+        return { "repo": repo, "tag": tag }
+      else
+        raise "Failed extracting version from line:\n#{line}\n\n"
+      end
+    end
+    
+    def self.prebuilt_info(path)
+      unless File.exist?(path)
+        return {}
+      end
+      
+      plist = CFPropertyList::List.new(:file => path)
+      data = CFPropertyList.native_types(plist.value)
+      
+      result = {}
+      if swift_version = data["swift_version"]
+        result.merge!({ "swift_version": swift_version})
+      end
+      
+      pod_version = version_info(data["entry"])
+      
+      result.merge!({ "version": pod_version })
+      result.merge!({ "specs": (data["specs"] || []) })
+      
+      return result
+    end
+
+    def self.restore_podspecs(root_name, restore_content)
+      specs = []
+      restore_content.each_line do |line|
+        if (matches = line.match(/pod '(#{root_name})(\/.*?)?'/)) && matches.size == 3
+          specs.push(matches[1] + (matches[2] || ""))
+        end
+      end
+
+      return specs.uniq
+    end
+
+    def self.restore_line(name, restore_content)
+      unless (matches = restore_content.match(/pod '#{name}(\/.*)?'.*/)) && matches.size == 2
+        raise "pod `#{name}` not found in restore file"
+      end
+      return matches[0]
+    end
+  end
+end

data/lib/pod_builder/install.rb

@@ -1,5 +1,24 @@
 require 'cfpropertylist'
 
+
+# We swizzle generate_pods_project to inject spec_overrides before building
+class Pod::Installer
+  alias_method :swz_generate_pods_project, :generate_pods_project
+
+  def generate_pods_project(*args)
+    analysis_result.specifications.each do |spec|
+      if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
+        overrides.each do |k, v|
+          spec.attributes_hash[k] = v
+        end
+      end
+    end
+
+    swz_generate_pods_project(*args)
+  end
+end
+
+
 module PodBuilder
   class Install
     def self.podfile(podfile_content, podfile_items, build_configuration)
@@ -64,7 +83,9 @@ module PodBuilder
       swift_version = PodBuilder::system_swift_version
       Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
         filename = File.basename(framework_path, ".*")
-        if podfile_item = podfile_items.detect { |x| x.module_name == filename }
+
+        specs = podfile_items.select { |x| x.module_name == filename }
+        if podfile_item = specs.first
           podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
           entry = podfile_item.entry(true, false)
 
@@ -75,7 +96,10 @@ module PodBuilder
           if Dir.glob(File.join(framework_path, "Headers/*-Swift.h")).count > 0
             plist_data['swift_version'] = swift_version
           end
-  
+          subspecs_deps = specs.map(&:dependency_names).flatten
+          subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{podfile_item.root_name}/") }
+          plist_data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
+
           plist.value = CFPropertyList.guess(plist_data)
           plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)
         else

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,6 +246,7 @@ files:
 - lib/pod_builder/command/deintegrate.rb
 - lib/pod_builder/command/generate_lfs.rb
 - lib/pod_builder/command/generate_podspec.rb
+- lib/pod_builder/command/info.rb
 - lib/pod_builder/command/init.rb
 - lib/pod_builder/command/install_sources.rb
 - lib/pod_builder/command/none.rb
@@ -255,6 +256,7 @@ files:
 - lib/pod_builder/command/update.rb
 - lib/pod_builder/configuration.rb
 - lib/pod_builder/core.rb
+- lib/pod_builder/info.rb
 - lib/pod_builder/install.rb
 - lib/pod_builder/licenses.rb
 - lib/pod_builder/podfile.rb