teleport 1.0.1 → 1.0.2

data/README.md

@@ -59,4 +59,4 @@ Teleport will ssh to the machine and set it up per your instructions.
 
 Full docs are in the wiki:
 
-https://github.com/rglabs/teleport/wiki
+https://github.com/gurgeous/teleport/wiki

data/lib/teleport/config.rb

@@ -1,7 +1,7 @@
 module Teleport
   # This class parses Telfile, and includes DSL and the models.
   class Config
-    RUBIES = ["1.9.2", "REE", "1.8.7"]
+    RUBIES = ["1.9.3", "1.9.2", "REE", "1.8.7"]
 
     attr_accessor :user, :ruby, :ssh_options, :roles, :servers, :apt, :packages, :callbacks, :dsl
     
@@ -17,6 +17,8 @@ module Teleport
 
       @user ||= Util.whoami
       @ruby ||= RUBIES.first
+
+      sanity_check_gemfiles
     end
 
     def role(n)
@@ -27,6 +29,17 @@ module Teleport
       @servers.find { |i| i.name == n.to_s }      
     end
 
+    def sanity_check_gemfiles
+      files = ["files"] + @roles.map { |i| "files_#{i.name}" }
+      files.each do |i|
+        gemfile = "#{i}/Gemfile"
+        lock = "#{gemfile}.lock"
+        if File.exists?(gemfile) && !File.exists?(lock)
+          Util.fatal "Hm. I found #{gemfile}, but you forgot to create #{lock}."
+        end
+      end
+    end
+
     # The model for role in the Telfile.
     class Role
       attr_reader :name, :options, :packages
@@ -118,7 +131,7 @@ module Teleport
         @config.packages += list.flatten
       end
 
-      %w(install user packages files).each do |op|
+      %w(install user packages gemfiles files).each do |op|
         %w(before after).each do |before_after|
           callback = "#{before_after}_#{op}".to_sym
           define_method(callback) do |&block|

data/lib/teleport/constants.rb

@@ -15,5 +15,5 @@ module Constants
   PUBKEY = "id_teleport.pub"
 
   # Minimum version of rubygems to install.
-  RUBYGEMS = "1.8.5"
+  RUBYGEMS = "1.8.10"
 end

data/lib/teleport/infer.rb

@@ -138,6 +138,7 @@ module Teleport
       when /Ruby Enterprise Edition/ then ruby = "REE"
       when /1\.8\.7/ then ruby = "1.8.7"
       when /1\.9\.2/ then ruby = "1.9.2"
+      when /1\.9\.3/ then ruby = "1.9.3"        
       end
       append "ruby #{ruby.inspect}" if ruby
     end

data/lib/teleport/install.rb

@@ -30,6 +30,9 @@ module Teleport
         _with_callback(:packages) do
           _packages
         end
+        _with_callback(:gemfiles) do
+          _gemfiles
+        end
         _with_callback(:files) do
           _files
         end
@@ -73,16 +76,6 @@ module Teleport
         run "gem update --system"
       end
 
-      # uninstall all gems except for bundler
-      gems = `gem list`.split("\n").map { |i| i.split.first }
-      gems.delete("bundler")
-      if !gems.empty?
-        banner "Uninstalling #{gems.length} system gems..."
-        gems.each do |i|
-          run "gem uninstall -aIx #{i}"
-        end
-      end
-
       # install bundler
       gem_if_necessary("bundler")
     end
@@ -104,15 +97,21 @@ module Teleport
       end
       run "hostname -F /etc/hostname"
 
-      puts "adding #{@host} to /etc/hosts ..."
+      # list of hostnames to add to /etc/hosts
+      hostnames = []
+      hostnames << @host
+      hostnames << @host.split(".").first if @host.index(".")
+      hostnames = hostnames.join(" ")
+
+      puts "adding #{hostnames} to /etc/hosts ..."
       _rewrite("/etc/hosts") do |fout|
         hosts = File.read("/etc/hosts")
 
         # old_hostname => @host
-        hosts.gsub!(_etc_hosts_regex(old_hostname), "\\1#{@host}\\2")
+        hosts.gsub!(_etc_hosts_regex(old_hostname), "\\1#{hostnames}\\2")
         if hosts !~ _etc_hosts_regex(@host)
           # not found? append to localhost
-          hosts.gsub!(_etc_hosts_regex("localhost"), "\\1localhost #{@host}\\2")
+          hosts.gsub!(_etc_hosts_regex("localhost"), "\\1localhost #{hostnames}\\2")
           if hosts !~ _etc_hosts_regex(@host)
             puts "  Hm. I couldn't add it, unfortunately. You'll have to do it manually."
           end
@@ -190,6 +189,21 @@ EOF
       list.sort.each { |i| package_if_necessary(i) }
     end
 
+    def _gemfiles
+      files = ["files"]
+      files << "files_#{@role.name}" if @role
+      Dir.chdir(DATA) do
+        files.each do |i|
+          gemfile = "#{i}/Gemfile"
+          lock = "#{gemfile}.lock"
+          if File.exists?(gemfile)
+            banner "Gemfiles - #{gemfile}..."
+            run "bundle install --gemfile #{gemfile}"
+          end
+        end
+      end
+    end
+
     def _files
       banner "Files..."
       files = ["files"]

data/lib/teleport/main.rb

@@ -27,13 +27,9 @@ module Teleport
     def cli(cmd)
       @options = { }
       @options[:cmd] = cmd
-      @options[:file] = "Telfile"
 
       opt = OptionParser.new do |o|
         o.banner = "Usage: teleport <hostname>"
-        o.on("-f", "--file FILE", "use this file instead of Telfile") do |f|
-          @options[:file] = f
-        end
         o.on("-i", "--infer", "infer a new Telfile from YOUR machine") do |f|
           @options[:cmd] = :infer
         end
@@ -63,10 +59,10 @@ module Teleport
 
     # Read Telfile
     def read_config
-      if !File.exists?(@options[:file])
-        fatal("Sadly, I can't find #{@options[:file]} here. Please create one.")
+      if !File.exists?("Telfile")
+        fatal("Sadly, I can't find Telfile here. Please create one.")
       end
-      @config = Config.new(@options[:file])
+      @config = Config.new("Telfile")
     end
 
     # Assemble the the tgz before we teleport to the host
@@ -76,12 +72,12 @@ module Teleport
       
       # gem
       run("cp", ["-r", "#{File.dirname(__FILE__)}/../../lib", GEM])
-      # Telfile, if necessary
-      if @options[:file] != "Telfile"
-        run("cp", [@options[:file], "Telfile"])
-      end
       # data
-      run("cp", ["-r", ".", DATA])
+      mkdir(DATA)
+      copy = []
+      copy << "Telfile"
+      copy += Dir["files*"]
+      copy.sort.each { |i| run("cp", ["-r", i, DATA]) }
       # config.sh
       File.open("#{DIR}/config", "w") do |f|
         f.puts("CONFIG_HOST='#{@options[:host]}'")        

data/lib/teleport/mirror.rb

@@ -5,6 +5,15 @@ module Teleport
   module Mirror
     include Constants
 
+    # Don't install these files.
+    IGNORE = [
+              ".",
+              "..",
+              "Gemfile",
+              "Gemfile.lock",              
+              /^.#/,
+             ]
+
     # Install file from the teleport data directory into the normal
     # filesystem. Path can use a few different formats:
     #
@@ -56,7 +65,7 @@ module Teleport
       mkdir_if_necessary(dst, user_for_file(dst)) if !dst.empty?      
       
       files = Dir.new(path).to_a.sort
-      files.delete_if { |i| i == "." || i == ".." || i =~ /^.#/ }
+      files.delete_if { |file| IGNORE.any? { |i| i === file } }
       files.each do |i|
         i = "#{path}/#{i}"
         if File.directory?(i)

data/lib/teleport/run.sh

@@ -33,6 +33,7 @@ function install_ruby() {
   case $CONFIG_RUBY in
     1.8.7 ) install_ruby_187 ;;
     1.9.2 ) install_ruby_192 ;;
+    1.9.3 ) install_ruby_193 ;;    
     REE )   install_ruby_ree ;;
 	* )     fatal "unknown ruby ($CONFIG_RUBY)" ;;
   esac
@@ -43,12 +44,12 @@ function install_ruby_187() {
   
   wget http://production.cf.rubygems.org/rubygems/rubygems-$CONFIG_RUBYGEMS.tgz
   tar xfpz rubygems-$CONFIG_RUBYGEMS.tgz
-  (cd rubygems-$CONFIG_RUBYGEMS ; ruby setup.rb)
+  (cd rubygems-$CONFIG_RUBYGEMS ; sudo ruby setup.rb)
   ln -s /usr/bin/gem1.8 /usr/bin/gem
 }
 
 function install_ruby_192() {
-  local patch=p180
+  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
@@ -78,10 +79,44 @@ function install_ruby_192() {
                            --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
+
+  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
+  
+  cd ruby-1.9.3-$patch
+  ./configure --prefix=/usr/local \
+              --program-suffix=1.9.3 \
+              --with-ruby-version=1.9.3 \
+              --disable-install-doc
+  make
+  sudo checkinstall -D -y \
+                    --fstrans=no \
+                    --nodoc \
+                    --pkgname="ruby1.9.3" \
+                    --pkgversion="1.9.3-$patch" \
+                    --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
+}
+
 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
+
+  # remove all gems
+  gem list | cut -d" " -f1 | xargs sudo gem uninstall
 }
 
 

data/lib/teleport/util.rb

@@ -89,6 +89,11 @@ module Teleport
       run("#{command} > /dev/null 2> /dev/null")
     end
 
+    # Run one or several commands, separate by newlines.
+    def shell(commands)
+      commands.split("\n").each { |i| run(i) }
+    end
+
     # Run a command, return true if it succeeds.
     def succeeds?(command)
       system("#{command} > /dev/null 2> /dev/null")

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/end_to_end_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 describe "a new ec2 instance" do
   ec2
 
+  # Telfile
   telfile do
     <<EOF
 user "gub"
@@ -18,6 +19,17 @@ before_install do
   puts "BEFORE_INSTALL"
 end
 
+after_files do
+  puts "AFTER_FILES"
+  puts "test.txt"
+  p File.read("/test.txt")
+end
+
+after_gemfiles do
+  puts "AFTER_GEMFILES"
+  Util.run "gem list"
+end
+
 after_install do
   puts "AFTER_INSTALL"
   run "touch /tmp/gub.txt"
@@ -25,6 +37,10 @@ end
 EOF
   end
 
+  # Roles. This is clunky, unfortunately.
+  role(nil, "test.txt.erb" => "<%= 1+2 %>", "Gemfile" => "source 'http://rubygems.org'\ngem 'trollop'", "Gemfile.lock" => "GEM\n  remote: http://rubygems.org/\n  specs:\n    trollop (1.16.2)\n\nPLATFORMS\n  ruby\n\nDEPENDENCIES\n  trollop")
+  role("master", "Gemfile" => "source 'http://rubygems.org'\ngem 'awesome_print'", "Gemfile.lock" => "GEM\n  remote: http://rubygems.org/\n  specs:\n    awesome_print (0.4.0)\n\nPLATFORMS\n  ruby\n\nDEPENDENCIES\n  awesome_print")
+  
   it "installs properly" do
     ARGV.clear
     ARGV << $ec2_ip_address

data/spec/support/ec2.rb

@@ -3,9 +3,10 @@ require "AWS"
 # spin up a fresh ec2 instance
 module Support
   module Ec2
-    AMI_10_04 = "fbbf7892"
-    AMI_10_10 = "08f40561"
-    AMI_11_04 = "68ad5201"
+    AMI_10_04 = "1136fb78"
+    AMI_10_10 = "1933fe70"
+    AMI_11_04 = "71589518"
+    AMI_11_10 = "4b772b0e"    
     KEYPAIR = "teleport"
     GROUP = "teleport"
 
@@ -76,10 +77,11 @@ EOF
         puts "Waiting for ec2 instance to start..."
         while true
           sleep 3
-          instance = describe_instances.first
-          status = instance["instanceState"]["name"]
-          puts "  #{instance["instanceId"]}: #{status}"
-          break if status == "running"
+          if instance = describe_instances.first
+            status = instance["instanceState"]["name"]
+            puts "  #{instance["instanceId"]}: #{status}"
+            break if status == "running"
+          end
         end
 
         # return the ip address

data/spec/support/telfile.rb

@@ -21,5 +21,17 @@ module Support
         Dir.chdir(pwd)
       end
     end
+
+    def role(role, files)
+      before(:all) do
+        path = (role == nil) ? "files" : "files_#{role}"
+        `mkdir -p #{path}`
+        Dir.chdir(path) do
+          files.each_pair do |key, value|
+            File.open(key, "w") { |f| f.write(value) }
+          end
+        end
+      end
+    end
   end
 end

data/teleport.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Adam Doppelt"]
   s.email       = ["amd@gurge.com"]
-  s.homepage    = "http://github.com/rglabs/teleport"  
+  s.homepage    = "http://github.com/gurgeous/teleport"  
   s.summary     = "Teleport - opinionated Ubuntu server setup with Ruby."
   s.description = "Easy Ubuntu server setup via teleportation."
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: teleport
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Adam Doppelt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -07:00
+date: 2011-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: awesome_print
   type: :development
@@ -44,8 +44,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   type: :development
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: rdoc
   type: :development
@@ -73,8 +73,8 @@ dependencies:
         - 3
         - 9
         version: "3.9"
-  requirement: *id004
   prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -88,8 +88,8 @@ dependencies:
         - 2
         - 6
         version: "2.6"
-  requirement: *id005
   prerelease: false
+  requirement: *id005
 description: Easy Ubuntu server setup via teleportation.
 email: 
 - amd@gurge.com
@@ -124,7 +124,7 @@ files:
 - spec/unit/teleport/config_spec.rb
 - teleport.gemspec
 has_rdoc: true
-homepage: http://github.com/rglabs/teleport
+homepage: http://github.com/gurgeous/teleport
 licenses: []
 
 post_install_message: