right_agent 0.9.8 → 0.9.9

data/lib/right_agent/platform.rb

@@ -322,6 +322,7 @@ module RightScale
         elsif windows?
           res = Platform.const_get(const_name).new
         end
+        self.instance_variable_set(instance_var, res)
       end
       return res
     end

data/lib/right_agent/platform/linux.rb

@@ -253,7 +253,7 @@ module RightScale
         results = []
         output_text.each do |line|
           volume = {}
-          line_regex = /^([\/a-z0-9]+):(.*)/
+          line_regex = /^([\/a-z0-9_\-\.]+):(.*)/
           volmatch = line_regex.match(line)
           raise ParserError.new("Failed to parse volume info from #{line.inspect} using #{line_regex.inspect}") unless volmatch
           volume[:device] = volmatch[1]

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.9.8'
-  spec.date      = '2012-04-04'
+  spec.version   = '0.9.9'
+  spec.date      = '2012-04-05'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/platform/linux_volume_manager_spec.rb

@@ -47,6 +47,30 @@ EOF
           @platform.volume_manager.parse_volumes(blkid_resp).should == volume_hash_ary
         end
 
+        it 'can parse volumes with hyphens or underscores (lvm use case)' do
+          blkid_resp = <<EOF
+/dev/vg-rightscale-data_storage1/lvol0: UUID="ee34706d-866f-476e-9da4-6a18745456a4" TYPE="xfs"
+EOF
+
+          volume_hash_ary = [
+            {:device => '/dev/vg-rightscale-data_storage1/lvol0', :uuid => 'ee34706d-866f-476e-9da4-6a18745456a4', :type => 'xfs', :filesystem => "xfs"}
+          ]
+
+          @platform.volume_manager.parse_volumes(blkid_resp).should == volume_hash_ary
+        end
+
+        it 'can parse volumes with periods' do
+          blkid_resp = <<EOF
+/dev/please.dont.do.this: UUID="ee34706d-866f-476e-9da4-6a18745456a4" TYPE="xfs"
+EOF
+
+          volume_hash_ary = [
+            {:device => '/dev/please.dont.do.this', :uuid => 'ee34706d-866f-476e-9da4-6a18745456a4', :type => 'xfs', :filesystem => "xfs"}
+          ]
+
+          @platform.volume_manager.parse_volumes(blkid_resp).should == volume_hash_ary
+        end
+
         it 'raises a parser error when blkid output is malformed' do
           blkid_resp = 'foobarbz'
 
@@ -100,9 +124,8 @@ EOF
 proc on /proc type proc (rw,noexec,nosuid,nodev)
 EOF
 
-          mount_popen_mock = flexmock(:read => mount_resp)
-          flexmock(IO).should_receive(:popen).with('mount',Proc).once.and_yield(mount_popen_mock)
-          flexmock(IO).should_receive(:popen).with('mount -t vfat /dev/xvdh1 /var/spool/softlayer',Proc).once.and_yield(flexmock(:read => ""))
+          flexmock(@platform.volume_manager).should_receive(:blocking_popen).with('mount').once.and_return([0, mount_resp])
+          flexmock(@platform.volume_manager).should_receive(:blocking_popen).with('mount -t vfat /dev/xvdh1 /var/spool/softlayer').once.and_return([0, '']);
 
           @platform.volume_manager.mount_volume({:device => "/dev/xvdh1", :filesystem => "vfat"}, "/var/spool/softlayer")
         end
@@ -113,10 +136,8 @@ EOF
 proc on /proc type proc (rw,noexec,nosuid,nodev)
 /dev/xvdh1 on /var/spool/softlayer type vfat (rw) [METADATA]
 EOF
-
-          mount_popen_mock = flexmock(:read => mount_resp)
-          flexmock(IO).should_receive(:popen).with('mount',Proc).once.and_yield(mount_popen_mock)
-          flexmock(IO).should_receive(:popen).with('mount -t vfat /dev/xvdh1 /var/spool/softlayer',Proc).never.and_yield(flexmock(:read => ""))
+          flexmock(@platform.volume_manager).should_receive(:blocking_popen).with('mount').once.and_return([0, mount_resp])
+          flexmock(@platform.volume_manager).should_receive(:blocking_popen).with('mount -t vfat /dev/xvdh1 /var/spool/softlayer').never.and_return([0, '']);
 
           @platform.volume_manager.mount_volume({:device => "/dev/xvdh1", :filesystem => "vfat"}, "/var/spool/softlayer")
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 -07:00
+date: 2012-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency