stevenson 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c934219c82cb57f9ed0cb87eda58348cc6219d
-  data.tar.gz: ffc0f55365499f06312e1ae956f5f6847eb25072
+  metadata.gz: dd0ac5e39c4a0da159e938d8aeaeca92cc11e280
+  data.tar.gz: 0073320152769d1e6c12575c495fc20802cd42d7
 SHA512:
-  metadata.gz: 6adb7a7c86cc0f9616e9d44568180a3017eb3c31899e10ddeccaccf8699bcb372793c24197bb2b37425279ce34f88557776cdd03ff2204b168d5fab0b8559555
-  data.tar.gz: bf375e0bc19e27e9b26151d3573dbb4ad786aea0ae4bded4c906d624eedd207b76ede31bd9a315583d18d828ab0224f31385b5f2ce7725980358cf3c6e23241f
+  metadata.gz: 8717e56f0725f28ebd7b647dac66da635a073d397876f62a9c17214dcb62732570432114db507938945564ebe672723ac6541fa4172710889bc9ec465dcf9a05
+  data.tar.gz: 421342ffb5e4804a1467caceeaa615fa8f5a1f5a7b7bafedde6a0077815115d6d6017a4d427c29c4805f77721dae46f14bc2b7cea5ee78e1285f55c492a9080c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+2.2.0 (October 9th, 2015)
+ - Add subdirectory option to Git template
+
 2.1.0 (October 3rd, 2015)
  - Add deployer logic
  - Add S3 deployer class for sending compiled projects to S3 buckets

data/lib/stevenson/templates/git.rb

@@ -2,7 +2,7 @@ require 'git'
 
 module Stevenson
   module Template
-    class Git < Base
+    class Git < Local
       attr_reader :template_url, :options
 
       def initialize(template_url, options)
@@ -10,16 +10,25 @@ module Stevenson
       end
 
       def local_directory
-        @_local_directory ||= Dir.mktmpdir.tap do |dir|
-          # Clone the repo to a temporary directory for later use
-          ::Git.clone(template_url, dir).tap do |repo|
-            # Switch_branch if set
-            repo.checkout(options[:branch]) if options.has_key?(:branch)
+        @_local_directory ||= begin
+          @template_path ||= Dir.mktmpdir.tap do |dir|
+            # Clone the repo to a temporary directory for later use
+            ::Git.clone(template_url, dir).tap do |repo|
+              # Switch_branch if set
+              repo.checkout(options[:branch]) if options.has_key?(:branch)
+            end
           end
+
+          super
         end
       rescue ::Git::GitExecuteError
         # If the given repo URL is not valid, raise an exception
-        raise InvalidTemplateException.new('Failed to clone the repository')
+        raise InvalidTemplateException.new('Failed to clone the repository and/or branch')
+      end
+
+      def close
+        FileUtils.rm_rf template_path if template_path
+        super
       end
     end
   end

data/lib/stevenson/version.rb

@@ -1,3 +1,3 @@
 module Stevenson
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/lib/templates/git_spec.rb

@@ -5,14 +5,19 @@ describe Stevenson::Template::Git do
 
   describe '#local_directory' do
     let(:tmp_dir) { '/tmp/dir/to/template' }
-    before { allow(Dir).to receive(:mktmpdir).and_return(tmp_dir) }
+    let(:local_tmp_dir) { '/tmp/dir/to/local_template' }
+    before { allow(Dir).to receive(:mktmpdir).and_return(tmp_dir, local_tmp_dir) }
 
     context 'when template_url is a valid URL' do
       let(:git_repo) { double(:git_repo) }
-      before { allow(::Git).to receive(:clone).and_return(git_repo) }
+      before do
+        allow(::Git).to receive(:clone).and_return(git_repo)
+        allow(File).to receive(:directory?).with(tmp_dir).and_return(true)
+        allow(FileUtils).to receive(:cp_r).with("#{tmp_dir}/.", local_tmp_dir).and_return(true)
+      end
 
       it 'returns a temp directory' do
-        expect(subject.local_directory).to eq tmp_dir
+        expect(subject.local_directory).to eq local_tmp_dir
       end
 
       it 'clones the given repository to the working template path' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stevenson
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - RootsRated
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler