generamba 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5382f3daaa79b49658dadd60155a036352984dce
-  data.tar.gz: f27992a72f3ffda44ab213cec784c87a262f4732
+  metadata.gz: 42e0536cf5d817ae13ea91bae5486c78bf904105
+  data.tar.gz: 968e719a76cdf580d9e0a7e9778cec1632c5ce45
 SHA512:
-  metadata.gz: dfe52b2b9ebe991851955d30dd3ead8604927f7162742afede6142816a1f44a02c424f5cea3245e6e1346c983084fca48818166447f2e7d8e5c2853649b29082
-  data.tar.gz: 098b52bdc639a2e86ecb79797574ec1d42d4f1809b17e849bf86e0eb2208f9a0e7908adb1b77a20aef231b4742fdde73ce6c3a5305ba9c31a1d0b33d349c4d14
+  metadata.gz: c05b963e09b56a990cf53f6a1cd913207755a49f8dae728d2a993034c1f917b7ea1463d6cab24d81eeed0082a730970c7c7aeae49a00cffca9bfd4fdad994dfa
+  data.tar.gz: 24a00a2acaaa7f1d69d6f4b64e6321b7bb7b63871083286cc3b86ce0f821bce15f72288d4020b44fd69b103fa5a2a0d5aa6696739c0610239f53287f8b3771bb

data/.gitignore

@@ -4,3 +4,5 @@
 .idea/modules.xml
 .idea/vcs.xml
 .idea/workspace.xml
+.rakeTasks
+encodings.xml

data/CHANGELOG.md

@@ -1,23 +1,20 @@
 # Change Log
 
-## [Unreleased](https://github.com/rambler-ios/Generamba/tree/HEAD)
-
-[Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.3...HEAD)
+## [0.7.4](https://github.com/rambler-ios/Generamba/tree/0.7.4) (2016-02-21)
+[Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.3...0.7.4)
 
 **Implemented enhancements:**
 
 - Asks the user if he needed tests in `generamba setup` command [\#85](https://github.com/rambler-ios/Generamba/issues/85)
-- Improve the visualization of commands with parameters [\#69](https://github.com/rambler-ios/Generamba/issues/69)
+- Can we introduce something similar to view partials in rails \(for duplicated parts of views\) [\#62](https://github.com/rambler-ios/Generamba/issues/62)
 
 **Fixed bugs:**
 
 - Add resources\(xib, storyboard and etc\) in project bundle resources. [\#84](https://github.com/rambler-ios/Generamba/issues/84)
 
-**Merged pull requests:**
+**Closed issues:**
 
-- Print table with summary info about input parameters [\#89](https://github.com/rambler-ios/Generamba/pull/89) ([Beniamiiin](https://github.com/Beniamiiin))
-- Handle any resources in template and correct add to project [\#88](https://github.com/rambler-ios/Generamba/pull/88) ([Beniamiiin](https://github.com/Beniamiiin))
-- Implemented new question, about need tests in `generamba setup` [\#87](https://github.com/rambler-ios/Generamba/pull/87) ([Beniamiiin](https://github.com/Beniamiiin))
+- Get "Liquid error: This liquid context does not allow includes." on all files in just generated module [\#93](https://github.com/rambler-ios/Generamba/issues/93)
 
 ## [0.7.3](https://github.com/rambler-ios/Generamba/tree/0.7.3) (2016-01-24)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.2...0.7.3)
@@ -27,17 +24,12 @@
 - Enhance `generamba template search` to search templates in custom catalogs [\#75](https://github.com/rambler-ios/Generamba/issues/75)
 - Enhance `generamba template list` to browse custom catalogs [\#74](https://github.com/rambler-ios/Generamba/issues/74)
 - Warn the user if template contains missing dependencies [\#17](https://github.com/rambler-ios/Generamba/issues/17)
-- Added method to check missing template dependencies in podfile [\#79](https://github.com/rambler-ios/Generamba/pull/79) ([Beniamiiin](https://github.com/Beniamiiin))
 
 **Closed issues:**
 
 - Can we use constants from rambafile in templates? [\#81](https://github.com/rambler-ios/Generamba/issues/81)
 - Arguments for `generamba gen Name modulename` [\#80](https://github.com/rambler-ios/Generamba/issues/80)
 
-**Merged pull requests:**
-
-- Fixed crash when templates directory exists. [\#78](https://github.com/rambler-ios/Generamba/pull/78) ([mogol](https://github.com/mogol))
-
 ## [0.7.2](https://github.com/rambler-ios/Generamba/tree/0.7.2) (2016-01-10)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.1...0.7.2)
 
@@ -50,25 +42,15 @@
 **Fixed bugs:**
 
 - Don't set target in swift projects [\#65](https://github.com/rambler-ios/Generamba/issues/65)
-- Errors if default path is empty [\#64](https://github.com/rambler-ios/Generamba/issues/64)
-- Default template set can not be used [\#60](https://github.com/rambler-ios/Generamba/issues/60)
 - Incorrect behavior when generate module which already exists [\#52](https://github.com/rambler-ios/Generamba/issues/52)
 
 **Closed issues:**
 
 - Can generamba be used to generate swift modules? [\#61](https://github.com/rambler-ios/Generamba/issues/61)
 - Git 1.2.9.1 [\#57](https://github.com/rambler-ios/Generamba/issues/57)
-
-**Merged pull requests:**
-
-- Feature/custom catalogs [\#73](https://github.com/rambler-ios/Generamba/pull/73) ([etolstoy](https://github.com/etolstoy))
-- Added `generamba version` command [\#67](https://github.com/rambler-ios/Generamba/pull/67) ([etolstoy](https://github.com/etolstoy))
-- Fixed \#64: Errors if default path is empty [\#66](https://github.com/rambler-ios/Generamba/pull/66) ([Beniamiiin](https://github.com/Beniamiiin))
-- Added error display, if not specify at least one template in Rambafile \#60 [\#63](https://github.com/rambler-ios/Generamba/pull/63) ([Beniamiiin](https://github.com/Beniamiiin))
-- Fixed \#52 - Incorrect behavior when generate module which already exists [\#59](https://github.com/rambler-ios/Generamba/pull/59) ([Beniamiiin](https://github.com/Beniamiiin))
-- docs, link to Rambafile when it mentioned [\#58](https://github.com/rambler-ios/Generamba/pull/58) ([MaksimBazarov](https://github.com/MaksimBazarov))
-- Fixed incorrect group path [\#56](https://github.com/rambler-ios/Generamba/pull/56) ([Beniamiiin](https://github.com/Beniamiiin))
-- Docs translated to english \(\#13\) [\#55](https://github.com/rambler-ios/Generamba/pull/55) ([novixon](https://github.com/novixon))
+- Clarify generamba parameters usage [\#51](https://github.com/rambler-ios/Generamba/issues/51)
+- Add documentation for liquid templates [\#48](https://github.com/rambler-ios/Generamba/issues/48)
+- The documentation is not translated into English [\#13](https://github.com/rambler-ios/Generamba/issues/13)
 
 ## [0.7.1](https://github.com/rambler-ios/Generamba/tree/0.7.1) (2015-12-20)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.0...0.7.1)
@@ -86,10 +68,6 @@
 
 - Add support for multiple targets during generamba setup [\#49](https://github.com/rambler-ios/Generamba/issues/49)
 
-**Merged pull requests:**
-
-- Feature/settingslogic remove [\#47](https://github.com/rambler-ios/Generamba/pull/47) ([etolstoy](https://github.com/etolstoy))
-
 ## [0.7.0](https://github.com/rambler-ios/Generamba/tree/0.7.0) (2015-12-13)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.6.2...0.7.0)
 
@@ -107,28 +85,17 @@
 - Non-informative error message when running `generamba template install` in the wrong directory [\#39](https://github.com/rambler-ios/Generamba/issues/39)
 - undefined method `each' for nil:NilClass \(NoMethodError\) [\#37](https://github.com/rambler-ios/Generamba/issues/37)
 
-**Merged pull requests:**
-
-- Feature/multiple targets [\#43](https://github.com/rambler-ios/Generamba/pull/43) ([etolstoy](https://github.com/etolstoy))
-- Feature/colored output [\#40](https://github.com/rambler-ios/Generamba/pull/40) ([etolstoy](https://github.com/etolstoy))
-- Feature/gen file flags [\#38](https://github.com/rambler-ios/Generamba/pull/38) ([etolstoy](https://github.com/etolstoy))
-
 ## [0.6.2](https://github.com/rambler-ios/Generamba/tree/0.6.2) (2015-11-25)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.6.1...0.6.2)
 
 **Fixed bugs:**
 
 - Can't install template from git repo  [\#36](https://github.com/rambler-ios/Generamba/issues/36)
-- Can't find template by local fullpath [\#35](https://github.com/rambler-ios/Generamba/issues/35)
 
 **Closed issues:**
 
 - Need more information about dependencies  [\#34](https://github.com/rambler-ios/Generamba/issues/34)
 
-**Merged pull requests:**
-
-- Mention the Ruby 2.2+ requirement in README [\#33](https://github.com/rambler-ios/Generamba/pull/33) ([rodionovd](https://github.com/rodionovd))
-
 ## [0.6.1](https://github.com/rambler-ios/Generamba/tree/0.6.1) (2015-11-21)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.6.0...0.6.1)
 
@@ -142,6 +109,11 @@
 - Sometimes Generamba fills in the wrong test target in the Rambafile [\#30](https://github.com/rambler-ios/Generamba/issues/30)
 - Seems that Generamba doesn't add project name to the headers [\#29](https://github.com/rambler-ios/Generamba/issues/29)
 
+**Closed issues:**
+
+- Add a documentation for a .rambaspec file and overall template structure [\#24](https://github.com/rambler-ios/Generamba/issues/24)
+- Rambafile format is not documented [\#9](https://github.com/rambler-ios/Generamba/issues/9)
+
 ## [0.6.0](https://github.com/rambler-ios/Generamba/tree/0.6.0) (2015-11-15)
 [Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.5.0...0.6.0)
 
@@ -152,24 +124,12 @@
 - Move the hardcoded keys to the constants [\#15](https://github.com/rambler-ios/Generamba/issues/15)
 - Implement automatic template creation [\#8](https://github.com/rambler-ios/Generamba/issues/8)
 - Change some of the questions of `generamba setup` [\#7](https://github.com/rambler-ios/Generamba/issues/7)
-- Implement installation of templates from the remote git repository [\#6](https://github.com/rambler-ios/Generamba/issues/6)
-- Implement installation of templates with local filepath [\#5](https://github.com/rambler-ios/Generamba/issues/5)
-- Remove the author-specific information from Rambafile [\#1](https://github.com/rambler-ios/Generamba/issues/1)
 
 **Fixed bugs:**
 
 - Rambafile uses absolute filepath to xcodeproj file [\#21](https://github.com/rambler-ios/Generamba/issues/21)
 - Duplicate file reference in project.pbxproj [\#20](https://github.com/rambler-ios/Generamba/issues/20)
 - Move the rambler\_viper\_controller template to the generamba-catalog [\#16](https://github.com/rambler-ios/Generamba/issues/16)
-- The output of `setup` command is splitted sometimes [\#4](https://github.com/rambler-ios/Generamba/issues/4)
-- Files are generated with incorrect filepaths [\#3](https://github.com/rambler-ios/Generamba/issues/3)
-
-**Merged pull requests:**
-
-- Feature/template creation [\#23](https://github.com/rambler-ios/Generamba/pull/23) ([etolstoy](https://github.com/etolstoy))
-- Added command: generamba template install [\#14](https://github.com/rambler-ios/Generamba/pull/14) ([etolstoy](https://github.com/etolstoy))
-- Feature/cli improvements [\#12](https://github.com/rambler-ios/Generamba/pull/12) ([AndreyZarembo](https://github.com/AndreyZarembo))
-- Master [\#2](https://github.com/rambler-ios/Generamba/pull/2) ([etolstoy](https://github.com/etolstoy))
 
 ## [0.5.0](https://github.com/rambler-ios/Generamba/tree/0.5.0) (2015-11-01)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    generamba (0.7.3)
+    generamba (0.7.4)
       cocoapods-core (= 0.39.0)
       git (= 1.2.9.1)
       liquid (= 3.0.6)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -32,7 +32,7 @@ GEM
     json (1.8.3)
     liquid (3.0.6)
     minitest (5.8.4)
-    nap (1.1.0)
+    nap (1.0.0)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/README.md

@@ -5,6 +5,8 @@
 
 **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).
 
+*We keep evolving Generamba:* [changelog](https://github.com/rambler-ios/Generamba/blob/develop/CHANGELOG.md), [release notes](https://github.com/rambler-ios/Generamba/releases).
+
 ![Generamba Screenshot](http://s24.postimg.org/gej9cg1cl/generamba.jpg)
 
 ### Key features
@@ -24,7 +26,7 @@ When necessary you can install the required Ruby version with the help of [`rvm`
 
 Run the command `gem install generamba`.
 
-### Using
+### Usage
 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.
@@ -41,6 +43,7 @@ Run `generamba help` to learn more about each of the Generamba features.
 
 **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))
+- [Introduction to Generamba](http://etolstoy.com/2016/02/10/generamba/)
 
 ### Authors
 

data/generamba.gemspec

@@ -6,7 +6,7 @@ require 'generamba/version'
 Gem::Specification.new do |spec|
   spec.name          = 'generamba'
   spec.version       = Generamba::VERSION
-  spec.authors       = ['Egor Tolstoy', 'Andrey Zarembo']
+  spec.authors       = ['Egor Tolstoy', 'Andrey Zarembo', 'Beniamin Sarkisyan']
   spec.email         = 'e.tolstoy@rambler-co.ru'
 
   spec.summary       = 'Advanced code generator for Xcode projects with a nice and flexible template system.'

data/lib/generamba/constants/rambafile_constants.rb

@@ -24,4 +24,5 @@ module Generamba
   TEMPLATE_DECLARATION_NAME_KEY = 'name'
   TEMPLATE_DECLARATION_LOCAL_KEY = 'local'
   TEMPLATE_DECLARATION_GIT_KEY = 'git'
+  TEMPLATE_DECLARATION_BRANCH_KEY = 'branch'
 end

data/lib/generamba/helpers/gen_command_table_parameters_formatter.rb

@@ -13,7 +13,7 @@ module Generamba
         templates.push(param['name'])
       end
 
-      params['templates'] = templates.join(', ')
+      params['templates'] = templates.join("\n")
 
       return params
     end

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

@@ -42,8 +42,7 @@ module Generamba
     # @return [Bool]
     def self.obtain_spec_path(template_name, template_path)
       spec_filename = template_name + RAMBASPEC_EXTENSION
-      Pathname.new(template_path)
-          .join(spec_filename)
+      Pathname.new(template_path).join(spec_filename)
     end
   end
 end

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

@@ -13,20 +13,27 @@ module Generamba
       puts("Installing #{template_name}...")
 
       repo_url = template_declaration.git
+      repo_branch = template_declaration.branch
 
       temp_path = Dir.tmpdir()
-      template_dir = Pathname.new(temp_path)
-                         .join(template_name)
-      Git.clone(repo_url, template_name, :path => temp_path)
+      template_dir = Pathname.new(temp_path).join(template_name)
+
+      if repo_branch != nil
+        Git.export(repo_url, template_name, :branch => repo_branch, :path => temp_path)
+      else
+        Git.clone(repo_url, template_name, :path => temp_path)
+      end
+
+      template_path = "#{template_dir}/#{template_name}"
 
-      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_dir)
+      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_path)
       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)
+      rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_path)
       unless rambaspec_valid
         error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
@@ -35,7 +42,7 @@ module Generamba
       install_path = Pathname.new(TEMPLATES_FOLDER)
                          .join(template_name)
       FileUtils.mkdir_p install_path
-      FileUtils.copy_entry(template_dir, install_path)
+      FileUtils.copy_entry(template_path, install_path)
 
       FileUtils.rm_rf(temp_path)
     end

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

@@ -15,12 +15,13 @@ module Generamba
   # Describes a Generamba template declaration model
   class TemplateDeclaration
 
-    attr_reader :name, :local, :git, :type
+    attr_reader :name, :local, :git, :branch, :type
 
     def initialize(template_hash)
       @name = template_hash[TEMPLATE_DECLARATION_NAME_KEY]
       @local = template_hash[TEMPLATE_DECLARATION_LOCAL_KEY]
       @git = template_hash[TEMPLATE_DECLARATION_GIT_KEY]
+      @branch = template_hash[TEMPLATE_DECLARATION_BRANCH_KEY]
 
       @type = TemplateDeclarationType::LOCAL_TEMPLATE if @local
       @type = TemplateDeclarationType::REMOTE_TEMPLATE if @git

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Egor Tolstoy
 - Andrey Zarembo
+- Beniamin Sarkisyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor