vagrant-layout 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e1776f2d37300f362631aa10c18abbcca88a44
-  data.tar.gz: a21a58fa879fba940359b3b89eef9bb86637b40c
+  metadata.gz: 2852387e8df22703fd65a71dc3194a8c817bf1af
+  data.tar.gz: dee5f017bee57fb699658e33d978da3181ee88c0
 SHA512:
-  metadata.gz: 5e7d8ad1dbcfdc927f9498043db535f615aa16f2052e118cd5b83f0e3f84e1b656b1872610ff877ac77bfbf22ffac98c8f47e1547d868bad9a472fc47345cd68
-  data.tar.gz: db584ca1921540abb5b89e032b97aabea18d52c5310b9b2f8daaec9ed70fd11b875f27ede877578d43adfc8aa029d8e0ee951a1b9ba02947a00a3e7a14456715
+  metadata.gz: f8c1d1c4e3b4166cab1750a7b36cc967922c076efe2d456e1c89f73e11d0e51aaacbd270d6a2b5280339f7e50282500008602b346d4ccda487651423fe91a35b
+  data.tar.gz: f2e9020c888f981a26b7b0ba62d3da7cec27d25d33f2a0c23feabd3daa1e9c9295f284b1360899e89bbdb7a6eda138469ed8b95c84cef4e199177b16ecc68d6d

data/lib/vagrant-layout/command.rb

@@ -39,7 +39,8 @@ module VagrantPlugins
         end
 
         puts @opts.help unless result == 0
-        return result
+
+        result
       end
     end
   end

data/lib/vagrant-layout/command_init.rb

@@ -6,8 +6,7 @@ module VagrantPlugins
     # init command
     #
     class CommandInit
-
-      DEFAULT_REPOSITORY = ['koseki', 'vagrant-layout', 'master']
+      DEFAULT_REPOSITORY = %w{koseki vagrant-layout master}
 
       def initialize(argv)
         @argv = argv
@@ -26,9 +25,7 @@ module VagrantPlugins
       end
 
       def parse_target(target)
-        unless target
-          return github_target(DEFAULT_REPOSITORY)
-        end
+        return github_target(DEFAULT_REPOSITORY) unless target
 
         if target =~ %r{\A(https://gist\.github\.com/[^/]+/[0-9a-f]+)(/(download)?)?}
           url  = Regexp.last_match[1]
@@ -41,7 +38,7 @@ module VagrantPlugins
             url += path
           end
 
-          return [:gist, url]
+          [:gist, url]
         end
 
         target = target.split('/')
@@ -53,12 +50,12 @@ module VagrantPlugins
           target = target[0..3]
         end
 
-        return github_target(target)
+        github_target(target)
       end
 
       def github_target(target)
         url = "https://github.com/#{ target[0] }/#{ target[1] }/archive/#{ target[2] }.tar.gz"
-        return [:github, url]
+        [:github, url]
       end
 
       def download_layout(root, target)
@@ -114,7 +111,7 @@ module VagrantPlugins
             else
               msg = 'Illegal base url. Base URL must be like '
               msg += 'https://github.com/{user}/{repos}/tree/[0-9a-f]{40}'
-              raise Exception.new(msg)
+              fail msg
             end
           end
         end
@@ -129,13 +126,17 @@ module VagrantPlugins
 
       def copy_gist_files(gist_dir, github_dir)
         Dir.chdir(gist_dir) do
-          Dir.glob('*').each do |file|
-            if file == 'patch'
-              apply_patch(File.join(gist_dir, 'patch'), github_dir)
-              next
-            end
-            dest_file = File.join(github_dir, file.gsub('__', '/'))
-            FileUtils.copy_entry(File.join(gist_dir, file), dest_file)
+          files = Dir.glob('*')
+          if files.include?('patch')
+            apply_patch(File.join(gist_dir, 'patch'), github_dir)
+            files.delete('patch')
+          end
+          files.each do |file|
+            dest_path = file.gsub('__', '/').gsub('//', '/')
+            next if dest_path =~ /\.\.|\r|\n/
+            dest_file = File.join(github_dir, dest_path)
+            FileUtils.mkdir_p(File.dirname(dest_file))
+            FileUtils.cp(File.join(gist_dir, file), dest_file, preserve: true)
           end
         end
       end

data/lib/vagrant-layout/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-layout
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - KOSEKI Kengo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler