generamba-mp 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0770fa2f33612f677ccf90e241af8663805979
-  data.tar.gz: 045bad5f2e6e4ed7536c94171acc3759892e2ade
+  metadata.gz: 4cf24c7bef74d63bd1a60fa24e1a13d8acfaf652
+  data.tar.gz: fafff07f593f7d39d2be0aaea8e1749f1007d535
 SHA512:
-  metadata.gz: 4bc14232ae967ac4bc900956f6955f7581d226632cf840a18850b0538ae8e3b2b3dfb2b2a65add5cf31d0e92623a468e1be358a9531e46d5abda5803701fb908
-  data.tar.gz: b35a706ca0a71f15be84efd5888d59f226b4c3b52077db5af4eb9e0e25acab229bfe712d4a19bb454747f068ff3e1ec4710ffdaf939cdbe5dbe8a119363cf02f
+  metadata.gz: 00aace9efe6aec620ed780c8a374a54c01d6715cacf5a7cab0c0aae8a04b2f11bc699485d605c7abfce113a921f54985a3975f3acd14d720b4d35b267bb3b728
+  data.tar.gz: 9c578a7ff41873246efba781363ff3914f306339ac86af4e942b49b68c2b654160159248e34ea96d43dfa5d01b8769beb71089deaae89740645634fe247fba30

data/.vscode/launch.json

@@ -0,0 +1,64 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug Local File",
+      "type": "Ruby",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/bin/generamba"
+    },
+    {
+      "name": "Listen for rdebug-ide",
+      "type": "Ruby",
+      "request": "attach",
+      "cwd": "${workspaceRoot}",
+      "remoteHost": "127.0.0.1",
+      "remotePort": "1234",
+      "remoteWorkspaceRoot": "${workspaceRoot}"
+    },
+    {
+      "name": "Rails server",
+      "type": "Ruby",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/bin/rails",
+      "args": [
+        "server"
+      ]
+    },
+    {
+      "name": "RSpec - all",
+      "type": "Ruby",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/bin/rspec",
+      "args": [
+        "-I",
+        "${workspaceRoot}"
+      ]
+    },
+    {
+      "name": "RSpec - active spec file only",
+      "type": "Ruby",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/bin/rspec",
+      "args": [
+        "-I",
+        "${workspaceRoot}",
+        "${file}"
+      ]
+    },
+    {
+      "name": "Cucumber",
+      "type": "Ruby",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "program": "${workspaceRoot}/bin/cucumber"
+    }
+  ]
+}

data/generamba.gemspec

@@ -5,13 +5,13 @@ require 'generamba/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'generamba-mp'
-  spec.version       = '0.0.3'
-  spec.authors       = ['Marton Pito']
+  spec.version       = '0.0.5'
+  spec.authors       = ['Egor Tolstoy', 'Andrey Zarembo', 'Beniamin Sarkisyan', 'Aleksandr Sychev','Marton Pito']
   spec.email         = 'martonpito@gmail.com'
 
-  spec.summary       = 'Generamba forked for own modifications.'
+  spec.summary       = 'FORKED FOR OWN USAGE! Advanced code generator for Xcode projects with a nice and flexible template system.'
   spec.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.'
-  spec.homepage      = 'https://github.com/Hunartimon/Generamba'
+  spec.homepage      = 'https://github.com/rambler-digital-solutions/Generamba'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/lib/generamba/cli/cli.rb

@@ -8,9 +8,9 @@ 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'
+require 'generamba/tools/liquid-camelcase.rb'
 
 module Generamba::CLI
 	class Application < Thor
-		
 	end
 end

data/lib/generamba/cli/gen_command.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'liquid'
 require 'generamba/helpers/print_table.rb'
 require 'generamba/helpers/rambafile_validator.rb'
 require 'generamba/helpers/xcodeproj_helper.rb'
@@ -58,15 +59,20 @@ module Generamba::CLI
       DependencyChecker.check_all_required_dependencies_has_in_cartfile(template.dependencies, code_module.cartfile_path)
 
       project = XcodeprojHelper.obtain_project(code_module.xcodeproj_path)
-      module_group_already_exists = XcodeprojHelper.module_with_group_path_already_exists(project, code_module.project_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
+
+      template.code_files.each do |file|
+        file_group = File.join(code_module.project_group_path, "/", File.dirname(file[TEMPLATE_NAME_KEY]))
+
+        if XcodeprojHelper.module_with_group_path_already_exists(project, file_group)          
+          replace_exists_module = yes?("#{module_name} module already exists. Replace? (yes/no)")
+          
+          unless replace_exists_module
+            return
+          else 
+            break
+          end
+        end 
+      end 
 
       generator = Generamba::ModuleGenerator.new
       generator.generate_module(module_name, code_module, template)

data/lib/generamba/code_generation/code_module.rb

@@ -81,7 +81,8 @@ module Generamba
           file_path = group_path unless file_path
 
           variable_value = file_path.gsub(SLASH_REGEX, '')
-          variable_value = Pathname.new(variable_value).join(@name)
+          variable_value = Pathname.new(variable_value)#.join(@name)
+          puts("setup_file_and_group_paths variable_value: #{variable_value}")
           instance_variable_set("@#{variable_name}", variable_value)
         end
 
@@ -91,7 +92,8 @@ module Generamba
           group_path = file_path unless group_path
 
           variable_value = group_path.gsub(SLASH_REGEX, '')
-          variable_value = Pathname.new(variable_value).join(@name)
+          variable_value = Pathname.new(variable_value)#.join(@name)
+          puts("setup_file_and_group_paths variable_value: #{variable_value}")
           instance_variable_set("@#{variable_name}", variable_value)
         end
       end

data/lib/generamba/helpers/xcodeproj_helper.rb

@@ -24,6 +24,8 @@ module Generamba
       file_path = file_path.join(file_group_path) if file_group_path
       file_path = file_path.join(file_name) if file_name
 
+      puts "add_file_to_project_and_targets file_path: #{file_path}"
+
       module_group = self.retrieve_group_or_create_if_needed(group_path, dir_path, file_group_path, project, true)
       xcode_file = module_group.new_file(File.absolute_path(file_path))
 
@@ -46,6 +48,7 @@ module Generamba
     #
     # @return [void]
     def self.add_group_to_project(project, group_path, dir_path, directory_name)
+      puts "add_group_to_project: group_path: #{group_path}, dir_path: #{dir_path}, directory_name:  #{directory_name} "
       self.retrieve_group_or_create_if_needed(group_path, dir_path, directory_name, project, true)
     end
 
@@ -72,9 +75,11 @@ module Generamba
     # @return [Void]
     def self.clear_group(project, targets_name, group_path)
       module_group = self.retrieve_group_or_create_if_needed(group_path, nil, nil, project, false)
+      puts "clear_group: group_path: #{group_path} module_group: #{module_group}"
       return unless module_group
 
       files_path = self.files_path_from_group(module_group, project)
+      puts "clear_group: group_path: #{group_path} files_path: #{files_path}"
       return unless files_path
 
       files_path.each do |file_path|
@@ -105,15 +110,16 @@ module Generamba
     #
     # @return [PBXGroup]
     def self.retrieve_group_or_create_if_needed(group_path, dir_path, file_group_path, project, create_group_if_not_exists)
+      
       group_names = path_names_from_path(group_path)
       group_components_count = group_names.count
       group_names += path_names_from_path(file_group_path) if file_group_path
-
+      puts "retrieve_group_or_create_if_needed group_names: #{group_names}" unless create_group_if_not_exists
       final_group = project
 
       group_names.each_with_index do |group_name, index|
         next_group = final_group[group_name]
-
+        # puts "retrieve_group_or_create_if_needed next_group: #{next_group}" unless create_group_if_not_exists
         unless next_group
           return nil unless create_group_if_not_exists
 
@@ -126,7 +132,7 @@ module Generamba
 
         final_group = next_group
       end
-
+      # puts "final_group: #{final_group}" unless create_group_if_not_exists
       final_group
     end
 

data/lib/generamba/module_generator.rb

@@ -55,25 +55,32 @@ module Generamba
 		def process_files_if_needed(files, code_module, template, project, targets, group_path, dir_path, processed_groups = [])
 			# 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
+			puts "process_files_if_needed: group_path: #{group_path}\n dir_path: #{dir_path}\n"
 			if targets.count == 0 || files == nil || files.count == 0 || dir_path == nil || group_path == nil
 				return
 			end
 
-			XcodeprojHelper.clear_group(project, targets, group_path) unless processed_groups.include? group_path
 			files.each do |file|
-				unless file[TEMPLATE_FILE_PATH_KEY]
 
+				file_group = File.dirname(file[TEMPLATE_NAME_KEY])
+				file_group = nil if file_group == '.'
+
+				unless processed_groups.include? File.join(group_path, "/", file_group)
+					# puts "process_files_if_needed: file_group: #{File.join(group_path, "/", file_group)}"
+					XcodeprojHelper.clear_group(project, targets, File.join(group_path, "/", file_group))
+					processed_groups.push(File.join(group_path, "/", file_group))
+				end
+
+				unless file[TEMPLATE_FILE_PATH_KEY]
 					directory_name = file[TEMPLATE_NAME_KEY].gsub(/^\/|\/$/, '')
 					file_group = dir_path.join(directory_name)
 
 					FileUtils.mkdir_p file_group
 					XcodeprojHelper.add_group_to_project(project, group_path, dir_path, directory_name)
+
 					next
 				end
 
-				# file_group = File.dirname(file[TEMPLATE_NAME_KEY])
-				file_group = nil if file_group == '.'
-
 				module_info = ModuleInfoGenerator.new(code_module)
 
 				# Generating the content of the code file and it's name

data/lib/generamba/tools/liquid-camelcase.rb

@@ -0,0 +1,14 @@
+require 'liquid'
+require 'uri'
+
+# Camelize all words of the input
+module Camelize
+
+  def camelize(term)
+    string = term.to_s
+    return string.camelize(:lower)
+  end
+
+end
+
+Liquid::Template.register_filter(Camelize)

metadata

@@ -1,14 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: generamba-mp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
+- Egor Tolstoy
+- Andrey Zarembo
+- Beniamin Sarkisyan
+- Aleksandr Sychev
 - Marton Pito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -179,10 +183,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".vscode/launch.json"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -242,9 +248,10 @@ files:
 - 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/liquid-camelcase.rb
 - lib/generamba/tools/string-colorize.rb
 - lib/generamba/version.rb
-homepage: https://github.com/Hunartimon/Generamba
+homepage: https://github.com/rambler-digital-solutions/Generamba
 licenses:
 - MIT
 metadata: {}
@@ -267,5 +274,6 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Generamba forked for own modifications.
+summary: FORKED FOR OWN USAGE! Advanced code generator for Xcode projects with a nice
+  and flexible template system.
 test_files: []