filemerger 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a09c150a5126637c31ee2f27b90fcab7c948264e1e170ed716e171481c9a33
-  data.tar.gz: f1b2a3959ef8b43b8d42befce7dfaddd0005a68916d315d5540b201e1eda8cc2
+  metadata.gz: 70403b153cce0471b55288f97ba184a62e725535f0fa830ac75b63e56835b90d
+  data.tar.gz: 4791e6c9efff08064ca469da425607a4b38a70a8faff27f355c36b9c959adb24
 SHA512:
-  metadata.gz: e97865d517a899d7cdd8a4cf10624e87ae20d9df8c131c0f61c72d38d037972d041060f4972956e5d201f342a76ba76aec5b667978bea67bbdd20bead5281320
-  data.tar.gz: aa66f8774c37a8ef52310fb298e082bf6af2f2ae7b44b475efb4c6d3ca5a68e9419fd117bf380a50ff9e981cd3605fac365647015a689d743f4530298706743b
+  metadata.gz: 37078d7cf5f25789e528f5067f34a4e2a074122e014bfbb8ddb7c06ce3fcda7e039427c14c887cf120d2a11c9f610a43485a6970abbfd28cf190b8c9aad190f8
+  data.tar.gz: 6fb5f3a9a531d73856314b4b7bc57d82dd900b77fb19e2b68d8ffb9ca8d92367b795d629fdfec84b76e6f76bae2aefd3b984bcfdaeff183177a2745853c309c1

data/Gemfile.lock

@@ -1,18 +1,30 @@
 PATH
   remote: .
   specs:
-    filemerger (0.3.1)
+    filemerger (0.4.0)
       colorize
       json
       thor
+      xcodeproj
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.6)
+    atomos (0.1.2)
+    claide (1.0.2)
+    colored2 (3.1.2)
     colorize (0.8.1)
     json (2.1.0)
+    nanaimo (0.2.3)
     rake (10.5.0)
     thor (0.20.0)
+    xcodeproj (1.5.6)
+      CFPropertyList (~> 2.3.3)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,6 @@
-# Filemerger
+# Filemerger  
 
+[![Gem Version](https://badge.fury.io/rb/filemerger.svg)](https://badge.fury.io/rb/filemerger)  
 Merger is a simple gem for merging files matching specified name patterns.
 
 ## Installation
@@ -53,7 +54,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/filemerger. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/yurybogdanov/filemerger. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -61,4 +62,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Filemerger project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/filemerger/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Filemerger project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/yurybogdanov/filemerger/blob/master/CODE_OF_CONDUCT.md).

data/filemerger.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "colorize"
   spec.add_dependency "json"
+  spec.add_dependency "xcodeproj"
 end

data/lib/filemerger/cli.rb

@@ -9,5 +9,10 @@ module Filemerger
       Filemerger.begin_merge
     end
 
+    desc "Creates mergefile", "Creates mergefile for Filemerger setup"
+    def setup
+      Filemerger.setup
+    end
+
   end
 end

data/lib/filemerger/configuration.rb

@@ -3,18 +3,23 @@ require 'filemerger/poster'
 
 module Filemerger
   class Configuration
-    attr_reader :masks, :result_mask, :delete_old_files
+    attr_reader :masks, :result_mask, :delete_old_files, :working_folders, :ommit_lines, :xcode_project, :xcode_targets
 
     def initialize
       Poster.post_configuration_search
 
-      if File.exist?("Mergefile.yaml")
+      if File.exist?("Mergefile")
         Poster.post_configuration_found
         data = YAML.load_file("Mergefile.yaml")
 
         @masks = data["masks"]
         @result_mask = data["result_mask"]
         @delete_old_files = data["delete_old_files"]
+        @working_folders = data["working_folders"]
+        @ommit_lines = data["ommit_lines"]
+        @xcode_project = data["xcode_project"]
+        @xcode_targets = data["xcode_targets"]
+        @ommit_lines = data["ommit_lines"]
       else
         Poster.post_configuration_not_found
         exit

data/lib/filemerger/generation/mergefile.template

@@ -0,0 +1,35 @@
+# Specify which files should be merged. The gem will look up for files matching patterns you input here.
+# Do not use asterisk (*).
+# Example:
+# masks:
+#   - 'PatternOne.swift'
+#   - 'PatternTwo.swift'
+#   - 'PatternThree.swift'
+
+masks:
+  - 'PatternOne.swift'
+  - 'PatternTwo.swift'
+
+# Specify which prefix should contain newly created files (which contain merged content)
+# Example:
+# result_mask: 'PatternIO.swift'
+result_mask: 'IO.swift'
+
+# Specify if files should be deleted after merge
+delete_old_files: true
+
+# Filemerger will look up for files in specified directory. If this is not specified, then
+# files will be looked up in current directory and it's subdirectories
+working_folders:
+  - "Example/**"
+
+# You can specify number of lines which will be ommited in second, third, etc. files.
+ommit_lines: 0
+
+# If you want all changes applied to your Xcode project, then specify it file's name here
+xcode_project: "Example.xcodeproj"
+
+# Xcode project's targets in case you need files to be associated with them.
+xcode_targets:
+  - "Example"
+  - "Example.qa"

data/lib/filemerger/generation/mergefile_generator.rb

@@ -0,0 +1,11 @@
+require 'filemerger/poster'
+
+module Filemerger
+  class MergefileGenerator
+    def self.generate
+      file_contents = IO.read(File.dirname(__FILE__) + '/mergefile.template')
+      File.open('Mergefile', 'w+') { |file| file.write(file_contents) }
+      Poster.post_mergefile_generated
+    end
+  end
+end

data/lib/filemerger/merger.rb

@@ -1,42 +1,63 @@
 require 'filemerger/poster'
 require 'filemerger/searcher'
+require 'filemerger/xcode_helper'
+require 'xcodeproj'
 
 module Filemerger
   class Merger
-    def self.merge_files(config)
-      first_mask_files = Searcher.find_files_for_mask(config.masks.first)
+    attr_accessor :config, :xcode_helper
+
+    def initialize(config)
+      @config = config
+      @xcode_helper = XcodeHelper.new(config)
+    end
+
+    def merge_files
+      first_mask_files = Searcher.find_files_for_mask(@config.masks.first, @config.working_folders)
 
       if first_mask_files.count == 0
         Poster.post_nothing_found
         exit
       end
 
+      project = @xcode_helper.project
+
       first_mask_files.each do |first_mask_file|
-        file_name = File.basename(first_mask_file).to_s.chomp(config.masks.first)
+        file_name = File.basename(first_mask_file).to_s.chomp(@config.masks.first)
         content = ""
-        config.masks.each do |mask|
+        @config.masks.each_with_index do |mask, index|
           file = File.dirname(first_mask_file) + "/" + file_name + mask
           if File.exist?(file)
-            content += File.readlines(file).join() + "\n"
-            delete_file_if_needed(file, config)
+            if !@config.ommit_lines.nil? && index != 0
+              content += File.readlines(file).drop(@config.ommit_lines).join() + "\n"
+            else
+              content += File.readlines(file).join() + "\n"
+            end
+            delete_file_if_needed(file)
           else
             Poster.post_file_not_found(file)
           end
         end
+        file_name_helper = file_name + @config.result_mask
 
-        new_file_name = File.dirname(first_mask_file) + "/" + file_name + config.result_mask
+        new_file_name = File.dirname(first_mask_file) + "/" + file_name_helper
         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)
       end
       Poster.post_merge_finished
+      project.save
     end
 
     private
 
-    def self.delete_file_if_needed(file, config)
-      if config.delete_old_files
+    def delete_file_if_needed(file)
+      if @config.delete_old_files
+        @xcode_helper.delete_file_from_build_phases(file)
         File.delete(file)
       end
     end
+
   end
 end

data/lib/filemerger/poster.rb

@@ -28,10 +28,6 @@ module Filemerger
       puts "0️⃣  No files matching specified masks found.".colorize(:blue)
     end
 
-    def self.post_search_completed(pattern, count)
-      puts "💁‍♀️  Found #{count} file(s) matching #{pattern}"
-    end
-
     def self.post_file_not_found(file)
       puts "❗️  Couldn't find file #{file}".colorize(:red)
     end
@@ -39,5 +35,22 @@ module Filemerger
     def self.post_merge_finished
       puts "✅  The merge has been successfuly completed.".colorize(:green)
     end
+
+    # Search
+
+    def self.post_search_files(folder)
+      puts "🕵️‍♂️  Searching for files in #{folder}".colorize(:blue)
+    end
+
+    def self.post_default_searching_path
+      puts "❗️  Searching folders not specified in Mergefile.".colorize(:yellow)
+      puts "🕵️‍♂️  Searching for files in #{Dir.pwd}".colorize(:blue)
+    end
+
+    # Generation
+
+    def self.post_mergefile_generated
+      puts "💁‍♂️   Mergefile generated!".colorize(:green)
+    end
   end
 end

data/lib/filemerger/searcher.rb

@@ -2,19 +2,20 @@ require 'filemerger/poster'
 
 module Filemerger
   class Searcher
-    def self.find_files(masks)
-      files = []
-      masks.each do | mask |
-        mask_files = Dir.glob("**/*#{mask}")
-        files.push(mask_files)
-        Poster.post_search_completed(mask, mask_files.count)
+    def self.find_files_for_mask(mask, folders)
+      unless folders.nil? || folders.empty?
+        files_for_merge = []
+        folders.each do |folder|
+          Poster.post_search_files("#{folder}/*#{mask}")
+          files_for_mask = Dir.glob("#{folder}/*#{mask}")
+          files_for_merge += files_for_mask
+        end
+        return files_for_merge
+      else
+        Poster.post_default_searching_path
+        files = Dir.glob("**/*#{mask}")
+        return files
       end
-      return files
-    end
-
-    def self.find_files_for_mask(mask)
-      files = Dir.glob("**/*#{mask}")
-      return files
     end
   end
 end

data/lib/filemerger/version.rb

@@ -1,3 +1,3 @@
 module Filemerger
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/filemerger/xcode_helper.rb

@@ -0,0 +1,67 @@
+require 'xcodeproj'
+
+module Filemerger
+  class XcodeHelper
+    attr_accessor :project
+    attr_reader :config
+
+    def initialize(config)
+      @project = Xcodeproj::Project.open(config.xcode_project)
+      @config = config
+    end
+
+    def add_file_to_project(file_path, file_name)
+      group = project[File.dirname(file_path)]
+      xcode_file = group.new_file(file_name)
+      targets = get_targets_from_config
+      targets.each do |t|
+        t.add_file_references([xcode_file])
+      end
+    end
+
+    def delete_file_from_build_phases(file)
+      build_phases = build_phases_from_targets
+      return if build_phases.nil?
+
+      build_phases.each do |build_phase|
+        build_phase.files.each do |build_file|
+          next if build_file.nil? || build_file.file_ref.nil?
+
+          build_file_path = configure_file_ref_path(build_file.file_ref)
+          if build_file_path == file
+            build_file.file_ref.remove_from_project
+          end
+        end
+      end
+    end
+
+    private
+
+    def get_targets_from_config
+      targets = []
+      @project.targets.each do |target|
+        targets.push(target) if @config.xcode_targets.include?(target.name)
+      end
+      targets
+    end
+
+    def build_phases_from_targets
+      build_phases = []
+      get_targets_from_config.each do |xcode_target|
+        xcode_target.build_phases.each do |build_phase|
+          if build_phase.isa == 'PBXSourcesBuildPhase'
+            build_phases.push(build_phase)
+          end
+        end
+      end
+      build_phases
+    end
+
+    def configure_file_ref_path(file_ref)
+      build_file_ref_path = file_ref.hierarchy_path.to_s
+      build_file_ref_path[0] = ''
+
+      build_file_ref_path
+    end
+  end
+end

data/lib/filemerger.rb

@@ -3,6 +3,7 @@ require "filemerger/poster"
 require "filemerger/searcher"
 require "filemerger/merger"
 require "filemerger/configuration"
+require "filemerger/generation/mergefile_generator"
 require "json"
 
 module Filemerger
@@ -10,7 +11,13 @@ module Filemerger
     def self.begin_merge
       Poster.post_greeting
       config = Configuration.new
-      Merger.merge_files(config)
+
+      merger = Merger.new(config)
+      merger.merge_files
+    end
+
+    def self.setup
+      MergefileGenerator.generate
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemerger
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Yury Bogdanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby gem for merging files.
 email:
 - yury-bogdanov@mail.ru
@@ -102,10 +116,13 @@ files:
 - lib/filemerger.rb
 - lib/filemerger/cli.rb
 - lib/filemerger/configuration.rb
+- lib/filemerger/generation/mergefile.template
+- lib/filemerger/generation/mergefile_generator.rb
 - lib/filemerger/merger.rb
 - lib/filemerger/poster.rb
 - lib/filemerger/searcher.rb
 - lib/filemerger/version.rb
+- lib/filemerger/xcode_helper.rb
 homepage: https://github.com/yurybogdanov/filemerger
 licenses:
 - MIT