teleport 1.0.9 → 1.0.10

data/README.md

@@ -6,7 +6,7 @@ Teleport strives to be **idempotent** - you can run it repeatedly without changi
 
 Teleport is great for managing a small number of hosted machines, either dedicated or in the cloud. Due to it's opinionated nature and limited scope you may find that it works better for you than other, more complicated tools.
 
-At the moment Teleport supports **Ubuntu 10.04/10.10/11.04/11.10/12.04 with Ruby 1.8.7, 1.9.2, 1.9.3, or [REE](http://www.rubyenterpriseedition.com/)**.
+At the moment Teleport supports **Ubuntu 10.04/10.10/11.04/11.10/12.04/12.10 with Ruby 1.8.7, 1.9.2, 1.9.3, or [REE](http://www.rubyenterpriseedition.com/)**.
 
 ## Getting Started
 
@@ -14,45 +14,45 @@ At the moment Teleport supports **Ubuntu 10.04/10.10/11.04/11.10/12.04 with Ruby
 
     ```
     $ sudo gem install teleport
-    ```    
-    
+    ```
+
 1. Create a `Telfile` config file. Here's a simple example. Note that we actually define two machines, `server_app1` and `server_db1`:
 
     ```
     $ mkdir ~/teleport
     $ cd ~/teleport
     ```
-    
+
     Put this into `~/teleport/Telfile`:
-    
+
     ``` ruby
     user "admin"
     ruby "1.9.3"
-    apt "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen", :key => "7F0CAB10"    
+    apt "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen", :key => "7F0CAB10"
     role :app, :packages => [:memcached]
     role :db, :packages => [:mongodb-10gen]
     server "server_app1", :role => :app
-    server "server_db1", :role => :db    
+    server "server_db1", :role => :db
     packages [:atop, :emacs, :gcc]
     ```
-    
+
 1. You'll want to copy files to your new machines too. Put the files into your teleport directory. For example, maybe you want to automatically have your `.bashrc` and `.emacs` files copied to your new server. You'll want the `memcached` and `mongodb` config files too. Here's what your teleport directory should look like:
 
     ```
     Telfile
     files/home/admin/.bashrc
-    files/home/admin/.emacs            
+    files/home/admin/.emacs
     files_app/etc/default/memcached
     files_app/etc/memcached.conf
     files_db/etc/mongodb.conf
     ```
-    
+
 1. Now run Teleport:
 
     ```
     $ teleport server_app1
     ```
-    
+
 Teleport will ssh to the machine and set it up per your instructions.
 
 ## Full Documentation
@@ -60,4 +60,3 @@ Teleport will ssh to the machine and set it up per your instructions.
 Full docs are in the wiki:
 
 https://github.com/gurgeous/teleport/wiki
-

data/lib/teleport/run.sh

@@ -56,7 +56,9 @@ function install_rubygems() {
   wget http://production.cf.rubygems.org/rubygems/rubygems-$CONFIG_RUBYGEMS.tgz
   tar xfpz rubygems-$CONFIG_RUBYGEMS.tgz
   (cd rubygems-$CONFIG_RUBYGEMS ; ruby setup.rb)
-  ln -s /usr/bin/gem1.8 /usr/bin/gem
+  if [ ! -f /usr/bin/gem ] ; then
+    ln -s /usr/bin/gem1.8 /usr/bin/gem
+  fi
 }
 
 #
@@ -98,7 +100,7 @@ function install_ruby_192() {
                       --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc192
 }
 
-function install_ruby_193() {
+function install_ruby_193_src() {
   local patch=p286
 
   install_ruby_19_requirements
@@ -127,6 +129,18 @@ function install_ruby_193() {
                       --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc193
 }
 
+function install_ruby_193_pkg() {
+  apt-get -y install ruby1.9.3
+}
+
+function install_ruby_193() {
+  if [ "${DISTRIB_RELEASE//[.]/}" -lt "1204" ] ; then
+    install_ruby_193_src
+  else
+    install_ruby_193_pkg
+  fi
+}
+
 function install_ruby_ree() {
   local ree="ruby-enterprise_1.8.7-2012.02_${ARCH}_ubuntu10.04.deb"
 
@@ -153,7 +167,7 @@ fi
 # which version?
 . /etc/lsb-release
 case $DISTRIB_RELEASE in
-  10.* | 11.* | 12.04 ) ;; # nop
+  10.* | 11.* | 12.04 | 12.10 ) ;; # nop
   *)
     banner "warning - Ubuntu $DISTRIB_RELEASE hasn't been tested with Teleport yet"
 esac

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleport
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4476656226626324211
+      hash: -3354560218731249117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4476656226626324211
+      hash: -3354560218731249117
 requirements: []
 rubyforge_project: teleport
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Teleport - opinionated Ubuntu server setup with Ruby.