cocoapods-multithread-installpod 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957005064b21e50500f8784dd86317a2078955d8
-  data.tar.gz: 0186b61495daf796f00c4acf1522b63755afaaec
+  metadata.gz: 6001a9022306eafedac367ed981dc514ed5e8e92
+  data.tar.gz: bc6937c40ecad7ea1430ea5e7ac76dc4d2e5d50a
 SHA512:
-  metadata.gz: b218798681fb5f10afb4a74b8c0096ae5bfdf7fa3e2adc842d65f2f192f56b365be0187f600129e54596f4082ca157beca4f2dea9e1b8219c18030a1ac611320
-  data.tar.gz: fa51eabec9addb58fa6ae52591a5417b51af8d69c12fcd837a9e8accd6bafa6468450bc6f3a096ef1fda0e96a339a798d8503a294cb2a09b2c633cb3c5ebc174
+  metadata.gz: a310bbdb2485ce016e56424d092961366387b3468da3a24c26127ba6b21b80231f21e39e21192caf212b5f240ed9565308d4dc934b4d79e37455364e0cfd1bf6
+  data.tar.gz: 3e48be4c22d98ac89883f2945dc352850378d7b1bd98c692490d52a32cccdd7f5f58d63c037012c9320a74bcc2c6279378565a3bd8caf663b3fb96063bca3363

data/lib/cocoapods-multithread-installpod.rb

@@ -1,57 +1,135 @@
 require "cocoapods-multithread-installpod/version"
+require 'thread'
 
-module Pod
-  class Installer
-    def install_pod_sources
-      @installed_specs = []
-      pods_to_install = sandbox_state.added | sandbox_state.changed
-      title_options = { :verbose_prefix => '-> '.green }
-      sorted_root_specs = root_specs.sort_by(&:name)
-      threads=[]
-      max_thread_count = 20.0
-      per_thead_task_count =(sorted_root_specs.count/max_thread_count).ceil
-      i = 0
-      while i < max_thread_count
-        sub_sorted_root_specs = sorted_root_specs[i*per_thead_task_count, per_thead_task_count]
-        if sub_sorted_root_specs != nil
-          threads << Thread.new(sub_sorted_root_specs) do |specs|
-            specs.each do |spec|
-              if pods_to_install.include?(spec.name)
-                if sandbox_state.changed.include?(spec.name) && sandbox.manifest
-                  previous = sandbox.manifest.version(spec.name)
-                  title = "Installing #{spec.name} #{spec.version} (was #{previous})"
+if Pod::VERSION=='0.39.0'
+  module Pod
+    class Installer
+      def install_pod_sources
+        @installed_specs = []
+        pods_to_install = sandbox_state.added | sandbox_state.changed
+        title_options = { :verbose_prefix => '-> '.green }
+
+        work_q = Queue.new
+        root_specs.sort_by(&:name).each{|spec| work_q.push spec }
+        workers = (0...20).map do
+          Thread.new do
+            begin
+              while spec = work_q.pop(true)
+                if pods_to_install.include?(spec.name)
+                  if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+                    previous = sandbox.manifest.version(spec.name)
+                    title = "Installing #{spec.name} #{spec.version} (was #{previous})"
+                  else
+                    title = "Installing #{spec}"
+                  end
+                  UI.titled_section(title.green, title_options) do
+                    install_source_of_pod(spec.name)
+                    #UI.titled_section("Installed #{spec}", title_options)
+                  end
                 else
-                  title = "Installing #{spec}"
-                end
-                UI.titled_section(title.green, title_options) do
-                  install_source_of_pod(spec.name)
+                  UI.titled_section("Using #{spec}", title_options) do
+                    create_pod_installer(spec.name)
+                    #UI.titled_section("Installed #{spec}", title_options)
+                  end
                 end
-              else
-                UI.titled_section("Using #{spec}", title_options)
               end
+            rescue ThreadError
             end
           end
         end
-        i+=1
+        workers.map(&:join)
+
       end
-      threads.each{|t| t.join}
     end
-  end
 
-  module UserInterface
-    class << self
-      def wrap_string(string, indent = 0)
-        if disable_wrap
-          string
-        else
-          first_space = ' ' * indent
-          # indented = CLAide::Helper.wrap_with_indent(string, indent, 9999)
-          # first_space + indented
+
+    module Downloader
+      # The class responsible for managing Pod downloads, transparently caching
+      # them in a cache directory.
+      #
+      class Cache
+        @@mutex=Mutex.new
+        def ensure_matching_version
+          @@mutex.lock
+          version_file = root + 'VERSION'
+          version = version_file.read.strip if version_file.file?
+
+          root.rmtree if version != Pod::VERSION && root.exist?
+          root.mkpath
+          version_file.open('w') { |f| f << Pod::VERSION }
+          @@mutex.unlock
         end
       end
     end
   end
 
+elsif Pod::VERSION=='0.35.0'
+  module Pod
+    class Installer
+      def install_pod_sources
+        @installed_specs = []
+        pods_to_install = sandbox_state.added | sandbox_state.changed
+        title_options = { :verbose_prefix => '-> '.green }
+        sorted_root_specs = root_specs.sort_by(&:name)
+        threads=[]
+        max_thread_count = 20.0
+        per_thead_task_count =(sorted_root_specs.count/max_thread_count).ceil
+        i = 0
+        while i < max_thread_count
+          sub_sorted_root_specs = sorted_root_specs[i*per_thead_task_count, per_thead_task_count]
+          if sub_sorted_root_specs != nil
+            threads << Thread.new(sub_sorted_root_specs) do |specs|
+              specs.each do |spec|
+                if pods_to_install.include?(spec.name)
+                  if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+                    previous = sandbox.manifest.version(spec.name)
+                    title = "Installing #{spec.name} #{spec.version} (was #{previous})"
+                  else
+                    title = "Installing #{spec}"
+                  end
+                  UI.titled_section(title.green, title_options) do
+                    install_source_of_pod(spec.name)
+                  end
+                else
+                  UI.titled_section("Using #{spec}", title_options)
+                end
+              end
+            end
+          end
+          i+=1
+        end
+        threads.each{|t| t.join}
+      end
+    end
+
+    module UserInterface
+      class << self
+        def wrap_string(string, indent = 0)
+          if disable_wrap
+            string
+          else
+            first_space = ' ' * indent
+            # indented = CLAide::Helper.wrap_with_indent(string, indent, 9999)
+            # first_space + indented
+          end
+        end
+      end
+    end
+  end
 end
 
 
+# module UserInterface
+#   class << self
+#     def wrap_string(string, indent = 0)
+#       if disable_wrap
+#         string
+#       else
+#         first_space = ' ' * indent
+#         # indented = CLAide::Helper.wrap_with_indent(string, indent, 9999)
+#         # first_space + indented
+#       end
+#     end
+#   end
+# end
+

data/lib/cocoapods-multithread-installpod/version.rb

@@ -1,3 +1,3 @@
 module CocoapodsMultithreadInstallpod
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-multithread-installpod
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - 晨燕
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 将cocoapods installer过程中download_dependencies改为20个线程并发，提高pod update的效率
@@ -71,12 +71,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []