pod-builder 0.1.6 → 0.1.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd72df247e9167eaab28018d45a0d472bacb2fb10ae30f3024056bf05d3b81f
-  data.tar.gz: a5dcc842f4e72712adee80fe25884551da99cc98a0ba1225ea282d26ee454146
+  metadata.gz: 883d322c0c5ffd3cf34a85d76a055f3a1200400243ae03b109cb93fd3d3fd8be
+  data.tar.gz: b0237ad432feae58f2b222c4ece477c580425cdd4986ebf148106d3b272a0e3b
 SHA512:
-  metadata.gz: ec05a3563dd83e63921bd133ee649c558314ba4ee386916dd31e420f3970fc8167d4dfa0b88d9f611a5d1efa320400494cd9b5b411db100f595e6e40584a594f
-  data.tar.gz: 66f07fa9a0d837353e524ab56ef7a237036d9450ca9ba032eeaac7898db0233314594952ea2572696500c585cfc8e25dd3338a13f0b54eec0be8a85648219af0
+  metadata.gz: 7443c790eb55db4a7565cb846d53a9aea7cdb26e5077f9407c1eddcaa8e217beee1851888ad688b6d683ea65c6274a0abd9cca701b7e21575118fcf479a37013
+  data.tar.gz: 2b455b666c9a690ef3682b810810e7fdf952c6d67846d193a8bead5b41402aa4afebaf24f3407dbb935461a5a14c1a15322a8a341bb992f15074195dc78e6947

data/.vscode/launch.json

@@ -55,7 +55,7 @@
             "args": [
                 "build",
                 "-d",
-                "MessagingUIViews/Core",
+                "AppNexusSDK/GoogleAdapterThatDependsOnGooglePod",
             ]
         },
         {

data/README.md

@@ -129,7 +129,7 @@ Xcode build settings to use. You can override the default values which are:
     "CLANG_ENABLE_MODULE_DEBUGGING": "NO",
     "GCC_OPTIMIZATION_LEVEL": "s",
     "SWIFT_OPTIMIZATION_LEVEL": "-Osize",
-    "SWIFT_COMPILATION_MODE": "Incremental"
+    "SWIFT_COMPILATION_MODE": "singlefile"
 } 
 ```
 

data/exe/pod_builder

@@ -171,6 +171,18 @@ begin
 
   PodBuilder::Configuration.load
   command_executed = parse_commandline
+rescue Exception => e
+  error = e.to_s
+
+  if error.length < 1000
+    puts "#{error.red}\n"
+    puts e.backtrace.join("\n\t").red
+    puts "\n\nCommand failed!".red
+  else
+    error_log = "/tmp/pod_builder.err"
+    puts "\n\nCommand failed, check #{error_log}!".red
+    File.write(error_log, error)
+  end
 ensure
   unless command_executed
     exit(0)

data/lib/pod_builder/cocoapods/analyzer.rb

@@ -4,7 +4,9 @@ module Pod
       def pods_and_deps_in_target(target_name, podfile_items)
         target_name = "Pods-#{target_name}"
 
-        specs = result.specs_by_target.select { |key, value| key.label == target_name }.values.first
+        unless specs = result.specs_by_target.select { |key, value| key.label == target_name }.values.first
+          return [], []
+        end
         specs.select! { |x| podfile_items.map(&:name).include?(x.name) }
         
         target_pods = []

data/lib/pod_builder/command/clean.rb

@@ -49,7 +49,7 @@ module PodBuilder
           end
 
           puts "Deleting sources #{path}".blue
-          FileUtils.rm_rf(path)
+          PodBuilder::safe_rm_rf(path)
         end
       end
 
@@ -64,7 +64,7 @@ module PodBuilder
           end
 
           puts "Deleting #{path}".blue
-          FileUtils.rm_rf(path)
+          PodBuilder::safe_rm_rf(path)
         end
 
         current_dir = Dir.pwd

data/lib/pod_builder/command/init.rb

@@ -28,12 +28,6 @@ module PodBuilder
         add_pre_install_actions(project_podfile_path)
         add_post_install_checks(project_podfile_path)
 
-        home_path = Pathname.new(PodBuilder::xcodepath)
-        prebuilt_path = Pathname.new(options[:prebuild_path])
-        relative_path = prebuilt_path.relative_path_from(home_path)
-
-        Configuration.base_path = relative_path
-
         Configuration.write
 
         puts "\n\n🎉 done!\n".green

data/lib/pod_builder/configuration.rb

@@ -21,12 +21,12 @@ module PodBuilder
       "CLANG_ENABLE_MODULE_DEBUGGING" => "NO",
       "GCC_OPTIMIZATION_LEVEL" => "s",
       "SWIFT_OPTIMIZATION_LEVEL" => "-Osize",
-      "SWIFT_COMPILATION_MODE" => "Incremental",
+      "SWIFT_COMPILATION_MODE" => "singlefile",
     }  
     @build_settings_overrides = {}
     @build_system = "Legacy" # either Latest (New build system) or Legacy (Standard build system)
     @config_file = "PodBuilder.json"
-    @base_path = "Frameworks"
+    @base_path = "Frameworks" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @build_path = "/tmp/pod_builder"
     @spec_overrides = {}
     @skip_licenses = []

data/lib/pod_builder/core.rb

@@ -48,11 +48,11 @@ module PodBuilder
   end
 
   def self.find_xcodeproject
-    return Dir.glob("#{home}/**/*.xcodeproj").detect { |x| !x.include?("Pods.xcodeproj") && !x.include?(basepath) }
+    return Dir.glob("#{home}/**/*.xcodeproj").detect { |x| !x.include?("/Pods/") && !x.include?(basepath) }
   end
 
   def self.find_xcodeworkspace
-    return Dir.glob("#{home}/**/*.xcworkspace").detect { |x| !x.include?("Pods.xcworkspace") && !x.include?(basepath) }
+    return Dir.glob("#{home}/**/*.xcworkspace").detect { |x| !x.include?("/Pods/") && !x.include?(basepath) }
   end
 
   def self.prepare_basepath

data/lib/pod_builder/podfile.rb

@@ -21,6 +21,9 @@ module PodBuilder
 
       build_settings = Configuration.build_settings
       podfile_build_settings = ""
+      
+      pod_dependencies = {}
+
       items.each do |item|
         item_build_settings = Configuration.build_settings_overrides[item.name] || {}
         build_settings['SWIFT_VERSION'] = item_build_settings["SWIFT_VERSION"] || project_swift_version(analyzer)
@@ -30,6 +33,19 @@ module PodBuilder
         end
 
         podfile_build_settings += "set_build_settings(\"#{item.root_name}\", #{build_settings.to_s}, installer)\n  "
+
+        dependency_names = item.dependency_names.map { |x|
+          if x.split("/").first == item.root_name
+            next nil # remove dependency to parent spec
+          end
+          if overridded_module_name = Configuration.spec_overrides[x]["module_name"]
+            next overridded_module_name
+          end
+        }.compact
+  
+        if dependency_names.count > 0
+          pod_dependencies[item.root_name] = dependency_names
+        end
       end
 
       podfile.sub!("%%%build_settings%%%", podfile_build_settings)
@@ -38,7 +54,7 @@ module PodBuilder
 
       podfile.sub!("%%%pods%%%", "\"#{items.map(&:name).join('", "')}\"")
       
-      podfile.sub!("%%%dependencies%%%", "\"#{items.map(&:dependency_names).flatten.uniq.join("\",\"")}\"")
+      podfile.sub!("%%%pods_dependencies%%%", pod_dependencies.to_s)
       
       podfile.sub!("%%%targets%%%", items.map(&:entry).join("\n  "))
 
@@ -148,7 +164,7 @@ module PodBuilder
 
     def self.pod_definition_in(line, include_commented)
       stripped_line = strip_line(line)
-      matches = stripped_line.match(/(pod')(.*?)(')/)
+      matches = stripped_line.match(/(^pod')(.*?)(')/)
       
       if matches&.size == 4 && (include_commented || !stripped_line.start_with?("#"))
         return matches[2]
@@ -159,7 +175,7 @@ module PodBuilder
 
     def self.target_definition_in(line, include_commented)
       stripped_line = strip_line(line)
-      matches = stripped_line.match(/(target')(.*?)(')/)
+      matches = stripped_line.match(/(^target')(.*?)(')/)
       
       if matches&.size == 4 && (include_commented || !stripped_line.start_with?("#"))
         return matches[2]

data/lib/pod_builder/podfile/post_actions.rb

@@ -129,7 +129,7 @@ module PodBuilder
     end
 
     def self.find_xcodeproj_targets
-      xcodeprojects = Dir.glob("#{PodBuilder::home}/**/*.xcodeproj").select { |x| !x.include?("Pods.xcodeproj") && !x.include?(PodBuilder::basepath) }
+      xcodeprojects = Dir.glob("#{PodBuilder::home}/**/*.xcodeproj").select { |x| !x.include?("/Pods/") && !x.include?(PodBuilder::basepath) }
       raise "xcdeoproj not found!".red if xcodeprojects.count == 0
       raise "Found multiple xcdeoprojs:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
       

data/lib/pod_builder/templates/build_podfile.template

@@ -19,28 +19,15 @@ plugin 'cocoapods-rome', {  dsym: false, configuration: '%%%build_configuration%
   end
 
   %%%build_settings%%%
-  pods = [%%%pods%%%]
-  dependencies = [%%%dependencies%%%]
+  pods_dependencies = %%%pods_dependencies%%%
 
-  removed_dependencies = []
-  installer.pods_project.targets.each do |target|
-    target.frameworks_build_phase.files.each do |f|
-      dependencies.each do |dependency|
-        if f.display_name().include?(dependency + ".a") then
-          removed_dependencies.push(dependency)
-          target.frameworks_build_phase.remove_build_file(f)
-        end
-      end
-    end        
-  end
-  
   # Add -l<dependency> to other linker flags
   installer.pods_project.targets.each do |target|
-    if pods.any? { |w| target.display_name().include?(w) }
-      removed_dependencies.each do |dependency|
-        target.build_configurations.each do |config|      
+    if dependencies = pods_dependencies[target.name]
+      target.build_configurations.each do |config|   
+        dependencies.each do |dependency|   
           if config.build_settings['OTHER_LDFLAGS'].nil?
-            config.build_settings['OTHER_LDFLAGS'] = '-framework '
+            config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -framework '
           else
             config.build_settings['OTHER_LDFLAGS'] << '-framework '
           end

data/lib/pod_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8.beta
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3