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

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,22 @@ 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))
+
+        podfile_content = Podfile.prepare_for_react_native(podfile_content)
+
+        File.write(prebuilt_podfile_path, podfile_content)
 
         Configuration.write
 
@@ -52,6 +59,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

data/lib/pod_builder/command/switch.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Switch
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
@@ -17,25 +17,62 @@ module PodBuilder
         argument_pods.each do |pod|
           pod_name_to_switch = pod
           pod_name_to_switch = Podfile::resolve_pod_names_from_podfile([pod_name_to_switch]).first
-          raise "\n\nDid not find pod '#{pod}'" if pod_name_to_switch.nil?
+          raise "\n\nDid not find pod '#{pod}'".red if pod_name_to_switch.nil?
           
           check_not_building_subspec(pod_name_to_switch)  
 
           pod_names_to_switch.push(pod_name_to_switch)
         end
+
+        dep_pod_names_to_switch = []
+        if OPTIONS[:switch_all] == true
+          pod_names_to_switch.each do |pod|
+            podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
+            unless File.exist?(podspec_path)
+              next
+            end
+
+            podspec_content = File.read(podspec_path)
+
+            regex = "p\\d\\.dependency '(.*)'"
+
+            podspec_content.each_line do |line|
+              matches = line.match(/#{regex}/)
+      
+              if matches&.size == 2
+                dep_pod_names_to_switch.push(matches[1].split("/").first)
+              end
+            end
+          end
+
+          dep_pod_names_to_switch.uniq!
+          dep_pod_names_to_switch.reverse.each do |dep_name|
+            podspec_path = PodBuilder::prebuiltpath("#{dep_name}/#{dep_name}.podspec")
+            if File.exist?(podspec_path)
+              if pod = Podfile::resolve_pod_names_from_podfile([dep_name]).first
+                pod_names_to_switch.push(pod)
+                next
+              end    
+            end
+            
+            dep_pod_names_to_switch.delete(dep_name)
+          end
+          pod_names_to_switch = pod_names_to_switch.map { |t| t.split("/").first }.uniq
+          dep_pod_names_to_switch.reject { |t| pod_names_to_switch.include?(t) } 
+        end
         
         pod_names_to_switch.each do |pod_name_to_switch|
           development_path = ""
           default_entries = Hash.new
 
-          case options[:switch_mode]
+          case OPTIONS[:switch_mode]
           when "development"
-            development_path = find_podspec(pod_name_to_switch)          
+            development_path = find_podspec(pod_name_to_switch)               
           when "prebuilt"
             podfile_path = PodBuilder::basepath("Podfile.restore")
             content = File.read(podfile_path)
             if !content.include?("pod '#{pod_name_to_switch}")
-              raise "\n\n'#{pod_name_to_switch}' does not seem to be prebuit!"
+              raise "\n\n'#{pod_name_to_switch}' does not seem to be prebuit!".red
             end
           when "default"
             podfile_path = PodBuilder::basepath("Podfile")
@@ -57,7 +94,15 @@ module PodBuilder
               end
             end
     
-            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}" if default_entries.keys.count == 0
+            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}".red if default_entries.keys.count == 0
+          end
+
+          if development_path.nil? 
+            if dep_pod_names_to_switch.include?(pod_name_to_switch)
+              next
+            else
+              raise "\n\nCouln't find `#{pod_name_to_switch}` sources in the following specified development pod paths:\n#{Configuration.development_pods_paths.join("\n")}\n".red
+            end
           end
 
           podfile_path = PodBuilder::project_path("Podfile")
@@ -74,10 +119,11 @@ module PodBuilder
             matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
             if matches&.size == 3
               if matches[1].split("/").first == pod_name_to_switch
-                case options[:switch_mode]
+                case OPTIONS[:switch_mode]
                 when "prebuilt"
                   indentation = line.split("pod '").first
-                  rel_path = Pathname.new(PodBuilder::prebuiltpath).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                  podspec_path = File.dirname(PodBuilder::prebuiltpath("#{pod_name_to_switch}/#{pod_name_to_switch}.podspec"))
+                  rel_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
                   prebuilt_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
                   if line.include?("# pb<") && marker = line.split("# pb<").last
                     prebuilt_line = prebuilt_line.chomp("\n") + " # pb<#{marker}"
@@ -102,10 +148,10 @@ module PodBuilder
                     lines.append(default_line)
                     next
                   elsif
-                    raise "Line for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile"
+                    raise "\n\nLine for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile".red
                   end
                 else
-                  raise "Unsupported mode '#{options[:switch_mode]}'"
+                  raise "\n\nUnsupported mode '#{OPTIONS[:switch_mode]}'".red
                 end
               end  
             end
@@ -144,10 +190,6 @@ module PodBuilder
           end
         end
 
-        if podspec_path.nil?
-          raise "\n\nCouln't find `#{podname}` sources in the following specified development pod paths:\n#{Configuration.development_pods_paths.join("\n")}\n".red
-        end
-
         return podspec_path
       end
             

data/lib/pod_builder/command/sync_podfile.rb

@@ -3,11 +3,11 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class SyncPodfile
-      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)
@@ -25,6 +25,7 @@ module PodBuilder
           system("#{bundler_prefix}pod install;")
         end
         
+        puts "\n\n🎉 done!\n".green
         return 0
       end
     end