generamba 0.7.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b7d38bed5812d081bc9af321e8f0b42b05315ad
-  data.tar.gz: 1bf9e9e8721031880b58a854028a8769e34ad31b
+  metadata.gz: 40260eafddc1f86ef6b3583e592e0fe6f0716efe
+  data.tar.gz: 525027d7e7ab9a936c4d5843da3903ffc30a3d1f
 SHA512:
-  metadata.gz: 5cff9119fe6f9329a0d9bbd008568396dac8c6b91c2e4004d0933684b47df98744ad9fbc5d798549a4a5fbef455363c5cd82cb347e517c4ca6e03e69d28ae2be
-  data.tar.gz: 669f7d7e3979766e6b68837ec2720390ec9722b4318c2b7d960df4be2402d8899daa8091f26b4b1018a201e8e1fdb147a202c712dfd10ff727a362cb3da0bf65
+  metadata.gz: a135a4822acac9d8524d94b18a986252d700826ba464369979ac46d5066bf603b4aba54c50b88a381bb665a1244b4a8076803fa0abd1d252671307d5aa5d4ae7
+  data.tar.gz: 911f34694191b513c6bf47f8bacccbfc1559b39dea7d298dfcd38080fa6f2348da8fcc6abac898fae1ab1e62a64e1f3ed7af13f77db1e81363dc524f192d11f7

data/generamba.gemspec

@@ -21,14 +21,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2'
 
   spec.add_runtime_dependency 'thor', '0.19.1'
-  spec.add_runtime_dependency 'xcodeproj', '0.28.2'
+  spec.add_runtime_dependency 'xcodeproj', '1.2.0'
   spec.add_runtime_dependency 'liquid', '3.0.6'
   spec.add_runtime_dependency 'git', '1.2.9.1'
-  spec.add_runtime_dependency 'cocoapods-core', '0.39.0'
+  spec.add_runtime_dependency 'cocoapods-core', '1.0.1'
   spec.add_runtime_dependency 'terminal-table', '1.4.5'
 
   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.1'
+  # ActiveSupport dependency is not used by dashramba; instead some other dependency
+  # requires it. We lock it to 4.2.7 so as to avoid using 5.0, which is
+  # not compatible with older versions of Ruby.
+  spec.add_development_dependency 'activesupport', '~> 4.2.7'
 end

data/lib/generamba/cli/gen_command.rb

@@ -21,6 +21,7 @@ module Generamba::CLI
     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, template_name)
 
       does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
@@ -51,6 +52,7 @@ module Generamba::CLI
       code_module = CodeModule.new(module_name, module_description, rambafile, options)
 
       DependencyChecker.check_all_required_dependencies_has_in_podfile(template.dependencies, code_module.podfile_path)
+      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.module_group_path)

data/lib/generamba/cli/version_command.rb

@@ -7,7 +7,19 @@ module Generamba::CLI
 
     desc 'version', 'Prints out Generamba current version'
     def version
-      puts(Generamba::VERSION.green)
+      options = {}
+      options['Version'] = Generamba::VERSION.green
+      options['Release date'] = Generamba::RELEASE_DATE.green
+      options['Change notes'] = Generamba::RELEASE_LINK.green
+
+      values = []
+
+      options.each do |title, value|
+        values.push("#{title}: #{value}")
+      end
+
+      output = values.join("\n")
+      puts(output)
     end
   end
 end

data/lib/generamba/code_generation/code_module.rb

@@ -1,5 +1,7 @@
 module Generamba
 
+  SLASH_REGEX = /^\/|\/$/
+
   # Represents currently generating code module
   class CodeModule
     attr_reader :name,
@@ -16,7 +18,9 @@ module Generamba
                 :test_group_path,
                 :project_targets,
                 :test_targets,
-                :podfile_path
+                :podfile_path,
+                :cartfile_path,
+                :custom_parameters
 
     def initialize(name, description, rambafile, options)
       # Base initialization
@@ -48,23 +52,49 @@ module Generamba
       @test_targets = [rambafile[TEST_TARGET_KEY]] if rambafile[TEST_TARGET_KEY] != nil
       @test_targets = rambafile[TEST_TARGETS_KEY] if rambafile[TEST_TARGETS_KEY] != nil
 
+      # Custom parameters
+      @custom_parameters = options[:custom_parameters]
+
       # 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]
 
-      @module_file_path = Pathname.new(options[:module_file_path]).join(@name) if options[:module_file_path]
-      @module_group_path = Pathname.new(options[:module_group_path]).join(@name) if options[:module_group_path]
-      @test_file_path = Pathname.new(options[:test_file_path]).join(@name) if options[:test_file_path]
-      @test_group_path = Pathname.new(options[:test_group_path]).join(@name) if options[:test_group_path]
+      if options[:module_file_path]
+        @module_file_path = options[:module_file_path].gsub(SLASH_REGEX, '')
+        @module_file_path = Pathname.new(@module_file_path).join(@name)
+      end
+
+      if options[:module_group_path]
+        @module_group_path = options[:module_group_path].gsub(SLASH_REGEX, '')
+        @module_group_path = Pathname.new(@module_group_path).join(@name)
+      end
+
+      if options[:test_file_path]
+        @test_file_path = options[:test_file_path].gsub(SLASH_REGEX, '')
+        @test_file_path = Pathname.new(@test_file_path).join(@name)
+      end
+
+      if options[:test_group_path]
+        @test_group_path = options[:test_group_path].gsub(SLASH_REGEX, '')
+        @test_group_path = Pathname.new(@test_group_path).join(@name)
+      end
 
       # The priority is given to `module_path` and 'test_path' options
-      @module_file_path = Pathname.new(options[:module_path]).join(@name) if options[:module_path]
-      @module_group_path = Pathname.new(options[:module_path]).join(@name) if options[:module_path]
-      @test_file_path = Pathname.new(options[:test_path]).join(@name) if options[:test_path]
-      @test_group_path = Pathname.new(options[:test_path]).join(@name) if options[:test_path]
+      if options[:module_path]
+        @module_path = options[:module_path].gsub(SLASH_REGEX, '')
+        @module_file_path = Pathname.new(@module_path).join(@name)
+        @module_group_path = Pathname.new(@module_path).join(@name)
+      end
+
+      if options[:test_path]
+        @test_path = options[:test_path].gsub(SLASH_REGEX, '')
+        @test_file_path = Pathname.new(@test_path).join(@name)
+        @test_group_path = Pathname.new(@test_path).join(@name)
+      end
 
       @podfile_path = rambafile[PODFILE_PATH_KEY] if rambafile[PODFILE_PATH_KEY] != nil
+      @cartfile_path = rambafile[CARTFILE_PATH_KEY] if rambafile[CARTFILE_PATH_KEY] != nil
     end
   end
 end

data/lib/generamba/code_generation/content_generator.rb

@@ -38,7 +38,8 @@ module Generamba
 					'date' => Time.now.strftime('%d/%m/%Y'),
 					'developer' => developer,
 					'module_info' => module_info,
-					'prefix' => code_module.prefix
+					'prefix' => code_module.prefix,
+					'custom_parameters' => code_module.custom_parameters
 			}
       
 			module_info['file_basename'] = file_basename

data/lib/generamba/helpers/dependency_checker.rb

@@ -5,7 +5,7 @@ module Generamba
   # Provides methods for check dependencies from rambaspec in podfile
   class DependencyChecker
 
-    # Check podfile for dependencies
+    # Check Podfile for dependencies
     # @param dependencies [Array] Array of dependencies name
     # @param podfile_path [String] String of Podfile path
     #
@@ -31,6 +31,28 @@ module Generamba
       end
     end
 
+    # Check Cartfile for dependencies
+    # @param dependencies [Array] Array of dependencies name
+    # @param cartfile_path [String] String of Podfile path
+    #
+    # @return [void]
+    def self.check_all_required_dependencies_has_in_cartfile(dependencies, cartfile_path)
+      return if !dependencies or dependencies.count == 0 or !cartfile_path
+
+      cartfile_string = File.read(cartfile_path)
+
+      not_existing_dependency = []
+      dependencies.each do |dependency_name|
+        unless cartfile_string.include?(dependency_name)
+          not_existing_dependency.push(dependency_name)
+        end
+      end
+
+      if not_existing_dependency.count > 0
+        puts "[Warning] Dependencies #{not_existing_dependency} missed in Cartfile".yellow
+      end
+    end
+
   end
 
 end

data/lib/generamba/helpers/xcodeproj_helper.rb

@@ -20,7 +20,7 @@ module Generamba
     #
     # @return [void]
     def self.add_file_to_project_and_targets(project, targets_name, group_path, file_path, file_type = nil)
-      module_group = self.retreive_group_or_create_if_needed(group_path, project, true)
+      module_group = self.retrieve_group_or_create_if_needed(group_path, project, true)
       xcode_file = module_group.new_file(File.absolute_path(file_path))
 
       file_name = File.basename(file_path)
@@ -34,10 +34,21 @@ module Generamba
             file_type = 'resource'
           end
         end
-        
-        self.add_file_to_target(xcode_target, xcode_file, file_type)
+
+        if file_type != nil
+          self.add_file_to_target(xcode_target, xcode_file, file_type)
+        end
       end
     end
+
+    # Adds a provided directory to a specific Project
+    # @param project [Xcodeproj::Project] The target xcodeproj file
+    # @param group_path [Pathname] The Xcode group path for current directory
+    #
+    # @return [void]
+    def self.add_group_to_project(project, group_path)
+      self.retrieve_group_or_create_if_needed(group_path, project, true)
+    end
     
     # Adds xcode file to target based on it's type
     # @param target [Xcodeproj::AbstractTarget] xcode target to use
@@ -77,7 +88,7 @@ module Generamba
     #
     # @return [Void]
     def self.clear_group(project, targets_name, group_path)
-      module_group = self.retreive_group_or_create_if_needed(group_path, project, false)
+      module_group = self.retrieve_group_or_create_if_needed(group_path, project, false)
       return unless module_group
 
       files_path = self.files_path_from_group(module_group, project)
@@ -96,7 +107,7 @@ module Generamba
     #
     # @return [TrueClass or FalseClass]
     def self.module_with_group_path_already_exists(project, group_path)
-      module_group = self.retreive_group_or_create_if_needed(group_path, project, false)
+      module_group = self.retrieve_group_or_create_if_needed(group_path, project, false)
       return module_group == nil ? false : true
     end
 
@@ -108,18 +119,19 @@ module Generamba
     # @param create_group_if_not_exists [TrueClass or FalseClass] If true notexistent group will be created
     #
     # @return [PBXGroup]
-    def self.retreive_group_or_create_if_needed(group_path, project, create_group_if_not_exists)
+    def self.retrieve_group_or_create_if_needed(group_path, project, create_group_if_not_exists)
       group_names = path_names_from_path(group_path)
 
       final_group = project
 
       group_names.each do |group_name|
         next_group = final_group[group_name]
+
         unless next_group
           unless create_group_if_not_exists
             return nil
           end
-            
+
           new_group_path = group_name
           next_group = final_group.new_group(group_name, new_group_path)
         end

data/lib/generamba/module_generator.rb

@@ -67,24 +67,30 @@ module Generamba
 
 			XcodeprojHelper.clear_group(project, targets, group_path)
 			files.each do |file|
-       
-				file_group = File.dirname(file[TEMPLATE_NAME_KEY])
-
-				# Generating the content of the code file and it's name
-				file_name, file_content = ContentGenerator.create_file(file, code_module, template)
-				file_path = dir_path.join(file_group)
-									.join(file_name)
-                  
-				# Creating the file in the filesystem
-				FileUtils.mkdir_p File.dirname(file_path)
-				File.open(file_path, 'w+') do |f|
-					f.write(file_content)
-				end
-        
-				file_type = file[TEMPLATE_FILE_FILETYPE_KEY]
+				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, file_group)
+				else
+					file_group = File.dirname(file[TEMPLATE_NAME_KEY])
+
+					# Generating the content of the code file and it's name
+					file_name, file_content = ContentGenerator.create_file(file, code_module, template)
+					file_path = dir_path.join(file_group).join(file_name)
 
-				# Creating the file in the Xcode project
-				XcodeprojHelper.add_file_to_project_and_targets(project, targets, group_path.join(file_group), file_path, file_type)
+					# Creating the file in the filesystem
+					FileUtils.mkdir_p File.dirname(file_path)
+					File.open(file_path, 'w+') do |f|
+						f.write(file_content)
+					end
+
+					file_type = file[TEMPLATE_FILE_FILETYPE_KEY]
+
+					# Creating the file in the Xcode project
+					XcodeprojHelper.add_file_to_project_and_targets(project, targets, group_path.join(file_group), file_path, file_type)
+				end
 			end
 		end
 	end

data/lib/generamba/version.rb

@@ -1,3 +1,5 @@
 module Generamba
-  VERSION = '0.7.8'
+  VERSION = '1.0.0'
+  RELEASE_DATE = '23.07.2016'
+  RELEASE_LINK = "https://github.com/rambler-ios/Generamba/releases/tag/#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.7
 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.