vagrant-babushka 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e4fbf03d84d215e28bba59e99a4a4977320e97
-  data.tar.gz: e7cb954be61dd2e063d4c1f2c1072e89f199def8
+  metadata.gz: 945fa78a5766333ea60149445306c614976a7871
+  data.tar.gz: c8c9dc4590166a89504da041e92bc041b88aec69
 SHA512:
-  metadata.gz: 459b3436c488c3cd84e7388a14db363f2ab912771e30ca807f6daf4e23c897458d48ebe19761a70557c5b0ba2b6c73116474e8998d9b11d958d248cde919e087
-  data.tar.gz: 04d9b502b199e485260ebb9148ff4e321c707bd73c776b668e24f2a6cee83e23f1d1925b7ca2b347680d9d124cd7844e981b8f2c63848ee605209fb8176df286
+  metadata.gz: 753bf4a56e36c05c0fa386b284ed57a04949e19cad9d345789016a9e895043205ca764e528758843357e129d05b41facd7cbf768b613fc269f3d3a38b45365ac
+  data.tar.gz: 47d0cc20dbc85047f9cc688c277dc2746fd3313052c9cdc6357961ae4cfc1239e4412129db7794bb2393039bc83c371789a69e3f4ea4f3a09a7fbfa9f6f97f86

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -5,6 +5,8 @@ using [Babushka][2].
 
 Based on a [plugin concept][3] by @tcurdt.
 
