vagrant-layout 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2852387e8df22703fd65a71dc3194a8c817bf1af
-  data.tar.gz: dee5f017bee57fb699658e33d978da3181ee88c0
+  metadata.gz: 1dd06af0864e15ef71a3c8a7fbe0aa0440448888
+  data.tar.gz: 2b3b2a6df8b6188182864110547e4bc1926b3d40
 SHA512:
-  metadata.gz: f8c1d1c4e3b4166cab1750a7b36cc967922c076efe2d456e1c89f73e11d0e51aaacbd270d6a2b5280339f7e50282500008602b346d4ccda487651423fe91a35b
-  data.tar.gz: f2e9020c888f981a26b7b0ba62d3da7cec27d25d33f2a0c23feabd3daa1e9c9295f284b1360899e89bbdb7a6eda138469ed8b95c84cef4e199177b16ecc68d6d
+  metadata.gz: 060a442d14c6b9f6a7af25223b3144b29009dc8e4677ebf8bea9b8300969f3f97b86388200724b9526ac05778c4058586cd7716a4afa1c8315dc8c46da8c1649
+  data.tar.gz: e11999ef371f7ba0b899918444ba3248234b6680ffbca7b5f9e8c63fcc78a69740b5ad1216592fcabec5fa796f4d9be72025e44f31120fbe5274fe1d89db6506

data/lib/vagrant-layout/command_init.rb

@@ -37,8 +37,7 @@ module VagrantPlugins
           else
             url += path
           end
-
-          [:gist, url]
+          return [:gist, url]
         end
 
         target = target.split('/')
@@ -141,11 +140,32 @@ module VagrantPlugins
         end
       end
 
-      def copy_layout(dir)
-        Dir.open(dir).each do |src|
-          next if src.to_s =~ /\A(README|\.git|LICENSE|\.\.?\z)/
-          FileUtils.cp_r(File.join(dir, src), '.')
+      def copy_layout(source_dir)
+        sources = Dir.chdir(source_dir) { Dir.glob('**/*') }
+        sources.delete_if { |src| src =~ /\A(README|LICENSE|\.git)/ }
+
+        overwrite = []
+        sources.each do |src|
+          if File.exist?(src)
+            overwrite << src
+          end
+        end
+
+        unless overwrite.empty?
+          puts 'File already exists in this directory. Please specify -f to overwrite.'
+          overwrite.each { |src| puts "  #{ src }" }
+          return false
+        end
+
+        sources.each do |src|
+          src_path = File.join(source_dir, src)
+          if File.directory?(src_path)
+            FileUtils.mkdir_p(src)
+          else
+            FileUtils.cp(src_path, src, preserve: true)
+          end
         end
+        true
       end
 
       def apply_patch(patch_file, github_dir)

data/lib/vagrant-layout/version.rb

@@ -3,6 +3,6 @@ module VagrantPlugins
   # Vagrant Layout Plugin
   #
   module Layout
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-layout
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - KOSEKI Kengo