filemerger 0.4.6 → 0.4.7
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 +4 -4
- data/Gemfile.lock +1 -1
- data/README.md +6 -23
- data/lib/filemerger/poster.rb +1 -1
- data/lib/filemerger/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 728f96452c295139752d47ec8e380a5219bb171c6ec23f574df83e13899349ea
|
|
4
|
+
data.tar.gz: 13588ae5859a12c86446b31a2be5dc5cfbeaf85ae8a9c731ee875eb1c2aee078
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b55f1f4d23d06b8ec441495e17ad036a66108394d29eaf0ca71bec5a41b80fb255b9f0a73b54e64b2da84d57f960d9a90d507fe2958cf9444cd35c741959f0a3
|
|
7
|
+
data.tar.gz: ed10d45e4521d41a8627cb59c0bf044870fc54063e88c80f06ceb5baa654bcbec08d5467147a3c6f61f955b80d2f8225d5f33f406bb818ca813d4b076d67c265
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
|
@@ -21,30 +21,13 @@ Or install it yourself as:
|
|
|
21
21
|
|
|
22
22
|
## Usage
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
# - 'PatternOne.swift'
|
|
31
|
-
# - 'PatternTwo.swift'
|
|
32
|
-
# - 'PatternThree.swift'
|
|
33
|
-
|
|
34
|
-
masks:
|
|
35
|
-
- 'PatternOne.swift'
|
|
36
|
-
- 'PatternTwo.swift'
|
|
37
|
-
- 'PatternThree.swift'
|
|
38
|
-
|
|
39
|
-
# Specify which prefix should contain newly created files (which contain merged content)
|
|
40
|
-
# Example:
|
|
41
|
-
# result_mask: 'PatternIO.swift'
|
|
42
|
-
result_mask: 'PatternIO.swift'
|
|
43
|
-
|
|
44
|
-
# Specify if files should be deleted after merge
|
|
45
|
-
delete_old_files: true
|
|
24
|
+
After installation go to your project's root folder and run
|
|
25
|
+
`filemerger setup`
|
|
26
|
+
Mergefile will be created. Edit it for your needs.
|
|
27
|
+
|
|
28
|
+
After Mergefile was configured, run
|
|
29
|
+
`filemerger merge`
|
|
46
30
|
|
|
47
|
-
```
|
|
48
31
|
|
|
49
32
|
## Development
|
|
50
33
|
|
data/lib/filemerger/poster.rb
CHANGED
|
@@ -37,7 +37,7 @@ module Filemerger
|
|
|
37
37
|
puts "✅ The merge has been successfuly completed.".colorize(:green)
|
|
38
38
|
else
|
|
39
39
|
puts "⚠️ The merge has been completed with #{errors_count} errors".colorize(:yellow)
|
|
40
|
-
puts "
|
|
40
|
+
puts " Please see the log above.".colorize(:yellow)
|
|
41
41
|
end
|
|
42
42
|
end
|
|
43
43
|
|
data/lib/filemerger/version.rb
CHANGED