pod-builder 0.1.8.beta → 0.2.0

data/lib/pod_builder/podspec.rb

@@ -1,41 +1,70 @@
 module PodBuilder
   class Podspec
-    def self.generate      
-      buildable_items = Podfile.podfile_items_at(PodBuilder::basepath("Podfile"))
-      buildable_items.select! { |x| x.is_prebuilt == false }
+    class PodspecItem
+      attr_accessor :name
+      attr_accessor :module_name
+      attr_accessor :vendored_frameworks
+      attr_accessor :frameworks
+      attr_accessor :weak_frameworks
+      attr_accessor :libraries
+      attr_accessor :resources
+      attr_accessor :exclude_files
+      attr_accessor :xcconfig
       
-      podspecs = []
-      buildable_items.each do |pod|
-        spec_exists = File.exist?(PodBuilder::basepath(vendored_spec_framework_path(pod))) 
-        subspec_exists = File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
-        
-        unless spec_exists || subspec_exists
-          puts "Skipping #{pod.name}, not prebuilt".blue
-          next
-        end
+      def initialize
+        @name = ""
+        @module_name = ""
+        @vendored_frameworks = []
+        @frameworks = []
+        @weak_frameworks = []
+        @libraries = []
+        @resources = []
+        @exclude_files = []
+        @xcconfig = {}
+      end
+      
+      def to_s
+        @name
+      end
+    end
+    private_constant :PodspecItem
+    
+    def self.generate(analyzer)  
+      puts "Generating PodBuilder's local podspec".yellow
+      
+      buildable_items = Podfile.podfile_items_at(PodBuilder::basepath("Podfile")).sort_by { |x| x.name }
+            
+      podspec_items = podspec_items_from(buildable_items)
 
-        vendored_frameworks = [pod] + pod.dependencies(buildable_items)
+      platform = analyzer.result.targets.first.platform
+      generate_podspec_from(podspec_items, platform)
+    end
+    
+    private
 
-        static_vendored_frameworks = vendored_frameworks.select { |x| x.is_static }
-        framework_paths = vendored_frameworks.map { |x| vendored_framework_path(x) }.compact
-        
-        podspec = "  s.subspec '#{pod.podspec_name}' do |p|\n"
-        podspec += "    p.vendored_frameworks = '#{framework_paths.uniq.join("','")}'\n"
+    def self.generate_podspec_from(podspec_items, platform)
+      podspecs = []
+      podspec_items.each do |item|
+        vendored_frameworks = item.vendored_frameworks.map { |x| vendored_framework_path(x) }.compact.uniq
         
-        podspec_resources = static_vendored_frameworks.map { |x| "#{vendored_framework_path(x)}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }
-        if podspec_resources.count > 0
-          podspec += "    p.resources = '#{podspec_resources.uniq.join("','")}'\n"
+        podspec = "  s.subspec '#{item.name.gsub("/", "_")}' do |p|\n"
+        podspec += "    p.vendored_frameworks = '#{vendored_frameworks.join("','")}'\n"
+        if item.frameworks.count > 0
+          podspec += "    p.frameworks = '#{item.frameworks.join("', '")}'\n"
         end
-        
-        podspec_exclude_files = static_vendored_frameworks.map { |x| "#{vendored_framework_path(x)}/Info.plist" }
-        if podspec_exclude_files.count > 0
-          podspec += "    p.exclude_files = '#{podspec_exclude_files.uniq.join("','")}'\n"
+        if item.libraries.count > 0
+          podspec += "    p.libraries = '#{item.libraries.join("', '")}'\n"
         end
-
-        if pod.xcconfig.count > 0
-          podspec += "    p.xcconfig = #{pod.xcconfig.to_s.gsub("\"", "'")}\n"
+        if item.resources.count > 0
+          podspec += "    p.resources = '#{item.resources.join("', '")}'\n"
         end
-        
+        if item.resources.count > 0
+          podspec += "    p.exclude_files = '#{item.exclude_files.join("', '")}'\n"
+        end
+        if item.xcconfig.keys.count > 0
+          podspec += "    p.xcconfig = #{item.xcconfig.to_s}\n"
+        end
+
         podspec += "  end"
         
         podspecs.push(podspec)
@@ -44,26 +73,82 @@ module PodBuilder
       cwd = File.dirname(File.expand_path(__FILE__))
       podspec_file = File.read("#{cwd}/templates/build_podspec.template")
       podspec_file.gsub!("%%%podspecs%%%", podspecs.join("\n\n"))
+            
+      podspec_file.sub!("%%%platform_name%%%", platform.name.to_s)
+      podspec_file.sub!("%%%deployment_version%%%", platform.deployment_target.version)
       
       File.write(PodBuilder::basepath("PodBuilder.podspec"), podspec_file)
     end
-    
-    private
 
+    def self.podspec_items_from(buildable_items)
+      podspec_items = []
+
+      buildable_items.each do |pod|
+        spec_exists = File.exist?(PodBuilder::basepath(vendored_spec_framework_path(pod))) 
+        subspec_exists = File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
+        
+        unless spec_exists || subspec_exists
+          puts "Skipping #{pod.name}, not prebuilt".blue
+          next
+        end
+        
+        pod_name = Configuration.subspecs_to_split.include?(pod.name) ? pod.name : pod.root_name
+        unless podspec_item = podspec_items.detect { |x| x.name == pod_name }
+          podspec_item = PodspecItem.new
+          podspec_items.push(podspec_item)
+          podspec_item.name = pod_name
+          podspec_item.module_name = pod.module_name
+        end
+        
+        podspec_item.vendored_frameworks += [pod] + pod.dependencies(buildable_items)
+        
+        podspec_item.frameworks = podspec_item.vendored_frameworks.map { |x| x.frameworks }.flatten.uniq.sort
+        podspec_item.weak_frameworks = podspec_item.vendored_frameworks.map { |x| x.weak_frameworks }.flatten.uniq.sort
+        podspec_item.libraries = podspec_item.vendored_frameworks.map { |x| x.libraries }.flatten.uniq.sort
+        
+        static_vendored_frameworks = podspec_item.vendored_frameworks.select { |x| x.is_static }
+        
+        podspec_item.resources = static_vendored_frameworks.map { |x| "#{vendored_framework_path(x)}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }.flatten.uniq
+        podspec_item.exclude_files = static_vendored_frameworks.map { |x| "#{vendored_framework_path(x)}/Info.plist" }.flatten.uniq
+
+        # Merge xcconfigs
+        if !pod.xcconfig.empty?
+          pod.xcconfig.each do |k, v|
+            unless v != "$(inherited)"
+              next
+            end
+            unless k == "OTHER_LDFLAGS"
+              next # For the time being limit to OTHER_LDFLAGS key
+            end
+
+            if podspec_values = podspec_item.xcconfig[k]
+              podspec_values_arr = podspec_values.split(" ")
+              podspec_values_arr.push(v)
+              v = podspec_values_arr.join(" ")          
+            end
+            
+            podspec_item.xcconfig[k] = v
+          end
+        end
+      end
+
+      return podspec_items
+    end
+    
     def self.vendored_framework_path(pod)
       if File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
         return vendored_subspec_framework_path(pod)
       elsif File.exist?(PodBuilder::basepath(vendored_spec_framework_path(pod)))
         return vendored_spec_framework_path(pod)
       end
-
+      
       return nil
     end
     
     def self.vendored_subspec_framework_path(pod)
       return "Rome/#{pod.prebuilt_rel_path}"
     end
-
+    
     def self.vendored_spec_framework_path(pod)
       return "Rome/#{pod.module_name}.framework"
     end

data/lib/pod_builder/templates/build_podfile.template

@@ -48,7 +48,7 @@ plugin 'cocoapods-rome', {  dsym: false, configuration: '%%%build_configuration%
   installer.pods_project.save
 }}
 
-platform :ios, '9.0'
+platform :%%%platform_name%%%, '%%%deployment_version%%%'
 
 # Targets
 
@@ -57,7 +57,7 @@ target 'DummyTarget' do
 end
 
 pre_install do |installer|
-  raise "\n🚨  Do not launch 'pod install' manually, use `pod_builder` instead!\n" if !File.exist?('pod_builder.lock')
+  raise "\n\n🚨  Do not launch 'pod install' manually, use `pod_builder` instead!\n" if !File.exist?('pod_builder.lock')
 
   # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
   Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}

data/lib/pod_builder/templates/build_podspec.template

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.author           = { "Tomas Camin" => "tomas.camin@schibsted.com" }
   s.source           = { :git => "https://www.subito.it", :tag => s.version.to_s }
   
-  s.platform     = :ios, '9.0'
+  s.platform     = :%%%platform_name%%%, '%%%deployment_version%%%'
   s.requires_arc = true
   
 %%%podspecs%%%

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.1.8.beta"
+  VERSION = "0.2.0"
 end
   

data/pod-builder.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'xcodeproj'
   spec.add_runtime_dependency 'colored'
+  spec.add_runtime_dependency 'highline'  
   spec.add_runtime_dependency 'cocoapods', '~> 1.0'
   spec.add_runtime_dependency 'cocoapods-core', '~> 1.0'
   spec.add_runtime_dependency 'cocoapods-rome', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.8.beta
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +237,7 @@ files:
 - bin/console
 - bin/setup
 - exe/pod_builder
+- lib/core_ext/string.rb
 - lib/pod_builder/analyze.rb
 - lib/pod_builder/cocoapods/analyzer.rb
 - lib/pod_builder/cocoapods/specification.rb
@@ -231,11 +246,14 @@ files:
 - lib/pod_builder/command/build_all.rb
 - lib/pod_builder/command/clean.rb
 - lib/pod_builder/command/deintegrate.rb
+- lib/pod_builder/command/generate_lfs.rb
 - lib/pod_builder/command/generate_podspec.rb
 - lib/pod_builder/command/init.rb
 - lib/pod_builder/command/install_sources.rb
 - lib/pod_builder/command/none.rb
 - lib/pod_builder/command/restore_all.rb
+- lib/pod_builder/command/switch.rb
+- lib/pod_builder/command/synch_podfile.rb
 - lib/pod_builder/configuration.rb
 - lib/pod_builder/core.rb
 - lib/pod_builder/install.rb
@@ -262,9 +280,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3