viperaptor 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58922aa6f479200b1c9099a373bed766afdb88d9beaea7be8ea508a85b71440
-  data.tar.gz: 8d9e4a20456d7f2c675269b4574e72ce27dc5ca2f86d629a7895d65cbcaeb0e6
+  metadata.gz: 511d4e53992bbd033fa123803fc86f1c4b16aa0bc1fefbadf6524a9349f0151a
+  data.tar.gz: 459fd4cbc7ebf43e9ff8b27cc2a1d3bf7502d57ab16004007f06a6185e1230b1
 SHA512:
-  metadata.gz: fb3a10779f5e0dfb0edc9d83a7114fe4a43c8baa5ca507b882c09f006fcda61986264e8aae8a480ddd91946f863b527d4bbe075c6579ae61a2371b4299924860
-  data.tar.gz: 838bc157c71d2216fe479db47af6a20349b5b4dd15ac9e240491053de314b5c78e6e6ee7a72eb4e9f854de8c5b4bed52558b4967c88f100f39e58f1648361f88
+  metadata.gz: b643fec7143d92ff355466771c2d20c809933207b22fbea6f0666b30ddc3d69f83f96634ce0e87449378dc3dad7204e300138278d68c2100ef33b4d5192f2e68
+  data.tar.gz: 7ae375baddc38e7135bb4e42acde87c44499841ae487567bf21a434e595e38e11f92e87161c85b76a46eac39966966e5283ec9db976cc0ee1e630489c1d2e12d

data/lib/viperaptor/cli/gen_command.rb

@@ -1,40 +1,39 @@
-require 'thor'
+require "thor"
 require "tty-prompt"
-require 'set'
-require 'viperaptor/helpers/print_table.rb'
-require 'viperaptor/helpers/rambafile.rb'
-require 'viperaptor/helpers/xcodeproj_helper.rb'
-require 'viperaptor/helpers/dependency_checker.rb'
-require 'viperaptor/helpers/gen_command_table_parameters_formatter.rb'
-require 'viperaptor/helpers/module_validator.rb'
-require 'viperaptor/helpers/module_info_generator.rb'
+require "set"
+require "viperaptor/helpers/print_table.rb"
+require "viperaptor/helpers/rambafile.rb"
+require "viperaptor/helpers/xcodeproj_helper.rb"
+require "viperaptor/helpers/dependency_checker.rb"
+require "viperaptor/helpers/gen_command_table_parameters_formatter.rb"
+require "viperaptor/helpers/module_validator.rb"
+require "viperaptor/helpers/module_info_generator.rb"
 
 module Viperaptor::CLI
   class Application < Thor
-
     include Viperaptor
 
-    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 :rambafile, :desc => 'Specifies Rambafile to use'
-    method_option :project_targets, :desc => 'Specifies project targets for adding new module files'
-    method_option :project_file_path, :desc => 'Specifies a location in the filesystem for new files'
-    method_option :project_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'
-    method_option :custom_parameters, :type => :hash, :default => {}, :desc => 'Specifies extra parameters in format `key1:value1 key2:value2` for usage during code generation'
-    def gen(module_name = nil, template_name = nil)
+    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 :rambafile, :desc => "Specifies Rambafile to use"
+    method_option :project_targets, :desc => "Specifies project targets for adding new module files"
+    method_option :project_file_path, :desc => "Specifies a location in the filesystem for new files"
+    method_option :project_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"
+    method_option :custom_parameters, :type => :hash, :default => {}, :desc => "Specifies extra parameters in format `key1:value1 key2:value2` for usage during code generation"
 
+    def gen(module_name = nil, template_name = nil)
       Rambafile.use(options[:rambafile])
 
       does_rambafile_exist = Rambafile.exist
 
       unless does_rambafile_exist
-        puts('Rambafile not found! Run `viperaptor setup` in the working directory instead!'.red)
+        puts("Rambafile not found! Run `viperaptor setup` in the working directory instead!".red)
         return
       end
 
@@ -55,15 +54,15 @@ module Viperaptor::CLI
       templates_as_set = Set.new(templates.map { |t| t["name"] })
       templates = templates.concat(TemplateHelper.global_templates.select { |t| !templates_as_set.include?(t) }.map { |name| { "name" => name } }).sort_by { |t| t["name"] }
 
-      filter = rambafile[TEMPLATES_FILTER_KEY] || ''
+      filter = rambafile[TEMPLATES_FILTER_KEY] || ""
 
       if !filter.kind_of?(Array)
         filter = [filter]
       end
 
       filter = filter.map { |f| f.strip }.select { |f| !f.empty? }
-      negative_filters = filter.select { |f| f.start_with?('!') }.map { |f| f[1...] }.map { |f| Regexp.new(f, Regexp::IGNORECASE) }
-      positive_filters = filter.select { |f| !f.start_with?('!') }.map { |f| Regexp.new(f, Regexp::IGNORECASE) }
+      negative_filters = filter.select { |f| f.start_with?("!") }.map { |f| f[1...] }.map { |f| Regexp.new(f, Regexp::IGNORECASE) }
+      positive_filters = filter.select { |f| !f.start_with?("!") }.map { |f| Regexp.new(f, Regexp::IGNORECASE) }
       original_templates = templates
 
       if original_templates.count == 0
