teleport 1.0.3 → 1.0.4

data/README.md

@@ -1,12 +1,14 @@
 ## Welcome to Teleport
 
+This is a fork of https://github.com/gurgeous/teleport, which is the canonical and maintained version of this gem.
+
 Teleport is a lightweight way to set up Ubuntu machines. The name derives from the mechanism that teleport uses to setup the target machine - it copies itself onto the target machine via ssh and then runs itself there. In effect, it "teleports" to the target. This design makes it possible for teleport to bootstrap itself onto a fresh machine. There's no need to install ruby or anything else by hand.
 
 Teleport strives to be **idempotent** - you can run it repeatedly without changing the result. In other words, as you build up your teleport config file you can generally run it over and over again without fear of breaking the target machine.
 
 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 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 with Ruby 1.8.7, 1.9.2, 1.9.3, or [REE](http://www.rubyenterpriseedition.com/)**.
 
 ## Getting Started
 

data/lib/teleport/run.sh

@@ -25,9 +25,17 @@ function fatal() {
 
 function install_ruby() {
   banner "apt-get update / upgrade..."
-  sudo apt-get update
-  sudo apt-get -y upgrade
-  sudo apt-get install -y wget libreadline5-dev
+  apt-get update
+  apt-get -y upgrade
+
+  # which version of readline to install?
+  local readline
+  if [ "${DISTRIB_RELEASE//[.]/}" -lt "1110" ] ; then
+    readline=libreadline5-dev
+  else
+    readline=libreadline-gplv2-dev
+  fi
+  apt-get install -y wget $readline
   
   banner "installing Ruby $CONFIG_RUBY..."
   case $CONFIG_RUBY in
@@ -40,20 +48,34 @@ function install_ruby() {
 }
 
 function install_ruby_187() {
-  sudo apt-get -y install irb libopenssl-ruby libreadline-ruby rdoc ri ruby ruby-dev
+  apt-get -y install irb libopenssl-ruby libreadline-ruby rdoc ri ruby ruby-dev
   
   wget http://production.cf.rubygems.org/rubygems/rubygems-$CONFIG_RUBYGEMS.tgz
   tar xfpz rubygems-$CONFIG_RUBYGEMS.tgz
-  (cd rubygems-$CONFIG_RUBYGEMS ; sudo ruby setup.rb)
+  (cd rubygems-$CONFIG_RUBYGEMS ; ruby setup.rb)
   ln -s /usr/bin/gem1.8 /usr/bin/gem
 }
 
+#
+# thanks to http://threebrothers.org/brendan/blog/ruby-1-9-2-on-ubuntu-11-04/
+# for suggestions
+#
+
+function install_ruby_19_requirements() {
+  local ffi
+  if [ "${DISTRIB_RELEASE//[.]/}" -lt "1110" ] ; then
+    ffi=libffi5
+  else
+    ffi=libffi6
+  fi
+  apt-get install -y bison build-essential checkinstall $ffi libssl-dev libyaml-dev zlib1g-dev
+}
+
 function install_ruby_192() {
   local patch=p290
-  
-  # see http://threebrothers.org/brendan/blog/ruby-1-9-2-on-ubuntu-11-04/
-  sudo apt-get install -y bison build-essential checkinstall libffi5 libssl-dev libyaml-dev zlib1g-dev
 
+  install_ruby_19_requirements
+  
   wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-$patch.tar.gz
   tar xvzf ruby-1.9.2-$patch.tar.gz
   
@@ -63,7 +85,7 @@ function install_ruby_192() {
               --with-ruby-version=1.9.2 \
               --disable-install-doc
   make
-  sudo checkinstall -D -y \
+  checkinstall -D -y \
                     --fstrans=no \
                     --nodoc \
                     --pkgname="ruby1.9.2" \
@@ -71,19 +93,18 @@ function install_ruby_192() {
                     --provides="ruby"
   cd ..
 
-  sudo update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby1.9.2 500 \
-                           --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri1.9.2 \
-                           --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb1.9.2 \
-                           --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem1.9.2 \
-                           --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb1.9.2 \
-                           --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc1.9.2
+  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby1.9.2 500 \
+                      --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri1.9.2 \
+                      --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb1.9.2 \
+                      --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem1.9.2 \
+                      --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb1.9.2 \
+                      --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc1.9.2
 }
 
 function install_ruby_193() {
   local patch=p0
-  
-  # see http://threebrothers.org/brendan/blog/ruby-1-9-2-on-ubuntu-11-04/
-  sudo apt-get install -y bison build-essential checkinstall libffi5 libssl-dev libyaml-dev zlib1g-dev
+
+  install_ruby_19_requirements
 
   wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-$patch.tar.gz
   tar xvzf ruby-1.9.3-$patch.tar.gz
@@ -94,7 +115,7 @@ function install_ruby_193() {
               --with-ruby-version=1.9.3 \
               --disable-install-doc
   make
-  sudo checkinstall -D -y \
+  checkinstall -D -y \
                     --fstrans=no \
                     --nodoc \
                     --pkgname="ruby1.9.3" \
@@ -102,21 +123,21 @@ function install_ruby_193() {
                     --provides="ruby"
   cd ..
 
-  sudo update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby1.9.3 500 \
-                           --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri1.9.3 \
-                           --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb1.9.3 \
-                           --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem1.9.3 \
-                           --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb1.9.3 \
-                           --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc1.9.3
+  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby1.9.3 500 \
+                      --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri1.9.3 \
+                      --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb1.9.3 \
+                      --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem1.9.3 \
+                      --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb1.9.3 \
+                      --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc1.9.3
 }
 
 function install_ruby_ree() {
   local ree="ruby-enterprise_1.8.7-2011.03_${ARCH}_ubuntu10.04.deb"
   wget http://rubyenterpriseedition.googlecode.com/files/$ree
-  sudo dpkg -i $ree
+  dpkg -i $ree
 
   # remove all gems
-  gem list | cut -d" " -f1 | xargs sudo gem uninstall
+  gem list | cut -d" " -f1 | xargs gem uninstall
 }
 
 
@@ -132,8 +153,7 @@ fi
 # which version?
 . /etc/lsb-release
 case $DISTRIB_RELEASE in
-  10.*  ) ;; # nop
-  11.04 ) ;; # nop
+  10.* | 11.* ) ;; # nop
   *)
     banner "warning - Ubuntu $DISTRIB_RELEASE hasn't been tested with Teleport yet"
 esac

data/lib/teleport/util.rb

@@ -2,6 +2,7 @@ require "cgi"
 require "digest/md5"
 require "etc"
 require "fileutils"
+require "yaml"
 
 module Teleport
   # Helper module for executing commands and printing stuff
@@ -273,7 +274,7 @@ module Teleport
 
     # Returns true if the pkg is installed.
     def package_is_installed?(pkg)
-      succeeds?("dpkg-query -f='${Status}' -W #{pkg} | grep 'install ok installed' 2> /dev/null")    
+      succeeds?("dpkg-query -f='${Status}' -W #{pkg} 2>&1 | grep 'install ok installed'")    
     end
 
     # Install pkg if necessary.
@@ -302,6 +303,16 @@ module Teleport
       false
     end
 
+    # Returns the newest currently installed version of
+    # the named gem or false if the gem is not installed
+    def gem_version(name)
+      spec_out = `gem specification #{name} 2> /dev/null`
+      if !spec_out.empty?
+        spec = Gem::Specification.from_yaml(spec_out)
+        spec.version
+      end
+    end
+
     # Returns true if the pidfile exists and that process id exists as
     # well.
     def process_by_pid?(pidfile)

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/end_to_end_spec.rb

@@ -8,7 +8,7 @@ describe "a new ec2 instance" do
   telfile do
     <<EOF
 user "gub"
-ruby "1.8.7"
+ruby "1.9.3"
 ssh_options ["-o", "User=ubuntu", "-o", "StrictHostKeyChecking=no", "-o", "IdentityFile=#{ENV["TELEPORT_SSH_KEY"]}"]
 
 role :master, :packages => %w(nginx), :recipes => %w(ruby.rb)

data/spec/support/ec2.rb

@@ -3,10 +3,11 @@ require "AWS"
 # spin up a fresh ec2 instance
 module Support
   module Ec2
+    # these are all us-east-1 64-bit instance
     AMI_10_04 = "1136fb78"
     AMI_10_10 = "1933fe70"
     AMI_11_04 = "71589518"
-    AMI_11_10 = "4b772b0e"    
+    AMI_11_10 = "21f53948"
     KEYPAIR = "teleport"
     GROUP = "teleport"
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: teleport
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 31
+  prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  segments_generated: true
+  version: 1.0.4
 platform: ruby
 authors: 
 - Adam Doppelt
@@ -15,13 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 -07:00
+date: 2011-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: amazon-ec2
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,13 +28,14 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  name: amazon-ec2
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,13 +43,14 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  name: awesome_print
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,13 +58,14 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  name: rake
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -72,13 +74,14 @@ dependencies:
         segments: 
         - 3
         - 9
+        segments_generated: true
         version: "3.9"
+  name: rdoc
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -87,9 +90,12 @@ dependencies:
         segments: 
         - 2
         - 6
+        segments_generated: true
         version: "2.6"
+  name: rspec
   prerelease: false
-  requirement: *id005
+  type: :development
+  version_requirements: *id005
 description: Easy Ubuntu server setup via teleportation.
 email: 
 - amd@gurge.com
@@ -140,6 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -149,11 +156,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: teleport
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Teleport - opinionated Ubuntu server setup with Ruby.