pod-builder 2.0.0.beta.19 → 2.0.0.beta.21

data/lib/pod_builder/command/build.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Build
-      def self.call(options) 
+      def self.call 
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
@@ -13,14 +13,14 @@ module PodBuilder
           return -1
         end
 
-        raise "\n\nPlease rename your Xcode installation path removing spaces, current `#{`xcode-select -p`.strip()}`\n" if `xcode-select -p`.strip().include?(" ")
+        raise "\n\nPlease rename your Xcode installation path removing spaces, current `#{`xcode-select -p`.strip()}`\n".red if `xcode-select -p`.strip().include?(" ")
 
         Podfile.sanity_check()
         check_not_building_subspecs(argument_pods)
 
         puts "Loading Podfile".yellow
 
-        install_update_repo = options.fetch(:update_repos, true)
+        install_update_repo = OPTIONS.fetch(:update_repos, true)
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
@@ -29,9 +29,12 @@ module PodBuilder
 
         build_all = argument_pods.first == "*"
         if build_all
-          argument_pods = analyzer.explicit_pods().map(&:root_name).uniq
+          argument_pods = all_buildable_items.map(&:root_name).uniq
         else
           argument_pods = Podfile::resolve_pod_names(argument_pods, all_buildable_items)
+          deps = all_buildable_items.select { |t| argument_pods.include?(t.root_name) }.map(&:dependency_names).flatten.map { |t| t.split("/").first }
+          argument_pods += deps
+          argument_pods.uniq!
         end
 
         available_argument_pods = argument_pods.select { |x| all_buildable_items.map(&:root_name).include?(x) }     
@@ -46,10 +49,10 @@ module PodBuilder
 
         restore_file_error = Podfile.restore_file_sanity_check
   
-        check_splitted_subspecs_are_static(all_buildable_items, options)
+        check_splitted_subspecs_are_static(all_buildable_items)
         check_pods_exists(argument_pods, all_buildable_items)
 
-        pods_to_build = resolve_pods_to_build(argument_pods, buildable_items, options)
+        pods_to_build = resolve_pods_to_build(argument_pods, buildable_items)
         buildable_items -= pods_to_build
 
         # We need to split pods to build in 3 groups
@@ -57,7 +60,7 @@ module PodBuilder
         # 2. pods to build in release
         # 3. pods to build in debug
 
-        check_not_building_development_pods(pods_to_build, options)
+        check_not_building_development_pods(pods_to_build)
 
         pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec && Configuration.subspecs_to_split.include?(x.name) }
 
@@ -83,19 +86,17 @@ module PodBuilder
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
           podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration)
           
-          Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)
-
-          licenses += license_specifiers
+          licenses += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)
           
           # remove lockfile which gets unexplicably created
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
-        clean_frameworks_folder(all_buildable_items)
+        Clean::prebuilt_items(all_buildable_items)
 
         Licenses::write(licenses, all_buildable_items)
 
-        GenerateLFS::call(nil)
+        GenerateLFS::call()
         Podspec::generate(all_buildable_items, analyzer)
 
         builded_pods = podfiles_items.flatten
@@ -104,13 +105,13 @@ module PodBuilder
         builded_pods_and_deps.select! { |x| !x.is_prebuilt }
         
         Podfile::write_restorable(builded_pods_and_deps + prebuilt_pods_to_install, all_buildable_items, analyzer)     
-        if !options.has_key?(:skip_prebuild_update)   
+        if !OPTIONS.has_key?(:skip_prebuild_update)   
           Podfile::write_prebuilt(all_buildable_items, analyzer)
         end
 
         Podfile::install
 
-        sanity_checks(options)
+        sanity_checks
 
         if (restore_file_error = restore_file_error) && Configuration.restore_enabled
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
@@ -122,89 +123,6 @@ module PodBuilder
 
       private
 
-      def self.license_specifiers
-        acknowledge_files = Dir.glob("#{PodBuilder::Configuration.build_path}/Pods/**/*acknowledgements.plist")
-        raise "Too many ackwnoledge files found" if acknowledge_files.count > 1
-
-        if acknowledge_file = acknowledge_files.first
-          plist = CFPropertyList::List.new(:file => acknowledge_file)
-          data = CFPropertyList.native_types(plist.value)
-          
-          return data["PreferenceSpecifiers"]
-        end
-
-        return []
-      end
-
-      # def self.buildable_dependencies(pod, buildable_items)
-      #   deps = []
-
-      #   pod.dependency_names.each do |dependency|
-      #     buildable_pods = buildable_items.select { |t| t.root_name == dependency }
-      #     if buildable_pods.any? { |t| t.source_files.count > 0 }
-      #       deps.push(dependency)
-      #     end
-      #   end
-
-      #   return deps
-      # end
-
-      # def self.expected_common_dependencies(pods_to_build, buildable_items, options)
-      #   warned_expected_pod_list = []
-      #   expected_pod_list = []
-      #   errors = []
-
-      #   pods_to_build.each do |pod_to_build|
-      #     buildable_dependencies(pod_to_build, buildable_items).each do |dependency|
-      #       unless buildable_items.detect { |x| x.root_name == dependency || x.name == dependency } != nil
-      #         next
-      #       end
-
-      #       buildable_items.each do |buildable_pod|
-      #         unless !buildable_dependencies(pod_to_build, buildable_items).include?(buildable_pod.name)
-      #           next
-      #         end
-
-      #         if buildable_dependencies(buildable_pod, buildable_items).include?(dependency) && !buildable_pod.has_subspec(dependency) && !buildable_pod.has_common_spec(dependency) then
-      #           expected_pod_list += pods_to_build.map(&:root_name) + [buildable_pod.root_name]
-      #           expected_pod_list.uniq!
-
-      #           expected_list = expected_pod_list.join(" ")
-      #           if !warned_expected_pod_list.include?(expected_list)
-      #             errors.push("Can't build #{pod_to_build.name} because it has common dependencies (#{dependency}) with #{buildable_pod.name}.\n\nUse `pod_builder build #{expected_list}` instead or use `pod_builder build -a #{pod_to_build.name}` to automatically resolve missing dependencies\n\n")
-      #             errors.uniq!
-      #             warned_expected_pod_list.push(expected_list)
-
-      #             if options.has_key?(:auto_resolve_dependencies)
-      #               puts "`#{pod_to_build.name}` has the following dependencies:\n`#{buildable_dependencies(pod_to_build, buildable_items).join("`, `")}`\nWhich are in common with `#{buildable_pod.name}` and requires it to be recompiled\n\n".yellow
-      #             end
-      #           end
-      #         end
-      #       end
-      #     end
-      #   end
-
-      #   return expected_pod_list, errors
-      # end
-
-      # def self.expected_parent_dependencies(pods_to_build, buildable_items, options)
-      #   expected_pod_list = []
-      #   errors = []
-
-      #   buildable_items_dependencies = buildable_items.map(&:dependency_names).flatten.uniq
-      #   pods_to_build.each do |pod_to_build|
-      #     if buildable_items_dependencies.include?(pod_to_build.name)
-      #       parent = buildable_items.detect { |x| x.dependency_names.include?(pod_to_build.name) }
-
-      #       expected_pod_list += (pods_to_build + [parent]).map(&:root_name)
-      #       expected_pod_list.uniq!
-      #       errors.push("Can't build #{pod_to_build.name} because it is a dependency of #{parent.name}.\n\nUse `pod_builder build #{expected_pod_list.join(" ")}` instead\n\n")
-      #     end
-      #   end
-
-      #   return expected_pod_list, errors
-      # end
-
       def self.check_not_building_subspecs(pods_to_build)
         pods_to_build.each do |pod_to_build|
           if pod_to_build.include?("/")
@@ -214,7 +132,7 @@ module PodBuilder
       end
 
       def self.check_pods_exists(pods, buildable_items)
-        raise "Empty Podfile?" if buildable_items.nil?
+        raise "\n\nEmpty Podfile?".red if buildable_items.nil?
 
         buildable_items = buildable_items.map(&:root_name)
         pods.each do |pod|
@@ -222,7 +140,7 @@ module PodBuilder
         end
       end
 
-      def self.check_splitted_subspecs_are_static(all_buildable_items, options)
+      def self.check_splitted_subspecs_are_static(all_buildable_items)
         non_static_subspecs = all_buildable_items.select { |x| x.is_subspec && x.is_static == false }
         non_static_subspecs_names = non_static_subspecs.map(&:name)
 
@@ -232,11 +150,11 @@ module PodBuilder
           return
         end
 
-        warn_message = "The following pods `#{invalid_subspecs.join(" ")}` are non static frameworks which are being splitted over different targets. Beware that this is an unsafe setup as per https://github.com/CocoaPods/CocoaPods/issues/5708 and https://github.com/CocoaPods/CocoaPods/issues/5643\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
-        if options[:allow_warnings]
+        warn_message = "The following pods `#{invalid_subspecs.join(" ")}` are non static binaries which are being splitted over different targets. Beware that this is an unsafe setup as per https://github.com/CocoaPods/CocoaPods/issues/5708 and https://github.com/CocoaPods/CocoaPods/issues/5643\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
+        if OPTIONS[:allow_warnings]
           puts "\n\n⚠️  #{warn_message}".yellow
         else
-          raise "\n\n🚨️  #{warn_message}".yellow
+          raise "\n\n🚨️  #{warn_message}".red
         end
       end
 
@@ -250,14 +168,14 @@ module PodBuilder
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
-          raise "Dependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies" if pods_with_unaligned_build_configuration.count > 0
+          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies".red if pods_with_unaligned_build_configuration.count > 0
         end
       end
 
-      def self.check_not_building_development_pods(pods, options)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (options[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
+      def self.check_not_building_development_pods(pods)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
           pod_names = development_pods.map(&:name).join(", ")
-          raise "The following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
+          raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
       end
 
@@ -270,7 +188,7 @@ module PodBuilder
         return buildable_subspecs - pods_to_build
       end
 
-      def self.sanity_checks(options)
+      def self.sanity_checks
         lines = File.read(PodBuilder::project_path("Podfile")).split("\n")
         stripped_lines = lines.map { |x| Podfile.strip_line(x) }.select { |x| !x.start_with?("#")}
 
@@ -278,7 +196,7 @@ module PodBuilder
 
         if !expected_stripped.all? { |x| stripped_lines.include?(x) }
           warn_message = "PodBuilder's post install actions missing from application Podfile!\n"
-          if options[:allow_warnings]
+          if OPTIONS[:allow_warnings]
             puts "\n\n⚠️  #{warn_message}".yellow
           else
             raise "\n\n🚨️  #{warn_message}".red
@@ -286,63 +204,14 @@ module PodBuilder
         end
       end
 
-      def self.resolve_pods_to_build(argument_pods, buildable_items, options)
+      def self.resolve_pods_to_build(argument_pods, buildable_items)
         pods_to_build = []
         
-        # fns = [method(:expected_common_dependencies), method(:expected_parent_dependencies)]
-        # fns.each do |fn|
-        #   loop do
-        #     pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
-        #     pods_to_build += other_subspecs(pods_to_build, buildable_items)
-        #     tmp_buildable_items = buildable_items - pods_to_build
-
-        #     expected_pods, errors = fn.call(pods_to_build, tmp_buildable_items, options)
-        #     if expected_pods.count > 0
-        #       if !options.has_key?(:auto_resolve_dependencies) && expected_pods.count > 0
-        #         raise "\n\n#{errors.join("\n")}".red
-        #       else
-        #         argument_pods = expected_pods.uniq
-        #       end  
-        #     end
-            
-        #     if !options.has_key?(:auto_resolve_dependencies) || expected_pods.count == 0
-        #       break
-        #     end
-        #   end  
-        # end
-
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
         return pods_to_build
-      end
-
-      def self.clean_frameworks_folder(buildable_items)
-        puts "Cleaning framework folder".yellow
-
-        expected_frameworks = buildable_items.map { |x| "#{x.module_name}.framework" }
-        expected_frameworks += buildable_items.map { |x| x.vendored_frameworks }.flatten.map { |x| File.basename(x) }
-        expected_frameworks.uniq!
-
-        existing_frameworks = Dir.glob(PodBuilder::prebuiltpath("*.framework"))
-
-        existing_frameworks.each do |existing_framework|
-          existing_framework_name = File.basename(existing_framework)
-          if !expected_frameworks.include?(existing_framework_name)
-            puts "Cleanining up `#{existing_framework_name}`, no longer found among dependencies".blue
-            FileUtils.rm_rf(existing_framework)
-          end
-        end
-
-        existing_dsyms = Dir.glob(PodBuilder::dsympath("**/*.dSYM"))
-        existing_dsyms.each do |existing_dsym|
-          existing_dsym_name = File.basename(existing_dsym)
-          if !expected_frameworks.include?(existing_dsym_name.gsub(".dSYM", ""))
-            puts "Cleanining up `#{existing_dsym_name}`, no longer found among dependencies".blue
-            FileUtils.rm_rf(existing_dsym)
-          end
-        end
-      end
+      end      
     end
   end
 end

data/lib/pod_builder/command/build_all.rb

@@ -3,12 +3,12 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class BuildAll
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
         ARGV << "*"
-        return Command::Build::call(options)
+        return Command::Build::call
       end
     end
   end

data/lib/pod_builder/command/clean.rb

@@ -4,90 +4,71 @@ require 'highline/import'
 module PodBuilder
   module Command
     class Clean
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
-        install_update_repo = options.fetch(:update_repos, true)
+        install_update_repo = OPTIONS.fetch(:update_repos, true)
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
-        podspec_names = all_buildable_items.map(&:podspec_name)
-        rel_paths = all_buildable_items.map(&:prebuilt_rel_path) + all_buildable_items.map(&:vendored_frameworks).flatten.map { |t| File.basename(t) }
-        rel_paths.uniq!
-
-        base_path = PodBuilder::prebuiltpath
-        framework_files = Dir.glob("#{base_path}/**/*.framework")
-        puts "Looking for unused frameworks".yellow
-        clean(framework_files, base_path, rel_paths)
-
-        rel_paths.map! { |x| "#{x}.dSYM"}
-
-        Configuration.supported_platforms.each do |platform|
-          base_path = PodBuilder::dsympath(platform)
-          dSYM_files = Dir.glob("#{base_path}/**/*.dSYM")
-          puts "Looking for #{platform} unused dSYMs".yellow    
-          clean(dSYM_files, base_path, rel_paths)  
-        end
-
-        puts "Looking for unused sources".yellow
-        clean_sources(podspec_names)
+        prebuilt_items(all_buildable_items)
+        install_sources(all_buildable_items)
 
         puts "\n\n🎉 done!\n".green
         return 0
       end
-
-      def self.clean_sources(podspec_names)        
-        base_path = PodBuilder::basepath("Sources")
-
-        repo_paths = Dir.glob("#{base_path}/*")
-
-        paths_to_delete = []
-        repo_paths.each do |path|
-          podspec_name = File.basename(path)
-
-          unless !podspec_names.include?(podspec_name)
-            next
+      
+      def self.prebuilt_items(buildable_items)
+        puts "Cleaning prebuilt folder".yellow
+
+        root_names = buildable_items.map(&:root_name).uniq
+        Dir.glob(File.join(PodBuilder::prebuiltpath, "*")).each do |path|
+          basename = File.basename(path)
+          unless root_names.include?(basename) 
+            puts "Cleanining up `#{basename}`, no longer found among dependencies".blue
+            PodBuilder::safe_rm_rf(path)
           end
-
-          paths_to_delete.push(path)
         end
 
-        paths_to_delete.flatten.each do |path|
-          confirm = ask("#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
-          if confirm.downcase == 'y'
+        puts "Cleaning dSYM folder".yellow
+        module_names = buildable_items.map(&:module_name).uniq
+        Dir.glob(File.join(PodBuilder::dsympath, "**/*.dSYM")).each do |path|
+          dsym_basename = File.basename(path, ".*")
+          dsym_basename.gsub!(/\.framework$/, "")
+          unless module_names.include?(dsym_basename)
+            puts "Cleanining up `#{dsym_basename}`, no longer found among dependencies".blue
             PodBuilder::safe_rm_rf(path)
           end
         end
+
       end
 
-      private
+      def self.install_sources(buildable_items)        
+        puts "Looking for unused sources".yellow
+
+        podspec_names = buildable_items.map(&:root_name).uniq
 
-      def self.clean(files, base_path, rel_paths)
-        files = files.map { |x| [Pathname.new(x).relative_path_from(Pathname.new(base_path)).to_s, x] }.to_h
+        base_path = PodBuilder::basepath("Sources")
 
         paths_to_delete = []
-        files.each do |rel_path, path|
-          unless !rel_paths.include?(rel_path)
+        repo_paths = Dir.glob("#{base_path}/*")
+        repo_paths.each do |path|
+          podspec_name = File.basename(path)
+
+          if podspec_names.include?(podspec_name)
             next
           end
 
           paths_to_delete.push(path)
         end
 
-        paths_to_delete.each do |path|
-          confirm = ask("\n#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
+        paths_to_delete.flatten.each do |path|
+          confirm = ask("#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
           if confirm.downcase == 'y'
             PodBuilder::safe_rm_rf(path)
           end
         end
-
-        Dir.chdir(base_path) do
-          # Before deleting anything be sure we're in a git repo
-          h = `git rev-parse --show-toplevel`.strip()
-          raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if h.empty?    
-          system("find . -type d -empty -delete") # delete empty folders
-        end
       end
     end
   end