filemerger 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728f96452c295139752d47ec8e380a5219bb171c6ec23f574df83e13899349ea
-  data.tar.gz: 13588ae5859a12c86446b31a2be5dc5cfbeaf85ae8a9c731ee875eb1c2aee078
+  metadata.gz: c719ccee6169269e17c77d11d908dd9e864b31507493d66f16c24ba4f82a5279
+  data.tar.gz: 3e18455cb361276a44a10645ce0a26ee1d477ca33fa2c8290c42cf3e1b71ca52
 SHA512:
-  metadata.gz: b55f1f4d23d06b8ec441495e17ad036a66108394d29eaf0ca71bec5a41b80fb255b9f0a73b54e64b2da84d57f960d9a90d507fe2958cf9444cd35c741959f0a3
-  data.tar.gz: ed10d45e4521d41a8627cb59c0bf044870fc54063e88c80f06ceb5baa654bcbec08d5467147a3c6f61f955b80d2f8225d5f33f406bb818ca813d4b076d67c265
+  metadata.gz: 5eb73c64e54a8dd0d9d391bca6f55f710641749b2141c42543317b7a52e6d192c248518d06f3311917253706fc355dc41bb935c0edcc58a319330f0b121d4ab2
+  data.tar.gz: 8e4e3176808c356caf197ad49194d0e7502e87d8c0446bc7d1a265439e316927ad7807a60507afe049763b30d96955a7a948aed0b30a82062bf8c213b186af30

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    filemerger (0.4.7)
+    filemerger (0.4.8)
       colorize
       json
       thor
@@ -16,15 +16,15 @@ GEM
     colored2 (3.1.2)
     colorize (0.8.1)
     json (2.1.0)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
     rake (10.5.0)
     thor (0.20.0)
-    xcodeproj (1.5.6)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -22,11 +22,15 @@ Or install it yourself as:
 ## Usage
 
 After installation go to your project's root folder and run  
-`filemerger setup`  
+
+    $ filemerger setup  
+
 Mergefile will be created. Edit it for your needs.
 
 After Mergefile was configured, run   
-`filemerger merge`  
+
+    $ filemerger merge  
+
 
 
 ## Development

data/lib/filemerger/configuration.rb

@@ -3,7 +3,13 @@ require 'filemerger/poster'
 
 module Filemerger
   class Configuration
-    attr_reader :masks, :result_mask, :delete_old_files, :working_folders, :ommit_lines, :xcode_project, :xcode_targets
+    attr_reader :masks,
+                :result_mask,
+                :delete_old_files,
+                :working_folders,
+                :ommit_lines,
+                :xcode_project,
+                :xcode_targets
 
     def initialize
       Poster.post_configuration_search

data/lib/filemerger/generation/mergefile.template

@@ -23,8 +23,8 @@ delete_old_files: true
 working_folders:
   - "Example/**"
 
-# You can specify number of lines which will be ommited in second, third, etc. files.
-ommit_lines: 0
+# You can specify number of lines which will be omitted in second, third, etc. files.
+omit_lines: 0
 
 # If you want all changes applied to your Xcode project, then specify it file's name here
 xcode_project: "Example.xcodeproj"

data/lib/filemerger/merger.rb

@@ -9,7 +9,9 @@ module Filemerger
 
     def initialize(config)
       @config = config
-      @xcode_helper = XcodeHelper.new(config)
+      unless config.xcode_project.nil?
+        @xcode_helper = XcodeHelper.new(config)
+      end
     end
 
     def merge_files
@@ -20,7 +22,9 @@ module Filemerger
         exit
       end
 
-      project = @xcode_helper.project
+      unless @xcode_helper.nil?
+        project = @xcode_helper.project
+      end
       errors = 0
 
       first_mask_files.each do |first_mask_file|
@@ -45,19 +49,23 @@ module Filemerger
         File.open(new_file_name, "w") { |f| f.puts content }
         Poster.post_file_created(new_file_name)
 
-        if @xcode_helper.add_file_to_project(first_mask_file, file_name_helper) == false
+        if !@xcode_helper.nil? && @xcode_helper.add_file_to_project(first_mask_file, file_name_helper) == false
           errors += 1
         end
       end
       Poster.post_merge_finished(errors)
-      project.save
+      unless @xcode_helper.nil?
+        project.save
+      end
     end
 
     private
 
     def delete_file_if_needed(file)
       if @config.delete_old_files
-        @xcode_helper.delete_file_from_build_phases(file)
+        unless @xcode_helper.nil?
+          @xcode_helper.delete_file_from_build_phases(file)
+        end
         File.delete(file)
       end
     end

data/lib/filemerger/version.rb

@@ -1,3 +1,3 @@
 module Filemerger
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemerger
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Yury Bogdanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler