vagrant-babushka 0.0.4 → 0.0.5

data/README.md

@@ -12,6 +12,8 @@ https://github.com/tcurdt/vagrant-boxes/blob/master/plugins/babushka_provisioner
 In Vagrant file set provisioner to `:babushka`
 
     config.vm.provision :babushka do |b|
+      # Uncoment to override default babushka branch on bootstrap
+      # b.bootstrap_branch = 'master'
       # Path for local deps, relative to Vagrantfile.
       # Syncronized to '/home/ssh_user_name/babushka-deps' on guest machine. 
       # 'ssh_user_name' here is 'vagrant' by default or any other name you use when connecting through ssh.
@@ -34,7 +36,8 @@ Also you can add options to deps giving hash as third parameter
 
 ## Thanks
 [patcon](https://github.com/patcon)  
-[wakeless](https://github.com/wakeless)
+[wakeless](https://github.com/wakeless)  
+[Val](https://github.com/Val)
 
 ## License
 

data/lib/vagrant-babushka/config.rb

@@ -1,17 +1,19 @@
 module VagrantPlugins
   module Babushka
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :args, :deps, :local_deps_path
+      attr_accessor :args, :deps, :local_deps_path, :bootstrap_branch
 
       def initialize
         super
         @deps = []
         @local_deps_path = UNSET_VALUE
+        @bootstrap_branch = UNSET_VALUE
       end
 
       def finalize!
         @deps = [] if @deps == UNSET_VALUE
         @local_deps_path  = nil if @local_deps_path  == UNSET_VALUE
+        @bootstrap_branch = nil if @bootstrap_branch == UNSET_VALUE
       end
 
       def local_dep(dep_name, args = {})

data/lib/vagrant-babushka/provisioner.rb

@@ -8,6 +8,7 @@ module VagrantPlugins
 
       def configure(root_config)
         @username = @machine.ssh_info[:username]
+        @username = root_config.ssh.default.username unless @username
         @hostname = root_config.vm.hostname
         if @config.local_deps_path
           local_path = @config.local_deps_path
@@ -31,9 +32,22 @@ module VagrantPlugins
         require 'net/http'
         @machine.env.ui.info("Installing babushka on #{@hostname}.")
         local_tmpfile = remote_tmpfile = "/tmp/babushka_me_up"
-        File.open(local_tmpfile, 'w') {|f| f.write `curl https://babushka.me/up` }
+        File.open(local_tmpfile, 'w') {|f| f.write `curl #{babushka_uri}` }
         @machine.communicate.upload(local_tmpfile, remote_tmpfile)
-        run_remote "bash #{remote_tmpfile}"
+        run_remote "#{proxy_env} sh #{remote_tmpfile}"
+      end
+
+      def proxy_env
+        vars = ''
+        vars_from_env = ENV.select { |k, _| /https_proxy/i.match(k) }
+        vars = vars_from_env.to_a.map{ |pair| pair.join('=') }.join(' ') unless vars_from_env.empty?
+        vars
+      end
+
+      def babushka_uri
+        uri = 'https://babushka.me/up'
+        uri = "#{uri}/#{@config.bootstrap_branch}" unless @config.bootstrap_branch.nil?
+        uri
       end
 
       def run_remote(command)

data/lib/vagrant-babushka/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Babushka
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-babushka
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant provisioner plugin for using Babushka
 email: