rubber 1.13.1 → 1.13.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.13.2
+-----
+
+fix npe <184cbac> [Matt Conway]
+Merge pull request #61 from dzinevich/e173588f4018bc118785bd3806d262ce3bdd033d <0bfb5c2> [Kevin Menard]
+make workaround so ebs works with 11.04 <e173588> [Denis Zinevich]
+
 1.13.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.13.1
+1.13.2

data/lib/rubber/instance.rb

@@ -157,7 +157,7 @@ module Rubber
         roles = Array(roles)
 
         if expanded.size == 0
-          common_deps = dependency_map[RoleItem.new('common')]
+          common_deps = Array(dependency_map[RoleItem.new('common')])
           roles.concat(common_deps)
         end
 

data/lib/rubber/recipes/rubber/volumes.rb

@@ -124,9 +124,14 @@ namespace :rubber do
               fi
               mv /etc/fstab /etc/fstab.bak
               cat /etc/fstab.bak | grep -v '#{vol_spec['mount']}' > /etc/fstab
-              echo '#{vol_spec['device']} #{vol_spec['mount']} #{vol_spec['filesystem']} noatime 0 0 # rubber volume #{vol_id}' >> /etc/fstab
-
-              #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + vol_spec['device']) if created}
+              if grep '11\.04' /etc/lsb-release; then
+		 device=`echo #{vol_spec['device']} | sed 's/sd/xvd/'`
+	      else
+		 device='#{vol_spec['device']}'
+	      fi
+		 echo "$device #{vol_spec['mount']} #{vol_spec['filesystem']} noatime 0 0 # rubber volume #{vol_id}" >> /etc/fstab		
+
+              #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + '$device') if created}
               #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}
               #{("mount '#{vol_spec['mount']}'") if vol_spec['mount']}
             fi
@@ -157,7 +162,7 @@ namespace :rubber do
             fi
 
             # partition format is: Start (blank is first available),Size(MB due to -uM),Id(83=linux,82=swap,etc),Bootable
-            echo "#{partition_spec['start']},#{partition_spec['size']},#{partition_spec['type']},#{partition_spec['bootable']}" | sfdisk -L -uM #{partition_spec['disk_device']}
+              echo "#{partition_spec['start']},#{partition_spec['size']},#{partition_spec['type']},#{partition_spec['bootable']}" | sfdisk -L -uM #{partition_spec['disk_device']}
           fi
         ENDSCRIPT
       end

metadata

@@ -2,7 +2,7 @@
 name: rubber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors: 
 - Matt Conway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-05-23 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency