cocoapods-taobao-environment 1.0.0.3 → 1.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bb1dadb505f13c9ce8a3fc2246b6ed4454b54d
-  data.tar.gz: 44fb048eab17e4989dd2a33595755cc5fd2cb1ad
+  metadata.gz: 776b22d090bba7003581ab62dc4567e59ba0e59e
+  data.tar.gz: 99a06635d3338e2c2d23bb09353f665a801982a4
 SHA512:
-  metadata.gz: d0e26f214f39ef8f91a5e48eb888086631ac959c492fb6c7f23ab56acf35bcbfded63b3fab74cd77d2415f8865e9624a47e6b609f5978a964409fe5a687b7dba
-  data.tar.gz: 0b25f6d731c25804827f886026ecca388feae01d5adefe6f9cc543861d291735c901fe5a0c747251d26134e616f88c52c999cfb4593479de45f522e24635356f
+  metadata.gz: 96ef690481f2542c016e6b0c6edd9df39ad9b50d83a5b336f4500f6be800310babaa00ab7edb8b14457c8ba6245893d84e110e3632c0a74c4f9d8e71f95c0fd0
+  data.tar.gz: 6307193ec1e06351fc6fdce81c00fd567b6d54a49b0facf7df0e545941e0a355422e6f2709ab198b65283faf329b654b1b2ce29154c61e6449ac7d8cb4e1d32c

data/README.md

@@ -15,7 +15,7 @@
 
 ## Installation
 
-该项目不再提供独立安装方式，已集成到 TaobaoEnv 项目中，如需使用，请访问 http://gitlab.alibaba-inc.com/wireless/package-taobao-environment
+该项目不再提供独立安装方式，已集成到 TaobaoEnv 项目中，如需使用，请访问 http://gitlab.alibaba-inc.com/PodEnv/package-taobao-environment
 
 ## Usage
 

data/lib/cocoapods/taobao/environment.rb

@@ -2,16 +2,22 @@ require "cocoapods/taobao/environment/version"
 
 if PodVersion(">= 0.39")
     require "cocoapods/taobao/environment/alibaba_source.rb"
-    require "cocoapods/taobao/environment/integrate_copy_framework_resouces_script.rb"
-    require "cocoapods/taobao/environment/cocoapods_sync_dependencies.rb"
     require "cocoapods/taobao/environment/inhibit_pod_warning.rb"
     require "cocoapods/taobao/environment/dynamic_dependency_for_ios_7.rb"
     require "cocoapods/taobao/environment/fix_dependency_conflict.rb"
+    require "cocoapods/taobao/environment/fix_ruby_2.3.x_support.rb"
+    require "cocoapods/taobao/environment/exclude_other_ld_flags.rb"
+    require "cocoapods/taobao/environment/cocoapods_sync_dependencies.rb"
+    require "cocoapods/taobao/environment/fix_framework_search_path_0.39.rb"
     if PodVersion("~> 1.0")
-        require "cocoapods/taobao/environment/fix_framework_search_path_1.0.rb"
         require "cocoapods/taobao/environment/deintegrate_pods_for_framework_1.0.rb"
     else
-        require "cocoapods/taobao/environment/fix_framework_search_path_0.39.rb"
         require "cocoapods/taobao/environment/deintegrate_pods_for_framework_0.39.rb"
     end
+
+    if PodVersion(">= 1.1")
+        require "cocoapods/taobao/environment/integrate_copy_framework_resouces_script_1.1.rb"
+    else
+        require "cocoapods/taobao/environment/integrate_copy_framework_resouces_script.rb"
+    end
 end

data/lib/cocoapods/taobao/environment/cocoapods_sync_dependencies.rb

@@ -39,7 +39,7 @@ def solve_podfile(file_path)
   json
 end
 
-def solve_dependency(file_path)
+def main_dependencies(file_path)
   return unless File.exists?(file_path)
 
   if $config[:fileName].include?("json")
@@ -66,7 +66,7 @@ def download_dependencies(file_path)
   require 'net/http'
   require 'open-uri'
   url = "#{$config[:gitlab]}/api/v3/projects/#{$config[:projectId]}/repository/blobs/#{$config[:branch]}?filepath=#{$config[:fileName]}&private_token=#{$config[:token]}"
-  Pod::UI.message "正在下载主工程最新依赖..."
+  Pod::UI.info "正在下载主工程最新依赖..."
   url = URI.parse(url)
   req = Net::HTTP::Get.new(url.to_s)
   res = Net::HTTP.start(url.host, url.port) { |http|
@@ -90,7 +90,7 @@ def save_cache(data, file_path)
   require 'fileutils'
   FileUtils.rm_rf(File.dirname(file_path))
   FileUtils::mkdir_p(File.dirname(file_path))
-  Pod::UI.info "缓存路径-> #{relative_path(file_path)}"
+  Pod::UI.info "缓存路径 => #{relative_path(file_path)}"
   File.open(file_path,"w") do |f|
     f.write(data)
   end
@@ -129,6 +129,7 @@ def init_config
     :configFileName => "config.json",
     :projectPath => Dir.pwd,
     :exclude => nil,
+    :syncMode => "",
     :configurations => ["Debug", "Release"],
     :token => ENV["ALIBABA_GITLAB_PRIVATE_TOKEN"]
   }
@@ -150,6 +151,48 @@ def prepare_config(config)
   $config.merge!(config)
 end
 
+#分析当前target最终需要的依赖信息
+def solve_dependenies(mainDepds)
+  depds = {}
+  if PodVersion('~> 0.39')
+    current_depds = current_target_definition.pods.collect
+  else
+    current_depds = current_target_definition.pods.map
+  end
+
+  # current_depds.each { |depd| Pod::UI.info "当前依赖 #{depd}"}
+  if $config[:syncMode].include?("declared")
+     Pod::UI.info "同步模式 => 已声明的依赖同步主工程对应依赖"
+     current_depds.each do |depd|
+      if depd.class == String 
+        depds["#{depd}"] = mainDepds["#{depd}"]
+      end
+    end
+  else
+    Pod::UI.info "同步模式 => 未声明的依赖同步主工程所有依赖"
+    depds = mainDepds
+    #remove exclude dependency
+    exclude = $config[:exclude]
+    excludes = []
+    excludes += exclude if exclude.class == Array
+    excludes << exclude if exclude.class == String
+    excludes.each {|exc| depds.delete(exc)}
+
+    #remove declare dependency
+    current_depds.each do |depd|
+      if depd.class == String
+        name = depd
+      elsif depd.class == Hash
+        name = depd.keys[0]
+      else
+        name = depd.name
+      end
+      depds.delete(name)
+    end
+  end
+  depds
+end
+
 # public method
 def cocoapods_sync_dependencies(config)
   prepare_config(config)
@@ -158,26 +201,18 @@ def cocoapods_sync_dependencies(config)
     $config[:branch] = CGI.escape($config[:branch]).gsub(".", "%2E")
 
     download_dependencies(cache_path)
-    json = solve_dependency(cache_path)
-
-    exclude = $config[:exclude]
-    if PodVersion('~> 0.39')
-      excludes = current_target_definition.pods.collect { |pod| pod.class == String ? pod : pod.keys[0]}
-    else
-      excludes = current_target_definition.pods.map {|pod| pod.name }
-    end
-    excludes += exclude if exclude.class == Array
-    excludes << exclude if exclude.class == String
-    excludes.each {|exc| json["dependencies"].delete(exc)}
+    main_dependencies = main_dependencies(cache_path)
 
-    json["dependencies"].to_a.each do |key, value|
+    real_depds = solve_dependenies(main_dependencies["dependencies"])
+    real_depds.to_a.each do |key, value|
+        # Pod::UI.info "pod '#{key}','#{value}'"
       pod(key, value)
     end
 
     configurations = []
     configurations << $config[:configurations] if $config[:configurations].class == String
     configurations += $config[:configurations] if $config[:configurations].class == Array
-    json["configurations"].to_a.each do |config, pods|
+    main_dependencies["configurations"].to_a.each do |config, pods|
       next if configurations.count > 0 && !configurations.include?(config)
       pods.each do |name|
         current_target_definition.whitelist_pod_for_configuration(name, config)

data/lib/cocoapods/taobao/environment/dynamic_dependency_for_ios_7.rb

@@ -1,3 +1,21 @@
+$disable_link_dynamic_framework = false
+
+$link_dynamic_framework_list = []
+def link_dynamic_frameworks(config)
+    $link_dynamic_framework_list += config if config.class == Array
+    $link_dynamic_framework_list << config if config.class == String
+end
+
+module Pod
+  class Podfile
+    module DSL
+      def disable_link_dynamic_framework!
+        $disable_link_dynamic_framework = true
+      end
+    end
+  end
+end
+
 module Pod
   module Generator
     module XCConfig
@@ -9,17 +27,33 @@ module Pod
         def self.add_dynamic_dependency_build_settings(target, xcconfig)
           # 如果目标平台是7.0，则不添加 -framewok xxx 到 xcconfig
           if target.platform.supports_dynamic_frameworks?
-            old(target, xcconfig)
+            # 如果目标平台支持动态库，但此时设置了 disable_link_dynamic_framework! 也不添加 -framework
+            if $disable_link_dynamic_framework
+              target.file_accessors.each do |file_accessor|
+                if file_accessor.vendored_dynamic_frameworks.count > 0
+                  # 如果主动设置了一些要 link 的库
+                  if $link_dynamic_framework_list.include? target.name
+                    old(target, xcconfig) 
+                  else
+                    puts "-framework #{target.name} is excluded from OTHER_LDFLAGS"
+                  end
+                end
+              end
+            else
+              old(target, xcconfig)
+            end
           else
             target.file_accessors.each do |file_accessor|
-              if file_accessor.vendored_dynamic_frameworks.count >0
-                # 输出到日志里，方便查看
-                puts "-framework #{target.name} is excluded from OTHER_LDFLAGS"
+              if file_accessor.vendored_dynamic_frameworks.count > 0
+                if $disable_link_dynamic_framework and $link_dynamic_framework_list.include? target.name
+                  old(target, xcconfig) 
+                else
+                  puts "-framework #{target.name} is excluded from OTHER_LDFLAGS"
+                end
               end
             end
           end
         end
-
       end
     end
   end

data/lib/cocoapods/taobao/environment/exclude_other_ld_flags.rb

@@ -0,0 +1,21 @@
+$other_ld_flags_excludes = []
+def exclude_other_ld_flags(config)
+    $other_ld_flags_excludes += config if config.class == Array
+    $other_ld_flags_excludes << config if config.class == String
+end
+
+module Pod
+  module Generator
+    module XCConfig
+      class AggregateXCConfig
+        alias_method :old_generate_other_ld_flags, :generate_other_ld_flags
+        def generate_other_ld_flags
+          old_generate_other_ld_flags
+          $other_ld_flags_excludes.each do |e| 
+            @xcconfig.libraries.delete(e)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/taobao/environment/fix_ruby_2.3.x_support.rb

@@ -0,0 +1,11 @@
+module Pod
+  class Specification
+    class Set
+      class LazySpecification < BasicObject
+         def respond_to_missing?(method, include_all = false)
+          specification.respond_to?(method, include_all)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/taobao/environment/integrate_copy_framework_resouces_script_1.1.rb

@@ -0,0 +1,56 @@
+module Pod
+  class AggregateTarget < Target
+    # @return [Pathname] The absolute path of the copy framewrok resources script.
+    #
+    def copy_framework_resources_script_path
+      support_files_dir + "copy-framework-resources.rb"
+    end
+
+    # @return [String] The path of the copy framework resources script relative to the
+    #         root of the user project.
+    #
+    def copy_framework_resources_script_relative_path
+      "${SRCROOT}/#{relative_to_srcroot(copy_framework_resources_script_path)}"
+    end
+  end
+end
+
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        class AggregateTargetInstaller < TargetInstaller
+          alias_method :old_create_copy_resources_script, :create_copy_resources_script
+          def create_copy_resources_script
+            old_create_copy_resources_script
+            path = target.copy_framework_resources_script_path
+            script_path = File.expand_path('../../../../../XCodeScript/CopyFrameworkResources/copy-framework-resources.rb', __FILE__)
+            FileUtils.cp(script_path, path)
+            add_file_to_support_group(path)
+          end
+        end
+      end
+    end
+  end
+end
+
+module Pod
+  class Installer
+    class UserProjectIntegrator
+      class TargetIntegrator
+        alias_method :old_add_copy_resources_script_phase, :add_copy_resources_script_phase
+        def add_copy_resources_script_phase
+        	old_add_copy_resources_script_phase
+          phase_name = 'Copy Framework Resources'
+          targets = PodVersion("~>1.0") ? native_targets : native_targets_to_integrate
+          targets = targets.select { |t| EMBED_FRAMEWORK_TARGET_TYPES.include?(t.symbol_type) }
+          targets.each do |native_target|
+              phase = create_or_update_build_phase(native_target, phase_name)
+              script_path = target.copy_framework_resources_script_relative_path
+              phase.shell_script = %(bash -l -c "ruby \\"#{script_path}\\"")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/taobao/environment/version.rb

@@ -1,7 +1,7 @@
 module Cocoapods
   module Taobao
     module Environment
-      VERSION = "1.0.0.3"
+      VERSION = "1.0.1.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-taobao-environment
 version: !ruby/object:Gem::Version
-  version: 1.0.0.3
+  version: 1.0.1.1
 platform: ruby
 authors:
 - 梅忘
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,11 +73,14 @@ files:
 - lib/cocoapods/taobao/environment/deintegrate_pods_for_framework_0.39.rb
 - lib/cocoapods/taobao/environment/deintegrate_pods_for_framework_1.0.rb
 - lib/cocoapods/taobao/environment/dynamic_dependency_for_ios_7.rb
+- lib/cocoapods/taobao/environment/exclude_other_ld_flags.rb
 - lib/cocoapods/taobao/environment/fix_dependency_conflict.rb
 - lib/cocoapods/taobao/environment/fix_framework_search_path_0.39.rb
 - lib/cocoapods/taobao/environment/fix_framework_search_path_1.0.rb
+- lib/cocoapods/taobao/environment/fix_ruby_2.3.x_support.rb
 - lib/cocoapods/taobao/environment/inhibit_pod_warning.rb
 - lib/cocoapods/taobao/environment/integrate_copy_framework_resouces_script.rb
+- lib/cocoapods/taobao/environment/integrate_copy_framework_resouces_script_1.1.rb
 - lib/cocoapods/taobao/environment/version.rb
 - lib/cocoapods_plugin.rb
 homepage: ''