madscience 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556e1b7bd3c2050a0ba264bb021158c4dad29594
-  data.tar.gz: 445e3ce0cef11b74e05b5f173772a16439f249c3
+  metadata.gz: 77cf959808d4818254eee6d230ed18dd68f19d70
+  data.tar.gz: 0ae73bcef31015732996c7e05c4e1cc59efbc8ad
 SHA512:
-  metadata.gz: 064fa10f61987ffead21d7e7bd0d6f67d8b48afb1d35d155cbe6031da0d0e42b1575a88074012cc9807745c9ee99735e35076764b33d542defae3b7db7a60d42
-  data.tar.gz: a9b871cf628cdb6ad1859303a15df93ebae5d83c34e04c68f61ada3fae35107523a8da772f4ee7e4493327f4bec6baefcfacceb0645194ff31803d54e129d509
+  metadata.gz: 25b4330caeecac20f50d66e82da6b122c853de3c1221d8ade83487b323c633c75c9f696895c270ba5d930ad017301f9c22ef99115efcbb94256de65289dfd214
+  data.tar.gz: 8e5dcce3f1ac829d1fb24bf8d035c7788d4a2c5fc85eee54789f6d222bbb337a8ad9e16d3b3dcb669ae02e8534bb15b62e25e4051d8428220d8416598a2cefb1

data/README.md

@@ -5,6 +5,10 @@ development machine to a new local VM and a matching production environment.
 It uses Vagrant, Chef and Capistrano. It stores deployment credentials under
 your home directory in the .deploy_credentials subdirectory.
 
+Most documentation is given with the base deploy repo:
+"http://github.com/noahgibbs/madscience" and its wiki:
+"https://github.com/noahgibbs/madscience/wiki".
+
 The Mad Science Stack is based on a class called Rails Deploy In An Hour
 (http://rails-deploy-in-an-hour.com), a paid product. This code is MIT
 licensed, however, and can be used according to that license.
@@ -17,7 +21,7 @@ services like email, your own AWS deploy keys and so on if you need them.
 When in doubt, run setup and look in the deploy credentials directory and
 nodes/app-server.json.erb in the deploy repository. You can also read
 documentation in the MadScience project Wiki:
-https://github.com/noahgibbs/madscience/wiki
+"https://github.com/noahgibbs/madscience/wiki"
 
 It's also possible to purchase an online class with additional videos, example
 configurations and documentation at "http://rails-deploy-in-an-hour.com" if you wish.

data/lib/madscience/version.rb

@@ -1,4 +1,4 @@
 module MadScience
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
   VERSION_LIBDIR = File.dirname(__FILE__)
 end

data/site-cookbooks/madscience-vagrant-cookbook/recipes/default.rb

@@ -53,7 +53,7 @@ end
 # URL sometimes seems not to be properly chosen by Vagrant cookbook
 
 # I'm not going to require curl, but for this version of Vagrant, this is the output of
-# curl https://dl.bintray.com/mitchellh/vagrant/1.7.1_SHA256SUMS?direct
+# "curl -L https://dl.bintray.com/mitchellh/vagrant/1.7.1_SHA256SUMS?direct"
 curl_output = <<-CURL
 eaeb3ad6624ccaeaefa6fc7a77a2f5d9640ef9385c5eeebdb90602d5f2011176  vagrant_1.7.1.dmg
 abab1db382be4c5d6b1e5aad96fb0909a559c3e500c5b2eb3f0c9178de7d1ac5  vagrant_1.7.1.msi
@@ -84,6 +84,44 @@ ENV['PATH'] = "/usr/bin:#{ENV['PATH']}"
 include_recipe "vagrant"
 include_recipe "virtualbox"
 
+# HIDEOUS WORKAROUND:
+# If you've previously installed Vagrant and manually uninstalled, the Vagrant
+# installer will simply fail to install, quietly. D'oh!
+# You have to manuall remove the package: sudo pkgutil --forget com.vagrant.vagrant
+# But there are other reasons this could happen, so escalate to the user :-(
+ruby_block "See if Vagrant just didn't install" do
+  block do
+    if !File.exist? "/opt/vagrant" || Dir["/opt/vagrant"].empty?
+      raise "Vagrant failed to install, but didn't raise an error! Uninstall manually and try again! http://docs.vagrantup.com/v2/installation/uninstallation.html"
+    end
+  end
+end
+
+# HIDEOUS WORKAROUND:
+# When the phase of the moon is wrong, the Vagrant cookbook will
+# install plugins to its own satisfaction, but they won't show up in
+# "vagrant plugin list" or actually work. But re-running the Vagrant
+# cookbook doesn't help, it thinks it's installed. Until debugged,
+# escalate to user.
+#
+# Are you a user? If so, you can fix this by manually installing
+# whatever plugins you don't see in "vagrant plugin list", from
+# the set of node.default['vagrant']['plugins'] above. Be sure
+# to install with the version given, like this:
+#
+# vagrant plugin install vagrant-whatever-plugin --plugin-version 1.2.3
+
+ruby_block "See if Vagrant plugins just didn't install" do
+  ALL_PLUGINS = node.default['vagrant']['plugins'].map { |row| row['name'] }
+  block do
+    output = `/usr/bin/vagrant plugin list` || ""
+    missing_plugins = ALL_PLUGINS.select { |p| !output[p] }
+    unless missing_plugins.empty?
+      raise "Vagrant plugins not installed correctly: #{missing_plugins.inspect}! Uninstall Vagrant and re-run :-(   http://docs.vagrantup.com/v2/installation/uninstallation.html"
+    end
+  end
+end
+
 ##### Second, set up a local directory of deploy credentials if not already present.
 
 # TODO: Test this on Windows

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madscience
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Noah Gibbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler