filemerger 0.4.7 → 0.4.8
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 +5 -5
- data/README.md +6 -2
- data/lib/filemerger/configuration.rb +7 -1
- data/lib/filemerger/generation/mergefile.template +2 -2
- data/lib/filemerger/merger.rb +13 -5
- data/lib/filemerger/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c719ccee6169269e17c77d11d908dd9e864b31507493d66f16c24ba4f82a5279
|
4
|
+
data.tar.gz: 3e18455cb361276a44a10645ce0a26ee1d477ca33fa2c8290c42cf3e1b71ca52
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5eb73c64e54a8dd0d9d391bca6f55f710641749b2141c42543317b7a52e6d192c248518d06f3311917253706fc355dc41bb935c0edcc58a319330f0b121d4ab2
|
7
|
+
data.tar.gz: 8e4e3176808c356caf197ad49194d0e7502e87d8c0446bc7d1a265439e316927ad7807a60507afe049763b30d96955a7a948aed0b30a82062bf8c213b186af30
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
filemerger (0.4.
|
4
|
+
filemerger (0.4.8)
|
5
5
|
colorize
|
6
6
|
json
|
7
7
|
thor
|
@@ -16,15 +16,15 @@ GEM
|
|
16
16
|
colored2 (3.1.2)
|
17
17
|
colorize (0.8.1)
|
18
18
|
json (2.1.0)
|
19
|
-
nanaimo (0.2.
|
19
|
+
nanaimo (0.2.5)
|
20
20
|
rake (10.5.0)
|
21
21
|
thor (0.20.0)
|
22
|
-
xcodeproj (1.5.
|
23
|
-
CFPropertyList (
|
22
|
+
xcodeproj (1.5.7)
|
23
|
+
CFPropertyList (>= 2.3.3, < 4.0)
|
24
24
|
atomos (~> 0.1.2)
|
25
25
|
claide (>= 1.0.2, < 2.0)
|
26
26
|
colored2 (~> 3.1)
|
27
|
-
nanaimo (~> 0.2.
|
27
|
+
nanaimo (~> 0.2.4)
|
28
28
|
|
29
29
|
PLATFORMS
|
30
30
|
ruby
|
data/README.md
CHANGED
@@ -22,11 +22,15 @@ Or install it yourself as:
|
|
22
22
|
## Usage
|
23
23
|
|
24
24
|
After installation go to your project's root folder and run
|
25
|
-
|
25
|
+
|
26
|
+
$ filemerger setup
|
27
|
+
|
26
28
|
Mergefile will be created. Edit it for your needs.
|
27
29
|
|
28
30
|
After Mergefile was configured, run
|
29
|
-
|
31
|
+
|
32
|
+
$ filemerger merge
|
33
|
+
|
30
34
|
|
31
35
|
|
32
36
|
## Development
|
@@ -3,7 +3,13 @@ require 'filemerger/poster'
|
|
3
3
|
|
4
4
|
module Filemerger
|
5
5
|
class Configuration
|
6
|
-
attr_reader :masks,
|
6
|
+
attr_reader :masks,
|
7
|
+
:result_mask,
|
8
|
+
:delete_old_files,
|
9
|
+
:working_folders,
|
10
|
+
:ommit_lines,
|
11
|
+
:xcode_project,
|
12
|
+
:xcode_targets
|
7
13
|
|
8
14
|
def initialize
|
9
15
|
Poster.post_configuration_search
|
@@ -23,8 +23,8 @@ delete_old_files: true
|
|
23
23
|
working_folders:
|
24
24
|
- "Example/**"
|
25
25
|
|
26
|
-
# You can specify number of lines which will be
|
27
|
-
|
26
|
+
# You can specify number of lines which will be omitted in second, third, etc. files.
|
27
|
+
omit_lines: 0
|
28
28
|
|
29
29
|
# If you want all changes applied to your Xcode project, then specify it file's name here
|
30
30
|
xcode_project: "Example.xcodeproj"
|
data/lib/filemerger/merger.rb
CHANGED
@@ -9,7 +9,9 @@ module Filemerger
|
|
9
9
|
|
10
10
|
def initialize(config)
|
11
11
|
@config = config
|
12
|
-
|
12
|
+
unless config.xcode_project.nil?
|
13
|
+
@xcode_helper = XcodeHelper.new(config)
|
14
|
+
end
|
13
15
|
end
|
14
16
|
|
15
17
|
def merge_files
|
@@ -20,7 +22,9 @@ module Filemerger
|
|
20
22
|
exit
|
21
23
|
end
|
22
24
|
|
23
|
-
|
25
|
+
unless @xcode_helper.nil?
|
26
|
+
project = @xcode_helper.project
|
27
|
+
end
|
24
28
|
errors = 0
|
25
29
|
|
26
30
|
first_mask_files.each do |first_mask_file|
|
@@ -45,19 +49,23 @@ module Filemerger
|
|
45
49
|
File.open(new_file_name, "w") { |f| f.puts content }
|
46
50
|
Poster.post_file_created(new_file_name)
|
47
51
|
|
48
|
-
if @xcode_helper.add_file_to_project(first_mask_file, file_name_helper) == false
|
52
|
+
if !@xcode_helper.nil? && @xcode_helper.add_file_to_project(first_mask_file, file_name_helper) == false
|
49
53
|
errors += 1
|
50
54
|
end
|
51
55
|
end
|
52
56
|
Poster.post_merge_finished(errors)
|
53
|
-
|
57
|
+
unless @xcode_helper.nil?
|
58
|
+
project.save
|
59
|
+
end
|
54
60
|
end
|
55
61
|
|
56
62
|
private
|
57
63
|
|
58
64
|
def delete_file_if_needed(file)
|
59
65
|
if @config.delete_old_files
|
60
|
-
@xcode_helper.
|
66
|
+
unless @xcode_helper.nil?
|
67
|
+
@xcode_helper.delete_file_from_build_phases(file)
|
68
|
+
end
|
61
69
|
File.delete(file)
|
62
70
|
end
|
63
71
|
end
|
data/lib/filemerger/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: filemerger
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yury Bogdanov
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-05-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|