cocoapods-podspec-binary 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72431b055019b6e7378fb89425060fd38fd73a574a857831af8d21366fa232a
-  data.tar.gz: c427ddfdaf904ca14d68028d03caf4c1826211147f0a3a979cceb3404696dcfd
+  metadata.gz: e577e29dc2968b4ae3fa28ca13146e1125644a0c2b73590886d77798ff8f4d6d
+  data.tar.gz: 8d6c0451acf9fe9288775f98ecbaf247b1ba34d0a63332276bf688fd93f745c8
 SHA512:
-  metadata.gz: 1e2f9b66964e91d6becd2e3177520ebac2cb54c8b334d6aac09359aebbd4bfa2fa878a743c1f4e16190c86a17c03698793e15235ce6b80ea76feeec7e5c6b114
-  data.tar.gz: e361d70899cea6182de506a59fe5dae029fcca3fc0399e478a08811627023ba625c5ce0e043b611808f7c3ca42fc49ae4836b0d8f8c39bb42395a14240ba725b
+  metadata.gz: 31fa892c3ef8edca940e7b7c434b5952c2eb655feb122c8ddb4cae9dabd5f20b0ac44d4b3451eb873f6208cb8b64f8335fd2fe602202e9bcbabc563f633d0c0f
+  data.tar.gz: 43e98f93f0ffc1931be88d2a93bbb90ac87e09e5080e2d7f352f0dac9b680b7bffe8482a7992b7771466627f6d5b911d460ea4b6a50113666b941e0d552382dc

data/lib/cocoapods-podspec-binary/command/mbuild.rb

@@ -42,7 +42,6 @@ module Pod
         @pod_version = argv.shift_argument
         @config_instance = MBuildConfig.instance
         @build_dir = @config_instance.mbuild_dir
-        @sources = argv.option('sources')
         super
       end
 
@@ -50,7 +49,7 @@ module Pod
         [
           ['--framework', 'Used to generate the framework '],
           ['--xcframework', 'Used to generate the xcframework '],
-          ['--sources=[sources]', 'The sources from which to pull dependent pods ']
+          ['--sources', 'The sources from which to pull dependent pods ']
         ].concat(super).reject { |(name, _)| name == 'name' }
       end
 
@@ -62,10 +61,12 @@ module Pod
       end
 
       def prepare
+        puts 'prepare begin'
         init_config
         MBuildFileUtils.create_folder(@build_dir)
         Dir.chdir(@build_dir)
         BuildProject.new.prepare_project
+        puts 'prepare end'
       end
 
       def init_config
@@ -76,10 +77,6 @@ module Pod
           @config_instance.command_config(@pod_name, @pod_version)
         end
         @config_instance.library_type = @xcframework ? BinaryType::XCFRAMEWORK : BinaryType::FRAMEWORK
-        puts "Preparing to generate the binary version of #{@pod_name}:#{@pod_version}."
-        return unless @sources
-
-        @config_instance.sources = @sources
       end
 
       def generate_project
@@ -87,21 +84,16 @@ module Pod
       end
 
       def build_binary
-        puts "Commencing the build of #{@pod_name}:#{@pod_version}."
-        project_dir = File.join(@build_dir, 'BinaryProj/Example')
+        project_dir = File.join(@build_dir, 'project')
         Dir.chdir(project_dir)
         binary_type = @xcframework ? BinaryType::XCFRAMEWORK : BinaryType::FRAMEWORK
         build_binary = BuildBinary.new(binary_type)
         build_binary.build
-        puts "The successful build of the #{@pod_name}:#{@pod_version} #{@binary_type}."
       end
 
       def export_binary
-        puts 'Exporting binary files.'
         export_dir = @config_instance.root_dir
-        FileUtils.cp_r("#{@build_dir}/#{@pod_name}-#{@pod_version}", export_dir)
-        FileUtils.rm_rf("#{@build_dir}/#{@pod_name}-#{@pod_version}")
-        puts 'Task execution completed.'
+        FileUtils.cp_r("#{@build_dir}/#{@pod_name}", export_dir)
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module CocoapodsPodspecBinary
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/cocoapods-podspec-binary/mbuild/mbuild_binary.rb

@@ -56,16 +56,14 @@ class BuildBinary
   end
 
   def generate_final_binary(framework)
-    binary_dir = "#{@config_instance.mbuild_dir}/#{@pod_name}-#{@pod_version}"
-    Dir.mkdir(binary_dir) unless Dir.exist? binary_dir
+    binary_dir = "#{@config_instance.mbuild_dir}/#{@pod_name}"
+    Dir.mkdir(binary_dir) if Dir.exist? binary_dir
     FileUtils.cp_r(framework, binary_dir)
-    podspec_file = "#{Dir.pwd}/#{@pod_name}.podspec.json"
-    FileUtils.cp_r(podspec_file, binary_dir)
   end
 
   def generate_cache_file
-    binary_dir = "#{@config_instance.mbuild_dir}/#{@pod_name}-#{@pod_version}/Podfile.lock"
-    FileUtils.cp_r("#{@config_instance.mbuild_dir}/BinaryProj/Example/Podfile.lock", binary_dir)
+    binary_dir = "#{@config_instance.mbuild_dir}/#{@pod_name}/Podfile.lock"
+    FileUtils.cp_r("#{@config_instance.mbuild_dir}/project/Podfile.lock", binary_dir)
   end
 
   private

data/lib/cocoapods-podspec-binary/mbuild/mbuild_hook.rb

@@ -9,13 +9,17 @@ module Pod
     # class
     class Request
       old_method = instance_method(:validate!)
+
       define_method(:validate!) do
+        puts '++++podspec hook+++++'
         pod_name = MBuildConfig.instance.pod_name
         pod_version = MBuildConfig.instance.pod_version
-        if spec.name == pod_name && spec.version.to_s == pod_version
-          podspec_hash = spec.attributes_hash.deep_dup
-          Pod::MbuildPodspec.new(podspec_hash).generate_podspec
+        puts "#{pod_name}:#{pod_version}"
+        if !spec.nil? && spec.name == pod_name && spec.version == pod_version
+          MbuildPodspec.new(spec).generate_podspec
+          puts 'podspec hook'
         end
+
         old_method.bind(self).call
       end
     end

data/lib/cocoapods-podspec-binary/mbuild/mbuild_podspec.rb

@@ -5,34 +5,31 @@ require 'fileutils'
 module Pod
   # generate podspec
   class MbuildPodspec
-    def initialize(podspec_hash)
-      @binary_type = MBuildConfig.instance.library_type == BinaryType::FRAMEWORK ? 'framework' : 'xcframework'
+    def initialize(podspec)
+      @podspec = podspec
+      @binary_type = MBuildConfig.instance.binary_type == BinaryType::FRAMEWORK ? 'framework' : 'xcframework'
       @config_instance = MBuildConfig.instance
       @pod_name = MBuildConfig.instance.pod_name
       @pod_version = MBuildConfig.instance.pod_version
-      @podspec_hash = podspec_hash
+      @podspec_hash = podspec.attributes_hash.deep_dup
     end
 
     def generate_podspec
       binary_spec_version
-      binary_spec_source
       binary_spec_framework
       binary_spec_lib
       binary_spec_public_header_files
       binary_private_header_files
+
       write_podspec_to_file
+      puts 'Generated podspec'
     end
 
     private
 
     def write_podspec_to_file
-      podspec_file = "#{Dir.pwd}/#{@pod_name}.podspec.json"
       podspec_json = JSON.pretty_generate(@podspec_hash)
-      File.write(podspec_file, podspec_json)
-    end
-
-    def binary_spec_source
-      @podspec_hash['source'] = { 'http': 'The location where files are stored' }
+      File.write("#{Dir.pwd}/#{@pod_name}.podspec.json", podspec_json)
     end
 
     def binary_spec_version
@@ -63,9 +60,7 @@ module Pod
     end
 
     def binary_spec_public_header_files
-      @podspec_hash.delete('default_subspecs') if @podspec_hash.key?('default_subspecs')
-      @podspec_hash.delete('source_files') if @podspec_hash.key?('source_files')
-      @podspec_hash.delete('public_header_files') if @podspec_hash.key?('public_header_files')
+      @podspec_hash.slice!('default_subspecs', 'source_files', 'public_header_files')
       @podspec_hash['public_header_files'] = "#{@pod_name}/Headers/*.h"
     end
   end

data/lib/cocoapods-podspec-binary/mbuild/mbuild_project.rb

@@ -6,18 +6,17 @@ require 'cocoapods'
 class BuildProject
   def initialize
     @config_instance = MBuildConfig.instance
-    @project_dir = File.join(MBuildConfig.instance.mbuild_dir, 'BinaryProj/Example')
+    @project_dir = File.join(MBuildConfig.instance.mbuild_dir, 'project')
   end
 
   def prepare_project
-    example_dir = File.join(MBuildConfig.instance.mbuild_dir, 'BinaryProj')
+    example_dir = @project_dir
     if File.directory?(example_dir)
       Git.open(example_dir).reset_hard
-      Git.open(example_dir).clean(force: true)
       Git.open(example_dir).pull
     else
       MBuildFileUtils.create_folder(@project_dir)
-      example_url = 'git@github.com:HuolalaTech/hll-cocoapods-podspec-binary.git'
+      example_url = 'ssh://git@gitlab.huolala.cn:56358/group-wp-sdk/binary-example-ios.git'
       Git.clone(example_url, example_dir)
     end
   end
@@ -34,11 +33,10 @@ class BuildProject
     podfile_content = File.read(podfile_path)
     pod_name = @config_instance.pod_name
     pod_version = @config_instance.pod_version
-    new_content = podfile_content.gsub('BINARY_NAME', pod_name).gsub('BINARY_VERSION', pod_version)
-    if @config_instance.sources
-      new_content.prepend(@config_instance.sources.split(',').map { |it| "source \"#{it.strip}\"\n" }.join)
-    end
-
+    puts("name:#{pod_name} version:#{pod_version}")
+    new_content = podfile_content.gsub('BINARY_NAME', pod_name).gsub('BINARY_VERSION', pod_version).gsub(
+      'cocoapods-mdapbox', 'cocoapods-podspec-binary'
+    )
     File.open(podfile_path, 'w') { |file| file.puts new_content }
   end
 

data/lib/cocoapods-podspec-binary/utils/file_utils.rb

@@ -5,12 +5,15 @@ require 'zlib'
 # FileUtils: A utility class for file operations.
 class MBuildFileUtils
   def self.create_folder(folder_path)
-    return if File.directory?(folder_path)
-
-    begin
-      Dir.mkdir(folder_path)
-    rescue SystemCallError => e
-      puts "Error creating folder: #{e.message}"
+    if File.directory?(folder_path)
+      puts 'Folder already exists.'
+    else
+      begin
+        Dir.mkdir(folder_path)
+        puts 'Folder created successfully!'
+      rescue SystemCallError => e
+        puts "Error creating folder: #{e.message}"
+      end
     end
   end
 

data/lib/cocoapods_plugin.rb

@@ -4,6 +4,5 @@
 require 'cocoapods-podspec-binary'
 require 'cocoapods-podspec-binary/command/mbuild'
 require 'cocoapods-podspec-binary/mbuild/mbuild_hook'
-require 'cocoapods-podspec-binary/mbuild/mbuild_podspec'
 require 'cocoapods-podspec-binary/utils/file_utils'
 require 'cocoapods-podspec-binary/utils/git_utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podspec-binary
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - pengpeng.dai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler