generamba 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa6d08c063acbc143e6bb207b57f3ff29335003f
-  data.tar.gz: 75be1fd6927e0a08bf3d9dc122925166abbfb654
+  metadata.gz: b25fd879d1e1ee8d3207d476da127fcb08fcfdd5
+  data.tar.gz: eed7ef7a0a606908dc0bf9833ab653b9ad74e993
 SHA512:
-  metadata.gz: 0c532fd9d76a7714fae9d7083849b41516bab539554195cb4e9a3f69dbceb3d63b076950732fd2a37676c564d73a7e0e4aebcb1d49f0ea6b2ef7ef6d68cdad95
-  data.tar.gz: 2b4bfa45e3fcc56debd966132ff98b09c239a52472a3fbdcc5113e816c977425133aeb2b1b50779ee67e6d8f313959866b5813ab100fcb0446036a5bd6468fb3
+  metadata.gz: 7b73f00f33b102a49e4c76cd5a2442533827a5eabb9705d3f9bef6c0a98ab94bd96a52be8a3518921ca8d803e8b81f15647e10741eb4a898cc26dde8de191942
+  data.tar.gz: a81ba5d21f02796dd6ef4f20baa93538325fee01f9afcc7eb90208509506f8ece559badb1b82d271a36a18ccaa702ea22235f8f57374d92df1ba74d63ffe8bc6

data/.gitignore

@@ -0,0 +1,6 @@
+.idea/.name
+.idea/Generamba.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/workspace.xml

data/.travis.yml

@@ -1,4 +1,5 @@
+os:
+  - osx
 language: ruby
 rvm:
   - 2.1.6
-before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in generamba.gemspec
 gemspec
+
+gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,18 +1,17 @@
 PATH
   remote: .
   specs:
-    generamba (0.5.0)
-      git
-      liquid
-      settingslogic
-      thor
-      tilt
-      xcodeproj
+    generamba (0.7.1)
+      git (= 1.2.9.1)
+      liquid (= 3.0.6)
+      thor (= 0.19.1)
+      tilt (= 2.0.1)
+      xcodeproj (= 0.28.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -21,11 +20,12 @@ GEM
     claide (0.9.1)
     colored (1.2)
     diff-lcs (1.2.5)
+    fakefs (0.6.7)
     git (1.2.9.1)
     i18n (0.7.0)
     json (1.8.3)
     liquid (3.0.6)
-    minitest (5.8.1)
+    minitest (5.8.3)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
@@ -40,7 +40,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    settingslogic (2.0.9)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
@@ -56,9 +55,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.10)
+  fakefs (~> 0.6)
   generamba!
   rake (~> 10.0)
-  rspec
+  rspec (~> 3.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.md

@@ -0,0 +1,51 @@
+### Overview
+
+[![Build Status](https://travis-ci.org/rambler-ios/Generamba.svg)](https://travis-ci.org/rambler-ios/Generamba)
+[![Gem Version](https://badge.fury.io/rb/generamba.svg)](https://badge.fury.io/rb/generamba)
+
+**Generamba** is a code generator made for working with Xcode. Primarily it is designed to generate VIPER modules but it is quite easy to customize it for generation of any other classes (both in Objective-C and Swift).
+
+![Generamba Screenshot](http://s24.postimg.org/gej9cg1cl/generamba.jpg)
+
+### Key features
+
+- Supports work with *.xcodeproj* files out of the box. All generated class files are automaticly placed on specific folders and groups of Xcode project.
+- Can generate both code itself and tests adding them to right targets.
+- Based on work with [liquid-templates](https://github.com/Shopify/liquid) that have plain and readable syntax in comparison with templates for Xcode.
+- It is very easy to create a new module: `generamba gen [MODULE_NAME] [TEMPLATE_NAME]`. You do not need to input a bunch of data each time because each project corresponds to only one configuration file that holds standard file system and Xcode-project pathes, names of targets, information about the author.
+
+### Installation
+
+> Ruby 2.2 or later version is required. To check your current Ruby version run this command in terminal:
+```bash
+$ ruby --version
+```
+When necessary you can install the required Ruby version with the help of [`rvm`](http://octopress.org/docs/setup/rvm/) or [`rbenv`](http://octopress.org/docs/setup/rbenv/).
+
+Run the command `gem install generamba`.
+
+### Using
+1. Run [`generamba setup`](https://github.com/rambler-ios/Generamba/wiki/Available-Commands#basic-generamba-configuration) in the project root folder. This command helps to create [Rambafile](https://github.com/rambler-ios/Generamba/wiki/Rambafile-Structure) that define all configuration needed to generate code. You can modify this file directly in future.
+2. Add all templates planned to use in the project to the generated [Rambafile](https://github.com/rambler-ios/Generamba/wiki/Rambafile-Structure). You can begin with one of the templates from our catalog: `{name: 'rviper_controller'}`.
+3. Run [`generamba template install`](https://github.com/rambler-ios/Generamba/wiki/Available-Commands#template-installation). All the templates will be placed in the '/Templates' folder of your current project.
+4. Run [`generamba gen [MODULE_NAME] [TEMPLATE_NAME]`](https://github.com/rambler-ios/Generamba/wiki/Available-Commands#module-generation) - It creates module with specific name from specific template.
+
+### Additional info
+
+Run `generamba help` to learn more about each of the Generamba features.
+
+**Wiki:**
+- [Command list](https://github.com/rambler-ios/Generamba/wiki/Available-Commands)
+- [Understanding the Rambafile](https://github.com/rambler-ios/Generamba/wiki/Rambafile-Structure)
+- [Understanding templates](https://github.com/rambler-ios/Generamba/wiki/Template-Structure)
+
+**Other materials:**
+- [Russian] Rambler.iOS V: Generamba and Code Generation ([Slides](http://www.slideshare.net/Rambler-iOS/viper-56423582) | [Video](http://www.youtube.com/watch?v=NXNiN9FaUnY))
+
+### Authors
+
+- Egor Tolstoy, Beniamin Sarkisyan, Andrey Zarembo and the rest of [Rambler.iOS team](https://github.com/orgs/rambler-ios/people).
+
+### License
+
+MIT

data/generamba.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'fakefs', '~> 0.6'
 end

data/lib/generamba/cli/cli.rb

@@ -5,6 +5,7 @@ require 'tilt'
 require 'git'
 require 'generamba/cli/gen_command.rb'
 require 'generamba/cli/setup_command.rb'
+require 'generamba/cli/version_command.rb'
 require 'generamba/cli/setup_username_command.rb'
 require 'generamba/cli/thor_extension.rb'
 require 'generamba/cli/template/template_group.rb'

data/lib/generamba/cli/gen_command.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'generamba/helpers/rambafile_validator.rb'
+require 'generamba/helpers/xcodeproj_helper.rb'
 
 module Generamba::CLI
   class Application < Thor
@@ -20,7 +21,7 @@ module Generamba::CLI
 
       does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
 
-      if (does_rambafile_exist == false)
+      unless does_rambafile_exist
         puts('Rambafile not found! Run `generamba setup` in the working directory instead!'.red)
         return
       end
@@ -39,6 +40,17 @@ module Generamba::CLI
       template = ModuleTemplate.new(template_name)
       code_module = CodeModule.new(module_name, module_description, rambafile, options)
 
+      project = XcodeprojHelper.obtain_project(code_module.xcodeproj_path)
+      module_group_already_exists = XcodeprojHelper.module_with_group_path_already_exists(project, code_module.module_group_path)
+
+      if module_group_already_exists
+        replace_exists_module = yes?("#{module_name} module already exists. Replace? (yes/no)")
+      
+        unless replace_exists_module
+          return
+        end
+      end
+
       generator = Generamba::ModuleGenerator.new()
       generator.generate_module(module_name, code_module, template)
     end

data/lib/generamba/cli/setup_username_command.rb

@@ -4,7 +4,7 @@ module Generamba::CLI
     no_commands {
       def setup_username
         username = Generamba::UserPreferences.obtain_username
-        if username == nil
+        unless username
           puts('The author name is not configured!'.red)
           git_username = Git.init.config['user.name']
           if git_username != nil && yes?("Your name in git is configured as #{git_username}. Do you want to use it in code headers? (yes/no)")

data/lib/generamba/cli/template/template_install_command.rb

@@ -5,13 +5,17 @@ module Generamba::CLI
     def install
       does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
 
-      if (does_rambafile_exist == false)
+      unless does_rambafile_exist
         puts('Rambafile not found! Run `generamba setup` in the working directory instead!'.red)
         return
       end
 
-      template_processor = Generamba::TemplateProcessor.new
-      template_processor.install_templates
+      catalog_downloader = Generamba::CatalogDownloader.new
+      installer_factory = Generamba::TemplateInstallerFactory.new
+      template_processor = Generamba::TemplateProcessor.new(catalog_downloader, installer_factory)
+
+      rambafile = YAML.load_file(RAMBAFILE_NAME)
+      template_processor.install_templates(rambafile)
     end
   end
 end

data/lib/generamba/cli/version_command.rb

@@ -0,0 +1,13 @@
+require 'thor'
+require 'generamba/version.rb'
+
+module Generamba::CLI
+  class Application < Thor
+    include Generamba
+
+    desc 'version', 'Prints out Generamba current version'
+    def version
+      puts(Generamba::VERSION.green)
+    end
+  end
+end

data/lib/generamba/code_generation/content_generator.rb

@@ -14,12 +14,12 @@ module Generamba
     # @return [String] The generated body
 		def self.create_file_content(file, code_module, template)
 			file_template = Tilt.new(template.template_path.join(file[TEMPLATE_FILE_PATH_KEY]))
-      file_name = File.basename(file[TEMPLATE_FILE_NAME_KEY])
+      		file_name = File.basename(file[TEMPLATE_FILE_NAME_KEY])
 			module_info = {
 					'name' => code_module.name,
 					'file_name' => file_name,
 					'description' => code_module.description,
-          'project_name' => code_module.project_name
+          			'project_name' => code_module.project_name
 			}
 
 			developer = {

data/lib/generamba/configuration/user_preferences.rb

@@ -33,14 +33,14 @@ module Generamba
 
       path_exists = Dir.exist?(home_path)
 
-      if path_exists == false
+      unless path_exists
         FileUtils.mkdir_p home_path
       end
 
       preferences_path = home_path.join(USER_PREFERENCES_FILE)
       preferences_exist = File.file?(preferences_path)
 
-      if preferences_exist == false
+      unless preferences_exist
         File.open(preferences_path, 'w+') { |f| f.write('') }
       end
 

data/lib/generamba/constants/rambafile_constants.rb

@@ -19,6 +19,7 @@ module Generamba
   PODFILE_PATH_KEY = 'podfile_path'
   CARTFILE_PATH_KEY = 'cartfile_path'
 
+  CATALOGS_KEY = 'catalogs'
   TEMPLATES_KEY = 'templates'
   TEMPLATE_DECLARATION_NAME_KEY = 'name'
   TEMPLATE_DECLARATION_LOCAL_KEY = 'local'

data/lib/generamba/helpers/rambafile_validator.rb

@@ -5,43 +5,100 @@ module Generamba
 
     # Method validates Rambafile contents
     # @param path [String] The path to a Rambafile
+    #
+    # @return [Void]
     def validate(path)
       file_contents = open(path).read
       preferences = file_contents.empty? ? {} : YAML.load(file_contents).to_hash
 
       mandatory_fields = [COMPANY_KEY,
                           PROJECT_NAME_KEY,
-                          XCODEPROJ_PATH_KEY,
-                          PROJECT_FILE_PATH_KEY,
-                          PROJECT_GROUP_PATH_KEY,
-                          TEMPLATES_KEY]
-
-      interchangable_fields = [[PROJECT_TARGETS_KEY, PROJECT_TARGET_KEY]]
+                          XCODEPROJ_PATH_KEY]
 
       mandatory_fields.each do |field|
-        if preferences.has_key?(field) == false
-          error_description = "Rambafile is broken! Cannot find #{field} field, which is mandatory. Either add it manually, or run *generamba setup*.".red
-          raise StandardError.new(error_description)
+        unless preferences[field]
+          puts "Rambafile is broken! *#{field}* field cannot be empty, because it is mandatory. Either add it manually, or run *generamba setup*.".red
+          exit
         end
       end
 
-      interchangable_fields.each do |fields_array|
-        has_value = false
-        fields_array.each do |field|
-          has_value = preferences.has_key?(field) || has_value
-        end
+      project_failure_fields = all_project_failure_fields(preferences)
+      test_failure_fields = all_test_failure_fields(preferences)
+      failure_fields = project_failure_fields + test_failure_fields
 
-        if has_value == false
-          error_description = "Rambafile is broken! Cannot find any of #{fields_array} fields, one of them is mandatory. Either add it manually, or run *generamba setup*.".red
-          raise StandardError.new(error_description)
-        end
+      if failure_fields.count > 0
+        puts "Rambafile is broken! Cannot find any of #{failure_fields} fields, one of them is mandatory. Either add it manually, or run *generamba setup*.".red
+        exit
       end
 
-      if preferences[TEMPLATES_KEY] == nil
-        error_description = "You can't run *generamba gen* without any templates installed. Add their declarations to a Rambafile and run *generamba template install*.".red
-        raise StandardError.new(error_description)
+      unless preferences[TEMPLATES_KEY]
+        puts "You can't run *generamba gen* without any templates installed. Add their declarations to a Rambafile and run *generamba template install*.".red
+        exit
+      end
+    end
+
+    private
+
+    # Method which return all project failure fields
+    # @param preferences [Hash] Converted Rambafile
+    #
+    # @return [Array]
+    def all_project_failure_fields(preferences)
+      return all_nil_mandatory_fields_for_target_type("project", preferences)
+    end
+
+    # Method which return all test failure fields
+    # @param preferences [Hash] Converted Rambafile
+    #
+    # @return [Array]
+    def all_test_failure_fields(preferences)
+      target = preferences[TEST_TARGET_KEY]
+      targets = preferences[TEST_TARGETS_KEY]
+      file_path = preferences[TEST_FILE_PATH_KEY]
+      group_path = preferences[TEST_GROUP_PATH_KEY]
+
+      has_test_fields = target || targets || file_path || group_path
+
+      unless has_test_fields
+        return []
+      end
+      
+      return all_nil_mandatory_fields_for_target_type("test", preferences)
+    end
+
+    # Method which return all failure fields for target_type
+    # @param target_type [String] "project" or "test"
+    # @param preferences [Hash] Converted Rambafile
+    # 
+    # @return [Array]
+    def all_nil_mandatory_fields_for_target_type(target_type, preferences)
+      target_type = target_type.upcase
+
+      target_const_value = Generamba.const_get(target_type + "_TARGET_KEY")
+      targets_const_value = Generamba.const_get(target_type + "_TARGETS_KEY")
+
+      target = preferences[target_const_value]
+      targets = preferences[targets_const_value]
+
+      fields = []
+
+      if !target && (!targets || (targets && targets.count == 0))
+        fields.push(target_const_value)
+      end
+
+      file_path_const_value = Generamba.const_get(target_type + "_FILE_PATH_KEY")      
+
+      unless preferences[file_path_const_value]
+        fields.push(file_path_const_value)
+      end 
+
+      group_path_const_value = Generamba.const_get(target_type + "_GROUP_PATH_KEY")
+
+      unless preferences[group_path_const_value]
+        fields.push(group_path_const_value)
       end
 
+      return fields
     end
 
   end

data/lib/generamba/helpers/template_helper.rb

@@ -24,7 +24,7 @@ module Generamba
                  .join(template_name)
 
       error_description = "Cannot find template named #{template_name}! Add it to the Rambafile and run *generamba template install*".red
-      raise StandardError.new(error_description) if path.exist? == false
+      raise StandardError.new(error_description) unless path.exist?
 
       return path
     end

data/lib/generamba/helpers/xcodeproj_helper.rb

@@ -13,50 +13,81 @@ module Generamba
 
     # Adds a provided file to a specific Project and Target
     # @param project [Xcodeproj::Project] The target xcodeproj file
-    # @param targets [AbstractTarget] Array of tatgets
+    # @param targets_name [String] Array of targets name
     # @param group_path [Pathname] The Xcode group path for current file
     # @param file_path [Pathname] The file path for current file
     #
     # @return [void]
-    def self.add_file_to_project_and_targets(project, targets, group_path, file_path)
-      module_group = self.retreive_or_create_group(group_path, project)
+    def self.add_file_to_project_and_targets(project, targets_name, group_path, file_path)
+      module_group = self.retreive_group_or_create_if_needed(group_path, project, true)
       xcode_file = module_group.new_file(File.absolute_path(file_path))
 
       file_name = File.basename(file_path)
-      if File.extname(file_name) == '.m'
-        targets.each do |target|
-          xcode_target = self.obtain_target(target, project)
-          xcode_target.add_file_references([xcode_file])
-        end
-      end
+      targets_name.each do |target|
+        xcode_target = self.obtain_target(target, project)
+        xcode_target.add_file_references([xcode_file])
+      end if self.add_file_to_target?(file_name)
+    end
+
+    # Decides should file be added
+    # @param file_name [String] Array of targets name
+    #
+    # @return [TrueClass or FalseClass]
+    def self.add_file_to_target?(file_name)
+      File.extname(file_name) == '.m' || File.extname(file_name) == '.swift' || File.extname(file_name) == '.mm'
     end
 
-    # Recursively clears children of te given group
+    # Recursively clears children of the given group
     # @param project [Xcodeproj::Project] The working Xcode project file
     # @param group_path [Pathname] The full group path
     #
     # @return [Void]
-    def self.clear_group(project, group_path)
-      module_group = self.retreive_or_create_group(group_path, project)
+    def self.clear_group(project, targets_name, group_path)
+      module_group = self.retreive_group_or_create_if_needed(group_path, project, false)
+      return unless module_group
+
+      files_path = self.files_path_from_group(module_group, project)
+      return unless files_path
+
+      files_path.each do |file_path|
+        self.remove_file_by_file_path(file_path, targets_name, project)
+      end
+      
       module_group.clear
     end
 
+    # Finds a group in a xcodeproj file with a given path
+    # @param project [Xcodeproj::Project] The working Xcode project file
+    # @param group_path [Pathname] The full group path
+    #
+    # @return [TrueClass or FalseClass]
+    def self.module_with_group_path_already_exists(project, group_path)
+      module_group = self.retreive_group_or_create_if_needed(group_path, project, false)
+      return module_group == nil ? false : true
+    end
+
     private
 
     # Finds or creates a group in a xcodeproj file with a given path
     # @param group_path [Pathname] The full group path
     # @param project [Xcodeproj::Project] The working Xcode project file
+    # @param create_group_if_not_exists [TrueClass or FalseClass] If true notexistent group will be created
     #
     # @return [PBXGroup]
-    def self.retreive_or_create_group(group_path, project)
+    def self.retreive_group_or_create_if_needed(group_path, project, create_group_if_not_exists)
       group_names = group_names_from_group_path(group_path)
 
       final_group = project
 
       group_names.each do |group_name|
         next_group = final_group[group_name]
-        if (next_group == nil)
-          next_group = final_group.new_group(group_name)
+        unless next_group
+          unless create_group_if_not_exists
+            return nil
+          end
+            
+          new_group_path = group_name
+          next_group = final_group.new_group(group_name, new_group_path)
         end
 
         final_group = next_group
@@ -89,5 +120,77 @@ module Generamba
       groups = group_path.to_s.split('/')
       return groups
     end
+
+    # Remove build file from target build phase
+    # @param file_path [String] The path of the file
+    # @param targets_name [String] Array of targets
+    # @param project [Xcodeproj::Project] The target xcodeproj file
+    #
+    # @return [Void]
+    def self.remove_file_by_file_path(file_path, targets_name, project)
+      build_phases = self.build_phases_from_targets(targets_name, project)
+      
+      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 = self.configure_file_ref_path(build_file.file_ref)
+          
+          if build_file_path == file_path
+            build_phase.remove_build_file(build_file)
+          end
+        end
+      end
+    end
+
+    # Find and return target build phases
+    # @param targets_name [String] Array of targets
+    # @param project [Xcodeproj::Project] The target xcodeproj file
+    #
+    # @return [[PBXSourcesBuildPhase]]
+    def self.build_phases_from_targets(targets_name, project)
+      build_phases = []
+
+      targets_name.each do |target_name|
+        xcode_target = self.obtain_target(target_name, project)
+        xcode_target.build_phases.each do |build_phase|
+          if build_phase.isa == 'PBXSourcesBuildPhase'
+            build_phases.push(build_phase)
+          end
+        end
+      end
+
+      return build_phases
+    end
+
+    # Get configure file full path
+    # @param file_ref [PBXFileReference] Build file
+    #
+    # @return [String]
+    def self.configure_file_ref_path(file_ref)
+      build_file_ref_path = file_ref.hierarchy_path.to_s
+      build_file_ref_path[0] = ''
+
+      return build_file_ref_path
+    end
+
+    # Get all files path from group path
+    # @param module_group [PBXGroup] The module group
+    # @param project [Xcodeproj::Project] The target xcodeproj file
+    #
+    # @return [[String]]
+    def self.files_path_from_group(module_group, project)
+      files_path = []
+
+      module_group.recursive_children.each do |file_ref|
+        if file_ref.isa == 'PBXFileReference'
+          file_ref_path = self.configure_file_ref_path(file_ref)
+          files_path.push(file_ref_path)
+        end
+      end
+
+      return files_path
+    end
+
   end
 end

data/lib/generamba/module_generator.rb

@@ -21,33 +21,41 @@ module Generamba
 			# Creating code files
 			puts('Creating code files...')
 			process_files_if_needed(template.code_files,
-															name,
-															code_module,
-															template,
-															project,
-															code_module.project_targets,
-															code_module.module_group_path,
-															code_module.module_file_path)
+									name,
+									code_module,
+									template,
+									project,
+									code_module.project_targets,
+									code_module.module_group_path,
+									code_module.module_file_path)
 
 			# Creating test files
-			puts('Creating test files...')
-			process_files_if_needed(template.test_files,
-															name,
-															code_module,
-															template,
-															project,
-															code_module.test_targets,
-															code_module.test_group_path,
-															code_module.test_file_path)
+			included_tests = code_module.test_targets && code_module.test_group_path && code_module.test_file_path
+
+			if included_tests
+				puts('Creating test files...')
+				process_files_if_needed(template.test_files,
+										name,
+										code_module,
+										template,
+										project,
+										code_module.test_targets,
+										code_module.test_group_path,
+										code_module.test_file_path)
+			end
 
 			# Saving the current changes in the Xcode project
 			project.save
+
+			test_file_path_created_message = !code_module.test_file_path ? "" : "Test file path: #{code_module.test_file_path}".green + "\n"
+			test_group_path_created_message = !code_module.test_group_path ? "" : "Test group path: #{code_module.test_group_path}".green
+
 			puts("Module successfully created!\n" +
-							 "Name: #{name}".green + "\n" +
-							 "Module file path: #{code_module.module_file_path}".green + "\n" +
-							 "Module group path: #{code_module.module_group_path}".green + "\n" +
-							 "Test file path: #{code_module.test_file_path}".green + "\n" +
-							 "Test group path: #{code_module.test_group_path}".green)
+				 "Name: #{name}".green + "\n" +
+				 "Module file path: #{code_module.module_file_path}".green + "\n" +
+				 "Module group path: #{code_module.module_group_path}".green + "\n" +
+				 test_file_path_created_message +
+				 test_group_path_created_message)
 		end
 
 		def process_files_if_needed(files, name, code_module, template, project, targets, group_path, dir_path)
@@ -57,7 +65,7 @@ module Generamba
 				return
 			end
 
-			XcodeprojHelper.clear_group(project, group_path)
+			XcodeprojHelper.clear_group(project, targets, group_path)
 			files.each do |file|
 				# The target file's name consists of three parameters: project prefix, module name and template file name.
 				# E.g. RDS + Authorization + Presenter.h = RDSAuthorizationPresenter.h
@@ -68,12 +76,9 @@ module Generamba
 				file_group = File.dirname(file[TEMPLATE_NAME_KEY])
 
 				# Generating the content of the code file
-				file_content = ContentGenerator.create_file_content(file,
-																														code_module,
-																														template)
-				file_path = dir_path
-												.join(file_group)
-												.join(file_name)
+				file_content = ContentGenerator.create_file_content(file, code_module, template)
+				file_path = dir_path.join(file_group)
+									.join(file_name)
 
 				# Creating the file in the filesystem
 				FileUtils.mkdir_p File.dirname(file_path)
@@ -82,10 +87,7 @@ module Generamba
 				end
 
 				# Creating the file in the Xcode project
-				XcodeprojHelper.add_file_to_project_and_targets(project,
-																											 targets,
-																											 group_path.join(file_group),
-																											 file_path)
+				XcodeprojHelper.add_file_to_project_and_targets(project, targets, group_path.join(file_group), file_path)
 			end
 		end
 	end

data/lib/generamba/template/helpers/catalog_downloader.rb

@@ -12,16 +12,15 @@ module Generamba
     #
     # @return [Pathname] A filepath to the downloaded catalog
     def download_catalog(name, url)
-      catalog_local_path = Pathname.new(ENV['HOME'])
+      catalogs_local_path = Pathname.new(ENV['HOME'])
                                .join(GENERAMBA_HOME_DIR)
                                .join(CATALOGS_DIR)
-      FileUtils.rm_rf catalog_local_path
-      FileUtils.mkdir_p catalog_local_path
+      current_catalog_path = catalogs_local_path
+                                 .join(name)
 
-      Git.clone(url, name, :path => catalog_local_path)
+      Git.clone(url, name, :path => catalogs_local_path)
 
-      return catalog_local_path
-                 .join(name)
+      return current_catalog_path
     end
   end
 end

data/lib/generamba/template/installer/catalog_installer.rb

@@ -12,29 +12,62 @@ module Generamba
       puts("Installing #{template_name}...")
 
       template_name = template_declaration.name
-      catalog_path = Pathname.new(ENV['HOME'])
+      catalogs_path = Pathname.new(ENV['HOME'])
                          .join(GENERAMBA_HOME_DIR)
                          .join(CATALOGS_DIR)
-                         .join(GENERAMBA_CATALOG_NAME)
-      template_path = catalog_path.join(template_name)
 
-      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_path)
+      catalog_path = catalogs_path.children.select { |child|
+        child.directory? && child.split.last.to_s[0] != '.'
+      }.select { |catalog_path|
+        template_path = browse_catalog_for_a_template(catalog_path, template_name)
+        template_path != nil
+      }.first
 
-      if rambaspec_exist == false
-        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the template catalog. Try another name.".red
-        raise StandardError.new(error_description)
+      if catalog_path == nil
+        error_description = "Cannot find #{template_name} in any catalog. Try another name.".red
+        puts(error_description)
+        return
+      end
+
+      template_path = catalog_path.join(template_name)
+      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_path)
+      unless rambaspec_exist
+        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the template catalog #{catalog_path}. Try another name.".red
+        puts(error_description)
+        return
       end
 
       rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_path)
-      if rambaspec_valid == false
+      unless rambaspec_valid
         error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
-        raise StandardError.new(error_description)
+        puts(error_description)
+        return
       end
 
       install_path = Pathname.new(TEMPLATES_FOLDER)
                          .join(template_name)
       FileUtils.mkdir_p install_path
-      FileUtils.copy_entry(template_path, install_path)
+
+      src = template_path.to_s + '/.'
+      FileUtils.cp_r(src, install_path)
+    end
+
+    private
+
+    # Browses a given catalog and returns a template path
+    #
+    # @param catalog_path [Pathname] A path to a catalog
+    # @param template_name [String] A name of the template
+    #
+    # @return [Pathname] A path to a template, if found
+    def browse_catalog_for_a_template(catalog_path, template_name)
+      template_path = catalog_path.join(template_name)
+
+      if Dir.exist?(template_path)
+        return template_path
+      end
+
+      return nil
     end
   end
 end

data/lib/generamba/template/installer/local_installer.rb

@@ -12,13 +12,13 @@ module Generamba
       local_path = template_declaration.local
       rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, local_path)
 
-      if rambaspec_exist == false
+      unless rambaspec_exist
         error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the specified directory. Try another path or name.".red
         raise StandardError.new(error_description)
       end
 
       rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, local_path)
-      if rambaspec_valid == false
+      unless rambaspec_valid
         error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
       end

data/lib/generamba/template/installer/remote_installer.rb

@@ -20,14 +20,14 @@ module Generamba
       Git.clone(repo_url, template_name, :path => temp_path)
 
       rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_dir)
-      if rambaspec_exist == false
+      unless rambaspec_exist
         FileUtils.rm_rf(temp_path)
         error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the root directory of specified repository.".red
         raise StandardError.new(error_description)
       end
 
       rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_dir)
-      if rambaspec_valid == false
+      unless rambaspec_valid
         error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
       end

data/lib/generamba/template/installer/template_installer_factory.rb

@@ -0,0 +1,22 @@
+require 'generamba/template/processor/template_declaration'
+
+module Generamba
+
+  # Factory that creates a proper installer for a given template type
+  class TemplateInstallerFactory
+
+    # Provides the appropriate strategy for a given template type
+    def installer_for_type(type)
+      case type
+        when TemplateDeclarationType::LOCAL_TEMPLATE
+          return Generamba::LocalInstaller.new
+        when TemplateDeclarationType::REMOTE_TEMPLATE
+          return Generamba::RemoteInstaller.new
+        when TemplateDeclarationType::CATALOG_TEMPLATE
+          return Generamba::CatalogInstaller.new
+        else
+          return nil
+      end
+    end
+  end
+end

data/lib/generamba/template/processor/template_declaration.rb

@@ -14,6 +14,7 @@ module Generamba
 
   # Describes a Generamba template declaration model
   class TemplateDeclaration
+
     attr_reader :name, :local, :git, :type
 
     def initialize(template_hash)

data/lib/generamba/template/processor/template_processor.rb

@@ -10,28 +10,34 @@ module Generamba
   # Incapsulates logic of processing templates declaration section from Rambafile
   class TemplateProcessor
 
+    def initialize(catalog_downloader, installer_factory)
+      @catalog_downloader = catalog_downloader
+      @installer_factory = installer_factory
+    end
+
     # This method parses Rambafile, serializes templates hashes into model objects and install them
-    def install_templates
+    def install_templates(rambafile)
       # We always clear previously installed templates to avoid conflicts in different versions
       clear_installed_templates
 
-      rambafile = YAML.load_file(RAMBAFILE_NAME)
+      templates = rambafile[TEMPLATES_KEY]
+
+      if !templates || templates.count == 0
+        puts 'You must specify at least one template in Rambafile under the key *templates*'.red
+        return
+      end
 
       # Mapping hashes to model objects
       templates = rambafile[TEMPLATES_KEY].map { |template_hash|
-        template_declaration = Generamba::TemplateDeclaration.new(template_hash)
+        Generamba::TemplateDeclaration.new(template_hash)
       }
 
-      if !templates || templates.count == 0
-        error_description = 'You must specify at least one template in Rambafile under the key *project_templates*'.red
-        raise StandardError.new(error_description)
-      end
-
-      # If there is at least one template from the shared catalog, we should update our local copy of the catalog
-      update_shared_catalog_if_needed(templates)
+      catalogs = rambafile[CATALOGS_KEY]
+      # If there is at least one template from catalogs, we should update our local copy of the catalog
+      update_catalogs_if_needed(catalogs, templates)
 
       templates.each do |template_declaration|
-        strategy = strategy_for_type(template_declaration.type)
+        strategy = @installer_factory.installer_for_type(template_declaration.type)
         template_declaration.install(strategy)
       end
     end
@@ -44,30 +50,38 @@ module Generamba
       FileUtils.rm_rf(Dir.glob(install_path))
     end
 
-    # Clones remote template catalog to the local directory
-    def update_shared_catalog_if_needed(templates)
+    # Clones remote template catalogs to the local directory
+    def update_catalogs_if_needed(catalogs, templates)
       needs_update = templates.any? {|template| template.type == TemplateDeclarationType::CATALOG_TEMPLATE}
 
       return unless needs_update
 
+      remove_all_catalogs
       puts('Updating shared generamba-catalog specs...')
+      @catalog_downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+
+      return unless catalogs != nil && catalogs.count > 0
 
-      downloader = CatalogDownloader.new
-      downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+      catalogs.each do |catalog_url|
+        catalog_name = catalog_url.split('://').last
+        catalog_name = catalog_name.gsub('/', '-');
+        puts("Updating #{catalog_name} specs...")
+        @catalog_downloader.download_catalog(catalog_name, catalog_url)
+      end
     end
 
-    # Provides the appropriate strategy for a given template type
-    def strategy_for_type(type)
-      case type
-        when TemplateDeclarationType::LOCAL_TEMPLATE
-          return Generamba::LocalInstaller.new
-        when TemplateDeclarationType::REMOTE_TEMPLATE
-          return Generamba::RemoteInstaller.new
-        when TemplateDeclarationType::CATALOG_TEMPLATE
-          return Generamba::CatalogInstaller.new
-        else
-          return nil
+    def remove_all_catalogs
+      catalogs_path = Pathname.new(ENV['HOME'])
+                          .join(GENERAMBA_HOME_DIR)
+                          .join(CATALOGS_DIR)
+      if Dir.exist?(catalogs_path) == false
+        FileUtils.mkdir_p catalogs_path
       end
+      catalogs_path.children.select { |child|
+        child.directory? && child.split.last.to_s[0] != '.'
+      }.each { |catalog_path|
+        FileUtils.rm_rf(catalog_path)
+      }
     end
   end
 end

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/generamba.rb

@@ -11,6 +11,7 @@ module Generamba
   require 'generamba/code_generation/rambafile_generator.rb'
   require 'generamba/module_generator.rb'
   require 'generamba/template/processor/template_processor.rb'
+  require 'generamba/template/installer/template_installer_factory'
   require 'generamba/configuration/user_preferences.rb'
   require 'generamba/template/creator/template_creator.rb'
   require 'generamba/tools/string-colorize.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Generamba is a powerful and easy-to-use Xcode code generator. It provides
   a project-based configuration, flexible templates system, the ability to generate
   code and tests simultaneously.
@@ -132,13 +146,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README.md
 - Rakefile
-- Readme.md
 - bin/console
 - bin/generamba
 - bin/setup
@@ -154,6 +169,7 @@ files:
 - lib/generamba/cli/template/template_list_command.rb
 - lib/generamba/cli/template/template_search_command.rb
 - lib/generamba/cli/thor_extension.rb
+- lib/generamba/cli/version_command.rb
 - lib/generamba/code_generation/Rambafile.liquid
 - lib/generamba/code_generation/code_module.rb
 - lib/generamba/code_generation/content_generator.rb
@@ -179,6 +195,7 @@ files:
 - lib/generamba/template/installer/catalog_installer.rb
 - lib/generamba/template/installer/local_installer.rb
 - lib/generamba/template/installer/remote_installer.rb
+- lib/generamba/template/installer/template_installer_factory.rb
 - lib/generamba/template/processor/template_declaration.rb
 - lib/generamba/template/processor/template_processor.rb
 - lib/generamba/tools/string-colorize.rb

data/Readme.md

@@ -1,51 +0,0 @@
-### Overview
-
-**Generamba** - это генератор кода, заточенный под работу с Xcode. В первую очередь предназначен для генерации модулей VIPER - но достаточно легко настраивается и для генерации любых других классов.
-
-### Основные особенности
-
-- Из коробки поддерживает работу с *.xcodeproj* файлами - все сгенерированные классы автоматически распределяются как по файловой структуре, так и по группам в проекте.
-- Умеет генерировать как непосредственно код, так и тесты, автоматически распределяя их по правильным таргетам.
-- Основан на работе с [liquid-шаблонами](https://github.com/Shopify/liquid) - синтаксис простой и понятный, особенно в сравнении с шаблонами для Xcode.
-- Создать новый модуль очень просто: `generamba gen MyModule`. Не требуется каждый раз вводить кучу данных - каждому проекту соответствует один конфигурационный файл, содержащий в себе стандартные пути в файловой системе и Xcode-проекте, названия таргетов, информацию об авторе.
-
-
-### Установка
-Проект пока что находится в стадии beta-версии, поэтому не добавлен в общий каталог ruby-gem'ов. Локальная установка осуществляется следующим образом:
-
-1. Склонируйте репозиторий себе на компьютер
-2. В консоли перейдите в директорию проекта
-3. Вызовите команду `gem install generamba`
-
-### Использование
-В настоящий момент Generamba поддерживает две команды:
-
-1. `generamba setup` - вызывается в корневой директории проекта. Помогает автоматически создать и настроить *Rambafile*, описывающий всю конфигурацию, необходимую для генерации кода. В дальнейшем этот файл может быть модифицирован вручную.
-2. `generamba gen MODULE_NAME` - генерирует модуль с указанным названием. В качестве стандартного используется шаблон *viper_module*. Команда поддерживает несколбко дополнительных опций - узнать о них больше поможет команда `generamba help gen`.
-
-В текущей версии нет возможности создавать локальные шаблоны и использовать их для генерации. Пока что используем следующий workaround:
-
-1. `open ~/.rvm/gems/ruby-2.1.6/gems`
-2. Находим директорию *Generamba-x.x.x*
-3. Переходим в *lib/generamba/default_templates/*
-4. Создаем папку с названием нового модуля. В остальном модуль создается по образцу стандартного.
-
-Оптимизация добавления шаблонов является главным приоритетом на данный момент.
-
-### Авторы
-
-- Егор Толстой
-- Андрей Зарембо-Годзяцкий
-
-### Лицензия
-
-MIT
-
-### TODO
-
-- Дать возможность использовать локальный шаблон, указав полный путь до него
-- В Rambafile держать информацию обо всех используемых в проекте шаблонах
-- Вынести из Rambafile информацию, специфичную для текущего автора (имя)
-- Добавить для каждого шаблона возможность модифицировать Podfile проекта
-- Добавить GUI
-- Добавить возможность генерирования тестов по указанным интерфейсным файлам