pod-builder 0.3.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6adf6261775573ce5d92fed4033a6f2cf2621136fece929f952cebefd4f02b4
-  data.tar.gz: 802eb3e919ebd5a2009364e2fcfa43e5d62eb1c5ff02ceeca8081f688a92a2ee
+  metadata.gz: 9cded05bfcf9315ed900e6ed9192277be561abdfc65676f7f7f3e18e8d94faeb
+  data.tar.gz: 58cd8fed676594d96f9bee43565dcb02348611420c8cd6dcb4606d4716613c80
 SHA512:
-  metadata.gz: 169ad5c3f81b3590764dbfb96eb62ecb23ae418e414723b0ccf1435487139c2f4fbb0160a1a99c79b56740f8954e5e305476128c09a8d9801b7a6559f90d5832
-  data.tar.gz: 36d9fd43f54a6ea00370b10a54a4d5cc41d24acc03a8a7573c5299bf886e1d2d9a7e29c9d18ec12e224b33fc1975d533815dab95a73f0cf9da429b4fbe5e7a98
+  metadata.gz: bf11ab141dc7134f3286bdf3334a0660aaa49e58e42326a2dfa4b361d7b4fa065445974370e2c061a4565a8d989d10de512463c678d70637e02d16d5771a52c7
+  data.tar.gz: a79759fc5a4147ebbc80831a40c9f4665aaae3292e850585fe2adc073e53507d9adc508fc908d1197e68c38780d123af0f8b5d6141633b94c43d35d9027ac5b8

data/exe/pod_builder

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if ENV['RUBYLIB']
+if ENV['DEBUGGING']
   puts "Running in debug, injecting $LOAD_PATH"
   libdir = File.expand_path("#{File.dirname(__FILE__)}/../lib")
   $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
@@ -285,28 +285,27 @@ Usage:
     }      
   }
    
-  subcommand = subcommands[ARGV.shift]
+  argv = ARGV.dup
+  if subcommand = subcommands[argv.first]
+    ARGV.shift
+  else
+    subcommand = subcommands["none"]
+  end
    
   ret = -1
-  if subcommand
-    if ARGV.include?("--help") || ARGV.include?("-h")
-      puts subcommand[:opts].help
-    else
-      PodBuilder::Configuration.load
-
-      subcommand[:opts].order!
-      subcommand[:call].each do |k|
-        if (ret = k.call(OPTIONS)) && ret == -1
-          puts subcommand[:opts].help
-        end
+  show_help = argv.include?("--help") || argv.include?("-h") || argv.count == 0
+  if show_help
+    puts subcommand[:opts].help
+  else
+    PodBuilder::Configuration.load
+
+    subcommand[:opts].order!    
+    subcommand[:call].each do |k|
+      if (ret = k.call(OPTIONS)) && ret == -1
+        puts subcommand[:opts].help
       end
-    end    
-  else  
-    subcommands["none"][:opts].order!    
-    if subcommands["none"][:call].first&.call(OPTIONS) != 0
-      puts subcommands["none"][:opts].help
     end
-  end
+  end    
 
   return ret
 end

data/lib/pod_builder/analyze.rb

@@ -15,6 +15,8 @@ module PodBuilder
       installer.repo_update = repo_update
       installer.update = false 
 
+      installer.prepare
+
       analyzer = installer.resolve_dependencies
 
       Dir.chdir(current_dir)

data/lib/pod_builder/command/update.rb

@@ -10,18 +10,27 @@ module PodBuilder
         
         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 line.match(/(pb<)(.*?)(>)/) # is not prebuilt
-              pod_entries.push(pod_entry)
+            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)

data/lib/pod_builder/core.rb

@@ -85,7 +85,9 @@ module PodBuilder
   end
 
   def self.system_swift_version
-    return `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
+    swift_version = `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
+    raise "Unsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`" if swift_version.length == 0
+    return swift_version
   end
 
   private 

data/lib/pod_builder/podfile.rb

@@ -14,7 +14,7 @@ module PodBuilder
       cwd = File.dirname(File.expand_path(__FILE__))
       podfile = File.read("#{cwd}/templates/build_podfile.template")
 
-      platform = analyzer.result.targets.first.platform
+      platform = analyzer.instance_variable_get("@result").targets.first.platform
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
       podfile.sub!("%%%deployment_version%%%", platform.deployment_target.version)
 
@@ -103,17 +103,17 @@ module PodBuilder
         }
       end
 
-      result_targets = analyzer.result.targets.map(&:name) 
+      result_targets = analyzer.instance_variable_get("@result").targets.map(&:name) 
       podfile_content = ["# Autogenerated by PodBuilder (https://github.com/Subito-it/PodBuilder)", "# Please don't modify this file", "\n"]
       podfile_content += analyzer.podfile.sources.map { |x| "source '#{x}'" }
       podfile_content += ["", "use_frameworks!", ""]
 
       # multiple platforms not (yet) supported
       # https://github.com/CocoaPods/Rome/issues/37
-      platform = analyzer.result.targets.first.platform
+      platform = analyzer.instance_variable_get("@result").targets.first.platform
       podfile_content += ["platform :#{platform.name}, '#{platform.deployment_target.version}'", ""]
 
-      analyzer.result.specs_by_target.each do |target, specifications|
+      analyzer.instance_variable_get("@result").specs_by_target.each do |target, specifications|
         target_name = target.name.to_s
 
         unless result_targets.select { |x| x.end_with?(target_name) }.count > 0
@@ -303,7 +303,7 @@ module PodBuilder
     end
 
     def self.project_swift_version(analyzer)
-      swift_versions = analyzer.result.target_inspections.values.map { |x| x.target_definition.swift_version }.compact.uniq
+      swift_versions = analyzer.instance_variable_get("@result").targets.map { |x| x.target_definition.swift_version }.compact.uniq
 
       raise "Found different Swift versions in targets. Expecting one, got `#{swift_versions}`" if swift_versions.count != 1
 

data/lib/pod_builder/podfile_item.rb

@@ -219,6 +219,7 @@ module PodBuilder
       embedded_as_static_lib = vendored_items_paths.any? { |x| x.match(/#{module_name}.*\\.a/) != nil }
       
       only_headers = @source_files.include?("*.h")
+      only_headers |= (source_files.count > 0 && @source_files.all? { |x| x.end_with?(".h") })
       no_sources = (@source_files.count == 0 || only_headers) && @vendored_items.count > 0
 
       return embedded_as_static_lib || embedded_as_vendored || only_headers || no_sources

data/lib/pod_builder/podspec.rb

@@ -36,7 +36,7 @@ module PodBuilder
             
       podspec_items = podspec_items_from(buildable_items)
 
-      platform = analyzer.result.targets.first.platform
+      platform = analyzer.instance_variable_get("@result").targets.first.platform
       generate_podspec_from(podspec_items, platform)
     end
 
@@ -107,7 +107,7 @@ module PodBuilder
         subspec_exists = File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
         
         unless spec_exists || subspec_exists
-          puts "Skipping #{pod.name}, not prebuilt".blue
+          puts "Skipping `#{pod.name}`, not prebuilt".blue
           next
         end
         

data/lib/pod_builder/templates/build_podfile.template

@@ -59,6 +59,11 @@ end
 pre_install do |installer|
   raise "\n\n🚨  Do not launch 'pod install' manually, use `pod_builder` instead!\n" if !File.exist?('pod_builder.lock')
 
+  installer.pod_targets.each do |target|
+    # set a random version to please CocoaPods, the proper version will be overridden by set_build_settings()
+    target.root_spec.swift_version = "1.0" 
+  end
+
   # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
   Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
   Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}

data/lib/pod_builder/version.rb

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

data/pod-builder.gemspec

@@ -29,8 +29,8 @@ 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', '~> 1.6'
+  spec.add_runtime_dependency 'cocoapods-core', '~> 1.6'
   spec.add_runtime_dependency 'cocoapods-rome', '~> 1.0'
   spec.add_runtime_dependency 'CFPropertyList'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: cocoapods-rome
   requirement: !ruby/object:Gem::Requirement