@@ -72,7 +71,6 @@ module Viperaptor::CLI
       end
 
       templates = templates.select do |t|
-
         if filter.count == 0
           next true
         end
@@ -110,8 +108,8 @@ module Viperaptor::CLI
 
       parameters = GenCommandTableParametersFormatter.prepare_parameters_for_displaying(code_module, template_name)
       PrintTable.print_values(
-          values: parameters,
-          title: "Summary for gen #{module_name}"
+        values: parameters,
+        title: "Summary for gen #{module_name}",
       )
 
       DependencyChecker.check_all_required_dependencies_has_in_podfile(template.dependencies, code_module.podfile_path)
@@ -122,7 +120,7 @@ module Viperaptor::CLI
 
       if module_group_already_exists
         replace_exists_module = yes?("#{module_name} module already exists. Replace? (yes/no)")
-      
+
         unless replace_exists_module
           return
         end
@@ -131,6 +129,5 @@ module Viperaptor::CLI
       generator = Viperaptor::ModuleGenerator.new
       generator.generate_module(module_name, code_module, template)
     end
-
   end
-end
+end

data/lib/viperaptor/code_generation/content_generator.rb

@@ -14,7 +14,7 @@ module Viperaptor
     # @return [String], [String] The generated file_name and body
 		def self.create_file(file, scope, template)
 
-			custom_parameters = template.custom_parameters
+			custom_parameters = template.custom_parameters || {}
 			scope['custom_parameters'] = (scope['custom_parameters'] || {}).merge(custom_parameters)
 
 			file_source = IO.read(template.template_path.join(file[TEMPLATE_FILE_PATH_KEY]))

data/lib/viperaptor/code_generation/module_template.rb

@@ -1,4 +1,4 @@
-require 'viperaptor/helpers/template_helper.rb'
+require "viperaptor/helpers/template_helper.rb"
 require "tty-prompt"
 
 module Viperaptor
@@ -7,30 +7,74 @@ module Viperaptor
   class ModuleTemplate
     attr_reader :template_name, :template_path, :code_files, :test_files, :dependencies, :custom_parameters
 
-    def load_variables_from_spec(spec)
+    def load_custom_parameters_from_spec(spec)
       custom_parameters = spec[TEMPLATE_CUSTOM_PARAMETERS_KEY]
-      @custom_parameters = {}
+      result = {}
       unless custom_parameters.nil?
-        custom_parameters.sort_by { |a| (a['order'] || 0) }.map do |desc|
-          if desc["type"].is_a?(Array)
-            prompt = TTY::Prompt.new
-            choices = desc["type"]
-            value = prompt.select("Select #{desc["description"]}?", choices, per_page: choices.count)
-            @custom_parameters[desc["name"]] = value
-          elsif desc["type"] == 'boolean'
-            prompt = TTY::Prompt.new
-            value = prompt.yes?("#{desc["description"]}?")
-            @custom_parameters[desc["name"]] = value
-          elsif desc["type"] == 'text'
-            prompt = TTY::Prompt.new
-            value = prompt.ask("#{desc["description"]}?")
-            @custom_parameters[desc["name"]] = value
-          else
-            puts("ERROR: Invalid variable type of template custom parameter '#{desc['name']}'".red)
-            exit(1)
+        custom_parameters.sort_by { |a| (a["order"] || 0) }.each do |desc|
+          skip = false
+
+          if !desc["only_if"].nil? && desc["only_if"].is_a?(Hash)
+            desc["only_if"].each do |key, value|
+              if value.is_a?(Array)
+                if result[key].nil?
+                  puts("ERROR: Required custom_parameter '#{key}' not defined".red)
+                  exit(1)
+                end
+
+                if !value.include?(result[key])
+                  skip = true
+                  break
+                end
+              end
+            end
+          end
+
+          if !skip
+            if !desc["only_if"].nil? && desc["only_if_not"].is_a?(Hash)
+              desc["only_if"].each do |key, value|
+                if value.is_a?(Array)
+                  if result[key].nil?
+                    break
+                  end
+
+                  if value.include?(result[key])
+                    skip = true
+                    break
+                  end
+                end
+              end
+            end
+          end
+
+          if !skip
+            if desc["options"].instance_of?(Array)
+              prompt = TTY::Prompt.new
+              choices = desc["options"]
+              value = prompt.select("#{desc["description"]}?", choices, per_page: choices.count)
+
+              case value
+              when "yes"
+                value = "true"
+              when "no"
+                value = "false"
+              else
+                #
+              end
+
+              result[desc["name"]] = value
+            elsif desc["options"].nil?
+              prompt = TTY::Prompt.new
+              value = prompt.ask("#{desc["description"]}?")
+              result[desc["name"]] = value
+            else
+              puts("ERROR: Invalid variable 'options' of template custom parameter '#{desc["name"]}'".red)
+              exit(1)
+            end
           end
         end
       end
+      return result
     end
 
     def initialize(name, options = nil)
@@ -45,14 +89,33 @@ module Viperaptor
         spec = YAML.load(spec_content)
       end
 
-      load_variables_from_spec(spec)
-      if !@custom_parameters.empty? && !options.nil?
+      viperaptor = spec[TEMPLATE_VIPERAPTOR_KEY]
+      if !viperaptor.nil? && Gem::Version.new(Viperaptor::VERSION) < Gem::Version.new(viperaptor)
+        puts("ERROR: Your viperaptor version is '#{Viperaptor::VERSION}' template requires '#{viperaptor}'. Please update it.".red)
+        exit(1)
+      end
+
+      custom_parameters = load_custom_parameters_from_spec(spec)
+
+      if !custom_parameters.empty? && !options.nil?
         spec_source = IO.read(spec_path)
         spec_template = Liquid::Template.parse(spec_source)
-        spec_content = spec_template.render(options.merge(@custom_parameters))
+
+        if options["custom_parameters"].nil?
+          options["custom_parameters"] = {}
+        end
+
+        new_options = options["custom_parameters"].merge(custom_parameters)
+
+        new_options.each_key do |k|
+          options["custom_parameters"][k] = new_options[k]
+        end
+
+        spec_content = spec_template.render(options)
         spec = YAML.load(spec_content)
       end
 
+      @custom_parameters = options["custom_parameters"]
       @code_files = spec[TEMPLATE_CODE_FILES_KEY]
       @test_files = spec[TEMPLATE_TEST_FILES_KEY]
       @template_name = spec[TEMPLATE_NAME_KEY]
@@ -60,4 +123,4 @@ module Viperaptor
       @dependencies = spec[TEMPLATE_DEPENDENCIES_KEY]
     end
   end
-end
+end

data/lib/viperaptor/constants/rambaspec_constants.rb

@@ -1,19 +1,20 @@
 module Viperaptor
 
   # Keys of .rambaspec files
-  TEMPLATE_NAME_KEY = 'name'
-  TEMPLATE_SUMMARY_KEY = 'summary'
-  TEMPLATE_AUTHOR_KEY = 'author'
-  TEMPLATE_VERSION_KEY = 'version'
-  TEMPLATE_LICENSE_KEY = 'license'
+  TEMPLATE_NAME_KEY = "name"
+  TEMPLATE_SUMMARY_KEY = "summary"
+  TEMPLATE_AUTHOR_KEY = "author"
+  TEMPLATE_VERSION_KEY = "version"
+  TEMPLATE_LICENSE_KEY = "license"
 
-  TEMPLATE_CODE_FILES_KEY = 'code_files'
-  TEMPLATE_TEST_FILES_KEY = 'test_files'
-  TEMPLATE_FILE_NAME_KEY = 'name'
-  TEMPLATE_FILE_CUSTOM_NAME_KEY = 'custom_name'
-  TEMPLATE_FILE_PATH_KEY = 'path'
-  TEMPLATE_FILE_IS_RESOURCE_KEY = 'is_resource'
-  TEMPLATE_CUSTOM_PARAMETERS_KEY = 'custom_parameters'
+  TEMPLATE_CODE_FILES_KEY = "code_files"
+  TEMPLATE_TEST_FILES_KEY = "test_files"
+  TEMPLATE_FILE_NAME_KEY = "name"
+  TEMPLATE_FILE_CUSTOM_NAME_KEY = "custom_name"
+  TEMPLATE_FILE_PATH_KEY = "path"
+  TEMPLATE_FILE_IS_RESOURCE_KEY = "is_resource"
+  TEMPLATE_CUSTOM_PARAMETERS_KEY = "custom_parameters"
 
-  TEMPLATE_DEPENDENCIES_KEY = 'dependencies'
-end
+  TEMPLATE_DEPENDENCIES_KEY = "dependencies"
+  TEMPLATE_VIPERAPTOR_KEY = "viperaptor"
+end

data/lib/viperaptor/version.rb

@@ -1,5 +1,5 @@
 module Viperaptor
-  VERSION = '2.1.0'
-  RELEASE_DATE = '01.02.2021'
+  VERSION = "2.2.0"
+  RELEASE_DATE = "24.06.2021"
   RELEASE_LINK = "https://github.com/ladeiko/Viperaptor/releases/tag/#{VERSION}"
 end

data/viperaptor.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '1.0.1'
   spec.add_runtime_dependency 'xcodeproj', '1.19.0'
   spec.add_runtime_dependency 'liquid', '4.0.3'
-  spec.add_runtime_dependency 'git', '1.7.0'
-  spec.add_runtime_dependency 'cocoapods-core', '1.10.0'
+  spec.add_runtime_dependency 'git', '1.8.1'
+  spec.add_runtime_dependency 'cocoapods-core', '1.10.1'
   spec.add_runtime_dependency 'terminal-table', '2.0.0'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.23.0'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.23.1'
 
   spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viperaptor
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Siarhei Ladzeika
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement