generamba 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e0536cf5d817ae13ea91bae5486c78bf904105
-  data.tar.gz: 968e719a76cdf580d9e0a7e9778cec1632c5ce45
+  metadata.gz: 04129f5e6777daf44ff8abc73838ae0faa4d4143
+  data.tar.gz: 8deecaf4017ca3f9260625254b20847de3788356
 SHA512:
-  metadata.gz: c05b963e09b56a990cf53f6a1cd913207755a49f8dae728d2a993034c1f917b7ea1463d6cab24d81eeed0082a730970c7c7aeae49a00cffca9bfd4fdad994dfa
-  data.tar.gz: 24a00a2acaaa7f1d69d6f4b64e6321b7bb7b63871083286cc3b86ce0f821bce15f72288d4020b44fd69b103fa5a2a0d5aa6696739c0610239f53287f8b3771bb
+  metadata.gz: d39bf225fadf01ff2edd26de5d808fe35e3efea4294bce452df27ebe4f9b46d3582e8091c05f2a67c1ba24ac0d51a8e851b5e7359f6dabdb46642c5531d9dc37
+  data.tar.gz: 4824dbce92c86b7c53816fe89487661b048f307558964c6e6b3f151633473258f7142b98442460bb69b64eeda482d4d557591978c825fced3e8d44a7a9a74383

data/.travis.yml

@@ -2,4 +2,4 @@ os:
   - osx
 language: ruby
 rvm:
-  - 2.1.6
+  - 2.2.1

data/CHANGELOG.md

@@ -1,11 +1,35 @@
 # Change Log
 
+## [0.7.5](https://github.com/rambler-ios/Generamba/tree/0.7.5) (2016-04-24)
+[Full Changelog](https://github.com/rambler-ios/Generamba/compare/0.7.4...0.7.5)
+
+**Implemented enhancements:**
+
+- Get templates from git by specific a branch [\#104](https://github.com/rambler-ios/Generamba/issues/104)
+
+**Fixed bugs:**
+
+- Generamba generator: Could not find 'generamba' [\#103](https://github.com/rambler-ios/Generamba/issues/103)
+- Layout issue in "Summary for gen module" [\#95](https://github.com/rambler-ios/Generamba/issues/95)
+
+**Closed issues:**
+
+- Module Name in .rambaspec support [\#102](https://github.com/rambler-ios/Generamba/issues/102)
+- Generate with project and tests targets in command line [\#97](https://github.com/rambler-ios/Generamba/issues/97)
+- Easy setup template path to local templates in Rambafile [\#94](https://github.com/rambler-ios/Generamba/issues/94)
+
+**Merged pull requests:**
+
+- Fixed \#104 [\#106](https://github.com/rambler-ios/Generamba/pull/106) ([Beniamiiin](https://github.com/Beniamiiin))
+- Fixed \#95 [\#105](https://github.com/rambler-ios/Generamba/pull/105) ([Beniamiiin](https://github.com/Beniamiiin))
+
 ## [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:**
@@ -23,7 +47,6 @@
 
 - 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)
 
 **Closed issues:**
 
@@ -42,6 +65,8 @@
 **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:**
@@ -50,7 +75,6 @@
 - Git 1.2.9.1 [\#57](https://github.com/rambler-ios/Generamba/issues/57)
 - 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)
@@ -78,7 +102,6 @@
 - Add a `generamba template search` command [\#26](https://github.com/rambler-ios/Generamba/issues/26)
 - Add a `generamba template list` command [\#25](https://github.com/rambler-ios/Generamba/issues/25)
 - Add the if statements to the Rambafile.liquid [\#22](https://github.com/rambler-ios/Generamba/issues/22)
-- Target membership for module sources [\#11](https://github.com/rambler-ios/Generamba/issues/11)
 
 **Fixed bugs:**
 
@@ -91,6 +114,7 @@
 **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:**
 
@@ -99,10 +123,6 @@
 ## [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)
 
-**Implemented enhancements:**
-
-- Add Rambafile validation [\#10](https://github.com/rambler-ios/Generamba/issues/10)
-
 **Fixed bugs:**
 
 - The author name should be configured without `generamba setup` [\#31](https://github.com/rambler-ios/Generamba/issues/31)
@@ -112,7 +132,6 @@
 **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)
@@ -121,15 +140,10 @@
 
 - Add a podfile\_path/cartfile\_path fields to a Rambafile [\#19](https://github.com/rambler-ios/Generamba/issues/19)
 - Add a dependencies field to the .rambaspec [\#18](https://github.com/rambler-ios/Generamba/issues/18)
-- 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)
 
 **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)
 
 ## [0.5.0](https://github.com/rambler-ios/Generamba/tree/0.5.0) (2015-11-01)
 

data/README.md

@@ -2,6 +2,7 @@
 
 [![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)
+[![Code Climate](https://codeclimate.com/github/rambler-ios/Generamba/badges/gpa.svg)](https://codeclimate.com/github/rambler-ios/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).
 

data/generamba.gemspec

@@ -30,5 +30,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'
+  spec.add_development_dependency 'fakefs', '~> 0.6.1'
 end

data/lib/generamba/cli/gen_command.rb

@@ -12,6 +12,7 @@ module Generamba::CLI
 
     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 :author, :desc => 'Specifies the author name for generated 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'

data/lib/generamba/cli/setup_command.rb

@@ -70,6 +70,15 @@ module Generamba::CLI
                                                            'Cartfile')
       end
 
+      should_add_templates = yes?('Do you want to add some well known templates to the Rambafile? (yes/no)')
+      if should_add_templates
+        properties[TEMPLATES_KEY] = [
+            '{name: rviper_controller}',
+            '{name: mvvm_controller}',
+            '{name: swifty_viper}'
+        ]
+      end
+
       properties[PROJECT_TARGET_KEY] = project_target.name
       properties[PROJECT_FILE_PATH_KEY] = project_file_path
       properties[PROJECT_GROUP_PATH_KEY] = project_group_path
@@ -88,11 +97,16 @@ module Generamba::CLI
 
       PrintTable.print_values(
           values: properties,
-          title: "Summary for generamba setup"
+          title: 'Summary for generamba setup'
       )
 
       Generamba::RambafileGenerator.create_rambafile(properties)
-      puts('Rambafile successfully created! Now add some templates to the Rambafile and run `generamba template install`.'.green)
+      if should_add_templates
+        puts('Rambafile successfully created! Now run `generamba template install`.'.green)
+      else
+        puts('Rambafile successfully created!\n Go on and find some templates in our catalog using `generamba template list` command.\n Add any of them to the Rambafile and run `generamba template install`.'.green)
+      end
+
     end
   end
 end

data/lib/generamba/code_generation/Rambafile.liquid

@@ -33,6 +33,8 @@ test_group_path: {{ test_group_path }}{% endif %}
 
 ### Templates
 templates:
-#- {name: local_template_name, local: 'absolute/file/path'}
+{% if templates.size > 0 %}{% for item in templates %}- {{ item }}
+{% endfor %}{% else %}#- {name: local_template_name, local: 'absolute/file/path'}
 #- {name: remote_template_name, git: 'https://github.com/igrekde/remote_template'}
-#- {name: catalog_template_name}
+#- {name: catalog_template_name}
+{% endif %}

data/lib/generamba/code_generation/code_module.rb

@@ -23,7 +23,12 @@ module Generamba
       @name = name
       @description = description
 
-      @author = UserPreferences.obtain_username
+      if rambafile[AUTHOR_NAME_KEY] != nil
+        @author = rambafile[AUTHOR_NAME_KEY]
+      else
+        @author = UserPreferences.obtain_username
+      end
+
       @company = rambafile[COMPANY_KEY]
       @year = Time.now.year.to_s
 
@@ -44,6 +49,7 @@ module Generamba
       @test_targets = rambafile[TEST_TARGETS_KEY] if rambafile[TEST_TARGETS_KEY] != nil
 
       # Options adaptation
+      @author = options[:author] if options[:author]
       @project_targets = options[:module_targets].split(',') if options[:module_targets]
       @test_targets = options[:test_targets].split(',') if options[:test_targets]
 

data/lib/generamba/code_generation/content_generator.rb

@@ -22,7 +22,9 @@ module Generamba
 					'name' => code_module.name,
 					'file_name' => file_name,
 					'description' => code_module.description,
-					'project_name' => code_module.project_name
+					'project_name' => code_module.project_name,
+					'project_targets' => code_module.project_targets,
+					'test_targets' => code_module.test_targets
 			}
 
 			developer = {

data/lib/generamba/constants/rambafile_constants.rb

@@ -2,6 +2,7 @@ module Generamba
 
   # Keys of Rambafile files
   COMPANY_KEY = 'company'
+  AUTHOR_NAME_KEY = 'author'
   PROJECT_NAME_KEY = 'project_name'
   PROJECT_PREFIX_KEY = 'prefix'
   XCODEPROJ_PATH_KEY = 'xcodeproj_path'

data/lib/generamba/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.1
 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.
@@ -166,7 +166,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,71 +0,0 @@
-PATH
-  remote: .
-  specs:
-    generamba (0.7.4)
-      cocoapods-core (= 0.39.0)
-      git (= 1.2.9.1)
-      liquid (= 3.0.6)
-      terminal-table (= 1.4.5)
-      thor (= 0.19.1)
-      xcodeproj (= 0.28.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    claide (0.9.1)
-    cocoapods-core (0.39.0)
-      activesupport (>= 4.0.2)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-    colored (1.2)
-    diff-lcs (1.2.5)
-    fakefs (0.6.7)
-    fuzzy_match (2.0.4)
-    git (1.2.9.1)
-    i18n (0.7.0)
-    json (1.8.3)
-    liquid (3.0.6)
-    minitest (5.8.4)
-    nap (1.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    terminal-table (1.4.5)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    xcodeproj (0.28.2)
-      activesupport (>= 3)
-      claide (~> 0.9.1)
-      colored (~> 1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.10)
-  fakefs (~> 0.6)
-  generamba!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.11.2