cocoapods-bin 0.1.24 → 0.1.25

data/lib/cocoapods-bin/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/helpers/sources_helper'
 require 'cocoapods-bin/helpers/spec_creator'
 require 'cocoapods-bin/helpers/spec_files_helper'

data/lib/cocoapods-bin/helpers/framework.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # copy from https://github.com/CocoaPods/cocoapods-packager
 
 module CBin
-	class Framework
+  class Framework
     attr_reader :headers_path
     attr_reader :module_map_path
     attr_reader :resources_path
@@ -58,5 +60,5 @@ module CBin
       @root_path = Pathname.new(@platform)
       @root_path.mkpath unless @root_path.exist?
     end
-	end
-end
+  end
+end

data/lib/cocoapods-bin/helpers/framework_builder.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 # copy from https://github.com/CocoaPods/cocoapods-packager
 
 require 'cocoapods-bin/helpers/framework.rb'
 
 module CBin
-	class Framework
+  class Framework
     class Builder
       include Pod
 
-      def initialize(spec, file_accessor, platform, source_dir) 
+      def initialize(spec, file_accessor, platform, source_dir)
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -16,7 +18,7 @@ module CBin
       end
 
       def build
-        UI.section("Building static framework #{@spec}") do 
+        UI.section("Building static framework #{@spec}") do
           defines = compile
 
           build_sim_libraries(defines)
@@ -29,15 +31,15 @@ module CBin
 
           cp_to_source_dir
         end
-      end 
+      end
 
       private
 
       def cp_to_source_dir
-        target_dir = "#{@source_dir}/#{@spec.name}.framework" 
+        target_dir = "#{@source_dir}/#{@spec.name}.framework"
         FileUtils.rm_rf(target_dir) if File.exist?(target_dir)
 
-        `cp -fa #{@platform.to_s}/#{@spec.name}.framework #{@source_dir}` 
+        `cp -fa #{@platform}/#{@spec.name}.framework #{@source_dir}`
       end
 
       def build_sim_libraries(defines)
@@ -49,8 +51,8 @@ module CBin
         public_headers = @file_accessor.public_headers
         UI.message "Copying public headers #{public_headers.map(&:basename).map(&:to_s)}"
 
-        public_headers.each do |h| 
-          `ditto #{h} #{framework.headers_path}/#{h.basename}` 
+        public_headers.each do |h|
+          `ditto #{h} #{framework.headers_path}/#{h.basename}`
         end
 
         # If custom 'module_map' is specified add it to the framework distribution
@@ -58,7 +60,9 @@ module CBin
         # create a default 'module_map' one using it.
         if !@spec.module_map.nil?
           module_map_file = @file_accessor.module_map
-          module_map = File.read(module_map_file) if Pathname(module_map_file).exist?
+          if Pathname(module_map_file).exist?
+            module_map = File.read(module_map_file)
+         end
         elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}.h")
           module_map = <<-MAP
           framework module #{@spec.name} {
@@ -72,26 +76,28 @@ module CBin
 
         unless module_map.nil?
           UI.message "Writing module map #{module_map}"
-          framework.module_map_path.mkpath unless framework.module_map_path.exist?
+          unless framework.module_map_path.exist?
+            framework.module_map_path.mkpath
+         end
           File.write("#{framework.module_map_path}/module.modulemap", module_map)
         end
       end
 
       def copy_license
-        UI.message "Copying license"
+        UI.message 'Copying license'
         license_file = @spec.license[:file] || 'LICENSE'
         `cp "#{license_file}" .` if Pathname(license_file).exist?
       end
 
       def copy_resources
-        bundles = Dir.glob("./build/*.bundle")
+        bundles = Dir.glob('./build/*.bundle')
 
         bundle_names = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
           consumer = spec.consumer(@platform)
           consumer.resource_bundles.keys +
-          consumer.resources.map do |r| 
-            File.basename(r, '.bundle') if File.extname(r) == 'bundle'
-          end
+            consumer.resources.map do |r|
+              File.basename(r, '.bundle') if File.extname(r) == 'bundle'
+            end
         end.compact.uniq
 
         bundles.select! do |bundle|
@@ -140,7 +146,7 @@ module CBin
       end
 
       def ios_architectures
-        archs = %w(x86_64 arm64 armv7 armv7s i386)
+        archs = %w[x86_64 arm64 armv7 armv7s i386]
         @vendored_libraries.each do |library|
           archs = `lipo -info #{library}`.split & archs
         end
@@ -149,7 +155,8 @@ module CBin
 
       def compile
         defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
-        defines << ' ' << @spec.consumer(@platform).compiler_flags.join(' ')
+        defines += ' '
+        defines += @spec.consumer(@platform).compiler_flags.join(' ')
 
         options = ios_build_options
         xcodebuild(defines, options)
@@ -170,10 +177,10 @@ module CBin
         output = `#{command}`.lines.to_a
 
         if $?.exitstatus != 0
-          raise <<-EOF
-Build command failed: #{command}
-Output:
-#{output.map { |line| "    #{line}" }.join}
+          raise <<~EOF
+            Build command failed: #{command}
+            Output:
+            #{output.map { |line| "    #{line}" }.join}
           EOF
 
           Process.exit
@@ -187,12 +194,12 @@ Output:
       end
 
       def framework
-        @framework ||= begin 
+        @framework ||= begin
           framework = Framework.new(@spec.name, @platform.name.to_s)
           framework.make
           framework
         end
       end
     end
-	end
-end
+  end
+end

data/lib/cocoapods-bin/helpers/sources_helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/sources_manager.rb'
 
 module CBin
-	module SourcesHelper
+  module SourcesHelper
     def sources_manager
       Pod::Config.instance.sources_manager
     end
@@ -24,8 +26,8 @@ module CBin
       sources
     end
 
-    def sources_option(code_dependencies, additional_sources) 
+    def sources_option(code_dependencies, additional_sources)
       (valid_sources(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
     end
-	end
-end
+  end
+end

data/lib/cocoapods-bin/helpers/spec_creator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 require 'cocoapods-bin/config/config'
 
@@ -8,22 +10,24 @@ module CBin
       attr_reader :template_spec
       attr_reader :spec
 
-      def initialize(code_spec, template_spec, platforms = 'ios') 
+      def initialize(code_spec, template_spec, platforms = 'ios')
         @code_spec = code_spec
         @template_spec = template_spec
         @platforms = Array(platforms)
-        validate!     
+        validate!
       end
 
       def validate!
-        raise Pod::Informative, "源码 podspec 不能为空 ."  unless code_spec
-        raise Pod::Informative, "不支持自动生成存在 subspec 的二进制 podspec , 需要提供模版文件 #{code_spec.name}.binary.podspec.template ."  if code_spec.subspecs.any? && template_spec.nil?
+        raise Pod::Informative, '源码 podspec 不能为空 .' unless code_spec
+        if code_spec.subspecs.any? && template_spec.nil?
+          raise Pod::Informative, "不支持自动生成存在 subspec 的二进制 podspec , 需要提供模版文件 #{code_spec.name}.binary.podspec.template ."
+        end
       end
 
       def create
         spec = template_spec ? create_from_code_spec_and_template_spec : create_from_code_spec
 
-        Pod::UI.message "生成二进制 podspec 内容: "
+        Pod::UI.message '生成二进制 podspec 内容: '
         spec.to_pretty_json.split("\n").each do |text|
           Pod::UI.message text
         end
@@ -38,15 +42,15 @@ module CBin
           f.write(spec.to_pretty_json)
         end
 
-        @filename = file 
+        @filename = file
       end
 
       def clear_spec_file
         File.delete(filename) if File.exist?(filename)
       end
 
-      def filename 
-        @filename ||= "#{spec.name}.binary.podspec.json" 
+      def filename
+        @filename ||= "#{spec.name}.binary.podspec.json"
       end
 
       private
@@ -62,8 +66,12 @@ module CBin
         # Resources
         extnames = []
         extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
-        extnames += code_spec_consumer.resources.map { |r| File.basename(r) } if code_spec_consumer.resources.any?
-        @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } } if extnames.any?
+        if code_spec_consumer.resources.any?
+          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+        end
+        if extnames.any?
+          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+        end
 
         # Source Location
         @spec.source = binary_source
@@ -72,7 +80,7 @@ module CBin
         @spec.source_files = framework_contents('Headers/*')
         @spec.public_header_files = framework_contents('Headers/*')
 
-        # Unused for binary 
+        # Unused for binary
         spec_hash = @spec.to_hash
         # spec_hash.delete('license')
         spec_hash.delete('resource_bundles')
@@ -85,14 +93,16 @@ module CBin
         # spec_hash.delete('vendored_libraries')
         # libraries 只能假设为动态库不做处理了，如果有例外，需要开发者自行处理
         vendored_libraries = spec_hash.delete('vendored_libraries')
-        vendored_libraries = Array(vendored_libraries).reject { |l| l.end_with?('.a') } 
-        spec_hash['vendored_libraries'] = vendored_libraries if vendored_libraries.any?
+        vendored_libraries = Array(vendored_libraries).reject { |l| l.end_with?('.a') }
+        if vendored_libraries.any?
+          spec_hash['vendored_libraries'] = vendored_libraries
+        end
 
         # Filter platforms
         platforms = spec_hash['platforms']
-        selected_platforms = platforms.select { |k, v| @platforms.include?(k) } 
+        selected_platforms = platforms.select { |k, _v| @platforms.include?(k) }
         spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
-   
+
         @spec = Pod::Specification.from_hash(spec_hash)
         @spec
       end
@@ -106,10 +116,10 @@ module CBin
       end
 
       def binary_source
-        { http: CBin.config.binary_download_url % [code_spec.root.name, code_spec.version], type: CBin.config.download_file_type } 
+        { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
       end
 
-      def code_spec_consumer(platform = :ios)
+      def code_spec_consumer(_platform = :ios)
         code_spec.consumer(:ios)
       end
 
@@ -118,4 +128,4 @@ module CBin
       end
     end
   end
-end
+end

data/lib/cocoapods-bin/helpers/spec_files_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'cocoapods-bin/native/sources_manager.rb'
 require 'cocoapods-bin/helpers/spec_creator'
 
 module CBin
-	module SpecFilesHelper
+  module SpecFilesHelper
     def spec_files
       @spec_files ||= Pathname.glob('*.podspec{,.json}')
     end
@@ -13,32 +15,39 @@ module CBin
 
     def binary_template_spec_files
       @binary_spec_template_files ||= Pathname.glob('*.binary-template.podspec{,.json}')
-    end 
+    end
 
     def binary_template_spec_file
       @binary_spec_template_file ||= binary_template_spec_files.first
-    end 
+    end
 
     def code_spec_files
       @code_spec_files ||= spec_files - binary_spec_files - binary_template_spec_files
     end
 
-    def code_spec 
-      Pod::Specification.from_file(code_spec_files.first) if code_spec_files.first
+    def code_spec
+      if code_spec_files.first
+        Pod::Specification.from_file(code_spec_files.first)
+     end
     end
 
-    def binary_spec 
-      Pod::Specification.from_file(binary_spec_files.first) if binary_spec_files.first
+    def binary_spec
+      if binary_spec_files.first
+        Pod::Specification.from_file(binary_spec_files.first)
+     end
     end
 
     def binary_template_spec
-      Pod::Specification.from_file(binary_template_spec_file) if binary_template_spec_file
-    end 
+      if binary_template_spec_file
+        Pod::Specification.from_file(binary_template_spec_file)
+     end
+    end
 
     def find_spec_file(podspec)
       path = Pathname(podspec)
       raise Pod::Informative, "无法找到 #{podspec}" unless path.exist?
-      path 
+
+      path
     end
 
     def create_binary_spec_file(code_spec, template_spec)
@@ -48,8 +57,12 @@ module CBin
       # 1.2.1 有，根据 template spec 生成
       # 1.2.2 没有，根据 code spec 生成
 
-      raise Pod::Informative, "没有二进制 podspec 的情况下，必须要提供源码 podspec." unless code_spec
-      raise Pod::Informative, "拥有 subspec 的组件，在生成二进制 podspec 时，必须要提供模版 podspec." if code_spec.subspecs.any? && template_spec.nil?
+      unless code_spec
+        raise Pod::Informative, '没有二进制 podspec 的情况下，必须要提供源码 podspec.'
+     end
+      if code_spec.subspecs.any? && template_spec.nil?
+        raise Pod::Informative, '拥有 subspec 的组件，在生成二进制 podspec 时，必须要提供模版 podspec.'
+     end
 
       @spec_creator = CBin::Specification::Creator.new(code_spec, template_spec)
       @spec_creator.create
@@ -58,7 +71,7 @@ module CBin
     end
 
     def clear_binary_spec_file_if_needed
-     @spec_creator.clear_spec_file if @spec_creator
+      @spec_creator&.clear_spec_file
     end
-	end
-end
+  end
+end

data/lib/cocoapods-bin/native.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 
 if Pod.match_version?('~> 1.4')
-	require 'cocoapods-bin/native/podfile'
-	require 'cocoapods-bin/native/installation_options'
-	require 'cocoapods-bin/native/specification'
-	require 'cocoapods-bin/native/path_source'
-	require 'cocoapods-bin/native/analyzer'
-	require 'cocoapods-bin/native/installer'
-	require 'cocoapods-bin/native/pod_source_installer'
-	require 'cocoapods-bin/native/linter'
-	require 'cocoapods-bin/native/resolver'
-	require 'cocoapods-bin/native/source'
-	require 'cocoapods-bin/native/validator'
-	require 'cocoapods-bin/native/acknowledgements'
-	require 'cocoapods-bin/native/sandbox_analyzer'
-	require 'cocoapods-bin/native/podspec_finder'
+  require 'cocoapods-bin/native/podfile'
+  require 'cocoapods-bin/native/installation_options'
+  require 'cocoapods-bin/native/specification'
+  require 'cocoapods-bin/native/path_source'
+  require 'cocoapods-bin/native/analyzer'
+  require 'cocoapods-bin/native/installer'
+  require 'cocoapods-bin/native/pod_source_installer'
+  require 'cocoapods-bin/native/linter'
+  require 'cocoapods-bin/native/resolver'
+  require 'cocoapods-bin/native/source'
+  require 'cocoapods-bin/native/validator'
+  require 'cocoapods-bin/native/acknowledgements'
+  require 'cocoapods-bin/native/sandbox_analyzer'
+  require 'cocoapods-bin/native/podspec_finder'
 end

data/lib/cocoapods-bin/native/acknowledgements.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Pod
   module Generator
     class Acknowledgements
-    	def license_text(spec)
+      def license_text(spec)
         return nil unless spec.license
+
         text = spec.license[:text]
         unless text
           if license_file = spec.license[:file]
@@ -21,4 +24,4 @@ module Pod
       end
     end
   end
-end
+end