cocoapods-tdfire-binary 1.1.0 → 1.2.0

data/example/test/Example/test/test-Info.plist

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

data/example/test/Example/test/test-Prefix.pch

@@ -0,0 +1,16 @@
+//
+//  Prefix header
+//
+//  The contents of this file are implicitly included at the beginning of every source file.
+//
+
+#import <Availability.h>
+
+#ifndef __IPHONE_5_0
+#warning "This project uses features only available in iOS SDK 5.0 and later."
+#endif
+
+#ifdef __OBJC__
+    @import UIKit;
+    @import Foundation;
+#endif

data/example/test/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2018 tripleCC <triplec.linux@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/example/test/README.md

@@ -0,0 +1,29 @@
+# test
+
+![CI Status](http://git.2dfire-inc.com/ios/test/pipelines)
+![Version](http://git.2dfire-inc.com/ios/cocoapods-spec/tree/master/test)
+[![License](https://img.shields.io/cocoapods/l/test.svg?style=flat)](http://cocoapods.org/pods/test)
+[![Platform](https://img.shields.io/cocoapods/p/test.svg?style=flat)](http://cocoapods.org/pods/test)
+
+## Example
+
+To run the example project, clone the repo, and run `pod install` from the Example directory first.
+
+## Requirements
+
+## Installation
+
+test is available through [CocoaPods](http://cocoapods.org). To install
+it, simply add the following line to your Podfile:
+
+```ruby
+pod 'test'
+```
+
+## Author
+
+tripleCC, triplec.linux@gmail.com
+
+## License
+
+test is available under the MIT license. See the LICENSE file for more info.

data/example/test/test.podspec

@@ -0,0 +1,56 @@
+#
+# Be sure to run `pod lib lint test.podspec' to ensure this is a
+# valid spec before submitting.
+#
+# Any lines starting with a # are optional, but their use is encouraged
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'test'
+  s.version          = '0.1.0'
+  s.summary          = 'A short description of test.'
+
+# This description is used to generate tags and improve search results.
+#   * Think: What does it do? Why did you write it? What is the focus?
+#   * Try to keep it short, snappy and to the point.
+#   * Write the description between the DESC delimiters below.
+#   * Finally, don't worry about the indent, CocoaPods strips it!
+
+  s.description      = <<-DESC
+TODO: Add long description of the pod here.
+                       DESC
+
+  s.homepage         = 'http://git.2dfire-inc.com/ios/test'
+  s.license          = { :type => 'MIT', :file => 'LICENSE' }
+  s.author           = { 'tripleCC' => 'triplec.linux@gmail.com' }
+  s.source           = { :git => 'http://git.2dfire-inc.com/ios/test.git', :tag => s.version.to_s }
+  s.ios.deployment_target = '8.0'
+  
+  tdfire_source_configurator = lambda do |s|
+    # 源码依赖配置
+    s.source_files = 'test/Classes/**/*'
+    s.public_header_files = 'test/Classes/**/*.{h}'
+    # s.private_header_files = 
+
+    # 资源依赖必须使用 bundle
+    # s.resource_bundles = {
+    #     'test' => ['test/Assets/*']
+    # }
+
+    # s.dependency 'TDFModuleKit'
+  end
+
+  unless %w[tdfire_set_binary_download_configurations tdfire_source tdfire_binary].reduce(true) { |r, m| s.respond_to?(m) & r }    
+    tdfire_source_configurator.call s
+  else
+    s.tdfire_source tdfire_source_configurator
+    s.tdfire_binary tdfire_source_configurator
+
+    #s.tdfire_binary tdfire_source_configurator do |s|
+    # 额外配置 (一般不用)
+    #end
+
+    s.tdfire_set_binary_download_configurations
+  end
+end

data/example/test/test/Classes/ReplaceMe.m

@@ -0,0 +1 @@
+ 故意写的，让 Xcode 报错，创建自己的文件后，记得删除 ReplaceMe.m 

data/lib/cocoapods-tdfire-binary.rb

@@ -4,4 +4,3 @@ require 'cocoapods'
 require 'cocoapods-tdfire-binary/podfile_dsl'
 require 'cocoapods-tdfire-binary/specification_dsl'
 
-

data/lib/cocoapods-tdfire-binary/binary_cache_cleaner.rb

@@ -0,0 +1,106 @@
+require 'fileutils'
+require 'colored2'
+require 'cocoapods-tdfire-binary/specification_dsl'
+require 'cocoapods-tdfire-binary/binary_url_manager'
+
+module Pod
+	class Installer
+		old_resolve_dependencies = instance_method(:resolve_dependencies)
+		define_method(:resolve_dependencies) do 
+			old_resolve_dependencies.bind(self).call()
+
+      cleaner = Pod::Tdfire::BinaryCacheCleaner.new(analysis_result)
+      cleaner.clean!
+			
+      # 二进制不存在，强制进行源码依赖
+			if cleaner.no_binary_specs.any?
+				pods = cleaner.no_binary_specs.map { |s| s.root.name }
+				Pod::Tdfire::BinaryStateStore.use_source_pods += pods
+				UI.warn "Tdfire: 以下组件没有二进制版本，将强制使用源码依赖，添加以下代码至Podfile规避此警告: tdfire_use_source_pods #{pods}"
+      end
+		end
+	end
+end
+
+module Pod
+  module Tdfire
+    class BinaryCacheCleaner
+      attr_reader :use_binary_specs
+
+      def initialize(analysis_result)
+        @analysis_result = analysis_result
+        @use_binary_specs = analysis_result.specifications.uniq { |s| s.root.name }.reject(&:tdfire_use_source?)
+      end
+
+      def clean!
+        # 判断有效组件的 cache 中是否有二进制，没有的话，删除组件缓存
+        specs = use_binary_specs - no_binary_specs
+        specs.each do |s|
+          # 处理 cache
+          clean_pod_cache(s)
+          
+          # 处理 Pods 
+          clean_local_cache(s)
+        end
+      end
+
+      def no_binary_specs
+        @invalid_specs ||= begin 
+          use_binary_specs.reject do |s|
+            json_string = Pod::Tdfire::BinaryUrlManager.search_binary(s.root.name)
+            pod = JSON.parse(json_string, object_class: OpenStruct)
+            versions = pod.versions || []
+            versions.include?(s.version.to_s)
+          end
+        end
+      end
+
+      private
+
+      def cache_descriptors
+        @cache_descriptors ||= begin
+          cache = Downloader::Cache.new(Config.instance.cache_root + 'Pods')
+          cache_descriptors = cache.cache_descriptors_per_pod
+        end
+      end
+
+      def clean_local_cache(spec)
+        pod_dir = Config.instance.sandbox.pod_dir(spec.root.name)
+        framework_file = pod_dir + "#{spec.root.name}.framework"
+        if pod_dir.exist? && !framework_file.exist?
+          UI.message "Tdfire: 删除缺少二进制的组件 #{spec.root.name}".yellow
+
+          # 设置沙盒变动标记，去 cache 中拿
+          # 只有 :changed 、:added 两种状态才会重新去 cache 中拿
+          @analysis_result.sandbox_state.add_name(spec.name, :changed)
+          begin
+            FileUtils.rm_rf(pod_dir)
+          rescue
+          end
+        end
+      end
+
+      def clean_pod_cache(spec)
+        descriptors = cache_descriptors[spec.root.name]
+        return if descriptors.nil?
+
+        descriptors = descriptors.select { |d| d[:version] == spec.version}
+        descriptors.each do |d|
+          # pod cache 文件名由文件内容的 sha1 组成，由于生成时使用的是 podspec，获取时使用的是 podspec.json 
+          # 导致生成的文件名不一致
+          # Downloader::Request slug
+          slug = d[:slug].dirname + "#{spec.version}-#{spec.checksum[0, 5]}"
+          framework_file = slug + "#{spec.root.name}.framework"
+          unless (framework_file.exist?)
+            UI.message "Tdfire: 删除缺少二进制的Cache #{spec.root.name}".magenta
+            begin
+              FileUtils.rm(descriptor[:spec_file])
+              FileUtils.rm_rf(descriptor[:slug])
+            rescue
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-tdfire-binary/binary_specification_refactor.rb

@@ -1,3 +1,4 @@
+
 require 'cocoapods-tdfire-binary/binary_url_manager'
 require 'cocoapods-tdfire-binary/binary_state_store'
 

data/lib/cocoapods-tdfire-binary/command/binary.rb

@@ -21,7 +21,7 @@ module Pod
       DESC
 
 			def binary_config
-				Tdfire::BinaryConfig.instance
+				Pod::Tdfire::BinaryConfig.instance
 			end
 
       def first_podspec

data/lib/cocoapods-tdfire-binary/command/publish.rb

@@ -48,6 +48,8 @@ module Pod
             push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
             push.validate!
             push.run
+
+            raise Pod::StandardError, "执行 pod repo push 失败，错误信息 #{$?}" if $?.exitstatus != 0
           end
         end
 

data/lib/cocoapods-tdfire-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTdfireBinary
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/cocoapods-tdfire-binary/podfile_hook.rb

@@ -1,5 +1,4 @@
 require 'cocoapods-tdfire-binary/binary_state_store'
-require 'cocoapods-tdfire-binary/source_chain_analyzer'
 
 module CocoapodsTdfireBinary
 	Pod::HooksManager.register('cocoapods-tdfire-binary', :pre_install) do |context, _|

data/lib/cocoapods-tdfire-binary/specification_dsl.rb

@@ -70,12 +70,6 @@ module Pod
       end
     end
 
-    private 
-
-    def tdfire_reference_spec
-      @tdfire_reference_spec || self        
-    end
-
     def tdfire_use_source?
       ((!Pod::Tdfire::BinaryStateStore.force_use_binary? &&
           (!Pod::Tdfire::BinaryStateStore.use_binary? || Pod::Tdfire::BinaryStateStore.real_use_source_pods.include?(root.name))) ||
@@ -83,6 +77,12 @@ module Pod
           (Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod != root.name)
     end
 
+    private 
+
+    def tdfire_reference_spec
+      @tdfire_reference_spec || self        
+    end
+
     def tdfire_should_skip_download?
       (!Pod::Tdfire::BinaryStateStore.force_use_binary? && Pod::Tdfire::BinaryStateStore.unpublished_pods.include?(root.name)) ||
           (Pod::Tdfire::BinaryStateStore.lib_lint_binary_pod == root.name)

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-tdfire-binary/podfile_dsl'
 require 'cocoapods-tdfire-binary/specification_dsl'
+require 'cocoapods-tdfire-binary/binary_cache_cleaner'
 require 'cocoapods-tdfire-binary/podfile_hook'
 require 'cocoapods-tdfire-binary/command'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdfire-binary
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-packager
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,39 @@ files:
 - README.md
 - Rakefile
 - cocoapods-tdfire-binary.gemspec
+- example/test/.gitignore
+- example/test/.gitlab-ci.yml
+- example/test/.travis.yml
+- example/test/Example/Podfile
+- example/test/Example/Podfile.lock
+- example/test/Example/Tests/Tests-Info.plist
+- example/test/Example/Tests/Tests-Prefix.pch
+- example/test/Example/Tests/Tests.m
+- example/test/Example/Tests/en.lproj/InfoPlist.strings
+- example/test/Example/test.xcodeproj/project.pbxproj
+- example/test/Example/test.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+- example/test/Example/test.xcodeproj/xcshareddata/xcschemes/test-Example.xcscheme
+- example/test/Example/test.xcworkspace/contents.xcworkspacedata
+- example/test/Example/test.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+- example/test/Example/test/Base.lproj/LaunchScreen.storyboard
+- example/test/Example/test/Base.lproj/Main.storyboard
+- example/test/Example/test/Images.xcassets/AppIcon.appiconset/Contents.json
+- example/test/Example/test/TDFAppDelegate.h
+- example/test/Example/test/TDFAppDelegate.m
+- example/test/Example/test/TDFViewController.h
+- example/test/Example/test/TDFViewController.m
+- example/test/Example/test/en.lproj/InfoPlist.strings
+- example/test/Example/test/main.m
+- example/test/Example/test/test-Info.plist
+- example/test/Example/test/test-Prefix.pch
+- example/test/LICENSE
+- example/test/README.md
+- example/test/test.podspec
+- example/test/test/Assets/.gitkeep
+- example/test/test/Classes/.gitkeep
+- example/test/test/Classes/ReplaceMe.m
 - lib/cocoapods-tdfire-binary.rb
+- lib/cocoapods-tdfire-binary/binary_cache_cleaner.rb
 - lib/cocoapods-tdfire-binary/binary_config.rb
 - lib/cocoapods-tdfire-binary/binary_specification_refactor.rb
 - lib/cocoapods-tdfire-binary/binary_state_store.rb