pod-builder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0fd6c7fa3523935f376b8a1c9cd375a86ef13da1d81762c9c1b678ca81581b
-  data.tar.gz: 28781b306ed31e7346d152f57069cd9883ea0f00bacca94a8f4a03c57039f47f
+  metadata.gz: cbade8908a2a47bc73d743c631c82a8ab251e13aaa7098bfda04972858de7d3d
+  data.tar.gz: cb1661a4210ea39c738c0cc1797e30ed663e446d83f235d9aa29bb498bfeaf79
 SHA512:
-  metadata.gz: 897c953a6bb6e73d8d1293328a90ca146d6a824d0df7c59b560acba01c7505d81119f787129101df116cbfec60997acb2389eab9fdeaa73c95c927f8c680241f
-  data.tar.gz: f2d58bc71c28c990474e6f289242f3b67d31f7bf39cc6ec354421facb6c072b44ce8ca8308c3eb414be860adb4d025011f09ac10683657fa04755dc3a14d723f
+  metadata.gz: 457db104594fad1b368e4b175e71cde10ac5ce54fe23b5add39e4f12751c8325bd1748aebb2218f2951372d4ddadcb41e9c4f19c361b0b6752e5fdf5dd7c2a59
+  data.tar.gz: 906ab6808e6f46d457139fe489427d73776414912a7039cd065246a263925c39b236b476a3d657429ec0eff9158dd13967cc52e812c699db708841f214be1de6

data/README.md

@@ -134,10 +134,13 @@ 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
+- `restore_info.is_static`: true if the expected pod produces a static framework
+- `restore_info.swift_version`: the expected swift compiler version to prebuild 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
+- `prebuilt_info.is_static`: true if the current prebuilt framework is static
+- `prebuilt_info.swift_version`: the swift compiler version that produced the current prebuilt framework
 
 **Version format**
 

data/lib/pod_builder/command/update.rb

@@ -21,6 +21,8 @@ module PodBuilder
             pods_to_update.append(pod_name)
           end
         end
+
+        pods_to_update.map! { |x| x.split("/").first }.uniq!
         
         unless pods_to_update.count > 0
           puts "Frameworks in sync!\n".green

data/lib/pod_builder/info.rb

@@ -19,23 +19,24 @@ module PodBuilder
       
       swift_version = PodBuilder::system_swift_version
       result = {}
-      podbuilder_name = nil
+      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
+          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
+
+          # fix name if it's a subspec
+          if (subspec_items = name.split("_")) && (subspec = subspec_items.last) && subspec_items.count > 1
             if path.include?("/#{subspec}")
-              name = podbuilder_name.sub(/_#{subspec}$/, "/#{subspec}")
+              name = name.sub(/_#{subspec}$/, "/#{subspec}")
             end
           end
-          result[name] = { "podbuilder_name": podbuilder_name, framework_path: path }
+                    
+          base = PodBuilder::basepath.gsub(PodBuilder::home + "/", "")
+          framework_path = File.join(base, matches[1].split("'").first)
+          result[name] = { framework_path: framework_path }
 
           specs = restore_podspecs(name.split("/").first, restore_content)
           unless specs.count > 0
@@ -44,7 +45,11 @@ module PodBuilder
 
           restore_line = restore_line(name, restore_content)
           version = version_info(restore_line)
-          result[name].merge!({ "restore_info": { "version": version, "specs": specs }})
+          is_static = is_static(restore_line)
+          result[name].merge!({ "restore_info": { "version": version, "specs": specs, "is_static": is_static }})
+          if swift_version = swift_version(restore_line)
+            result[name][:restore_info].merge!({ "swift_version": swift_version })
+          end
           
           prebuilt_info = prebuilt_info(plist_path)
           if prebuilt_info.count > 0 
@@ -86,6 +91,22 @@ module PodBuilder
         raise "Failed extracting version from line:\n#{line}\n\n"
       end
     end
+
+    def self.swift_version(line)
+      return podbuilder_tag("sv", line)
+    end
+
+    def self.is_static(line)
+      return podbuilder_tag("is", line)
+    end
+
+    def self.podbuilder_tag(name, line)
+      if (matches = line&.match(/#{name}<(.*?)?>/)) && matches.size == 2
+        return matches[1]
+      end
+
+      return nil
+    end
     
     def self.prebuilt_info(path)
       unless File.exist?(path)
@@ -104,6 +125,7 @@ module PodBuilder
       
       result.merge!({ "version": pod_version })
       result.merge!({ "specs": (data["specs"] || []) })
+      result.merge!({ "is_static": (data["is_static"] || false) })
       
       return result
     end

data/lib/pod_builder/install.rb

@@ -99,6 +99,7 @@ module PodBuilder
           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_data['is_static'] = podfile_item.is_static
 
           plist.value = CFPropertyList.guess(plist_data)
           plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)

data/lib/pod_builder/podfile_item.rb

@@ -262,7 +262,20 @@ module PodBuilder
       end
 
       if include_pb_entry && !is_prebuilt
-        e += " # pb<#{name}>"
+        plists = Dir.glob(PodBuilder::basepath("Rome/**/#{module_name}.framework/#{Configuration::framework_plist_filename}"))
+        if plists.count > 0
+          plist = CFPropertyList::List.new(:file => plists.first)
+          data = CFPropertyList.native_types(plist.value)
+          swift_version = data["swift_version"]
+          is_static = data["is_static"] || false
+        
+          e += " # pb<#{name}> is<#{is_static}>"
+          if swift_version
+            e += " sv<#{swift_version}>"
+          end
+        else
+          e += " # pb<#{name}>"
+        end
       end
 
       return e
@@ -282,6 +295,7 @@ module PodBuilder
 
     def prebuilt_entry(include_pb_entry = true)
       relative_path = Pathname.new(Configuration.base_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+
       if Configuration.subspecs_to_split.include?(name)
         entry = "pod 'PodBuilder/#{podspec_name}', :path => '#{relative_path}'"
       else

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler