RubyGems - rubber - Versions diffs - 1.14.0 → 1.14.1 - Mend

rubber 1.14.0 → 1.14.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/CHANGELOG +6 -0
data/VERSION +1 -1
data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb +5 -32
data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml +1 -2
data/lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb +5 -32
data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml +1 -2
metadata +29 -2

data/CHANGELOG CHANGED Viewed

@@ -1,3 +1,9 @@
+1.14.1 (06/02/2011)
+-----
+Upgraded the version of RVM installed by default
+Switched from using our own installation method to using the new RVM installer
 1.14.0 (06/02/2011)
 -----

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.14.0
1	+ 1.14.1

data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb CHANGED Viewed

@@ -7,35 +7,11 @@ namespace :rubber do
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ ! `rvm --version 2> /dev/null` =~ "#{rubber_env.rvm_version}" ]]; then
-          echo "rvm_prefix=/usr/local/" > /etc/rvmrc
-          echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
-          # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest
-          #
-          if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-          if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-          rvm_path="${rvm_path:-$HOME/.rvm}"
-          mkdir -p $rvm_path/src/
-          builtin cd $rvm_path/src
-          stable_version=#{rubber_env.rvm_version}
-          echo "rvm-${stable_version}"
-          curl -L "http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz" -o "rvm-${stable_version}.tar.gz"
-          tar zxf "rvm-${stable_version}.tar.gz"
-          builtin cd "rvm-${stable_version}"
-          dos2unix scripts/* >/dev/null 2>&1 || true
-          bash ./scripts/install
+          cd /tmp
+          curl -s https://rvm.beginrescueend.com/install/rvm -o rvm-installer
+          chmod +x rvm-installer
+          rm -f /etc/rvmrc
+          rvm_path=#{rubber_env.rvm_prefix} ./rvm-installer --version #{rubber_env.rvm_version}
           # Set up the rubygems version
           sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
@@ -47,9 +23,6 @@ namespace :rubber do
           # Set up the .gemrc file
           echo "--- " >> ~/.gemrc
           echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
-          #
-          # end rvm install script
         fi
       ENDSCRIPT
     end

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml CHANGED Viewed

@@ -1,4 +1,3 @@
 # rvm needs some extra packages to compile/install ruby runtimes
 # curl is required.
 # patch is required (for ree, some ruby head's).
@@ -12,7 +11,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 # REQUIRED: the version of rvm itself
-rvm_version: 1.2.7
+rvm_version: 1.6.18
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb CHANGED Viewed

@@ -7,35 +7,11 @@ namespace :rubber do
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ ! `rvm --version 2> /dev/null` =~ "#{rubber_env.rvm_version}" ]]; then
-          echo "rvm_prefix=/usr/local/" > /etc/rvmrc
-          echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
-          # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest
-          #
-          if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-          if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-          rvm_path="${rvm_path:-$HOME/.rvm}"
-          mkdir -p $rvm_path/src/
-          builtin cd $rvm_path/src
-          stable_version=#{rubber_env.rvm_version}
-          echo "rvm-${stable_version}"
-          curl -L "http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz" -o "rvm-${stable_version}.tar.gz"
-          tar zxf "rvm-${stable_version}.tar.gz"
-          builtin cd "rvm-${stable_version}"
-          dos2unix scripts/* >/dev/null 2>&1 || true
-          bash ./scripts/install
+          cd /tmp
+          curl -s https://rvm.beginrescueend.com/install/rvm -o rvm-installer
+          chmod +x rvm-installer
+          rm -f /etc/rvmrc
+          rvm_path=#{rubber_env.rvm_prefix} ./rvm-installer --version #{rubber_env.rvm_version}
           # Set up the rubygems version
           sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
@@ -47,9 +23,6 @@ namespace :rubber do
           # Set up the .gemrc file
           echo "--- " >> ~/.gemrc
           echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
-          #
-          # end rvm install script
         fi
       ENDSCRIPT
     end

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml CHANGED Viewed

@@ -1,4 +1,3 @@
 # rvm needs some extra packages to compile/install ruby runtimes
 # curl is required.
 # patch is required (for ree, some ruby head's).
@@ -12,7 +11,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 # REQUIRED: the version of rvm itself
-rvm_version: 1.2.7
+rvm_version: 1.6.18
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

metadata CHANGED Viewed

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
+  hash: 45
   prerelease:
-  version: 1.14.0
+  segments:
+  - 1
+  - 14
+  - 1
+  version: 1.14.1
 platform: ruby
 authors:
 - Matt Conway
@@ -21,6 +26,11 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 31
+        segments:
+        - 2
+        - 4
+        - 0
         version: 2.4.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 25
+        segments:
+        - 0
+        - 9
+        - 17
         version: 0.9.17
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,9 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -54,6 +72,9 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -480,17 +501,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.3.8
+rubygems_version: 1.6.2
 signing_key:
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)