emerge 0.7.4 → 0.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7df9bc68c4aa8766d26378a7d8164770f2e0aee37dd919e3b7cf54de77b69ac5
4
- data.tar.gz: 776950af8aa7c3cc32150a0969ac8074a62833c54b39166c48f896f1d87985e6
3
+ metadata.gz: 66e8055e5a23225c6e3d4ca58ba5a65c5f57eb05cfd1aa0dec5a3003cdaa977d
4
+ data.tar.gz: 7f3ad2aaf92ee59ee9e6e1557b0ae04311ebe83ce40ae14955c4e72a77945e39
5
5
  SHA512:
6
- metadata.gz: 81c866f015a8e6d6a29d107c307fefa792a210ed7d2063bb98f8cb6870357702c6a21dfcad27e72b4953ca3ba6b0df41fe1e3f4f96e33db534650ad149cef41f
7
- data.tar.gz: e6afe32068d8068f57e211973b13309317714e4bce8a29ea22725b57557c376da8daf222b38aac46993dc451e962923882e65959fea2d206b70a695196f01e30
6
+ metadata.gz: 130fb2b9274a259ea6f61d85deafacbc6c916616a5bc5a746071a0d38074f45ed1b814298c14d85b7a108124afee8f1f6bd5600f1aa2b01d913fe04f3275fde9
7
+ data.tar.gz: 5dd9b9f7dbec27f9ab52fc1193541d4ff7be89f32d83f18dd5f7ade9ebd5e5a877cb9935ff68e408b500df1454fca3486fb6c79e0b6d6f2eaef20da592ad783a
@@ -3,8 +3,9 @@ module EmergeCLI
3
3
  module Upload
4
4
  module ClientLibraries
5
5
  class Default
6
- def initialize(image_paths)
6
+ def initialize(image_paths, group_delimiter)
7
7
  @image_paths = image_paths
8
+ @group_delimiter = group_delimiter
8
9
  end
9
10
 
10
11
  def image_files
@@ -13,10 +14,14 @@ module EmergeCLI
13
14
 
14
15
  def parse_file_info(image_path)
15
16
  file_name = File.basename(image_path)
17
+ file_name_without_extension = File.basename(file_name, '.*')
18
+ parts = file_name_without_extension.split(@group_delimiter)
19
+ group_name = parts.first
20
+ variant_name = parts[1..].join(@group_delimiter)
16
21
  {
17
22
  file_name:,
18
- group_name: File.basename(image_path, '.*'),
19
- variant_name: nil
23
+ group_name:,
24
+ variant_name:
20
25
  }
21
26
  end
22
27
  end
@@ -27,7 +27,8 @@ module EmergeCLI
27
27
  option :base_sha, type: :string, required: false, desc: 'Base SHA'
28
28
  option :previous_sha, type: :string, required: false, desc: 'Previous SHA'
29
29
  option :pr_number, type: :string, required: false, desc: 'PR number'
30
- option :concurrency, type: :integer, default: 5, desc: 'Number of concurrency for parallel uploads'
30
+ option :concurrency, type: :integer, default: 5,
31
+ desc: 'Number of concurrency for parallel image uploads when not using batch mode'
31
32
 
32
33
  option :client_library, type: :string, required: false, values: %w[swift-snapshot-testing paparazzi roborazzi],
33
34
  desc: 'Client library used for snapshots'
@@ -36,7 +37,7 @@ module EmergeCLI
36
37
  option :profile, type: :boolean, default: false, desc: 'Enable performance profiling metrics'
37
38
 
38
39
  option :batch, type: :boolean, default: true, desc: 'Upload images in batch using zip file'
39
-
40
+ option :group_delimiter, type: :string, default: '__', desc: 'Delimiter for group and variant names'
40
41
  argument :image_paths, type: :array, required: false, desc: 'Paths to folders containing images'
41
42
 
42
43
  def initialize(network: nil, git_info_provider: nil)
@@ -119,7 +120,7 @@ module EmergeCLI
119
120
  raise "Unsupported client library: #{@options[:client_library]}"
120
121
  end
121
122
  else
122
- ClientLibraries::Default.new(image_paths)
123
+ ClientLibraries::Default.new(image_paths, @options[:group_delimiter])
123
124
  end
124
125
  end
125
126
 
data/lib/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EmergeCLI
2
- VERSION = '0.7.4'.freeze
2
+ VERSION = '0.7.5'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: emerge
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.4
4
+ version: 0.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Emerge Tools