generamba 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cba8bb628b52530a159a36780d57b09ed21c345
-  data.tar.gz: 1067a8772c6101c895318f7efebdeac4f67c767c
+  metadata.gz: 86031870069f4fd70b4aab732b9cd8b3b148bd73
+  data.tar.gz: 5cfaf9db6ee20956d3ca39a3540ed60ca1680437
 SHA512:
-  metadata.gz: 261f30a1f64c7cec05a45772305d88835608e728914d2ec565378969ae58bad69a0f9fd362f70a43fe63474ca64619349045edcb5f2afaba33b144e81a4a527a
-  data.tar.gz: f6c46c812e23bfc3118e671ba62340fdadfeddc083ab7b50e15f777bc3a526bf3dc1ca3269910a8453b7b4190360dd8c75094f7e42a2316bbee612f3cf67d0b3
+  metadata.gz: 5e11bd68fe9b713a03773084ff0aaf91584fb6fae2ec01eba3136b8ff8dda3d9b1d8c348f7d11ba4a4988570c9009c6be8a0247c6d8c299321aeb7d1926de349
+  data.tar.gz: 6488c2d30051969a72b09eca9da7c99f9382b13dee0c642d5cbb70be0791863f021719e51559e3ffb1a3edda8db4c26303aed04c8588e02bbff78d5143874100

data/lib/generamba.rb

@@ -14,4 +14,5 @@ module Generamba
   require 'generamba/template/processor/template_processor.rb'
   require 'generamba/configuration/user_preferences.rb'
   require 'generamba/template/creator/template_creator.rb'
+  require 'generamba/tools/string-colorize.rb'
 end

data/lib/generamba/cli/gen_command.rb

@@ -6,14 +6,22 @@ module Generamba::CLI
 
     include Generamba
 
-    desc 'gen [MODULE_NAME] [TEMPLATE_NAME_KEY]', 'Creates a new VIPER module with a given name from a specific template'
+    desc 'gen [MODULE_NAME] [TEMPLATE_NAME]', 'Creates a new VIPER module with a given name from a specific template'
     method_option :description, :aliases => '-d', :desc => 'Provides a full description to the module'
+    method_option :module_targets, :desc => 'Specifies project targets for adding new module files'
+    method_option :module_file_path, :desc => 'Specifies a location in the filesystem for new files'
+    method_option :module_group_path, :desc => 'Specifies a location in Xcode groups for new files'
+    method_option :module_path, :desc => 'Specifies a location (both in the filesystem and Xcode) for new files'
+    method_option :test_targets, :desc => 'Specifies project targets for adding new test files'
+    method_option :test_file_path, :desc => 'Specifies a location in the filesystem for new test files'
+    method_option :test_group_path, :desc => 'Specifies a location in Xcode groups for new test files'
+    method_option :test_path, :desc => 'Specifies a location (both in the filesystem and Xcode) for new test files'
     def gen(module_name, template_name)
 
       does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
 
       if (does_rambafile_exist == false)
-        puts('Rambafile not found! Run `generamba setup` in the working directory instead!')
+        puts('Rambafile not found! Run `generamba setup` in the working directory instead!'.red)
         return
       end
 
@@ -26,9 +34,11 @@ module Generamba::CLI
       default_module_description = "#{module_name} module"
       module_description = options[:description] ? options[:description] : default_module_description
 
-      generator = Generamba::ModuleGenerator.new()
-      generator.generate_module(template_name, module_name, module_description)
+      template = ModuleTemplate.new(template_name)
+      code_module = CodeModule.new(module_name, module_description, options)
 
+      generator = Generamba::ModuleGenerator.new()
+      generator.generate_module(module_name, code_module, template)
     end
 
   end

data/lib/generamba/cli/setup_command.rb

@@ -67,7 +67,7 @@ module Generamba::CLI
       properties[TEST_GROUP_PATH_KEY] = test_group_path
 
       Generamba::RambafileGenerator.create_rambafile(properties)
-      say('Rambafile successfully created! Now add some templates to the Rambafile and run `generamba template install`.')
+      puts('Rambafile successfully created! Now add some templates to the Rambafile and run `generamba template install`.'.green)
     end
   end
 end

data/lib/generamba/cli/setup_username_command.rb

@@ -5,7 +5,7 @@ module Generamba::CLI
       def setup_username
         username = Generamba::UserPreferences.obtain_username
         if username == nil
-          puts('The author name is not configured!')
+          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)")
             username = git_username

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

@@ -23,7 +23,7 @@ module Generamba::CLI
 
       template_creator = Generamba::TemplateCreator.new
       template_creator.create_template(properties)
-      say("The template #{template_name} is successfully generated! Now add some file templates into it.")
+      puts("The template #{template_name} is successfully generated! Now add some file templates into it.".green)
     end
   end
 end

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

@@ -1,5 +1,7 @@
 require 'generamba/cli/template/template_install_command.rb'
 require 'generamba/cli/template/template_create_command.rb'
+require 'generamba/cli/template/template_list_command.rb'
+require 'generamba/cli/template/template_search_command.rb'
 
 module Generamba::CLI
   class Application < Thor

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

@@ -3,6 +3,13 @@ module Generamba::CLI
 
     desc 'install', 'Installs all the templates specified in the Rambafile from the current directory'
     def install
+      does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
+
+      if (does_rambafile_exist == false)
+        puts('Rambafile not found! Run `generamba setup` in the working directory instead!'.red)
+        return
+      end
+
       template_processor = Generamba::TemplateProcessor.new
       template_processor.install_templates
     end

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

@@ -0,0 +1,21 @@
+require 'generamba/template/helpers/catalog_downloader.rb'
+
+module Generamba::CLI
+  class Template < Thor
+    include Generamba
+
+    desc 'list', 'Prints out the list of all templates available in the shared GitHub catalog'
+    def list
+      downloader = CatalogDownloader.new
+      generamba_catalog_path = downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+
+      generamba_catalog_path.children.select { |child|
+        child.directory? && child.split.last.to_s[0] != '.'
+      }.map { |template_path|
+        template_path.split.last.to_s
+      }.each { |template_name|
+        puts(template_name)
+      }
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'generamba/template/helpers/catalog_downloader.rb'
+
+module Generamba::CLI
+  class Template < Thor
+    include Generamba
+
+    desc 'search [SEARCH_STRING]', 'Searches a template with a given name in the shared GitHub catalog'
+    def search(term)
+      downloader = CatalogDownloader.new
+      generamba_catalog_path = downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+
+      generamba_catalog_path.children.select { |child|
+        child.directory? && child.split.last.to_s[0] != '.'
+      }.map { |template_path|
+        template_path.split.last.to_s
+      }.select { |template_name|
+        template_name.include?(term)
+      }.map { |template_name|
+        keywords = term.squeeze.strip.split(' ').compact.uniq
+        matcher = Regexp.new('(' + keywords.join('|') + ')')
+        template_name.gsub(matcher) { |match| "#{match}".yellow }
+      }.each { |template_name|
+        puts(template_name)
+      }
+    end
+  end
+end

data/lib/generamba/cli/thor_extension.rb

@@ -26,7 +26,7 @@ module Generamba::CLI
         loop do
           value = ask(message)
           return value if is_valid_value.call(value)
-          puts(description)
+          puts(description.red)
         end
       end
     end

data/lib/generamba/code_generation/Rambafile.liquid

@@ -3,8 +3,8 @@ company: {{ company }}
 
 ### Xcode project settings
 project_name: {{ project_name }}
-prefix: {{ prefix }}
 xcodeproj_path: {{ xcodeproj_path }}
+{% if prefix != "" %}prefix: {{ prefix }}{% endif %}
 
 ### Code generation settings section
 # The main project target name
@@ -16,19 +16,19 @@ project_file_path: {{ project_file_path }}
 # The Xcode group path to new modules
 project_group_path: {{ project_group_path }}
 
-### Tests generation settings section
-# The tests target name
-test_target: {{ test_target }}
+{% if test_target != "" or test_file_path != "" or test_group_path != "" %}### Tests generation settings section{% endif %}
+{% if test_target != "" %}# The tests target name
+test_target: {{ test_target }}{% endif %}
 
-# The file path for new tests
-test_file_path: {{ test_file_path }}
+{% if test_file_path != "" %}# The file path for new tests
+test_file_path: {{ test_file_path }}{% endif %}
 
-# The Xcode group path to new tests
-test_group_path: {{ test_group_path }}
+{% if test_group_path != "" %}# The Xcode group path to new tests
+test_group_path: {{ test_group_path }}{% endif %}
 
-### Dependencies settings section
-podfile_path: {{ podfile_path }}
-cartfile_path: {{ cartfile_path }}
+{% if podfile_path != "" or cartfile_path != "" %}### Dependencies settings section{% endif %}
+{% if podfile_path != "" %}podfile_path: {{ podfile_path }}{% endif %}
+{% if cartfile_path != "" %}cartfile_path: {{ cartfile_path }}{% endif %}
 
 ### Templates
 templates:

data/lib/generamba/code_generation/code_module.rb

@@ -2,11 +2,32 @@ module Generamba
 
   # Represents currently generating code module
   class CodeModule
-    attr_reader :name, :description, :author, :company, :year, :prefix, :project_name
+    attr_reader :name,
+                :description,
+                :module_file_path,
+                :module_group_path,
+                :test_file_path,
+                :test_group_path,
+                :project_targets,
+                :test_targets
 
-    def initialize(name, description)
+    def initialize(name, description, options)
       @name = name
       @description = description
+
+      @project_targets = options[:module_targets].split(',') if options[:module_targets]
+      @test_targets = options[:test_targets].split(',') if options[:test_targets]
+
+      @module_file_path = Pathname.new(options[:module_file_path]) if options[:module_file_path]
+      @module_group_path = Pathname.new(options[:module_group_path]) if options[:module_group_path]
+      @test_file_path = Pathname.new(options[:test_file_path]) if options[:test_file_path]
+      @test_group_path = Pathname.new(options[:test_group_path]) if options[:test_group_path]
+
+      # The priority is given to `module_path` and 'test_path' options
+      @module_file_path = Pathname.new(options[:module_path]) if options[:module_path]
+      @module_group_path = Pathname.new(options[:module_path]) if options[:module_path]
+      @test_file_path = Pathname.new(options[:test_path]) if options[:test_path]
+      @test_group_path = Pathname.new(options[:test_path]) if options[:test_path]
     end
 
     def author
@@ -28,5 +49,77 @@ module Generamba
     def project_name
       ProjectConfiguration.project_name
     end
+
+    def module_file_path
+      return @module_file_path != nil ?
+          @module_file_path :
+          Pathname.new(ProjectConfiguration.project_file_path)
+              .join(@name)
+    end
+
+    def module_group_path
+      return @module_group_path != nil ?
+          @module_group_path :
+          Pathname.new(ProjectConfiguration.project_group_path)
+              .join(@name)
+    end
+
+    def test_file_path
+      if @test_file_path == nil
+        if ProjectConfiguration.test_file_path == nil
+          return nil
+        end
+
+        return Pathname.new(ProjectConfiguration.test_file_path)
+                   .join(@name)
+      end
+      return @test_file_path
+    end
+
+    def test_group_path
+      if @test_group_path == nil
+        if ProjectConfiguration.test_group_path == nil
+          return nil
+        end
+
+        return Pathname.new(ProjectConfiguration.test_group_path)
+                   .join(@name)
+      end
+      return @test_group_path
+    end
+
+    def project_targets
+      targets = Array.new
+      if ProjectConfiguration.project_target != nil
+        targets = [ProjectConfiguration.project_target]
+      end
+
+      if ProjectConfiguration.project_targets != nil
+        targets = ProjectConfiguration.project_targets
+      end
+
+      if @project_targets != nil
+        targets = @project_targets
+      end
+
+      return targets
+    end
+
+    def test_targets
+      targets = Array.new
+      if ProjectConfiguration.test_target != nil
+        targets = [ProjectConfiguration.test_target]
+      end
+
+      if ProjectConfiguration.test_targets != nil
+        targets = ProjectConfiguration.test_targets
+      end
+
+      if @test_targets != nil
+        targets = @test_targets
+      end
+
+      return targets
+    end
   end
 end

data/lib/generamba/configuration/project_configuration.rb

@@ -5,5 +5,6 @@ module Generamba
   # A singletone class representing a Rambafile of the current project
   class ProjectConfiguration < Settingslogic
     source Dir.getwd + '/' + RAMBAFILE_NAME
+    suppress_errors(true)
   end
 end

data/lib/generamba/constants/rambafile_constants.rb

@@ -7,10 +7,12 @@ module Generamba
   XCODEPROJ_PATH_KEY = 'xcodeproj_path'
 
   PROJECT_TARGET_KEY = 'project_target'
+  PROJECT_TARGETS_KEY = 'project_targets'
   PROJECT_FILE_PATH_KEY = 'project_file_path'
   PROJECT_GROUP_PATH_KEY = 'project_group_path'
 
   TEST_TARGET_KEY = 'test_target'
+  TEST_TARGETS_KEY = 'test_targets'
   TEST_FILE_PATH_KEY = 'test_file_path'
   TEST_GROUP_PATH_KEY = 'test_group_path'
 

data/lib/generamba/helpers/rambafile_validator.rb

@@ -12,23 +12,33 @@ module Generamba
       mandatory_fields = [COMPANY_KEY,
                           PROJECT_NAME_KEY,
                           XCODEPROJ_PATH_KEY,
-                          PROJECT_TARGET_KEY,
                           PROJECT_FILE_PATH_KEY,
                           PROJECT_GROUP_PATH_KEY,
-                          TEST_TARGET_KEY,
-                          TEST_FILE_PATH_KEY,
-                          TEST_GROUP_PATH_KEY,
                           TEMPLATES_KEY]
 
-      mandatory_fields.each { |field|
+      interchangable_fields = [[PROJECT_TARGETS_KEY, PROJECT_TARGET_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*."
+          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)
+        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
+
+        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
-      }
+      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*."
+        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)
       end
 

data/lib/generamba/helpers/template_helper.rb

@@ -23,7 +23,7 @@ module Generamba
                  .join(TEMPLATES_FOLDER)
                  .join(template_name)
 
-      error_description = "Cannot find #{template_name}! Add it to the Rambafile and run *generamba template install*"
+      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
 
       return path

data/lib/generamba/helpers/xcodeproj_helper.rb

@@ -11,33 +11,23 @@ module Generamba
       Xcodeproj::Project.open(project_name)
     end
 
-    # Returns an AbstractTarget class for a given name
-    # @param target_name [String] The name of the target
-    # @param project [Xcodeproj::Project] The target xcodeproj file
-    #
-    # @return [Xcodeproj::AbstractTarget]
-    def self.obtain_target(target_name, project)
-      project.targets.each { |target|
-        if target.name == target_name
-          return target
-        end
-      }
-    end
-
     # Adds a provided file to a specific Project and Target
     # @param project [Xcodeproj::Project] The target xcodeproj file
-    # @param target [AbstractTarget] The target for a file
+    # @param targets [AbstractTarget] Array of tatgets
     # @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_target(project, target, group_path, file_path)
+    def self.add_file_to_project_and_targets(project, targets, group_path, file_path)
       module_group = self.retreive_or_create_group(group_path, project)
       xcode_file = module_group.new_file(File.absolute_path(file_path))
 
       file_name = File.basename(file_path)
       if File.extname(file_name) == '.m'
-        target.add_file_references([xcode_file])
+        targets.each do |target|
+          xcode_target = self.obtain_target(target, project)
+          xcode_target.add_file_references([xcode_file])
+        end
       end
     end
 
