toquen 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1cb31452676748b9908bc91b8300250ecf6393
-  data.tar.gz: 97434ad4686d0633abfb322a1e2fa3583a0ef76f
+  metadata.gz: 60347daff862f9d0e982d621f11a771cc9a9bf14
+  data.tar.gz: c85e030a7ab529d75561901e907cc4b94253e543
 SHA512:
-  metadata.gz: 1f7e6927a983aaed9da271e43d28e5ec348c09d4b18803424c7b38ace8c6c92d4f38082b3dcbe728c9988acde0cd2e1a86f095974794fa05f27b1ab14c74bf99
-  data.tar.gz: e2753fccf28f0bed35b2141981056480fd915270150b61635cc9c702247cf5fb552a4f7a3cb1d401e6203960eae987286b5c032709d71ae11c64755cde093c20
+  metadata.gz: 5c622aa58984509dd48f53b3faed12ca650e40c56989c8736e38576820c67baee88a8985f7b724f799b59fd81ba85fde0a9c401ce209a6cfc96c24664d92c9d1
+  data.tar.gz: 52c6ed6c0f46f1d9aec9d1810be76b9df6e021efe90f2ad6277f6c7f536b77910aaa373e0195d50572e708f0e12d2e54503e9a4491a316728dfb03ebf14a0a44

data/README.md

@@ -39,9 +39,8 @@ Bootstrapping a server will perform all of the following:
 
 1. Update all packages (assuming a Debian/Ubuntu system)
 1. Sets the hostname to be whatever you set as value for the Name tag in AWS
-1. Set ruby 1.9.3 as the default ruby
-1. Install rubygems
-1. Install the chef and bundler gems
+1. Installs Ruby / RubyGems
+1. Install the chef gem
 1. Reboot
 
 You can bootstrap a single server by using:
@@ -91,13 +90,6 @@ By default, instance information is only pulled out of the default region (us-ea
 set :aws_regions, ['us-west-1', 'us-west-2']
 ```
 
-You can also manually specify the version of ruby (default 1.9.3) and rubygems (defualt 2.2.2) you want installed:
-
-```ruby
-set :rubygems_version, "2.1.11"
-set :ruby_version, "2.0"
-```
-
 ## View Instances
 To see details about your aws instances you can use the **details** cap task.
 
@@ -119,3 +111,7 @@ To allow an SSH connection from your current machine (based on your internet vis
 And then, when you're finished:
 
     $ cap databases close_ssh
+
+Or, if you want to do everything in one step:
+
+    $ cap databases open_ssh cook close_ssh

data/lib/toquen/bootstrapper.rb

@@ -7,8 +7,6 @@ module Toquen
       hosttype = fetch(:hosttype, 'ubuntu')
       path = File.expand_path("../templates/#{hosttype}_bootstrap.erb", __FILE__)
       raise "Bootstrap process for #{hosttype} does not exist!" unless File.exists?(path)
-      rubygems_version = fetch(:rubygems_version, '2.2.2')
-      ruby_version = fetch(:ruby_version, '1.9.3')
       user = fetch(:ssh_options)[:user]
       StringIO.new ERB.new(File.read(path)).result(binding)
     end

data/lib/toquen/templates/ubuntu_bootstrap.erb

@@ -1,20 +1,17 @@
-#!/bin/bash
+#!/bin/bash -l
 if [ -e "/home/<%= user %>/bootstrap.lock" ]; then exit 0; fi
 DEBIAN_FRONTEND=noninteractive apt-get -y update
 DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
 DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
-DEBIAN_FRONTEND=noninteractive apt-get -y install gcc ruby<%= ruby_version %> ruby<%= ruby_version %>-dev automake make
-update-alternatives --set ruby /usr/bin/ruby<%= ruby_version %>
+DEBIAN_FRONTEND=noninteractive apt-get -y install ruby ruby-dev build-essential
+
+gem install --no-rdoc --no-ri chef
+
+echo Setting host variables...
 echo "127.0.0.1     <%= host.properties.awsname %>" >> /etc/hosts
 echo "<%= host.properties.awsname %>" > /etc/hostname
 hostname "<%= host.properties.awsname %>"
-cd /usr/src
-rm -rf rubygems*
-wget -q http://production.cf.rubygems.org/rubygems/rubygems-<%= rubygems_version %>.tgz
-tar -zxf rubygems-<%= rubygems_version %>.tgz
-cd /usr/src/rubygems-<%= rubygems_version %>
-ruby setup.rb
-gem install --no-rdoc --no-ri chef bundler
+
 touch /home/<%= user %>/bootstrap.lock
 echo "Rebooting now, standby..."
 reboot

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano