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

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

data/lib/pod_builder/command/clear_lldbinit.rb

@@ -4,7 +4,11 @@ require 'digest'
 module PodBuilder
   module Command
     class ClearLldbInit
-      def self.call(options)
+      def self.call
+        Configuration.check_inited
+        if Configuration.build_using_repo_paths
+          raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
+        end
 
         argument_pods = ARGV.dup
         
@@ -34,7 +38,7 @@ module PodBuilder
       
         File.write(lldbinit_path, lldbinit_lines.join())
 
-        if options.nil? == false
+        if OPTIONS.nil? == false
           puts "\n\n🎉 done!\n".green
         end
         return 0

data/lib/pod_builder/command/deintegrate.rb

@@ -3,11 +3,11 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Deintegrate
-      def self.call(options)
+      def self.call
         raise "\n\nPodBuilder not initialized!\n".red if !Configuration.exists
 
-        prebuilt_podfile = File.join(Configuration.base_path, "Podfile")
-        restored_podfile = File.join(PodBuilder::project_path, "Podfile")
+        prebuilt_podfile = PodBuilder::basepath("Podfile")
+        restored_podfile = PodBuilder::project_path("Podfile")
 
         FileUtils.cp(prebuilt_podfile, restored_podfile)
 
@@ -32,9 +32,14 @@ module PodBuilder
         end
 
         FileUtils.rm_f(restored_podfile)
-        File.write(restored_podfile, podfile_lines.join)
-        Podfile.update_path_entires(restored_podfile, false)
-        Podfile.update_project_entries(restored_podfile, false)
+
+        podfile_content = podfile_lines.join
+        
+        podfile_content = Podfile.update_path_entries(podfile_content, Deintegrate.method(:podfile_path_transform))
+        podfile_content = Podfile.update_project_entries(podfile_content, Deintegrate.method(:podfile_path_transform))
+        podfile_content = Podfile.update_require_entries(podfile_content, Deintegrate.method(:podfile_path_transform))
+
+        File.write(restored_podfile, podfile_content)
 
         PodBuilder::safe_rm_rf(Configuration.base_path)
 
@@ -54,6 +59,22 @@ module PodBuilder
 
       private
 
+      def self.podfile_path_transform(path)
+        use_absolute_paths = false 
+        podfile_path = PodBuilder::project_path("Podfile")
+        original_basepath = PodBuilder::basepath
+
+        podfile_base_path = Pathname.new(File.dirname(podfile_path))
+  
+        original_path = Pathname.new(File.join(original_basepath, path))
+        replace_path = original_path.relative_path_from(podfile_base_path)
+        if use_absolute_paths
+          replace_path = replace_path.expand_path(podfile_base_path)
+        end
+  
+        return replace_path
+      end    
+
       def self.update_gemfile
         gemfile_path = File.join(PodBuilder::home, "Gemfile")
         unless File.exist?(gemfile_path)

data/lib/pod_builder/command/generate_lfs.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class GenerateLFS
-      def self.call(options)
+      def self.call
         Configuration.check_inited
 
         unless Configuration.lfs_update_gitattributes

data/lib/pod_builder/command/generate_podspec.rb

@@ -3,13 +3,14 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class GeneratePodspec
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, false)
+        all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
-        Podspec::generate(analyzer)
+        Podspec::generate(all_buildable_items, analyzer)
 
         puts "\n\n🎉 done!\n".green
         return 0

data/lib/pod_builder/command/info.rb

@@ -4,7 +4,7 @@ require 'json'
 module PodBuilder
   module Command
     class Info
-      def self.call(options)          
+      def self.call          
         Configuration.check_inited
 
         info = PodBuilder::Info.generate_info()

data/lib/pod_builder/command/init.rb

@@ -3,24 +3,24 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Init
-      def self.call(options)
+      def self.call
         raise "\n\nAlready initialized\n".red if Configuration.exists
 
         xcworkspace = Dir.glob("*.xcworkspace")
-        raise "\n\nNo xcworkspace found in current folder\n" if xcworkspace.count == 0
-        raise "\n\nToo many xcworkspaces found in current folder\n#{xcworkspace}\n" if xcworkspace.count > 1
+        raise "\n\nNo xcworkspace found in current folder\n".red if xcworkspace.count == 0
+        raise "\n\nToo many xcworkspaces found in current folder\n#{xcworkspace}\n".red if xcworkspace.count > 1
 
         Configuration.project_name = File.basename(xcworkspace.first, ".*")
         
-        options[:prebuild_path] ||= Configuration.base_path
+        OPTIONS[:prebuild_path] ||= Configuration.base_path
 
-        if File.expand_path(options[:prebuild_path]) != options[:prebuild_path] # if not absolute
-          options[:prebuild_path] = File.expand_path(PodBuilder::project_path(options[:prebuild_path]))
+        if File.expand_path(OPTIONS[:prebuild_path]) != OPTIONS[:prebuild_path] # if not absolute
+          OPTIONS[:prebuild_path] = File.expand_path(PodBuilder::project_path(OPTIONS[:prebuild_path]))
         end
 
-        FileUtils.mkdir_p(options[:prebuild_path])
-        FileUtils.mkdir_p("#{options[:prebuild_path]}/.pod_builder")
-        FileUtils.touch("#{options[:prebuild_path]}/.pod_builder/pod_builder")
+        FileUtils.mkdir_p(OPTIONS[:prebuild_path])
+        FileUtils.mkdir_p("#{OPTIONS[:prebuild_path]}/.pod_builder")
+        FileUtils.touch("#{OPTIONS[:prebuild_path]}/.pod_builder/pod_builder")
 
         source_path_rel_path = "Sources"
         development_pods_config_rel_path = Configuration.dev_pods_configuration_filename
@@ -32,15 +32,24 @@ module PodBuilder
                        source_path_rel_path,
                        development_pods_config_rel_path]
         
-        File.write("#{options[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
+        File.write("#{OPTIONS[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
 
         project_podfile_path = PodBuilder::project_path("Podfile")
-        prebuilt_podfile_path = File.join(options[:prebuild_path], "Podfile")
+        prebuilt_podfile_path = File.join(OPTIONS[:prebuild_path], "Podfile")
         FileUtils.cp(project_podfile_path, prebuilt_podfile_path)
+
+        podfile_content = File.read(prebuilt_podfile_path)
         
-        Podfile.add_install_block(prebuilt_podfile_path)
-        Podfile.update_path_entires(prebuilt_podfile_path, false, PodBuilder::project_path(""))
-        Podfile.update_project_entries(prebuilt_podfile_path, false, PodBuilder::project_path(""))
+        podfile_content = Podfile.add_install_block(podfile_content)
+        podfile_content = Podfile.update_path_entries(podfile_content, Init.method(:podfile_path_transform))
+        podfile_content = Podfile.update_project_entries(podfile_content, Init.method(:podfile_path_transform))
+        podfile_content = Podfile.update_require_entries(podfile_content, Init.method(:podfile_path_transform))
+
+        if podfile_content.include?("/node_modules/react-native/")
+          podfile_content = Podfile.prepare_for_react_native(podfile_content)
+        end
+
+        File.write(prebuilt_podfile_path, podfile_content)
 
         Configuration.write
 
@@ -52,6 +61,22 @@ module PodBuilder
 
       private 
 
+      def self.podfile_path_transform(path)
+        use_absolute_paths = false
+        podfile_path = File.join(OPTIONS[:prebuild_path], "Podfile")
+        original_basepath = PodBuilder::project_path
+
+        podfile_base_path = Pathname.new(File.dirname(podfile_path))
+  
+        original_path = Pathname.new(File.join(original_basepath, path))
+        replace_path = original_path.relative_path_from(podfile_base_path)
+        if use_absolute_paths
+          replace_path = replace_path.expand_path(podfile_base_path)
+        end
+  
+        return replace_path
+      end   
+
       def self.update_gemfile
         gemfile_path = File.join(PodBuilder::home, "Gemfile")
         unless File.exist?(gemfile_path)

data/lib/pod_builder/command/install_sources.rb

@@ -3,14 +3,18 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class InstallSources
-      def self.call(options)
+      def self.call
         Configuration.check_inited
+        if Configuration.build_using_repo_paths
+          raise "\n\nSource cannot be installed because lldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
+        end
+
         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)
-        framework_items = Analyze.podfile_items(installer, analyzer).select { |x| !x.is_prebuilt }
-        podspec_names = framework_items.map(&:podspec_name)
+        podfile_items = Analyze.podfile_items(installer, analyzer).select { |x| !x.is_prebuilt }
+        podspec_names = podfile_items.map(&:podspec_name)
 
         base_path = PodBuilder::prebuiltpath
         framework_files = Dir.glob("#{base_path}/**/*.framework")
@@ -18,15 +22,14 @@ module PodBuilder
         framework_files.each do |path|
           rel_path = Pathname.new(path).relative_path_from(Pathname.new(base_path)).to_s
 
-          if framework_spec = framework_items.detect { |x| x.prebuilt_rel_path == rel_path }
-            update_repo(framework_spec)
+          if podfile_spec = podfile_items.detect { |x| x.prebuilt_rel_path == rel_path }
+            update_repo(podfile_spec)
           end
         end
 
-        Command::Clean::clean_sources()
+        Command::Clean::clean_sources(podspec_names)
 
         ARGV << PodBuilder::basepath("Sources")
-        Command::UpdateLldbInit::call(options)
 
         puts "\n\n🎉 done!\n".green
         return 0
@@ -35,6 +38,10 @@ module PodBuilder
       private
 
       def self.update_repo(spec)
+        if spec.path != nil || spec.podspec_path != nil
+          return
+        end
+
         dest_path = PodBuilder::basepath("Sources")
         FileUtils.mkdir_p(dest_path)
 
@@ -43,25 +50,25 @@ module PodBuilder
 
         repo_dir = File.join(dest_path, spec.podspec_name)
         if !File.directory?(repo_dir)
-          raise "Failed cloning #{spec.name}" if !system("git clone #{spec.repo} #{spec.podspec_name}")
+          raise "\n\nFailed cloning #{spec.name}".red if !system("git clone #{spec.repo} #{spec.podspec_name}")
         end
 
         Dir.chdir(repo_dir)
         puts "Checking out #{spec.podspec_name}".yellow
-        raise "Failed cheking out #{spec.name}" if !system(git_hard_checkout_cmd(spec))
+        raise "\n\nFailed cheking out #{spec.name}".red if !system(git_hard_checkout_cmd(spec))
 
         Dir.chdir(current_dir)
       end
 
       def self.git_hard_checkout_cmd(spec)
         prefix = "git fetch --all --tags --prune; git reset --hard"
-        if @tag
+        if spec.tag
           return "#{prefix} tags/#{spec.tag}"
         end
-        if @commit
+        if spec.commit
           return "#{prefix} #{spec.commit}"
         end
-        if @branch
+        if spec.branch
           return "#{prefix} origin/#{spec.branch}"
         end
   

data/lib/pod_builder/command/none.rb

@@ -3,8 +3,8 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class None
-      def self.call(options)
-        unless !options.has_key?(:version)
+      def self.call
+        unless !OPTIONS.has_key?(:version)
           puts VERSION
           return 0
         end

data/lib/pod_builder/command/restore_all.rb

@@ -3,9 +3,9 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class RestoreAll
-      def self.call(options)
+      def self.call
         unless Configuration.restore_enabled
-          raise "Restore not enabled!".red
+          raise "\n\nRestore not enabled!".red
         end
   
         Configuration.check_inited
@@ -16,8 +16,8 @@ module PodBuilder
           File.rename(PodBuilder::basepath("Podfile.restore"), PodBuilder::basepath("Podfile"))
 
           ARGV << "*"
-          options[:skip_prebuild_update] = true
-          return Command::Build::call(options)
+          OPTIONS[:skip_prebuild_update] = true
+          return Command::Build::call
         rescue Exception => e
           raise e
         ensure