@@ -75,6 +65,22 @@ module Generamba
       return final_group
     end
 
+    # Returns an AbstractTarget class for a given name
+    # @param target_name [String] The name of the target
+    # @param project [Xcodeproj::Project] The target xcodeproj file
+    #
+    # @return [Xcodeproj::AbstractTarget]
+    def self.obtain_target(target_name, project)
+      project.targets.each do |target|
+        if target.name == target_name
+          return target
+        end
+      end
+
+      error_description = "Cannot find a target with name #{target_name} in Xcode project".red
+      raise StandardError.new(error_description)
+    end
+
     # Splits the provided Xcode group path to an array of separate groups
     # @param group_path The full group path
     #

data/lib/generamba/module_generator.rb

@@ -7,61 +7,56 @@ module Generamba
 	# Responsible for creating the whole code module using information from the CLI
 	class ModuleGenerator
 
-		def generate_module(template_name, name, description)
-			# Setting up CodeModule and ModuleTemplate objects.
-			# TODO: Move it to the CLI infrastructure
-			code_module = CodeModule.new(name, description)
-			template = ModuleTemplate.new(template_name)
-
+		def generate_module(name, code_module, template)
 			# Setting up Xcode objects
 			project = XcodeprojHelper.obtain_project(ProjectConfiguration.xcodeproj_path)
-			project_target = XcodeprojHelper.obtain_target(ProjectConfiguration.project_target,
-																										 project)
-			test_target = XcodeprojHelper.obtain_target(ProjectConfiguration.test_target,
-																									project)
 
 			# Configuring file paths
-			module_dir_path = Pathname.new(ProjectConfiguration.project_file_path)
-														.join(name)
-			test_dir_path = Pathname.new(ProjectConfiguration.test_file_path)
-													.join(name)
-			FileUtils.mkdir_p module_dir_path
-			FileUtils.mkdir_p test_dir_path
+			FileUtils.mkdir_p code_module.module_file_path
 
-			# Configuring group paths
-			module_group_path = Pathname.new(ProjectConfiguration.project_group_path)
-															.join(name)
-			test_group_path = Pathname.new(ProjectConfiguration.test_group_path)
-														.join(name)
+			if code_module.test_file_path != nil
+				FileUtils.mkdir_p code_module.test_file_path
+			end
 
 			# Creating code files
 			puts('Creating code files...')
-			process_files(template.code_files,
-										name,
-									 	code_module,
-									 	template,
-										project,
-									 	project_target,
-										module_group_path,
-										module_dir_path)
+			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)
 
 			# Creating test files
 			puts('Creating test files...')
-			process_files(template.test_files,
-										name,
-										code_module,
-										template,
-										project,
-										test_target,
-										test_group_path,
-										test_dir_path)
+			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)
 
 			# Saving the current changes in the Xcode project
 			project.save
-			puts("Module #{name} successfully created!")
+			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)
 		end
 
-		def process_files(files, name, code_module, template, project, target, group_path, dir_path)
+		def process_files_if_needed(files, name, code_module, template, project, targets, group_path, dir_path)
+			# It's possible that current project doesn't test targets configured, so it doesn't need to generate tests.
+			# The same is for files property - a template can have only test or project files
+			if targets.count == 0 || files == nil || files.count == 0 || dir_path == nil || group_path == nil
+				return
+			end
+
 			XcodeprojHelper.clear_group(project, group_path)
 			files.each do |file|
 				# The target file's name consists of three parameters: project prefix, module name and template file name.
@@ -87,8 +82,8 @@ module Generamba
 				end
 
 				# Creating the file in the Xcode project
-				XcodeprojHelper.add_file_to_project_and_target(project,
-																											 target,
+				XcodeprojHelper.add_file_to_project_and_targets(project,
+																											 targets,
 																											 group_path.join(file_group),
 																											 file_path)
 			end

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

@@ -0,0 +1,27 @@
+require 'git'
+
+module Generamba
+
+  # Provides the functionality to download template catalogs from the remote repository
+  class CatalogDownloader
+
+    # Clones a template catalog from a remote repository
+    #
+    # @param name [String] The name of the template catalog
+    # @param url [String] The url of the repository
+    #
+    # @return [Pathname] A filepath to the downloaded catalog
+    def download_catalog(name, url)
+      catalog_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
+
+      Git.clone(url, name, :path => catalog_local_path)
+
+      return catalog_local_path
+                 .join(name)
+    end
+  end
+end

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

@@ -21,13 +21,13 @@ module Generamba
       rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_path)
 
       if rambaspec_exist == false
-        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the template catalog. Try another name."
+        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the template catalog. Try another name.".red
         raise StandardError.new(error_description)
       end
 
       rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_path)
       if rambaspec_valid == false
-        error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid."
+        error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
       end
 

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

@@ -13,13 +13,13 @@ module Generamba
       rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, local_path)
 
       if rambaspec_exist == false
-        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the specified directory. Try another path or name."
+        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
-        error_description = "#{template_name + RAMBASPEC_EXTENSION} is not 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

@@ -22,13 +22,13 @@ module Generamba
       rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_dir)
       if rambaspec_exist == false
         FileUtils.rm_rf(temp_path)
-        error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the root directory of specified repository."
+        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
-        error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid."
+        error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
       end
 

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

@@ -2,6 +2,7 @@ require 'generamba/template/processor/template_declaration.rb'
 require 'generamba/template/installer/local_installer.rb'
 require 'generamba/template/installer/remote_installer.rb'
 require 'generamba/template/installer/catalog_installer.rb'
+require 'generamba/template/helpers/catalog_downloader.rb'
 require 'git'
 
 module Generamba
@@ -22,7 +23,7 @@ module Generamba
       }
 
       if !templates || templates.count == 0
-        error_description = 'You must specify at least one template in Rambafile under the key *project_templates*'
+        error_description = 'You must specify at least one template in Rambafile under the key *project_templates*'.red
         raise StandardError.new(error_description)
       end
 
@@ -51,13 +52,8 @@ module Generamba
 
       puts('Updating shared generamba-catalog specs...')
 
-      catalog_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
-
-      Git.clone(RAMBLER_CATALOG_REPO, GENERAMBA_CATALOG_NAME, :path => catalog_local_path)
+      downloader = CatalogDownloader.new
+      downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
     end
 
     # Provides the appropriate strategy for a given template type

data/lib/generamba/tools/string-colorize.rb

@@ -0,0 +1,23 @@
+# Adds a number of methods for colorizing output strings
+class String
+
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
+  def blue
+    colorize(34)
+  end
+end

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -165,6 +165,8 @@ files:
 - lib/generamba/cli/template/template_create_command.rb
 - lib/generamba/cli/template/template_group.rb
 - lib/generamba/cli/template/template_install_command.rb
+- lib/generamba/cli/template/template_list_command.rb
+- lib/generamba/cli/template/template_search_command.rb
 - lib/generamba/cli/thor_extension.rb
 - lib/generamba/code_generation/Rambafile.liquid
 - lib/generamba/code_generation/code_module.rb
@@ -186,6 +188,7 @@ files:
 - lib/generamba/template/creator/new_template/Tests/Service/service_tests.m.liquid
 - lib/generamba/template/creator/new_template/template.rambaspec.liquid
 - lib/generamba/template/creator/template_creator.rb
+- lib/generamba/template/helpers/catalog_downloader.rb
 - lib/generamba/template/helpers/rambaspec_validator.rb
 - lib/generamba/template/installer/abstract_installer.rb
 - lib/generamba/template/installer/catalog_installer.rb
@@ -193,6 +196,7 @@ files:
 - lib/generamba/template/installer/remote_installer.rb
 - lib/generamba/template/processor/template_declaration.rb
 - lib/generamba/template/processor/template_processor.rb
+- lib/generamba/tools/string-colorize.rb
 - lib/generamba/version.rb
 homepage: https://github.com/rambler-ios/Generamba
 licenses: