vagrant-layout 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62f9a4e800e11e58f60420932d03b06b7e80926
-  data.tar.gz: f9c14b3ca68979cb8cd02ce608bd4ea3bb2c7c3b
+  metadata.gz: 7df38e9feb8a4e818a87ad7924a1452bcbf50d02
+  data.tar.gz: 25df792cda72734a15feafabf5e8b118f2024468
 SHA512:
-  metadata.gz: bd3aed20b4075a60b5fe113cef4f8bf43aa43994dfc75a7905737398da35770148e30717f6d4549d8663be3d5f82e4e32438d81167559ea878b9bd65cee978b9
-  data.tar.gz: 4e1d76fb84502b3682ebc006ee7050c3d8f5d5b7de5848f3842318bcef4aa17e588891d035e06d9cecba37576d76c73ea42ab4d7510275d56632c2fce2600277
+  metadata.gz: b231cae5fa8d2ee031deb77c5ddf3b86b48080d5e04043b1cddc6d88a6a4d8b60060affde27fa253c1c212cb660b7488ed3fe8c6951fab177fdec9bece1fdd7a
+  data.tar.gz: f10b53efc735c7988b05aed1e562e180416458367c9210fdd6e14fdad1fcb53e625184d9ec46bbd53d4876d063740eea8660f6c3a47dc3bdaf0f57600956eb59

data/lib/vagrant-layout/command.rb

@@ -13,28 +13,32 @@ module VagrantPlugins
       end
 
       def execute
-        @opts = OptionParser.new do |o|
+        opts = { force: false }
+        oparser = OptionParser.new do |o|
           o.banner = 'Usage: vagrant layout init [gist-url]'
+          o.on('-f', '--force', 'Overwrite existing files') do |f|
+            opts[:force] = f
+          end
           o.separator ''
         end
 
-        @argv = parse_options(@opts)
-        if @argv.empty?
-          puts @opts.help
+        opts[:argv] = parse_options(oparser)
+        if opts[:argv].empty?
+          puts oparser.help
           return -1
         end
 
-        command = @argv.shift
+        command = opts[:argv].shift
 
         result = -1
         if command == 'help'
-          puts @opts.help
+          puts oparser.help
           result = 0
         elsif command == 'init'
-          result = CommandInit.new(@argv).execute
+          result = CommandInit.new(opts).execute
         end
 
-        puts @opts.help unless result == 0
+        puts oparser.help unless result == 0
 
         result
       end

data/lib/vagrant-layout/command_init.rb

@@ -12,12 +12,12 @@ module VagrantPlugins
     class CommandInit
       DEFAULT_REPOSITORY = %w{koseki vagrant-layout master}
 
-      def initialize(argv)
-        @argv = argv
+      def initialize(opts)
+        @opts = opts
       end
 
       def execute
-        target = parse_target(@argv.shift)
+        target = parse_target(@opts[:argv].shift)
         return -1 unless target
 
         Dir.mktmpdir do |root|
@@ -150,15 +150,19 @@ module VagrantPlugins
 
         overwrite = []
         sources.each do |src|
-          if File.exist?(src)
+          if File.exist?(src) && ! File.directory?(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
+          if @opts[:force]
+            overwrite.each { |src| puts "Overwrite: #{ src }" }
+          else
+            puts 'File already exists in this directory. Please specify -f to overwrite.'
+            overwrite.each { |src| puts "  #{ src }" }
+            return false
+          end
         end
 
         sources.each do |src|

data/lib/vagrant-layout/version.rb

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

metadata

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