generamba 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25fd879d1e1ee8d3207d476da127fcb08fcfdd5
-  data.tar.gz: eed7ef7a0a606908dc0bf9833ab653b9ad74e993
+  metadata.gz: 7dc501f252222516eac75ae4ce0111181043e982
+  data.tar.gz: 4e4b25ff2df471bd2c4e1daa8261787749cffca2
 SHA512:
-  metadata.gz: 7b73f00f33b102a49e4c76cd5a2442533827a5eabb9705d3f9bef6c0a98ab94bd96a52be8a3518921ca8d803e8b81f15647e10741eb4a898cc26dde8de191942
-  data.tar.gz: a81ba5d21f02796dd6ef4f20baa93538325fee01f9afcc7eb90208509506f8ece559badb1b82d271a36a18ccaa702ea22235f8f57374d92df1ba74d63ffe8bc6
+  metadata.gz: d865768cd0dc64bf901bce59b128acea1fb44d3540c6c0eb9b85093b52bc7a1a78428650d5bdf954733cd9a37ebb30d6117f3b34d2aa0622ff077e2330e2a745
+  data.tar.gz: b663fa970dd38613403b5ae00e5923275123455a985874700c8be232d0ca459d9b6eaf4e95399c806f7f56095e9df30442d0dc8ddf5a050189404d7e4108e602

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    generamba (0.7.1)
+    generamba (0.7.2)
+      cocoapods-core (= 0.39.0)
       git (= 1.2.9.1)
       liquid (= 3.0.6)
       thor (= 0.19.1)
@@ -18,14 +19,20 @@ GEM
       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.3)
+    minitest (5.8.4)
+    nap (1.0.0)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/generamba.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'liquid', '3.0.6'
   spec.add_runtime_dependency 'tilt', '2.0.1'
   spec.add_runtime_dependency 'git', '1.2.9.1'
+  spec.add_runtime_dependency 'cocoapods-core', '0.39.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/generamba.rb

@@ -1,5 +1,3 @@
-require 'xcodeproj'
-
 module Generamba
   require 'generamba/constants/constants.rb'
   require 'generamba/constants/rambafile_constants.rb'

data/lib/generamba/cli/gen_command.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'generamba/helpers/rambafile_validator.rb'
 require 'generamba/helpers/xcodeproj_helper.rb'
+require 'generamba/helpers/dependency_checker.rb'
 
 module Generamba::CLI
   class Application < Thor
@@ -40,6 +41,8 @@ module Generamba::CLI
       template = ModuleTemplate.new(template_name)
       code_module = CodeModule.new(module_name, module_description, rambafile, options)
 
+      DependencyChecker.check_all_required_dependencies_has_in_podfile(template.dependencies, code_module.podfile_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/template/template_list_command.rb

@@ -1,4 +1,5 @@
-require 'generamba/template/helpers/catalog_downloader.rb'
+require 'generamba/template/helpers/catalog_downloader'
+require 'generamba/template/helpers/catalog_template_list_helper'
 
 module Generamba::CLI
   class Template < Thor
@@ -7,15 +8,18 @@ module Generamba::CLI
     desc 'list', 'Prints out the list of all templates available in the shared GitHub catalog'
     def list
       downloader = CatalogDownloader.new
-      generamba_catalog_path = downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+      catalog_template_list_helper = CatalogTemplateListHelper.new
 
-      generamba_catalog_path.children.select { |child|
-        child.directory? && child.split.last.to_s[0] != '.'
-      }.map { |template_path|
-        template_path.split.last.to_s
-      }.each { |template_name|
+      templates = []
+      catalog_paths = downloader.update_all_catalogs_and_return_filepaths
+      catalog_paths.each do |path|
+        templates += catalog_template_list_helper.obtain_all_templates_from_a_catalog(path)
+        templates = templates.uniq
+      end
+
+      templates.each do |template_name|
         puts(template_name)
-      }
+      end
     end
   end
 end

data/lib/generamba/cli/template/template_search_command.rb

@@ -1,4 +1,5 @@
 require 'generamba/template/helpers/catalog_downloader.rb'
+require 'generamba/template/helpers/catalog_template_search_helper'
 
 module Generamba::CLI
   class Template < Thor
@@ -7,15 +8,17 @@ module Generamba::CLI
     desc 'search [SEARCH_STRING]', 'Searches a template with a given name in the shared GitHub catalog'
     def search(term)
       downloader = CatalogDownloader.new
-      generamba_catalog_path = downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
+      catalog_template_search_helper = CatalogTemplateSearchHelper.new
 
-      generamba_catalog_path.children.select { |child|
-        child.directory? && child.split.last.to_s[0] != '.'
-      }.map { |template_path|
-        template_path.split.last.to_s
-      }.select { |template_name|
-        template_name.include?(term)
-      }.map { |template_name|
+      catalog_paths = downloader.update_all_catalogs_and_return_filepaths
+
+      templates = []
+      catalog_paths.each do |path|
+        templates += catalog_template_search_helper.search_templates_in_a_catalog(path, term)
+        templates = templates.uniq
+      end
+
+      templates.map { |template_name|
         keywords = term.squeeze.strip.split(' ').compact.uniq
         matcher = Regexp.new('(' + keywords.join('|') + ')')
         template_name.gsub(matcher) { |match| "#{match}".yellow }

data/lib/generamba/code_generation/code_module.rb

@@ -15,7 +15,8 @@ module Generamba
                 :test_file_path,
                 :test_group_path,
                 :project_targets,
-                :test_targets
+                :test_targets,
+                :podfile_path
 
     def initialize(name, description, rambafile, options)
       # Base initialization
@@ -56,6 +57,8 @@ module Generamba
       @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]
+
+      @podfile_path = rambafile[PODFILE_PATH_KEY] if rambafile[PODFILE_PATH_KEY] != nil
     end
   end
 end

data/lib/generamba/code_generation/module_template.rb

@@ -4,16 +4,17 @@ module Generamba
 
   # Represents a single Generamba module template
   class ModuleTemplate
-    attr_reader :template_name, :template_path, :code_files, :test_files
+    attr_reader :template_name, :template_path, :code_files, :test_files, :dependencies
 
     def initialize(name)
       spec_path = TemplateHelper.obtain_spec(name)
       spec = YAML.load_file(spec_path)
-
+      
       @code_files = spec[TEMPLATE_CODE_FILES_KEY]
       @test_files = spec[TEMPLATE_TEST_FILES_KEY]
       @template_name = spec[TEMPLATE_NAME_KEY]
       @template_path = TemplateHelper.obtain_path(name)
+      @dependencies = spec[TEMPLATE_DEPENDENCIES_KEY]
     end
   end
 end

data/lib/generamba/helpers/dependency_checker.rb

@@ -0,0 +1,36 @@
+require 'cocoapods-core'
+
+module Generamba
+
+  # Provides methods for check dependencies from rambaspec in podfile
+  class DependencyChecker
+
+    # Check podfile for dependencies
+    # @param dependencies [Array] Array of dependencies name
+    # @param podfile_path [String] String of Podfile path
+    #
+    # @return [void]
+    def self.check_all_required_dependencies_has_in_podfile(dependencies, podfile_path)
+      return if !dependencies or dependencies.count == 0 or !podfile_path
+
+      dependencies_names = []
+      Pod::Podfile.from_file(Pathname.new(podfile_path)).dependencies.each do |dependency|
+        dependencies_names.push(dependency.name.gsub(/ .*/, ''))
+      end
+
+      not_existing_dependency = []
+
+      dependencies.each do |dependency_name|
+        unless dependencies_names.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 Podfile".yellow
+      end
+    end
+
+  end
+
+end

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

@@ -5,6 +5,33 @@ module Generamba
   # Provides the functionality to download template catalogs from the remote repository
   class CatalogDownloader
 
+    # Updates all of the template catalogs and returns their filepaths.
+    # If there is a Rambafile in the current directory, it also updates all of the catalogs specified there.
+    #
+    # @return [Array] An array of filepaths to downloaded catalogs
+    def update_all_catalogs_and_return_filepaths
+      does_rambafile_exist = Dir[RAMBAFILE_NAME].count > 0
+
+      if does_rambafile_exist
+        rambafile = YAML.load_file(RAMBAFILE_NAME)
+        catalogs = rambafile[CATALOGS_KEY]
+      end
+
+      terminator = CatalogTerminator.new
+      terminator.remove_all_catalogs
+
+      catalog_paths = [download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)]
+
+      if catalogs != nil && catalogs.count > 0
+        catalogs.each do |catalog_url|
+          catalog_name = catalog_url.split('://').last
+          catalog_name = catalog_name.gsub('/', '-');
+          catalog_paths.push(download_catalog(catalog_name, catalog_url))
+        end
+      end
+      return catalog_paths
+    end
+
     # Clones a template catalog from a remote repository
     #
     # @param name [String] The name of the template catalog
@@ -18,7 +45,12 @@ module Generamba
       current_catalog_path = catalogs_local_path
                                  .join(name)
 
-      Git.clone(url, name, :path => catalogs_local_path)
+      if File.exists?(current_catalog_path)
+        g = Git.open(current_catalog_path)
+        g.pull
+      else
+        Git.clone(url, name, :path => catalogs_local_path)
+      end
 
       return current_catalog_path
     end

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

@@ -0,0 +1,23 @@
+module Generamba
+
+  # Provides the functionality to list all of the templates, available in the catalog
+  class CatalogTemplateListHelper
+
+    # Finds out all of the templates located in a catalog
+    #
+    # @param catalog_path [Pathname] The path to a template catalog
+    #
+    # @return [Array] An array with template names
+    def obtain_all_templates_from_a_catalog(catalog_path)
+      template_names = []
+      catalog_path.children.select { |child|
+        File.directory?(child) && child.split.last.to_s[0] != '.'
+      }.map { |template_path|
+        template_path.split.last.to_s
+      }.each { |template_name|
+        template_names.push(template_name)
+      }
+      return template_names
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Generamba
+
+  # Provides the functionality to search templates, in catalogs
+  class CatalogTemplateSearchHelper
+
+    # Finds out all of the templates located in a catalog
+    #
+    # @param catalog_path [Pathname] The path to a template catalog
+    #
+    # @return [Array] An array with template names
+    def search_templates_in_a_catalog(catalog_path, search_term)
+      template_names = []
+
+      catalog_path.children.select { |child|
+        File.directory?(child) && child.split.last.to_s[0] != '.'
+      }.map { |template_path|
+        template_path.split.last.to_s
+      }.select { |template_name|
+        template_name.include?(search_term)
+      }.each { |template_name|
+        template_names.push(template_name)
+      }
+
+      return template_names
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Generamba
+
+  # Provides a functionality to terminate all previously installed catalogs
+  #
+  # @return [Void]
+  class CatalogTerminator
+    def remove_all_catalogs
+      catalogs_path = Pathname.new(ENV['HOME'])
+                          .join(GENERAMBA_HOME_DIR)
+                          .join(CATALOGS_DIR)
+      if Dir.exist?(catalogs_path) == false
+        FileUtils.mkdir_p catalogs_path
+      end
+      catalogs_path.children.select { |child|
+        child.directory? && child.split.last.to_s[0] != '.'
+      }.each { |catalog_path|
+        FileUtils.rm_rf(catalog_path)
+      }
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require 'generamba/template/installer/local_installer.rb'
 require 'generamba/template/installer/remote_installer.rb'
 require 'generamba/template/installer/catalog_installer.rb'
 require 'generamba/template/helpers/catalog_downloader.rb'
+require 'generamba/template/helpers/catalog_terminator'
 require 'git'
 
 module Generamba
@@ -56,7 +57,8 @@ module Generamba
 
       return unless needs_update
 
-      remove_all_catalogs
+      terminator = CatalogTerminator.new
+      terminator.remove_all_catalogs
       puts('Updating shared generamba-catalog specs...')
       @catalog_downloader.download_catalog(GENERAMBA_CATALOG_NAME, RAMBLER_CATALOG_REPO)
 
@@ -69,19 +71,5 @@ module Generamba
         @catalog_downloader.download_catalog(catalog_name, catalog_url)
       end
     end
-
-    def remove_all_catalogs
-      catalogs_path = Pathname.new(ENV['HOME'])
-                          .join(GENERAMBA_HOME_DIR)
-                          .join(CATALOGS_DIR)
-      if Dir.exist?(catalogs_path) == false
-        FileUtils.mkdir_p catalogs_path
-      end
-      catalogs_path.children.select { |child|
-        child.directory? && child.split.last.to_s[0] != '.'
-      }.each { |catalog_path|
-        FileUtils.rm_rf(catalog_path)
-      }
-    end
   end
 end

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -81,6 +81,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.9.1
+- !ruby/object:Gem::Dependency
+  name: cocoapods-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.39.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,7 @@ files:
 - lib/generamba/constants/rambafile_constants.rb
 - lib/generamba/constants/rambaspec_constants.rb
 - lib/generamba/constants/user_preferences_constants.rb
+- lib/generamba/helpers/dependency_checker.rb
 - lib/generamba/helpers/rambafile_validator.rb
 - lib/generamba/helpers/template_helper.rb
 - lib/generamba/helpers/xcodeproj_helper.rb
@@ -190,6 +205,9 @@ files:
 - lib/generamba/template/creator/new_template/template.rambaspec.liquid
 - lib/generamba/template/creator/template_creator.rb
 - lib/generamba/template/helpers/catalog_downloader.rb
+- lib/generamba/template/helpers/catalog_template_list_helper.rb
+- lib/generamba/template/helpers/catalog_template_search_helper.rb
+- lib/generamba/template/helpers/catalog_terminator.rb
 - lib/generamba/template/helpers/rambaspec_validator.rb
 - lib/generamba/template/installer/abstract_installer.rb
 - lib/generamba/template/installer/catalog_installer.rb