teleport 1.0.4 → 1.0.5

data/README.md

@@ -1,7 +1,5 @@
 ## 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.

data/lib/teleport/config.rb

@@ -1,9 +1,11 @@
 module Teleport
   # This class parses Telfile, and includes DSL and the models.
   class Config
+    include Constants
+
     RUBIES = ["1.9.3", "1.9.2", "REE", "1.8.7"]
 
-    attr_accessor :user, :ruby, :ssh_options, :roles, :servers, :apt, :packages, :recipes, :callbacks, :dsl
+    attr_accessor :user, :ruby, :ssh_options, :roles, :servers, :apt, :packages, :recipes, :callbacks, :dsl, :ssh_key
 
     def initialize(file = "Telfile")
       @roles = []
@@ -152,6 +154,10 @@ module Teleport
         @config.recipes += list.flatten
       end
 
+      def ssh_key(v)
+        @config.ssh_key = v
+      end
+
       %w(install user packages gemfiles files recipes).each do |op|
         %w(before after).each do |before_after|
           callback = "#{before_after}_#{op}".to_sym

data/lib/teleport/install.rb

@@ -10,10 +10,13 @@ module Teleport
       run_verbose!
       _read_config
 
-      # setup @config constants
-      Config::DSL.const_set("HOST", @host)
-      Config::DSL.const_set("USER", @config.user)
-      Config::DSL.const_set("ROLE", @role && @role.name)
+      # setup @config constants. Put them in mirror so they're
+      # accessible to both the DSL and Mirror itself. That way you can
+      # access these if you call install_file directly.
+      Mirror.const_set("HOST", @host)
+      Mirror.const_set("USER", @config.user)
+      Mirror.const_set("ROLE", @role && @role.name)
+      Mirror.const_set("SERVER", @server)
 
       # add mixins
       @config.dsl.extend(Mirror)
@@ -170,7 +173,7 @@ EOF
       if File.exists?(PUBKEY)
         authorized_keys = "/home/#{user}/.ssh/authorized_keys"
         if !File.exists?(authorized_keys)
-          puts "adding #{PUBKEY} to authorized_keys..."
+          puts "adding #{File.basename(@config.ssh_key || PUBKEY)} to authorized_keys..."
           mkdir_if_necessary(File.dirname(authorized_keys), user, 0700)
           cp(PUBKEY, authorized_keys, user, 0600)
         end
@@ -220,7 +223,6 @@ EOF
       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}"

data/lib/teleport/main.rb

@@ -86,9 +86,14 @@ module Teleport
         f.puts("CONFIG_RUBYGEMS='#{RUBYGEMS}'")        
       end
       # keys
-      ssh_key = "#{ENV["HOME"]}/.ssh/#{PUBKEY}"
+      if ssh_key = @config.ssh_key
+        if !File.exists?(ssh_key)
+          fatal("I can't find the specified ssh key: #{ssh_key}")
+        end
+      end
+      ssh_key ||= "#{ENV["HOME"]}/.ssh/#{PUBKEY}"
       if File.exists?(ssh_key)
-        run("cp", [ssh_key, DIR])
+        run("cp", [ssh_key, "#{DIR}/#{PUBKEY}"])
       end
       
       Dir.chdir(File.dirname(DIR)) do

data/lib/teleport/run.sh

@@ -36,12 +36,12 @@ function install_ruby() {
     readline=libreadline-gplv2-dev
   fi
   apt-get install -y wget $readline
-  
+
   banner "installing Ruby $CONFIG_RUBY..."
   case $CONFIG_RUBY in
     1.8.7 ) install_ruby_187 ;;
     1.9.2 ) install_ruby_192 ;;
-    1.9.3 ) install_ruby_193 ;;    
+    1.9.3 ) install_ruby_193 ;;
     REE )   install_ruby_ree ;;
 	* )     fatal "unknown ruby ($CONFIG_RUBY)" ;;
   esac
@@ -49,7 +49,7 @@ function install_ruby() {
 
 function install_ruby_187() {
   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 ; ruby setup.rb)
@@ -75,13 +75,13 @@ function install_ruby_192() {
   local patch=p290
 
   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
-  
+
   cd ruby-1.9.2-$patch
   ./configure --prefix=/usr/local \
-              --program-suffix=1.9.2 \
+              --program-suffix=192 \
               --with-ruby-version=1.9.2 \
               --disable-install-doc
   make
@@ -93,42 +93,41 @@ function install_ruby_192() {
                     --provides="ruby"
   cd ..
 
-  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/ruby192 500 \
+                      --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri192 \
+                      --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb192 \
+                      --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem192 \
+                      --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb192 \
+                      --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc192
 }
 
 function install_ruby_193() {
-  local patch=p0
+  local patch=p125
 
   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
-  
+
   cd ruby-1.9.3-$patch
   ./configure --prefix=/usr/local \
-              --program-suffix=1.9.3 \
+              --program-suffix=193 \
               --with-ruby-version=1.9.3 \
               --disable-install-doc
   make
   checkinstall -D -y \
-                    --fstrans=no \
                     --nodoc \
                     --pkgname="ruby1.9.3" \
                     --pkgversion="1.9.3-$patch" \
                     --provides="ruby"
   cd ..
 
-  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/ruby193 500 \
+                      --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri193 \
+                      --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb193 \
+                      --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem193 \
+                      --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb193 \
+                      --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc193
 }
 
 function install_ruby_ree() {

data/lib/teleport/version.rb

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

data/spec/unit/teleport/config_spec.rb

@@ -21,6 +21,8 @@ describe Teleport::Config do
 user "somebody"
 ruby "1.8.7"
 
+ssh_key "keys/my-key.pub"
+
 role :master, :packages => %w(nginx), :recipes => %w(master.rb)
 role :slave, :packages => %w(memcached)
 server "one", :role => :master, :packages => %w(strace)
@@ -42,6 +44,7 @@ EOF
     let(:config) do
       Teleport::Config.new
     end
+
     it "has the master role" do
       config.role(:master).name.should == :master
       config.role(:master).packages.should == %w(nginx)
@@ -71,5 +74,8 @@ EOF
       config.apt.first.line.should == "blah blah blah"
       config.apt.first.options[:key].should == "123"
     end
+    it "has a ssh key path" do
+      config.ssh_key.should == "keys/my-key.pub"
+    end
   end
 end

metadata

@@ -1,111 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: teleport
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  segments_generated: true
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Adam Doppelt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+date: 2012-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: amazon-ec2
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: awesome_print
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        segments_generated: true
-        version: "3.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        segments_generated: true
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Easy Ubuntu server setup via teleportation.
-email: 
+email:
 - amd@gurge.com
-executables: 
+executables:
 - teleport
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -129,41 +122,34 @@ files:
 - spec/support/telfile.rb
 - spec/unit/teleport/config_spec.rb
 - teleport.gemspec
-has_rdoc: true
 homepage: http://github.com/gurgeous/teleport
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -562607455023534771
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: -562607455023534771
 requirements: []
-
 rubyforge_project: teleport
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Teleport - opinionated Ubuntu server setup with Ruby.
 test_files: []
-