filemerger 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6c5aa0cfc1967b012bc5731832458d27ebd4da8411f7bca4e3988cffda9a2b
-  data.tar.gz: e1897ec0be8bdb13931eea4fc216557dc99024725502631a7e355e1926cd32f8
+  metadata.gz: 663815ca23f0ca77bce0514b449e53b68b685d0cc9070ac4c55eca7dabb01313
+  data.tar.gz: 47ae0c81dc5304544ea52edcab9c61307e5322eb2377412d93e4a5867708ea50
 SHA512:
-  metadata.gz: cb33073c514ee7520619f6e61caa71cd97f3f90935b4ea0b2e0486b7cafb767b0266bab243a33887d84b7be1cf3bcef3de28443354cc596d9610f7326b7f6c42
-  data.tar.gz: 8b30b37651d04ff540582805cd2bf823e6249d1ad2513ca07c86843ae0c510539907e78776571eec17528ff9eddfcd044062e9a5ac2229ba108d31956f6f077f
+  metadata.gz: d75f1fc584c1bfae8357df81b6ccd8a228204c80720b916b49f0299fe4685445646275ed026190731d9fa468615a63df6487e5fa23860e4039a4293ff5de9913
+  data.tar.gz: 872e3f7b70320a09536b8c981594e7fcb3087ec5946a5ef426881e52ea230b2c1a58f4eab37cf5c592cc060cb4357d820961ade685f6d17977638bd32b6814ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    filemerger (0.4.2)
+    filemerger (0.4.3)
       colorize
       json
       thor

data/lib/filemerger/merger.rb

@@ -21,6 +21,7 @@ module Filemerger
       end
 
       project = @xcode_helper.project
+      errors = 0
 
       first_mask_files.each do |first_mask_file|
         file_name = File.basename(first_mask_file).to_s.chomp(@config.masks.first)
@@ -44,9 +45,9 @@ module Filemerger
         File.open(new_file_name, "w") { |f| f.puts content }
         Poster.post_file_created(new_file_name)
 
-        @xcode_helper.add_file_to_project(first_mask_file, file_name_helper)
+        errors += 1 if @xcode_helper.add_file_to_project(first_mask_file, file_name_helper)
       end
-      Poster.post_merge_finished
+      Poster.post_merge_finished(errors)
       project.save
     end
 

data/lib/filemerger/poster.rb

@@ -32,8 +32,13 @@ module Filemerger
       puts "❗️  Couldn't find file #{file}".colorize(:red)
     end
 
-    def self.post_merge_finished
-      puts "✅  The merge has been successfuly completed.".colorize(:green)
+    def self.post_merge_finished(errors_count)
+      if errors_count == 0
+        puts "✅  The merge has been successfuly completed.".colorize(:green)
+      else
+        puts "⚠️  The merge has been completed with #{erros_count} errors".colorize(:yellow)
+        puts "    Please see the log above.".colorize(:yellow)
+      end
     end
 
     # Search
@@ -47,6 +52,10 @@ module Filemerger
       puts "🕵️‍♂️  Searching for files in #{Dir.pwd}".colorize(:blue)
     end
 
+    def self.post_no_group_found(dir)
+      puts "❌  Couldn't find group for #{dir}".colorize(:red)
+    end
+
     # Generation
 
     def self.post_mergefile_generated

data/lib/filemerger/version.rb

@@ -1,3 +1,3 @@
 module Filemerger
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/filemerger/xcode_helper.rb

@@ -18,8 +18,10 @@ module Filemerger
         targets.each do |t|
           t.add_file_references([xcode_file])
         end
+        return true
       else
-        puts "Couldn't find group for #{File.dirname(file_path)}"
+        Poster.post_no_group_found(File.dirname(file_path))
+        return false
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filemerger
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yury Bogdanov