cocoapods-gd 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f42f504fd6a2564ff180b2887201cda6efef5a093aebe5daaffcf036bd75db9
-  data.tar.gz: ac0a4628f51ba7e00a8c21b780eb68ed2e2ba21ebcecbe1389790f388a2187bf
+  metadata.gz: 68633c73a94efde0973209d10cbbc7f4712107cfb2453043c8229e72944f5d3e
+  data.tar.gz: bc812963c3ffcfc9518a5baa3b671731c7e440be148df3de9226ba25a6b7aaca
 SHA512:
-  metadata.gz: 494214649db2ef58d7086e605a4f7e8bdd31ee1059bc968a7ad29bc8ae3591c7c58180a8499745faabd00da558ddd7497436a5aca9ab7a82966b9ac782f28a2a
-  data.tar.gz: b706a58beb2324cf7c4912173e5d36960e2e377fd9f4c0e7413f919838c1dd8d8fdd072f462ade2f8e8f0060a96c9d6defb6796baa5e6f7fa949e322914876d1
+  metadata.gz: 6649071183530ab917f1a2e5e28ba1360be5d071c16d14d6a2e8e0ba652c3a80021aa27ce8e64d075571ac9f8c7628a824b95998b9fa6bd3f007db736b660446
+  data.tar.gz: 84a859b1fac4174876860886ef9e76e63d653dd8be21cac1407f9391a1cb203187f82e7ae9d55487264613871160d59684cd5b8183827d2f76d8683e93c229d9

data/lib/cocoapods-gd.rb

@@ -1,5 +1,5 @@
 module Pod
   module Gd
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/cocoapods-gd/install_frameworks.rb

@@ -19,7 +19,11 @@ module Pod
             end
 
             Pod::UI::puts("replaceing Frameworks")
-            nameList = podfile.get_use_source_code_selector.call()
+            if podfile.get_use_source_code_selector.nil?
+                nameList = []
+            else
+                nameList = podfile.get_use_source_code_selector.call() 
+            end
             if nameList.nil?
                 nameList = []
             end

data/lib/cocoapods-gd/pod_utils.rb

@@ -39,12 +39,13 @@ module Pod
       end
 
       def podfile_from_spec(path, spec_name, platform_name, deployment_target, subspecs, sources)
+        new_path = create_new_podspec(path)
         options = {}
-        if path
+        if new_path
           if @local
-            options[:path] = path
+            options[:path] = new_path
           else
-            options[:podspec] = path
+            options[:podspec] = new_path
           end
         end
         options[:subspecs] = subspecs if subspecs
@@ -64,6 +65,45 @@ module Pod
         end
       end
 
+      def create_new_podspec(path)
+        include_json = "#{path}".end_with?(".json")
+        if include_json
+          local_podspec = "#{Dir.pwd}/replaced.podspec.json"
+        else
+          local_podspec = "#{Dir.pwd}/replaced.podspec"
+        end
+        
+        FileUtils.cp("#{path}", local_podspec)
+        has_swift_version = false
+        lines = IO.readlines(local_podspec).map do |line|
+          if line.include?("swift_version")
+            has_swift_version = true
+          end
+          if include_json 
+            if line.include?("homepage")
+               line = "#{line} \n  \"swift_version\": \"5.0\","
+            end 
+          else
+            spec = ""
+            if line.include?("s.homepage")
+              spec = "s"
+              line = "#{line} \n  #{spec}.swift_version = '5.0'"
+            end
+            if line.include?("spec.homepage")
+              spec = "spec"
+              line = "#{line} \n  #{spec}.swift_version = '5.0'"
+            end
+          end
+          line
+        end
+        if !has_swift_version
+          File.open(local_podspec, 'w') do |file|
+            file.puts lines
+          end
+        end
+        local_podspec
+      end
+
       def binary_only?(spec)
         deps = spec.dependencies.map { |dep| spec_with_name(dep.name) }
         [spec, *deps].each do |specification|

data/lib/cocoapods-gd/podfile_env.rb

@@ -2,15 +2,15 @@ require 'cocoapods'
 
 module Pod
   class Podfile
-    USE_BINARIES = 'use_binaries'
+    GD_USE_BINARIES = 'use_binaries'
     USE_SOURCE_CODE_SELECTOR = 'use_source_code'
 
   	def use_binaries!(flag = true)
-  		internal_hash[USE_BINARIES] = flag
+  		internal_hash[GD_USE_BINARIES] = flag
     end
 
     def get_use_binaries
-      internal_hash[USE_BINARIES]
+      internal_hash[GD_USE_BINARIES]
     end
 
     def use_source_code_selector!(&block)

data/lib/cocoapods-gd/spec_builder.rb

@@ -1,5 +1,5 @@
 module Pod
-  class SpecBuilder
+  class GDSpecBuilder
     def initialize(spec, source, embedded, dynamic, git_sources)
       @spec = spec
       @source = source.nil? ? '{ :path => \'.\' }' : source

data/lib/cocoapods-gd/uploader.rb

@@ -1,7 +1,7 @@
 require 'zip'
 
 module Pod
-class Uploader
+class GDUploader
 	def initialize(spec, upload_spec_name, upload_local_path, spec_sources)
 		@spec = spec
 		@work_dir = Dir.pwd

data/lib/pod/command/gd.rb

@@ -11,7 +11,7 @@ module Pod
       def self.options
         [
           ['--spec-sources=private,https://github.com/CocoaPods/Specs.git', '指定source源'],
-          ['--upload', '是否上传，默认上传'],  
+          ['--upload', '是否上传，默认不上传'],  
           ['--upload-spec-name', '上传仓库必要参数，二进制源对应的spec版本仓库名称'],
           ['--upload-git-sources', '上传仓库必要参数，二进制源对应的git源码仓库名称'],
           ['--upload-local-path', '上传仓库必要参数，git源码仓库映射的本地路径'],
@@ -36,7 +36,7 @@ module Pod
         @spec_sources.push('https://gitlab.gaodun.com/iOSLibs/Specs.git')
 
 #       是否上传
-        @upload = argv.option('upload')
+        @upload = argv.flag?('upload')
 
 #       上传二进制源仓库名称
         @upload_spec_name = argv.option('upload-spec-name')
@@ -47,12 +47,8 @@ module Pod
 #       二进制源本地仓库地址
         @upload_local_path = argv.option('upload-local-path')
 
-        if @upload.nil?
-           @upload = 1
-        end 
-
         if @upload_spec_name.nil?
-          @upload_spec_name = "frameworks-specs"
+          @upload_spec_name = "lizuba-frameworks-specs"
         end
         if @upload_git_sources.nil?
           @upload_git_sources = "https://gitlab.gaodun.com/iOSLibs/Frameworks/raw/master"
@@ -80,21 +76,30 @@ module Pod
         target_dir, work_dir = create_working_directory
         return if target_dir.nil?
         build_gd
+
         build_path="#{Dir.pwd}/build"
         if File.exist?("#{build_path}")
           FileUtils.rm_rf('build/')
         end
+        podspec_path="#{Dir.pwd}/replaced.podspec"
+        if File.exist?("#{podspec_path}")
+          FileUtils.rm_rf("#{podspec_path}")
+        end
+        json_path="#{Dir.pwd}/replaced.podspec.json"
+        if File.exist?("#{json_path}")
+          FileUtils.rm_rf("#{json_path}")
+        end
         `mv "#{work_dir}" "#{target_dir}"`
         Dir.chdir(@source_dir)
 
-        if @upload == 1
-          uploader = Uploader.new(@spec, @upload_spec_name, @upload_local_path, @spec_sources)
+        if @upload == true
+          uploader = GDUploader.new(@spec, @upload_spec_name, @upload_local_path, @spec_sources)
         end
       end
 
       private
 
-      def build_in_sandbox(platform)
+      def gd_build_in_sandbox(platform)
         config.installation_root  = Pathname.new(Dir.pwd)
         config.sandbox_root       = 'Pods'
 
@@ -107,7 +112,7 @@ module Pod
         end
 
         begin
-          perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
+          gd_perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
         ensure # in case the build fails; see Builder#xcodebuild.
           Pathname.new(config.sandbox_root).rmtree
           FileUtils.rm_f('Podfile.lock')
@@ -115,12 +120,12 @@ module Pod
       end
 
       def build_gd
-        builder = SpecBuilder.new(@spec, @source, @embedded, @dynamic, @upload_git_sources)
+        builder = GDSpecBuilder.new(@spec, @source, @embedded, @dynamic, @upload_git_sources)
         newspec = builder.spec_metadata
 
         @spec.available_platforms.each do |platform|
           if platform.name == :ios
-            build_in_sandbox(platform)
+            gd_build_in_sandbox(platform)
             newspec += builder.spec_platform(platform)
           end
         end
@@ -153,7 +158,7 @@ module Pod
         [target_dir, work_dir]
       end
 
-      def perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
+      def gd_perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
         static_sandbox_root = config.sandbox_root.to_s
         if @dynamic
           static_sandbox_root = "#{static_sandbox_root}/#{static_sandbox.root.to_s.split('/').last}"

data/spec/unit/specification/spec_builder_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 module Pod
-  describe SpecBuilder do
+  describe GDSpecBuilder do
     def compare_attributes(first_spec, second_spec, attribute_name)
       first_spec.attributes_hash[attribute_name].should ==
         second_spec.attributes_hash[attribute_name]
@@ -24,7 +24,7 @@ module Pod
     describe 'Preserve attributes from source specification' do
       before do
         @spec = Specification.from_file('spec/fixtures/Builder.podspec')
-        @builder = SpecBuilder.new(@spec, nil, false, nil, nil)
+        @builder = GDSpecBuilder.new(@spec, nil, false, nil, nil)
       end
 
       it "preserves platform.frameworks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-gd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods