Fixed #104

strongself · Apr 11, 2016 · 112d0b3 · 112d0b3
1 parent bd6d67f
commit 112d0b3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/lib/generamba/constants/rambafile_constants.rb b/lib/generamba/constants/rambafile_constants.rb
@@ -24,4 +24,5 @@ module Generamba
   TEMPLATE_DECLARATION_NAME_KEY = 'name'
   TEMPLATE_DECLARATION_LOCAL_KEY = 'local'
   TEMPLATE_DECLARATION_GIT_KEY = 'git'
+  TEMPLATE_DECLARATION_BRANCH_KEY = 'branch'
 end
diff --git a/lib/generamba/template/helpers/rambaspec_validator.rb b/lib/generamba/template/helpers/rambaspec_validator.rb
@@ -42,8 +42,7 @@ def self.validate_spec(template_name, template_path)
     # @return [Bool]
     def self.obtain_spec_path(template_name, template_path)
       spec_filename = template_name + RAMBASPEC_EXTENSION
-      Pathname.new(template_path)
-          .join(spec_filename)
+      Pathname.new(template_path).join(spec_filename)
     end
   end
 end
diff --git a/lib/generamba/template/installer/remote_installer.rb b/lib/generamba/template/installer/remote_installer.rb
@@ -13,20 +13,27 @@ def install_template(template_declaration)
       puts("Installing #{template_name}...")
 
       repo_url = template_declaration.git
+      repo_branch = template_declaration.branch
 
       temp_path = Dir.tmpdir()
-      template_dir = Pathname.new(temp_path)
-                         .join(template_name)
-      Git.clone(repo_url, template_name, :path => temp_path)
+      template_dir = Pathname.new(temp_path).join(template_name)
+
+      if repo_branch != nil
+        Git.export(repo_url, template_name, :branch => repo_branch, :path => temp_path)
+      else
+        Git.clone(repo_url, template_name, :path => temp_path)
+      end
+
+      template_path = "#{template_dir}/#{template_name}"
 
-      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_dir)
+      rambaspec_exist = Generamba::RambaspecValidator.validate_spec_existance(template_name, template_path)
       unless rambaspec_exist
         FileUtils.rm_rf(temp_path)
         error_description = "Cannot find #{template_name + RAMBASPEC_EXTENSION} in the root directory of specified repository.".red
         raise StandardError.new(error_description)
       end
 
-      rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_dir)
+      rambaspec_valid = Generamba::RambaspecValidator.validate_spec(template_name, template_path)
       unless rambaspec_valid
         error_description = "#{template_name + RAMBASPEC_EXTENSION} is not valid.".red
         raise StandardError.new(error_description)
@@ -35,7 +42,7 @@ def install_template(template_declaration)
       install_path = Pathname.new(TEMPLATES_FOLDER)
                          .join(template_name)
       FileUtils.mkdir_p install_path
-      FileUtils.copy_entry(template_dir, install_path)
+      FileUtils.copy_entry(template_path, install_path)
 
       FileUtils.rm_rf(temp_path)
     end

diff --git a/lib/generamba/template/processor/template_declaration.rb b/lib/generamba/template/processor/template_declaration.rb
@@ -15,12 +15,13 @@ class TemplateDeclarationType
   # Describes a Generamba template declaration model
   class TemplateDeclaration
 
-    attr_reader :name, :local, :git, :type
+    attr_reader :name, :local, :git, :branch, :type
 
     def initialize(template_hash)
       @name = template_hash[TEMPLATE_DECLARATION_NAME_KEY]
       @local = template_hash[TEMPLATE_DECLARATION_LOCAL_KEY]
       @git = template_hash[TEMPLATE_DECLARATION_GIT_KEY]
+      @branch = template_hash[TEMPLATE_DECLARATION_BRANCH_KEY]
 
       @type = TemplateDeclarationType::LOCAL_TEMPLATE if @local
       @type = TemplateDeclarationType::REMOTE_TEMPLATE if @git