+[![Build Status](https://travis-ci.org/vvalgis/vagrant-babushka.png)](https://travis-ci.org/vvalgis/vagrant-babushka.png)  
+
 [1]: <https://www.vagrantup.com>
 [2]: <https://babushka.me>
 [3]: <https://github.com/tcurdt/vagrant-boxes/blob/master/plugins/babushka_provisioner.rb>

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/dist/babushka.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+# This is a modified version of the Babushka binary that is distributed
+# with Babushka. It's been modified to ensure that stdout and stderr
+# are automatically flushed when written to, and not buffered.
+#
+# When running inside Vagrant, this is more important than the
+# performance gains associated with output buffering. This is because
+# Babushka often prints messages like "installing..." during a long
+# operation, and these usually aren't followed by a newline. So these
+# types of messages will often sit in the buffer (unseen by the user)
+# for the entire duration of the long operation. The user will only see
+# the "installing" message after the next newline is printed, which
+# will only happen when the installation is already complete!
+$stdout.sync = true
+$stderr.sync = true
+
+# This file is what gets run when babushka is invoked from the command line.
+
+# First, load babushka itself, by traversing from the actual location of
+# this file (it might have been invoked via a symlink in the PATH) to the
+# corresponding lib/babushka.rb.
+require File.expand_path(
+  File.join(
+    File.dirname(File.expand_path(
+      File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+    )),
+    '../lib/babushka'
+  )
+)
+
+# Mix in the #Dep, #dep & #meta top-level helper methods, since we're running
+# standalone.
+Object.send :include, Babushka::DSL
+
+# Handle ctrl-c gracefully during babushka runs.
+Babushka::Base.exit_on_interrupt!
+
+# Invoke babushka, returning the correct exit status to the shell.
+exit !!Babushka::Base.run

data/lib/vagrant-babushka.rb

@@ -4,6 +4,8 @@ rescue LoadError
   raise "vagrant-babushka must be loaded from within Vagrant."
 end
 
+I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
+
 require "vagrant-babushka/version"
 require "vagrant-babushka/dep"
 require "vagrant-babushka/config"

data/lib/vagrant-babushka/provisioner.rb

@@ -98,6 +98,7 @@ module VagrantPlugins
           install_curl! unless in_path? "curl"
           create_destination!
           install_babushka!
+          patch_babushka_binary!
           ui.info "\n\n\n"
         end
       end
@@ -119,7 +120,8 @@ module VagrantPlugins
           config.deps.each do |dep|
             ui.info "Meeting Babushka dep '#{dep.id}'", :scope => name
             ui.info "Executing '#{command_for(dep).strip}'...", :scope => name
-            communicate.execute command_for(dep), &log_stdout
+            options = {:error_key => "vagrant_babushka_provision_error"}
+            communicate.execute command_for(dep), options, &log_stdout
           end
         end
       end
@@ -179,6 +181,22 @@ module VagrantPlugins
           communicate.execute install_babushka_command, &log_stdout
         end
 
+        # Installs the patched binary distributed with this plugin
+        #
+        # The patched binary ensures stdout and stderr are unbuffered,
+        # so they will be flushed after every write. This avoids
+        # progress bars and status messages from being hidden during
+        # long-running processes.
+        #
+        # The patched binary is at dist/babushka.rb, relative to the
+        # root of this project.
+        def patch_babushka_binary!
+          ui.info "Patching Babushka binary...", :scope => name
+          root = File.expand_path '../..', File.dirname(__FILE__)
+          source = File.join root, 'dist', 'babushka.rb'
+          communicate.upload source, '/usr/local/bin/babushka'
+        end
+
         # The command used to install Babushka on the virtual machine
         def install_babushka_command
           %Q[#{vars} sh -c "`#{vars} curl #{escape config.bootstrap_url}`"]

data/lib/vagrant-babushka/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Babushka
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  vagrant:
+    errors:
+      vagrant_babushka_provision_error: |-
+        An error occurred during the last Babushka run. Please check
+        the output above for information about what went wrong.

data/spec/unit/vagrant-babushka/provisioner_spec.rb

@@ -60,6 +60,7 @@ describe VagrantPlugins::Babushka::Provisioner do
         expect(provisioner).to receive(:install_curl!)
         expect(provisioner).to receive(:create_destination!)
         expect(provisioner).to receive(:install_babushka!)
+        expect(provisioner).to receive(:patch_babushka_binary!)
         expect(ui).to receive(:info).with("\n\n\n")
         subject.prepare
       end
@@ -71,6 +72,7 @@ describe VagrantPlugins::Babushka::Provisioner do
           expect(provisioner).to_not receive(:install_curl!)
           expect(provisioner).to receive(:create_destination!)
           expect(provisioner).to receive(:install_babushka!)
+          expect(provisioner).to receive(:patch_babushka_binary!)
           expect(ui).to receive(:info).with("\n\n\n")
           subject.prepare
         end
@@ -112,9 +114,9 @@ describe VagrantPlugins::Babushka::Provisioner do
         expect(ui).to receive(:info).with("Meeting Babushka dep 'the dep 2'", :scope => "the name")
         expect(ui).to receive(:info).with("Executing 'bar'...", :scope => "the name")
         expect(provisioner).to receive(:command_for).with(dep1).twice().and_return("foo")
-        expect(communicate).to receive(:execute).with("foo")
+        expect(communicate).to receive(:execute).with("foo", :error_key => "vagrant_babushka_provision_error")
         expect(provisioner).to receive(:command_for).with(dep2).twice().and_return("bar")
-        expect(communicate).to receive(:execute).with("bar")
+        expect(communicate).to receive(:execute).with("bar", :error_key => "vagrant_babushka_provision_error")
         subject.do_babushka_run
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-babushka
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vladimir Valgis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,17 +76,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - Vagrantfile
+- dist/babushka.rb
 - lib/vagrant-babushka.rb
 - lib/vagrant-babushka/config.rb
 - lib/vagrant-babushka/dep.rb
 - lib/vagrant-babushka/plugin.rb
 - lib/vagrant-babushka/provisioner.rb
 - lib/vagrant-babushka/version.rb
+- locales/en.yml
 - spec/spec_helper.rb
 - spec/unit/vagrant-babushka/config_spec.rb
 - spec/unit/vagrant-babushka/dep_spec.rb