madscience 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df0d9249b04bbfb7808f867235ad6e2263a122c
-  data.tar.gz: 75679d7d7916ea23947c5797d95f1fe998581825
+  metadata.gz: 34a9f1056f45be911a00ad0d7254a377fb3b4892
+  data.tar.gz: 00f049faf8223344c038efbe3c622a30ab035557
 SHA512:
-  metadata.gz: 5e9828bbbebc878f53215599c4c29a014a4c59f6c3e6caa16d1202bff0931573001ff1b91898a90dc66046e30450f1a44e316ee4f23ced6b8c9fdc61105bb504
-  data.tar.gz: 1543bfa1892f9f9e76fc027c357a104b269bc685e95ef9b83a1f9b476765ed0a5dfeb324cc7798fa6c450f00c92020f1ac57c7444c79627748469650e7b9802d
+  metadata.gz: 4e06c7fd2a2ddf2ed47fb6c18e28d4d102c3384285792c540478abd83ac5f3c42311c80e655dee179c487ab83ee384dccbcf98878e2f75709fcb1cd7e009a6c0
+  data.tar.gz: cf199b1ecfc14a92299f07fb477fca0b8fa12706e3d94b8c8ac76e433299b3802ed748c29330381fa0aa30e7d7f7e6f7402391cfcb0687a165d031f64e441972

data/README.md

@@ -15,7 +15,7 @@ doesn't exist, but you'll need to fill in your own passwords for external
 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/all_nodes.json.erb in the deploy repository. You can also read
+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
 

data/bin/madscience

@@ -77,9 +77,9 @@ end
 
 def do_local_setup
   in_madscience_dir do
-    # Don't librarian-chef install any more. The default
+    # Goal: Don't librarian-chef install any more. The default
     # cookbooks should be included by default now.
-    # system("librarian-chef", "install")
+    system("librarian-chef", "install")
     system("chown -R #{get_sudo_user} cookbooks")
     system("chef-solo", "-c", "solo.rb") or raise "Failed during chef run!"
   end
@@ -103,24 +103,35 @@ end
 def do_deploy
   # Deploy from the 'madscience' dir under this directory
 
-  cmd = "cd madscience && bundle && vagrant up --provision --provider=#{MADSCIENCE_PROVIDER}"
+  Dir.chdir "madscience" do
+    # Bundle in the subdirectory, but unset existing Bundler
+    # env vars, anything w/ "BUNDLE"
+    bkeys = ENV.keys.select { |k| k["BUNDLE"] }
+    pid = Kernel.spawn Hash[bkeys.zip([])], "bundle"
+    Process.wait pid
 
-  # Does this display STDOUT properly?
-  pid = Kernel.spawn cmd
-  Process.wait pid  # Wait for process to finish
+    cmd = "vagrant up --provision --provider=#{MADSCIENCE_PROVIDER}"
 
-  unless $?.success?
-    raise "Deploy process failed with status #{$?.exitstatus}! Fix and/or re-run using 'vagrant provision'!"
-  end
+    pid = Kernel.spawn cmd
+    Process.wait pid  # Wait for process to finish
+
+    unless $?.success?
+      raise "Deploy process failed with status #{$?.exitstatus}! Fix and/or re-run using 'vagrant provision'!"
+    end
 
-  puts <<-MESSAGE
+    if Dir[File.join("madscience", ".deployed-*")].empty?
+      raise "Deploy process didn't create a successful deploy! Fix and/or re-run using 'vagrant provision'!"
+    end
+
+    puts <<-MESSAGE
 You have successfully deployed the default Rails application in your repository (#{MADSCIENCE_REPO_URL}).
-Congratulations! If this isn't your actual Rails application, go and modify madscience/nodes/all_nodes.json.erb.
+Congratulations! If this isn't your actual Rails application, go and modify madscience/nodes/app-server.json.erb.
 You can find documentation in the RubyMadScience wiki: 
     https://github.com/noahgibbs/madscience/wiki
 
 Have fun with RubyMadScience!
-  MESSAGE
+    MESSAGE
+  end
 end
 
 # No subcommand takes arguments (yet?)
@@ -140,7 +151,7 @@ end
 if ARGV[0] == "clone"
   do_clone
 
-  puts "Successfully cloned repo under this directory. Now customize nodes/all_nodes.json.erb!"
+  puts "Successfully cloned repo under this directory. Now customize nodes/app-server.json.erb!"
   exit 0
 end
 
@@ -153,7 +164,7 @@ if ARGV[0] == "setup_clone_and_deploy" || ARGV[0] == "construct"
   do_clone
   do_deploy
 
-  puts "Successfully cloned repo #{MADSCIENCE_REPO_URL} under this directory. Now customize nodes/all_nodes.json.erb!"
+  puts "Successfully cloned repo #{MADSCIENCE_REPO_URL} under this directory. Now customize nodes/app-server.json.erb!"
   exit 0
 end
 

data/lib/madscience/version.rb

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

data/madscience.gemspec

@@ -29,7 +29,7 @@ DESC
 
   spec.add_runtime_dependency 'knife-solo', '0.4.2'
   spec.add_runtime_dependency 'librarian-chef', '0.0.4'
-  spec.add_runtime_dependency 'chef', '12.0.3'
+  spec.add_runtime_dependency 'chef', '11.18.6'
   spec.add_runtime_dependency 'capistrano', '3.2.1'
   spec.add_runtime_dependency 'capistrano-rails', '1.1.1'
   spec.add_runtime_dependency 'capistrano-bundler', '1.1.2'

data/site-cookbooks/madscience-vagrant-cookbook/files/default/linode.json

@@ -0,0 +1,7 @@
+{
+  "token": "",
+  "distribution": "Ubuntu 14.04 LTS",
+  "datacenter": "newark",
+  "plan": "Linode 2048",
+  "setup": false
+}

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

@@ -120,6 +120,12 @@ cookbook_file "aws.json" do
   action :create_if_missing
 end
 
+cookbook_file "linode.json" do
+  owner user
+  path File.join(creds_dir, "linode.json")
+  action :create_if_missing
+end
+
 file File.join(creds_dir, "authorized_keys") do
   user user
   action :create_if_missing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madscience
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Noah Gibbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.3
+        version: 11.18.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.3
+        version: 11.18.6
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +319,7 @@ files:
 - site-cookbooks/madscience-vagrant-cookbook/README.md
 - site-cookbooks/madscience-vagrant-cookbook/files/default/aws.json
 - site-cookbooks/madscience-vagrant-cookbook/files/default/digital_ocean.json
+- site-cookbooks/madscience-vagrant-cookbook/files/default/linode.json
 - site-cookbooks/madscience-vagrant-cookbook/metadata.rb
 - site-cookbooks/madscience-vagrant-cookbook/recipes/default.rb
 - solo.rb