lhj-tools 0.1.41 → 0.1.42

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c8fa90967ee885cff64ed4b4d175cf1178919449b42aa8e644ad5fedf17386de
4
- data.tar.gz: 750834e640eb75b5653e4f9639dc9b09bf5c320ac34bf721ab637f881729fc08
3
+ metadata.gz: '080d2ba9a8af88c54194f832036407dd590ba281de5196eb4668a1fef19761c3'
4
+ data.tar.gz: b7e10f83ba5acf3e587af543f3c7bdf67f7778dd3528265e961e9305881d5550
5
5
  SHA512:
6
- metadata.gz: b08ab0ab7d6bb7ac5fe0e38bd823032779370b4e6265444db96f691078502d10c199656297b7190f1eaa1be92a76c701f6ec1c467aede28c49464853ccb1add1
7
- data.tar.gz: 1a546488cdfca768c14599022da2d80cb5eca23a272d71fbc75b879b74a2f9d99d9574afae62316fad2cd7ebd54010a001396219a5b42eec7f065ba87f09d6cc
6
+ metadata.gz: 92ddcd3c9912a4d036fa584db8783b330789340ad3b0b5bbd27e74389a5f4997eb929e2a6b2f14722e969d8063b9e2ff276646466735d12154f001745317feff
7
+ data.tar.gz: 37a3edac304e4006f4cb92889534f7ec66314d96f06619d5ae5aa91e54b67b034984768772a11241625954bc4e6bdaa1d081b8c7c2e99e6887d48ab54a2d314c
@@ -1,7 +1,9 @@
1
+ # frozen_string_literal: true
1
2
  require 'faraday'
2
3
  require 'faraday_middleware'
3
4
  require 'lhj/helper/pgyer_config'
4
5
  require 'lhj/helper/vika_helper'
6
+ require 'lhj/helper/oss_helper'
5
7
  require 'lhj/command/yapi/formatters/service'
6
8
  require 'lhj/config'
7
9
  require_relative 'tb_config'
@@ -9,8 +11,7 @@ require_relative 'tb_config'
9
11
  module Lhj
10
12
  # pgyer upload
11
13
  class Pgyer
12
-
13
- API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'.freeze
14
+ API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'
14
15
 
15
16
  attr_reader :api_key, :user_key, :password, :result
16
17
 
@@ -39,6 +40,13 @@ module Lhj
39
40
  end
40
41
 
41
42
  def upload_file(file, des)
43
+ upload_with_path('', file, des)
44
+ end
45
+
46
+ # @param [current path] path
47
+ # @param [upload file] file
48
+ # @param [desc] des
49
+ def upload_with_path(path, file, des)
42
50
  update_description = @result[:update_description]
43
51
  update_description = '' if update_description.nil?
44
52
  params = {
@@ -49,7 +57,7 @@ module Lhj
49
57
  'installType' => 2,
50
58
  'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
51
59
  }
52
- upload_code
60
+ upload_file_with_path(path) unless path.empty?
53
61
  begin
54
62
  puts 'begin upload...'
55
63
  response = http_client.post API_HOST, params
@@ -66,13 +74,21 @@ module Lhj
66
74
  end
67
75
  end
68
76
 
69
- def upload_code
70
- if @env == :release
71
- # packing
72
- current_dir = File.dirname(__FILE__)
73
- puts current_dir
74
- # upload to oss
75
- end
77
+ def upload_file_with_path(path)
78
+ return unless @env == :release
79
+
80
+ # step 1
81
+ folder_path_dir = path
82
+ rand_key = rand(100) % 3
83
+ zipped_path = "Life_#{rand_key}.zip"
84
+ Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/*), log: false)
85
+ # step 2
86
+ oss_key = "code/#{zipped_path}"
87
+ oss_file = File.join(folder_path_dir, zipped_path)
88
+ Lhj::OSS::Helper.instance.upload(oss_key, oss_file)
89
+ # step 3
90
+ file_exists = File.exist?(oss_file)
91
+ FileUtils.rm(oss_file) if file_exists
76
92
  end
77
93
 
78
94
  def render_template
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Lhj
4
4
  module Tools
5
- VERSION = "0.1.41"
5
+ VERSION = "0.1.42"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lhj-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.41
4
+ version: 0.1.42
5
5
  platform: ruby
6
6
  authors:
7
7
  - lihaijian