pod-builder 2.0.0.beta.22 → 2.0.0.beta.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7884fca89b1f5498840e59b6e590836862749f7753f889120d7bd33bdc05a201
-  data.tar.gz: 3936b3ec07e51655f368c2c1001874b4933476d3678096d15184e0a36515be6b
+  metadata.gz: 16bb73e4ce3559e587cb45b0b80e7e92b1b904a016a09ef8769bdc5f36bd3c3b
+  data.tar.gz: 1b7990f9999ff210171bc012d2ae3d72b96b2cce7fd273906ed97351dcf74694
 SHA512:
-  metadata.gz: 6c0e8f13ca1a0a3c970c41722bae17a19236295fb3192cf6e5ff52a05507c831bf157363a3725b2184799451cd36a04a8c85c840ec33991f2d75bc890b2b1019
-  data.tar.gz: 5a340dc6930ec07ba988b3836a03a6caa7e2a7c9f033f6b901b5e7363353c1a4487e11ef8908adb0549a19dce1c13b1405a486baaa130f02716e85cd9857cb5c
+  metadata.gz: 7344c45e940ba2d2ff9b9c4cef8ca43fc49e07151b17124fceb1cccad2ce7cfaafcfe20e6de71cd58792db839a4c28ea61c9928eb5511b429deda37166df0824
+  data.tar.gz: 92b7caed18491251d38ed4f90325b968e3fb5d6dced12b98d34a96522904472231f61a31e471c3ed095863a8d489074de6ef053bcdfeb5a865a103dcf635e349

data/lib/pod_builder/core.rb

@@ -120,7 +120,7 @@ module PodBuilder
 
     xcodeprojects = Dir.glob("#{home}/**/#{project_name}.xcodeproj").select { |x| 
       folder_in_home = x.gsub(home, "")
-      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) 
+      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") 
     }
     raise "\n\nxcodeproj not found!".red if xcodeprojects.count == 0
     raise "\n\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
@@ -136,7 +136,7 @@ module PodBuilder
 
     xcworkspaces = Dir.glob("#{home}/**/#{Configuration.project_name}*.xcworkspace").select { |x| 
       folder_in_home = x.gsub(home, "")
-      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) && !x.include?(".xcodeproj/")
+      !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") && !x.include?(".xcodeproj/")
     }
     raise "\n\nxcworkspace not found!".red if xcworkspaces.count == 0
     raise "\n\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1

data/lib/pod_builder/podfile.rb

@@ -17,7 +17,8 @@ module PodBuilder
 
       platform = analyzer.instance_variable_get("@result").targets.first.platform
 
-      install_using_frameworks = analyzer.podfile.root_target_definitions.map(&:uses_frameworks?).uniq.first
+      install_using_frameworks = install_using_frameworks(analyzer)      
+
       podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "") 
 
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
@@ -180,7 +181,7 @@ module PodBuilder
           next
         end
 
-        if pod_name = pod_definition_in(line, true)          
+        if pod_name = pod_definition_in(line, true)      
           if podfile_item = all_buildable_items.detect { |x| x.name == pod_name }
             marker = podfile_item.prebuilt_marker()
 
@@ -198,7 +199,7 @@ module PodBuilder
               dep_item = all_buildable_items.detect { |x| x.name == dep.name }
 
               if File.exist?(dep_item.prebuilt_podspec_path) && !dep_item.is_prebuilt 
-                pod_name = dep_item.prebuilt_entry(false)
+                pod_name = dep_item.prebuilt_entry(false, false)
                 prebuilt_lines.push("#{line.detect_indentation}#{pod_name}#{marker}\n")
               end
 
@@ -676,5 +677,21 @@ module PodBuilder
 
       return podfile_content
     end
+
+    def self.install_using_frameworks(analyzer)
+      target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
+      if target_settings.count == 1
+        if target_settings.first == false
+          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
+        end
+        return target_settings.first
+      elsif target_settings.count > 1
+        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red
+      else
+        raise "\n\nFailed detecting use_frameworks!"
+      end
+
+      return true
+    end
   end
 end

data/lib/pod_builder/podfile_cp.rb

@@ -49,7 +49,7 @@ module Pod
         pod_entries = pod_entries.uniq.sort_by { |t| t.name }
 
         prebuild_entries.each do |pod|
-          target_s += "#{child_indentation}#{pod.prebuilt_entry(false)}\n"
+          target_s += "#{child_indentation}#{pod.prebuilt_entry(false, false)}\n"
         end
         pod_entries.each do |pod|
           target_s += "#{child_indentation}#{pod.entry(true, false)}\n"

data/lib/pod_builder/podfile_item.rb

@@ -401,7 +401,7 @@ module PodBuilder
       if absolute_path 
         return podspec_path
       else
-        pod_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+        pod_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::basepath)).to_s
       end
     end
 

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.22"
+  VERSION = "2.0.0.beta.23"
 end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.22
+  version: 2.0.0.beta.23
 platform: ruby
 authors:
 - Tomas Camin