teleport 1.0.13 → 1.0.14

data/lib/teleport/config.rb

@@ -3,7 +3,7 @@ module Teleport
   class Config
     include Constants
 
-    RUBIES = ["1.9.3", "1.9.2", "REE", "1.8.7"]
+    RUBIES = ["2.0.0", "1.9.3", "1.9.2", "REE", "1.8.7"]
 
     attr_accessor :user, :ruby, :ssh_options, :roles, :servers, :apt, :packages, :recipes, :callbacks, :dsl, :ssh_key
 

data/lib/teleport/main.rb

@@ -36,6 +36,9 @@ module Teleport
         o.on("-r", "--recipe [RECIPE]", "run a single recipe instead of a full install") do |f|
           @options[:recipe] = f
         end
+        o.on("-u", "--upgrade", "upgrade the existing ruby to the version configured") do |f|
+          @options[:upgrade] = true
+        end
         o.on_tail("-h", "--help", "print this help text") do
           puts opt
           exit(0)
@@ -92,6 +95,7 @@ module Teleport
         f.puts("CONFIG_HOST='#{@options[:host]}'")        
         f.puts("CONFIG_RUBY='#{@config.ruby}'")
         f.puts("CONFIG_RUBYGEMS='#{RUBYGEMS}'")
+        f.puts("CONFIG_UPGRADE='#{@options[:upgrade] || false}'")
         f.puts("CONFIG_RECIPE='#{@options[:recipe]}'") if @options[:recipe]
       end
       # keys

data/lib/teleport/run.sh

@@ -42,6 +42,7 @@ function install_ruby() {
     1.8.7 ) install_ruby_187 ;;
     1.9.2 ) install_ruby_192 ;;
     1.9.3 ) install_ruby_193 ;;
+    2.0.0 ) install_ruby_200 ;;
     REE )   install_ruby_ree ;;
 	* )     fatal "unknown ruby ($CONFIG_RUBY)" ;;
   esac
@@ -61,6 +62,46 @@ function install_rubygems() {
   fi
 }
 
+#
+# thanks to http://blog.statuspage.io/moving-to-ruby-2-on-mac-rvm-and-ubuntu-12-04/
+# for suggestions
+#
+
+function install_ruby_20_requirements() {
+  apt-get -y install build-essential checkinstall libffi-dev libncurses5-dev libssl-dev libyaml-dev zlib1g-dev
+}
+
+function install_ruby_200() {
+  local patch=p0
+
+  install_ruby_20_requirements
+
+  wget http://www.mirrorservice.org/sites/ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-$patch.tar.gz
+  #wget http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-$patch.tar.gz
+  tar xvzf ruby-2.0.0-$patch.tar.gz
+
+  cd ruby-2.0.0-$patch
+  ./configure --prefix=/usr/local \
+              --program-suffix=200 \
+              --with-ruby-version=2.0.0 \
+              --disable-install-doc
+  make
+  checkinstall -D -y \
+                    --nodoc \
+                    --dpkgflags=--force-overwrite \
+                    --pkgname="ruby2.0.0" \
+                    --pkgversion="2.0.0-$patch" \
+                    --provides="ruby200"
+  cd ..
+
+  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby200 200 \
+                      --slave   /usr/local/bin/ri   ri   /usr/local/bin/ri200 \
+                      --slave   /usr/local/bin/irb  irb  /usr/local/bin/irb200 \
+                      --slave   /usr/local/bin/gem  gem  /usr/local/bin/gem200 \
+                      --slave   /usr/local/bin/erb  erb  /usr/local/bin/erb200 \
+                      --slave   /usr/local/bin/rdoc rdoc /usr/local/bin/rdoc200
+}
+
 #
 # thanks to http://threebrothers.org/brendan/blog/ruby-1-9-2-on-ubuntu-11-04/
 # for suggestions
@@ -87,12 +128,13 @@ function install_ruby_192() {
   checkinstall -D -y \
                     --fstrans=no \
                     --nodoc \
+                    --dpkgflags=--force-overwrite \
                     --pkgname="ruby1.9.2" \
                     --pkgversion="1.9.2-$patch" \
                     --provides="ruby"
   cd ..
 
-  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby192 500 \
+  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby192 192 \
                       --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 \
@@ -116,12 +158,13 @@ function install_ruby_193_src() {
   make
   checkinstall -D -y \
                     --nodoc \
+                    --dpkgflags=--force-overwrite \
                     --pkgname="ruby1.9.3" \
                     --pkgversion="1.9.3-$patch" \
                     --provides="ruby"
   cd ..
 
-  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby193 500 \
+  update-alternatives --install /usr/local/bin/ruby ruby /usr/local/bin/ruby193 193 \
                       --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 \
@@ -190,8 +233,15 @@ cd /tmp/_teleported
 source ./config
 
 # do we need to install ruby?
-if ! which ruby > /dev/null ; then
+if ! which ruby > /dev/null; then
   install_ruby
+elif ! [[ `ruby -v` =~ "$CONFIG_RUBY" ]]; then
+  # installed ruby version does not matched the one configured
+  if [[ 'true' = "$CONFIG_UPGRADE" ]] ; then
+    install_ruby
+  else
+    banner "warning - Use the --upgrade argument to upgrade to Ruby $CONFIG_RUBY"
+  fi
 fi
 
 # do we need to get rid of the apt rubygems package?

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleport
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-04-23 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: 2963280599816926644
+      hash: 72796242449791997
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2963280599816926644
+      hash: 72796242449791997
 requirements: []
 rubyforge_project: teleport
 rubygems_version: 1.8.24