cocoapods-nexus 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8330342a1bfb924159fd14f64c815a82244bb3d127ea04fca63c221cbc48c06b
-  data.tar.gz: 83dadc37dd09a79bcc5fa428dec201b5626949eba412dbbf4c62fefc18c53d8c
+  metadata.gz: f26e201f54fc7fa7527ced7f39be79211ea312640a2080b1cf9dad3f27d32b8e
+  data.tar.gz: eea1a06b6eb1eb14f80b63961c37d2ed1abfcdc1e83e126a8659cf0e19b76095
 SHA512:
-  metadata.gz: c9ebc809664b18f2a02d5d05df55933e5e5e0d8056ef4efd5bc442549a1b3cc981de187df08c6a7654feaea3b15527249c9c959b27c6e9dd32e088743201fec6
-  data.tar.gz: ac82c558f92e9faf3797f0b70c156113816061423936f90d47004b9d77ef761d5adb9ddd2828e77d18aa69867768a8b21d8b7209660f5362ac27adfbb2337c31
+  metadata.gz: 472e4c8da17a58c0f3dc9067a968308727b24f97da71f31da0bd276a1bdc86574bf5a6dcc659cc5122e5125ccd0d0efc2ee665f85f3a1f4f9d691b752964d159
+  data.tar.gz: 525daa7f70e4fe069c0d83ffa6ac68bf20ebaa8bea43c7dd9762d0245a59f0e79d2fff83b29bf950eb07cfdc0e3670520050a7ce97c19751485883e3efe5c0d5

data/README.md

@@ -26,7 +26,7 @@ $ gem install cocoapods-nexus
 ```shell
 $ pod nexus add RepoName NexusHostUrl
 # 例如:
-# pod nexus add ios_release http://ip:host
+# pod nexus add ios_release http://ip:port
 ```
 
 #### List
@@ -45,7 +45,7 @@ $ pod nexus list
 $ pod nexus push path/to/podspec --url=NexusHostUrl --repo=RepoName --artifact=path/to/预编译文件
 
 # 例如:
-# pod nexus push ~/demo.podspec --url=http://ip:host --repo=ios_release --artifact=~/demo.zip
+# pod nexus push ~/demo.podspec --url=http://ip:port --repo=ios_release --artifact=~/demo.zip
 ```
 
 ### Podfile配置
@@ -55,7 +55,7 @@ $ pod nexus push path/to/podspec --url=NexusHostUrl --repo=RepoName --artifact=p
 plugin 'cocoapods-nexus', :sources => [
   {
     :name => "ios",
-    :url => "http://ip:host",
+    :url => "http://ip:port",
   }
 ]
 
@@ -77,7 +77,7 @@ password nexus_password
 
 ### 2.服务器地址
 
-插件关于nexus的相关操作只需要配置ip和host，后续的mount地址默认为nexus，暂时不支持修改。
+插件关于nexus的相关操作只需要配置ip和port，后续的mount地址默认为nexus，暂时不支持修改。
 
 ## 致谢
 

data/cocoapods-nexus.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'cocoapods-nexus'
-  spec.version = "0.0.5"
+  spec.version = "0.0.6"
   spec.authors = ['mrdaios']
   spec.email = ['mrdaios@gmail.com']
   spec.description = 'a cocoapods plugin for nexus.'

data/lib/cocoapods-nexus/api/components.rb

@@ -6,22 +6,49 @@ module CocoapodsNexus
     end
 
     # 上传组件
-    def upload_maven_component(artifact_id:, version:, group_id:, podspec:, artifact:, files:)
+    def upload_maven_component(artifact_id:, version:, group_id:, podspec:, artifact:, podspec_hook:, files:)
       parameters = {
         'maven2.artifactId' => artifact_id,
         'maven2.version' => version,
         'maven2.groupId' => group_id,
         'maven2.generate-pom' => true,
-        'maven2.packaging' => artifact.nil? ? 'podspec' : File.extname(artifact).delete(".")
+        'maven2.packaging' => artifact.nil? ? 'podspec' : File.extname(artifact).delete('.')
       }
       upload_files = []
-      upload_files << podspec unless podspec.nil?
-      upload_files << artifact unless artifact.nil?
-      upload_files | files unless files.nil?
+      unless podspec.nil?
+        upload_files << {
+          'file' => podspec,
+          'extension' => 'podspec',
+          # 'classifier' => 'podspec'
+        }
+      end
+      unless artifact.nil?
+        upload_files << {
+          'file' => artifact,
+          'extension' => File.extname(artifact).delete('.')
+        }
+      end
+      unless podspec_hook.nil?
+        upload_files << {
+          'file' => podspec_hook,
+          'extension' => 'rb',
+          'classifier' => 'podspec_hook'
+        }
+      end
+
+      unless files.nil?
+        upload_files |= files.map do |file|
+          {
+            'file' => file,
+            'extension' => File.extname(file).delete('.'),
+          }
+        end
+      end
 
       upload_files.each_index do |index|
-        parameters["maven2.asset#{index + 1}"] = File.open(upload_files[index], 'r:utf-8')
-        parameters["maven2.asset#{index + 1}.extension"] = File.extname(upload_files[index]).delete(".")
+        parameters["maven2.asset#{index + 1}"] = File.open(upload_files[index]['file'], 'r:utf-8')
+        parameters["maven2.asset#{index + 1}.extension"] = upload_files[index]['extension'] unless upload_files[index]['extension'].nil?
+        parameters["maven2.asset#{index + 1}.classifier"] = upload_files[index]['classifier'] unless upload_files[index]['classifier'].nil?
       end
       @connection.post(endpoint: "components?repository=#{@repo}", parameters: parameters, headers: {})
     end

data/lib/cocoapods-nexus/command/nexus/push.rb

@@ -16,9 +16,10 @@ module Pod
 
         def self.options
           [
-            ['--url=url', 'a nexus hostname'],
-            ['--repo=repo', 'a nexus repo'],
-            ['--artifact=artifact', 'a nexus artifact']
+            %w[--url=url nexus服务器地址(http://ip:port)],
+            %w[--repo=repo nexus的仓库名称],
+            %w[--artifact=artifact 制品文件],
+            %w[--podspec_hook=podspec_hook. podspec动态修改脚本文件]
           ].concat(super)
         end
 
@@ -27,6 +28,7 @@ module Pod
           @url = argv.option('url')
           @repo = argv.option('repo')
           @artifact = argv.option('artifact')
+          @podspec_hook = argv.option('podspec_hook')
           super
         end
 
@@ -40,8 +42,10 @@ module Pod
         def run
           podspec_path = File.expand_path(@podspec)
           artifact_path = File.expand_path(@artifact) unless @artifact.nil?
+          podspec_hook_path = File.expand_path(@podspec_hook) unless @podspec_hook.nil?
 
-          UI.section("开始发布 #{File.basename(@podspec)} -> #{@url}/nexus/#browse/browse:#{@repo}") do
+
+          UI.section("开始发布 #{File.basename(@podspec)} -> #{File.join(@url,"/nexus/#browse/browse:",@repo)}") do
             spec = Specification.from_file(podspec_path)
             artifact_id = spec.attributes_hash['name']
             version = spec.attributes_hash['version']
@@ -52,7 +56,8 @@ module Pod
                                                 group_id: group_id,
                                                 podspec: podspec_path,
                                                 artifact: artifact_path,
-                                                files: [])
+                                                podspec_hook: podspec_hook_path,
+                                                files: nil)
               UI.puts "成功发布 #{artifact_id}(#{version})"
             else
               raise Informative, "发布失败 #{artifact_id}(#{version})，请检查~/.netrc文件或#{@repo}类型"

data/lib/cocoapods-nexus/downloader.rb

@@ -12,7 +12,7 @@ module Pod
       executable :curl
 
       def download!
-        @filename = "#{options[:name]}.#{'podspec'.to_sym}"
+        @filename = "#{options[:name]}.#{options[:type]}"
         @download_path = @target_path + @filename
         download_file(@download_path)
       end

data/lib/cocoapods-nexus/hook/specification.rb

@@ -0,0 +1,19 @@
+require 'cocoapods-core'
+
+module Pod
+  class Specification
+    class << Specification
+      def _eval_nexus_podspec(nexus_podspec, parent_podspec)
+        podspec_string = nexus_podspec.gsub('Pod::Spec.new', 'Pod::Spec.nexus(parent_podspec)')
+                                      .gsub('Pod::Specification.new', 'Pod::Spec.nexus(parent_podspec)')
+        # rubocop:disable Eval
+        eval(podspec_string, binding)
+        # rubocop:enable Eval
+      end
+
+      def nexus(parent_podspec)
+        yield parent_podspec if block_given?
+      end
+    end
+  end
+end

data/lib/cocoapods-nexus/nexus_source.rb

@@ -1,6 +1,7 @@
 require 'cocoapods-nexus/api'
 require 'cocoapods-nexus/downloader'
 require 'versionomy'
+require 'cocoapods-nexus/hook/specification'
 
 module Pod
   class NexusSource < Source
@@ -39,7 +40,7 @@ module Pod
         # 暂时这样处理
         spec_version = query.requirement.requirements.last.last.to_s
         artifacte = nexus_find_artifacte(spec_name: query.root_name, spec_version: spec_version)
-        unless artifacte.empty?
+        if artifacte
           download_url = parse_artifacte_asset_url(artifacte, 'podspec')
           if download_url
             target_path = "#{@repo}/#{query.root_name}/#{spec_version}"
@@ -66,7 +67,24 @@ module Pod
         specification.attributes_hash['source'] = {
             'http' => download_url
         }
-        specification.attributes_hash['vendored_frameworks'] = "#{name}.framework"
+
+        # 执行自定义脚本
+        podspec_rb_url = parse_artifacte_asset_url(artifacte, 'podspec_hook.rb')
+        if podspec_rb_url
+          tmpdir = Dir.tmpdir
+          downloader = Pod::Downloader::NexusHttp.new(tmpdir, podspec_rb_url, {:type => 'rb', :name => name})
+          downloader.download
+
+          path = File.join(tmpdir, "#{name}.rb")
+          if File.exist?(path)
+            string = File.open(path, 'r:utf-8', &:read)
+            if string
+              Pod::Specification._eval_nexus_podspec(string, specification)
+            end
+          end
+        else
+          specification.attributes_hash['vendored_frameworks'] = "#{name}.framework"
+        end
       end
       specification
     end
@@ -88,7 +106,7 @@ module Pod
     def parse_artifacte_asset_url(artifacte, asset_type)
       asset = artifacte['assets'].select { |asset| asset['path'].end_with?(asset_type) }.first
       asset['downloadUrl'] if asset && asset['downloadUrl']
-    end 
+    end
 
     def nexus_find_artifacte(spec_name:, spec_version:)
       artifactes = nexus_api.search_maven_component(artifact_id: spec_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-nexus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - mrdaios
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -108,6 +108,7 @@ files:
 - lib/cocoapods-nexus/hook/analyzer.rb
 - lib/cocoapods-nexus/hook/installer.rb
 - lib/cocoapods-nexus/hook/manager.rb
+- lib/cocoapods-nexus/hook/specification.rb
 - lib/cocoapods-nexus/nexus_source.rb
 - lib/cocoapods_plugin.rb
 - spec/command/nexus_spec.rb