vcpkg_pipeline 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec9347d6f9cbeb02afb322a7011cc50859d3b489e33a244f4d809ed90594dc3
-  data.tar.gz: 2e8411883dcc7a7cf7f502ea58dee01490f2711bfca8a182a8bd6c281f8fd1a3
+  metadata.gz: 5010aa5bfd34c56e05d6c8a1993d943610c6c1926c751918b1912b8f21e07d4f
+  data.tar.gz: 5ae3189936a34d87a5d8ebe3c177f2553f8893d6f7a94dccfcd22b9ebaff8bae
 SHA512:
-  metadata.gz: 6199e01e27504350f80a1609973e97e21c2d9d8f8c4c93216750d3f940e5c030768db0e1c50f94033e1087f0e6c9d90a38db1363b81b7411550f52c86ab3c2c1
-  data.tar.gz: 8cc55c454cdbf12463213a033af6725530560ca7f275e856e302915bb9d581309f17b65a41f86dcefabc150b2d62358e1c214e813805e48ec58798404cc1ab55
+  metadata.gz: 8d71c841df08f944b8c1016419b5590112e563a364a216f2bdef2ba35255258249e569763feb179282dc9fe502b9c8daea7c1661c8dfa94c739346d2fd6e9db6
+  data.tar.gz: 6b67b01c803d575413e8ce5168b3e4f54ceea1ede43456a3aaec1542b0ed6cff89c7c3388523dda759c00271f408d6b16b4880282bbf2bcda1471679acff7869

data/lib/vcpkg_pipeline/core/spec.rb

@@ -46,12 +46,15 @@ module VPL
     def distfile_package(output_path = nil)
       output_path ||= '.'
       distfile_path = "#{output_path}/#{distfile_name}"
-      `zip #{distfile_path} #{sources.join(' ')}`
-      if File.exist? distfile_path
-        VPL.info("Dist包 打包成功: #{distfile_path}")
-      else
-        VPL.error("Dist包 打包失败: #{distfile_path}")
+
+      zip_sources = []
+      @sources.each do |source|
+        zip_sources += Dir[source]
       end
+      VPL.info(zip_sources.join('\n'))
+      `zip #{distfile_path} #{zip_sources.join(' ')}`
+
+      VPL.error("Dist包 打包失败: #{distfile_path}") unless File.exist? distfile_path
       VCPkg.hash(distfile_path)
     end
 

data/lib/vcpkg_pipeline/extension/vcpkg_vpl.rb

@@ -10,10 +10,6 @@ module VCPkg
     VCPkg::Base.new(path || root)
   end
 
-  def self.root
-    `echo $VCPKG_ROOT`.sub(/\n/, '')
-  end
-
   def self.hash(zip_path)
     `vcpkg hash #{zip_path}`.sub(/\n/, '')
   end
@@ -24,32 +20,48 @@ module VCPkg
 
   # VCPkg::Base
   class Base
-    attr_accessor :path
+    attr_accessor :path, :git
 
     def initialize(path)
       @path = path
+
+      @git = Git.open(@path)
     end
 
     def ports
       "#{@path}/ports"
     end
 
+    def copy_port(vcport, commit_message)
+      name = vcport.vcpkg.name
+
+      `cp #{vcport.port_path}/* #{ports}/#{name}`
+      @git.add('.')
+      @git.commit(commit_message)
+    end
+
+    def add_version(vcport, commit_message)
+      name = vcport.vcpkg.name
+
+      `vcpkg x-add-version #{name} --vcpkg-root=#{@path}`
+      @git.add('.')
+      @git.commit(commit_message, amend: true)
+    end
+
     def publish(vcport)
       name = vcport.vcpkg.name
-      version = vcport.vcpkg.version
 
-      git_vcpkg = Git.open(@path)
+      @git.quick_stash('保存之前的修改')
 
-      git_vcpkg.quick_stash('保存之前的修改')
+      port_exist = File.directory? "#{@path}/ports/#{name}"
+      `mkdir -p #{@path}/ports/#{name}` unless port_exist
 
-      port_exist = File.directory? "#{VCPkg.root}/ports/#{name}"
+      commit_message = "[#{name}] #{port_exist ? 'Update' : 'Add'} #{vcport.vcpkg.version}"
 
-      `cp -fr #{vcport.port_path} #{ports}/#{name}`
-      `vcpkg x-add-version #{name} --vcpkg-root=#{@path}`
+      copy_port(vcport, commit_message)
+      add_version(vcport, commit_message)
 
-      git_vcpkg.add('.')
-      git_vcpkg.commit("[#{name}] #{port_exist ? 'Update' : 'Add'} #{version}")
-      git_vcpkg.quick_push
+      @git.quick_push
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcpkg_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - 郑贤达