vagrant_bootstrap 0.1.3 → 0.1.4

data/lib/vagrant_bootstrap/bootstrap.rb

@@ -11,7 +11,7 @@ module VagrantBootstrap
         FileUtils.mkdir_p dir
       rescue
         STDERR.puts "FATAL: #{dir} already exists!"
-        exit
+        exit false
       end
       render opts.template_file, "#{dir}/Vagrantfile", opts
     end
@@ -19,16 +19,25 @@ module VagrantBootstrap
     private
 
     def render(template_file, target, opts)
-      puts "Rendering #{target} from #{template_file}..." if opts.verbose
-      file = "#{template_path}/#{template_file}"
+      file = template_path(template_file)
+      if file.nil?
+        STDERR.puts "FATAL: Couldn't find a template matching `#{template_file}'!"
+        exit false
+      end
+      puts "Rendering #{target} from #{file}..." if opts.verbose
       template = open(file, 'r') {|f| f.read}
       render = ERB.new(template).result(opts.instance_eval {binding})
       open(target, 'w') {|f| f.write render}
       puts "Done rendering #{target}." if opts.verbose
     end
 
-    def template_path
-      @template_path ||= File.expand_path "#{File.dirname __FILE__}/../../templates/"
+    def template_path(file)
+      tpath = File.expand_path "#{File.dirname __FILE__}/../../templates/#{file}"
+      ret = nil
+      [file, file+'.erb', tpath, tpath+'.erb'].each do |f|
+        ret = f and break if File.exists? f
+      end
+      ret
     end
   end
 end

data/lib/vagrant_bootstrap/cli.rb

@@ -7,7 +7,7 @@ module VagrantBootstrap
   class CLI
 
     DEFAULT_BRIDGE = 'br0'
-    DEFAULT_TEMPLATE_FILE = 'Vagrantfile.erb'
+    DEFAULT_TEMPLATE_FILE = 'default.erb'
 
     BANNER = <<-EOS
 Easily generate a Vagrantfile in a namespaced directory

data/lib/vagrant_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module VagrantBootstrap
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -45,7 +45,7 @@ files:
 - lib/vagrant_bootstrap/bootstrap.rb
 - lib/vagrant_bootstrap/cli.rb
 - lib/vagrant_bootstrap/version.rb
-- templates/Vagrantfile.erb
+- templates/default.erb
 - vagrant_bootstrap.gemspec
 homepage: https://github.com/SmartReceipt/vagrant_bootstrap
 licenses: []