vcpkg_pipeline 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc2e64a36ee7d26974d7d9a0fe558aef0912e2d8164cc173eeb45e253ba73c5
-  data.tar.gz: 2db353e8a206c29dc3229d548b7cb502b12e6611dc7286146744af279472a079
+  metadata.gz: bec9347d6f9cbeb02afb322a7011cc50859d3b489e33a244f4d809ed90594dc3
+  data.tar.gz: 2e8411883dcc7a7cf7f502ea58dee01490f2711bfca8a182a8bd6c281f8fd1a3
 SHA512:
-  metadata.gz: ec12ab0a8d6ff34e70a747a13ef87c09d22a1b55cfd9db23e6512f57d761393bdc2c83150bdc50da51543c6f97b84ffe2a71e964a783cb47bf8e6f7f6996cdb7
-  data.tar.gz: 360c1fbb0f5f53e34707ab915f1a651a5e908a08b9c762dd1719770344c5118b5b586758760236ed952ed9adb9ba23137891a11deba371a53da241584bfe2ebd
+  metadata.gz: 6199e01e27504350f80a1609973e97e21c2d9d8f8c4c93216750d3f940e5c030768db0e1c50f94033e1087f0e6c9d90a38db1363b81b7411550f52c86ab3c2c1
+  data.tar.gz: 8cc55c454cdbf12463213a033af6725530560ca7f275e856e302915bb9d581309f17b65a41f86dcefabc150b2d62358e1c214e813805e48ec58798404cc1ab55

data/lib/vcpkg_pipeline/command/publish.rb

@@ -2,9 +2,11 @@
 
 require 'vcpkg_pipeline/extension/vcpkg_vpl'
 
+require 'vcpkg_pipeline/core/log'
 require 'vcpkg_pipeline/core/scanner'
 
 require 'vcpkg_pipeline/command/update'
+require 'vcpkg_pipeline/command/update/all'
 
 module VPL
   class Command
@@ -18,27 +20,33 @@ module VPL
         CLAide::Argument.new('项目根目录(默认使用当前目录)', false)
       ]
       def self.options
-        [].concat(super).concat(options_extension)
+        [
+          ['--registry=.', '指定vcpkg的registry目录, 不可为空']
+        ].concat(super).concat(options_extension)
       end
 
       def self.options_extension_hash
         Hash[
-          'update' => Update.options,
+          'update' => Update::All.options,
         ]
       end
 
       def initialize(argv)
         @path = argv.shift_argument || Dir.pwd
 
+        @registry = argv.option('registry', '').split(',').first
         super
       end
 
       def run
+        VPL.error("registry目录异常: #{@registry}") unless File.directory? @registry
+
         Update::All.run([@path] + argv_extension['update'])
 
         scanner = Scanner.new(@path)
 
-        VCPkg.publish(scanner.vcport)
+        vcpkg = VCPkg.open(@registry)
+        vcpkg.publish(scanner.vcport)
       end
     end
   end

data/lib/vcpkg_pipeline/command/scan/all.rb

@@ -30,7 +30,7 @@ module VPL
         def run
           scanner = Scanner.new(@path)
 
-          VPL.info("Release: #{ENV['Release'] ? true : false}")
+          VPL.info("Debug: #{ENV['Debug'] ? true : false}")
           VPL.info("Git: #{scanner.git}")
           VPL.info("CMake: #{scanner.cmake}")
           VPL.info("VCPort: #{scanner.vcport}")

data/lib/vcpkg_pipeline/command/update/all.rb

@@ -10,7 +10,7 @@ module VPL
         self.summary = '更新项目内容'
 
         self.description = <<-DESC
-          更新项目CMake、VCPort、Git Tag内容。
+          更新项目Spec、CMake、VCPort、Git Tag内容。
         DESC
 
         self.arguments = [

data/lib/vcpkg_pipeline/command/update/spec.rb

@@ -19,7 +19,9 @@ module VPL
         ]
 
         def self.options
-          [].concat(super)
+          [
+            ['--version=x.x.x', '新版本号。(默认使用patch+1)']
+          ].concat(super)
         end
 
         def initialize(argv)

data/lib/vcpkg_pipeline/command/update/vcport.rb

@@ -18,7 +18,9 @@ module VPL
         ]
 
         def self.options
-          [].concat(super)
+          [
+            ['--output=./', '项目打包的输出目录。(默认使用项目 根目录/build)']
+          ].concat(super)
         end
 
         def initialize(argv)

data/lib/vcpkg_pipeline/command/update.rb

@@ -2,11 +2,11 @@
 
 require 'vcpkg_pipeline/core/updater'
 
-require 'vcpkg_pipeline/command/update/all'
 require 'vcpkg_pipeline/command/update/spec'
 require 'vcpkg_pipeline/command/update/cmake'
 require 'vcpkg_pipeline/command/update/vcport'
 require 'vcpkg_pipeline/command/update/git'
+require 'vcpkg_pipeline/command/update/all'
 
 module VPL
   class Command

data/lib/vcpkg_pipeline/extension/git_vpl.rb

@@ -11,22 +11,28 @@ module Git
       branches.current.first
     end
 
-    def quick_push_tag(has_tag)
-      push(remote, current_branch, has_tag)
-      VPL.info("Git上传 #{remote} #{current_branch} #{new_version}")
+    def quick_push_tag(new_tag = nil)
+      unless ENV['Debug']
+        has_tag = !new_tag.nil?
+        push(remote, current_branch, has_tag)
+      end
+      VPL.info("Git上传 #{remote} #{current_branch} #{new_tag}")
     end
 
     def quick_push(new_tag = nil)
-      return unless ENV['Release']
-
-      has_tag = !new_tag.empty?
+      has_tag = !new_tag.nil?
       if has_tag
         tags.each { |tag| VPL.error("当前版本 #{new_tag} 已发布, 请尝试其他版本号") if tag.name.eql? new_tag }
 
         add_tag(new_tag)
         VPL.info("Git提交Tag: #{new_tag}")
       end
-      quick_push_tag(has_tag)
+      quick_push_tag(new_tag)
+    end
+
+    def quick_stash(msg)
+      add('.')
+      branch.stashes.save(msg)
     end
 
     def to_s

data/lib/vcpkg_pipeline/extension/vcpkg_vpl.rb

@@ -6,12 +6,12 @@ require 'vcpkg_pipeline/core/log'
 
 # VCPkg
 module VCPkg
-  def self.root
-    `echo $VCPKG_ROOT`
+  def self.open(path = nil)
+    VCPkg::Base.new(path || root)
   end
 
-  def self.ports
-    "#{root}/ports"
+  def self.root
+    `echo $VCPKG_ROOT`.sub(/\n/, '')
   end
 
   def self.hash(zip_path)
@@ -22,20 +22,34 @@ module VCPkg
     `vcpkg format-manifest #{vcpkg_json_path}`
   end
 
-  def self.publish(vcport)
-    name = vcport.vcpkg.name
-    version = vcport.vcpkg.version
+  # VCPkg::Base
+  class Base
+    attr_accessor :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def ports
+      "#{@path}/ports"
+    end
+
+    def publish(vcport)
+      name = vcport.vcpkg.name
+      version = vcport.vcpkg.version
+
+      git_vcpkg = Git.open(@path)
 
-    git_vcpkg = Git.open(root)
-    git_vcpkg.stashes.all
+      git_vcpkg.quick_stash('保存之前的修改')
 
-    port_exist = File.directory? "#{VCPkg.root}/ports/#{name}"
+      port_exist = File.directory? "#{VCPkg.root}/ports/#{name}"
 
-    `cp -fr #{vcport.port_path} #{ports}`
-    `vcpkg x-add-version #{name}`
+      `cp -fr #{vcport.port_path} #{ports}/#{name}`
+      `vcpkg x-add-version #{name} --vcpkg-root=#{@path}`
 
-    git_vcpkg.add('.')
-    git_vcpkg.commit("[#{name}] #{port_exist ? 'Update' : 'Add'} #{version}")
-    git_vcpkg.quick_push
+      git_vcpkg.add('.')
+      git_vcpkg.commit("[#{name}] #{port_exist ? 'Update' : 'Add'} #{version}")
+      git_vcpkg.quick_push
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcpkg_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -86,7 +86,6 @@ files:
 - lib/vcpkg_pipeline/command/scan/all.rb
 - lib/vcpkg_pipeline/command/scan/branch.rb
 - lib/vcpkg_pipeline/command/scan/name.rb
-- lib/vcpkg_pipeline/command/scan/release.rb
 - lib/vcpkg_pipeline/command/scan/remote.rb
 - lib/vcpkg_pipeline/command/scan/version.rb
 - lib/vcpkg_pipeline/command/update.rb

data/lib/vcpkg_pipeline/command/scan/release.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'vcpkg_pipeline/core/scanner'
-
-module VPL
-  class Command
-    class Scan < Command
-      # VPL::Command::Scan::Release
-      class Release < Scan
-        self.summary = '输出 Github Release URL'
-
-        self.description = <<-DESC
-            输出 Github Release URL。
-        DESC
-
-        self.arguments = [
-          CLAide::Argument.new('项目根目录(默认使用当前目录)', false)
-        ]
-
-        def self.options
-          [].concat(super)
-        end
-
-        def initialize(argv)
-          @path = argv.shift_argument || Dir.pwd
-
-          super
-        end
-
-        def run
-          scanner = Scanner.new(@path)
-
-          puts scanner.disturl
-        end
-      end
-    end
-  end
-end