filemerger 0.4.2 → 0.4.3

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: ca6c5aa0cfc1967b012bc5731832458d27ebd4da8411f7bca4e3988cffda9a2b
4
- data.tar.gz: e1897ec0be8bdb13931eea4fc216557dc99024725502631a7e355e1926cd32f8
3
+ metadata.gz: 663815ca23f0ca77bce0514b449e53b68b685d0cc9070ac4c55eca7dabb01313
4
+ data.tar.gz: 47ae0c81dc5304544ea52edcab9c61307e5322eb2377412d93e4a5867708ea50
5
5
  SHA512:
6
- metadata.gz: cb33073c514ee7520619f6e61caa71cd97f3f90935b4ea0b2e0486b7cafb767b0266bab243a33887d84b7be1cf3bcef3de28443354cc596d9610f7326b7f6c42
7
- data.tar.gz: 8b30b37651d04ff540582805cd2bf823e6249d1ad2513ca07c86843ae0c510539907e78776571eec17528ff9eddfcd044062e9a5ac2229ba108d31956f6f077f
6
+ metadata.gz: d75f1fc584c1bfae8357df81b6ccd8a228204c80720b916b49f0299fe4685445646275ed026190731d9fa468615a63df6487e5fa23860e4039a4293ff5de9913
7
+ data.tar.gz: 872e3f7b70320a09536b8c981594e7fcb3087ec5946a5ef426881e52ea230b2c1a58f4eab37cf5c592cc060cb4357d820961ade685f6d17977638bd32b6814ec
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- filemerger (0.4.2)
4
+ filemerger (0.4.3)
5
5
  colorize
6
6
  json
7
7
  thor
@@ -21,6 +21,7 @@ module Filemerger
21
21
  end
22
22
 
23
23
  project = @xcode_helper.project
24
+ errors = 0
24
25
 
25
26
  first_mask_files.each do |first_mask_file|
26
27
  file_name = File.basename(first_mask_file).to_s.chomp(@config.masks.first)
@@ -44,9 +45,9 @@ module Filemerger
44
45
  File.open(new_file_name, "w") { |f| f.puts content }
45
46
  Poster.post_file_created(new_file_name)
46
47
 
47
- @xcode_helper.add_file_to_project(first_mask_file, file_name_helper)
48
+ errors += 1 if @xcode_helper.add_file_to_project(first_mask_file, file_name_helper)
48
49
  end
49
- Poster.post_merge_finished
50
+ Poster.post_merge_finished(errors)
50
51
  project.save
51
52
  end
52
53
 
@@ -32,8 +32,13 @@ module Filemerger
32
32
  puts "❗️ Couldn't find file #{file}".colorize(:red)
33
33
  end
34
34
 
35
- def self.post_merge_finished
36
- puts "✅ The merge has been successfuly completed.".colorize(:green)
35
+ def self.post_merge_finished(errors_count)
36
+ if errors_count == 0
37
+ puts "✅ The merge has been successfuly completed.".colorize(:green)
38
+ else
39
+ puts "⚠️ The merge has been completed with #{erros_count} errors".colorize(:yellow)
40
+ puts " Please see the log above.".colorize(:yellow)
41
+ end
37
42
  end
38
43
 
39
44
  # Search
@@ -47,6 +52,10 @@ module Filemerger
47
52
  puts "🕵️‍♂️ Searching for files in #{Dir.pwd}".colorize(:blue)
48
53
  end
49
54
 
55
+ def self.post_no_group_found(dir)
56
+ puts "❌ Couldn't find group for #{dir}".colorize(:red)
57
+ end
58
+
50
59
  # Generation
51
60
 
52
61
  def self.post_mergefile_generated
@@ -1,3 +1,3 @@
1
1
  module Filemerger
2
- VERSION = "0.4.2"
2
+ VERSION = "0.4.3"
3
3
  end
@@ -18,8 +18,10 @@ module Filemerger
18
18
  targets.each do |t|
19
19
  t.add_file_references([xcode_file])
20
20
  end
21
+ return true
21
22
  else
22
- puts "Couldn't find group for #{File.dirname(file_path)}"
23
+ Poster.post_no_group_found(File.dirname(file_path))
24
+ return false
23
25
  end
24
26
  end
25
27
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: filemerger
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yury Bogdanov