right_agent 0.9.11 → 0.10.2

data/Rakefile

@@ -46,8 +46,9 @@ directory gemtask.package_dir
 CLEAN.include(gemtask.package_dir)
 
 # == Unit tests == #
-
-RSPEC_OPTS = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.opts\""
+spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.win32.opts\"" if RUBY_PLATFORM =~ /mingw|mswin32/
+RSPEC_OPTS = ['--options', spec_opts_file]
 
 desc 'Run unit tests'
 RSpec::Core::RakeTask.new do |t|

data/lib/right_agent/actors/agent_manager.rb

@@ -65,7 +65,7 @@ class AgentManager
   #
   # === Return
   # (RightScale::OperationResult):: Always returns success
-  def stats(options)
+  def stats(options = {})
     @agent.stats(RightScale::SerializationHelper.symbolize_keys(options))
   end
 
@@ -80,7 +80,7 @@ class AgentManager
   #
   # === Return
   # (OperationResult):: Empty success result or error result with message
-  def profile(options)
+  def profile(options = {})
     require 'memprof'
 
     options = RightScale::SerializationHelper.symbolize_keys(options)

data/lib/right_agent/agent.rb

@@ -177,7 +177,7 @@ module RightScale
       now = Time.now
       Log.info("[start] Agent #{@identity} starting; time: #{now.utc}; utc_offset: #{now.utc_offset}")
       Log.debug("Start options:")
-      log_opts = @options.inject([]){ |t, (k, v)| t << "-  #{k}: #{v}" }
+      log_opts = @options.inject([]){ |t, (k, v)| t << "-  #{k}: #{v.respond_to?(:each) ? v.inspect : v}" }
       log_opts.each { |l| Log.debug(l) }
 
       begin
@@ -532,19 +532,23 @@ module RightScale
     def stats(options = {})
       now = Time.now
       reset = options[:reset]
-      result = OperationResult.success("name"            => @agent_name,
-                                       "identity"        => @identity,
-                                       "hostname"        => Socket.gethostname,
-                                       "memory"          => Platform.process.resident_set_size,
-                                       "version"         => AgentConfig.protocol_version,
-                                       "brokers"         => @broker.stats(reset),
-                                       "agent stats"     => agent_stats(reset),
-                                       "receive stats"   => @dispatcher.stats(reset),
-                                       "send stats"      => @sender.stats(reset),
-                                       "last reset time" => @last_stat_reset_time.to_i,
-                                       "stat time"       => now.to_i,
-                                       "service uptime"  => (now - @service_start_time).to_i,
-                                       "machine uptime"  => Platform.shell.uptime)
+      stats = {
+        "name"            => @agent_name,
+        "identity"        => @identity,
+        "hostname"        => Socket.gethostname,
+        "memory"          => Platform.process.resident_set_size,
+        "version"         => AgentConfig.protocol_version,
+        "brokers"         => @broker.stats(reset),
+        "agent stats"     => agent_stats(reset),
+        "receive stats"   => @dispatcher.stats(reset),
+        "send stats"      => @sender.stats(reset),
+        "last reset time" => @last_stat_reset_time.to_i,
+        "stat time"       => now.to_i,
+        "service uptime"  => (now - @service_start_time).to_i,
+        "machine uptime"  => Platform.shell.uptime
+      }
+      stats["revision"] = @revision if @revision
+      result = OperationResult.success(stats)
       @last_stat_reset_time = now if reset
       result
     end
@@ -612,6 +616,7 @@ module RightScale
       @agent_type = parsed_identity.agent_type
       @agent_name = @options[:agent_name]
       @stats_routing_key = "stats.#{@agent_type}.#{parsed_identity.base_id}"
+      @revision = revision
 
       @remaining_setup = {}
       @all_setup = [:setup_identity_queue]
@@ -814,6 +819,13 @@ module RightScale
       yield
     end
 
+    # Determine current revision of software
+    #
+    # === Return
+    # (String):: Revision of software in displayable format
+    def revision
+    end
+
   end # Agent
 
 end # RightScale

data/lib/right_agent/packets.rb

@@ -102,7 +102,9 @@ module RightScale
         'size'          => nil
       }.to_msgpack(*a)
       @size = msg.size
-      msg.sub!(/size\300/) { |m| "size" + @size.to_msgpack }
+      # For ruby 1.9 size attribute moves from front to back of packet
+      re = RUBY_VERSION < "1.9.0" ? /size\xC0/ : /size\xC0$/
+      msg.sub!(re) { |m| "size" + @size.to_msgpack }
       msg
     end
 

data/lib/right_agent/platform/windows.rb

@@ -327,6 +327,9 @@ module RightScale
 
       def initialize
         @os_info = OSInformation.new
+
+        @assignable_disk_regex = /^[D-Zd-z]:[\/\\]?$/
+        @assignable_path_regex = /^[A-Za-z]:[\/\\][\/\\\w\s\d\-_\.~]+$/
       end
 
       # Determines if the given path is valid for a Windows volume attachemnt
@@ -335,7 +338,7 @@ module RightScale
       # === Return
       # result(Boolean):: true if path is a valid volume root
       def is_attachable_volume_path?(path)
-         return nil != (path =~ /^[D-Zd-z]:[\/\\]?$/)
+         return (nil != (path =~ @assignable_disk_regex) || nil != (path =~ @assignable_path_regex))
       end
 
       # Gets a list of physical or virtual disks in the form:
@@ -448,7 +451,7 @@ EOF
       #
       # === Parameters
       # disk_index(int): zero-based disk index (from disks list, etc.)
-      # device(String):: device specified for the volume to create
+      # device(String):: disk letter or mount path specified for the volume to create
       #
       # === Return
       # always true
@@ -457,12 +460,14 @@ EOF
       # ArgumentError:: on invalid parameters
       # VolumeError:: on failure to format
       def format_disk(disk_index, device)
+        if device.match(@assignable_path_regex) && @os_info.major < 6
+          raise ArgumentError.new("Mount path assignment is not supported in this version of windows")
+        end
         # note that creating the primary partition automatically creates and
         # selects a new volume, which can be assigned a letter before the
         # partition has actually been formatted.
         raise ArgumentError.new("Invalid index = #{disk_index}") unless disk_index >= 0
         raise ArgumentError.new("Invalid device = #{device}") unless is_attachable_volume_path?(device)
-        letter = device[0,1]
         online_command = if @os_info.major < 6; "online noerr"; else; "online disk noerr"; end
         clear_readonly_command = if @os_info.major < 6; ""; else; "attribute disk clear readonly noerr"; end
 
@@ -477,7 +482,7 @@ select disk #{disk_index}
 #{online_command}
 clean
 create partition primary
-assign letter=#{letter}
+#{get_assign_command_for_device(device)}
 #{format_command}
 EOF
         exit_code, output_text = run_script(script)
@@ -485,7 +490,7 @@ EOF
 
         # must format using command shell's FORMAT command before 2008 server.
         if @os_info.major < 6
-          command = "echo Y | format #{letter}: /Q /V: /FS:NTFS"
+          command = "echo Y | format #{device[0,1]}: /Q /V: /FS:NTFS"
           output_text = `#{command}`
           exit_code = $?.exitstatus
           raise VolumeError.new("Failed to format disk #{disk_index} for device #{device}: exit code = #{exit_code}\n#{output_text}") if exit_code != 0
@@ -531,7 +536,7 @@ EOF
       #
       # === Parameters
       # volume_device_or_index(int):: old device or zero-based volume index (from volumes list, etc.) to select for assignment.
-      # device(String):: device specified for the volume to create
+      # device(String):: disk letter or mount path specified for the volume to create
       #
       # === Return
       # always true
@@ -541,18 +546,24 @@ EOF
       # VolumeError:: on failure to assign device name
       # ParserError:: on failure to parse volume list
       def assign_device(volume_device_or_index, device)
+        if device.match(@assignable_path_regex) && @os_info.major < 6
+          raise ArgumentError.new("Mount path assignment is not supported in this version of windows")
+        end
+        # Volume selector for drive letter assignments
         volume_selector_match = volume_device_or_index.to_s.match(/^([D-Zd-z]|\d+):?$/)
+        # Volume selector for mount path assignments
+        volume_selector_match = volume_device_or_index.to_s.match(@assignable_path_regex) unless volume_selector_match
         raise ArgumentError.new("Invalid volume_device_or_index = #{volume_device_or_index}") unless volume_selector_match
         volume_selector = volume_selector_match[1]
         raise ArgumentError.new("Invalid device = #{device}") unless is_attachable_volume_path?(device)
-        new_letter = device[0,1]
         script = <<EOF
 rescan
 list volume
-select volume #{volume_selector}
+select volume "#{volume_selector}"
 attribute volume clear readonly noerr
-assign letter=#{new_letter}
+#{get_assign_command_for_device(device)}
 EOF
+
         exit_code, output_text = run_script(script)
         raise VolumeError.new("Failed to assign device \"#{device}\" for volume \"#{volume_device_or_index}\": exit code = #{exit_code}\n#{script}\n#{output_text}") if exit_code != 0
         true
@@ -641,7 +652,8 @@ EOF
       # conditions{Hash):: hash of conditions to match or nil (default)
       #
       # === Return
-      # result(Array):: volumes or empty
+      # result(Array):: volumes or empty.  Drive letters are appended with ':' even though they aren't
+      # returned that way from diskpart
       #
       # === Raise
       # ParserError:: on failure to parse volume list
@@ -657,6 +669,14 @@ EOF
               break
             end
             match_data = line.match(line_regex)
+            unless match_data
+              path_match_regex = /([A-Za-z]:[\/\\][\/\\\w\s\d]+)/
+              match_data = line.match(path_match_regex)
+              if match_data
+                result.last[:device] = match_data[1]
+                next
+              end
+            end
             raise ParserError.new("Failed to parse volume info from #{line.inspect} using #{line_regex.inspect}") unless match_data
             letter = nil_if_empty(match_data[2])
             device = "#{letter.upcase}:" if letter
@@ -689,8 +709,8 @@ EOF
             info_width = header_match[5].length
             line_regex_text = "^[\\* ] Volume (\\d[\\d ]\{2\})   ([A-Za-z ])   "\
                               "(.\{#{label_width}\})  (.\{#{filesystem_width}\})  "\
-                              "(.\{#{type_width}\})  [ ]?([\\d ]\{3\}\\d) (.?B)  "\
-                              "(.\{#{status_width}\})  (.\{#{info_width}\})"
+                              "(.\{#{type_width}\})  [ ]?([\\d ]\{3\}\\d) (.?B)\\s{0,2}"\
+                              "(.\{#{status_width}\})\\s{0,2}(.\{0,#{info_width}\})"
             line_regex = Regexp.compile(line_regex_text)
           else
             # one or more lines of ignored headers
@@ -823,6 +843,21 @@ EOF
         end
       end
 
+      # Returns the correct diskpart assignment command for the specified device (either drive letter, or path)
+      #
+      # === Parameters
+      # device(String):: Either a drive letter or mount path
+      #
+      # === Return
+      # result(String):: The correct diskpart assignment command
+      def get_assign_command_for_device(device)
+        if device.match(@assignable_disk_regex)
+          "assign letter=#{device[0,1]}"
+        elsif device.match(@assignable_path_regex)
+          "assign mount=\"#{device}\""
+        end
+      end
+
     end # VolumeManager
 
     # Provides utilities for formatting executable shell commands, etc.

data/lib/right_agent/serialize/message_pack.rb

@@ -35,7 +35,12 @@ module MessagePack
   # === Return
   # obj(Object):: Unserialized object
   def self.load(data)
-    create(unpack(data))
+    if data.respond_to?(:force_encoding)
+      # For Ruby 1.9 need to ensure that MessagePack receives ASCII-8BIT data
+      create(unpack(data.force_encoding("ASCII-8BIT")))
+    else
+      create(unpack(data))
+    end
   end
 
   # Create any msgpack_class objects nested within the unserialized data by calling

data/lib/right_agent/serialize/serializer.rb

@@ -141,7 +141,7 @@ module RightScale
     # === Return
     # (Array):: Ordered serializers
     def order_serializers(packet)
-      packet[0] > 127 ? MSGPACK_FIRST_SERIALIZERS : JSON_FIRST_SERIALIZERS
+      packet.getbyte(0) > 127 ? MSGPACK_FIRST_SERIALIZERS : JSON_FIRST_SERIALIZERS
     end
 
   end # Serializer

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.9.11'
-  spec.date      = '2012-04-16'
+  spec.version   = '0.10.2'
+  spec.date      = '2012-05-01'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -38,13 +38,18 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', '~> 1.3')
-  spec.add_dependency('right_amqp', '~> 0.1')
+  spec.add_dependency('right_amqp', '~> 0.3')
   spec.add_dependency('json', ['~> 1.4'])
   spec.add_dependency('eventmachine', '~> 0.12.10')
   spec.add_dependency('right_popen', '~> 1.0.11')
   spec.add_dependency('msgpack', '0.4.4')
   spec.add_dependency('net-ssh', '~> 2.0')
 
+  if spec.platform.to_s =~ /mswin|mingw/
+    spec.add_dependency('win32-dir', '~> 0.3.5')
+    spec.add_dependency('win32-process', '~> 0.6.1')
+  end
+
   spec.description = <<-EOF
 RightAgent provides a foundation for running an agent on a server to interface
 in a secure fashion with other agents in the RightScale system. A RightAgent

data/spec/dispatcher_spec.rb

@@ -337,6 +337,7 @@ describe "RightScale::Dispatcher" do
     EM.run do
       @agent.should_receive(:options).and_return(:dup_check => true)
       @dispatcher = RightScale::Dispatcher.new(@agent)
+      @dispatcher.em = EMMock
       req = RightScale::Request.new('/foo/bar', 'you', :token => "try")
       @dispatcher.instance_variable_get(:@dispatched).store(req.token)
       @dispatcher.dispatch(req).should be_nil
@@ -349,6 +350,7 @@ describe "RightScale::Dispatcher" do
     EM.run do
       @agent.should_receive(:options).and_return(:dup_check => true)
       @dispatcher = RightScale::Dispatcher.new(@agent)
+      @dispatcher.em = EMMock
       req = RightScale::Request.new('/foo/bar', 'you', :token => "try")
       req.tries.concat(["try1", "try2"])
       @dispatcher.instance_variable_get(:@dispatched).store("try2")
@@ -361,6 +363,7 @@ describe "RightScale::Dispatcher" do
     EM.run do
       @agent.should_receive(:options).and_return(:dup_check => true)
       @dispatcher = RightScale::Dispatcher.new(@agent)
+      @dispatcher.em = EMMock
       req = RightScale::Request.new('/foo/bar', 'you', :token => "try")
       req.tries.concat(["try1", "try2"])
       @dispatcher.instance_variable_get(:@dispatched).store("try3")
@@ -372,6 +375,7 @@ describe "RightScale::Dispatcher" do
   it "should not check for duplicates if dup_check disabled" do
     EM.run do
       @dispatcher = RightScale::Dispatcher.new(@agent)
+      @dispatcher.em = EMMock
       req = RightScale::Request.new('/foo/bar', 'you', :token => "try")
       req.tries.concat(["try1", "try2"])
       @dispatcher.instance_variable_get(:@dispatched).should be_nil

data/spec/log_spec.rb

@@ -35,7 +35,7 @@ describe RightScale::Log do
   def log_count(text)
     # no such animal as egrep in windows, so hacked up an equivalent here.
     pattern = Regexp.compile(text)
-    File.read(@log_file).each.select { |x| x =~ pattern }.count
+    File.read(@log_file).each_line.select { |x| x =~ pattern }.count
   end
 
   before(:all) do

data/spec/platform/windows_volume_manager_spec.rb

@@ -0,0 +1,253 @@
+#
+# Copyright (c) 2012 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+if RightScale::Platform.windows?
+  module OsInfoExtensions
+    def set_osinfo(osinfo)
+      @os_info = osinfo
+    end
+
+    def get_osinfo
+      @os_info
+    end
+  end
+
+  describe RightScale::Platform do
+    before(:all) do
+      @platform = RightScale::Platform
+    end
+
+    context :volume_manager do
+      context :is_attachable_volume_path do
+        it 'allows paths with hyphens and underscores' do
+          @platform.volume_manager.is_attachable_volume_path?('C:\\Some_crazy-path').should == true
+        end
+
+        it 'allows paths with periods' do
+          @platform.volume_manager.is_attachable_volume_path?('C:\\Some.crazy.path').should == true
+        end
+
+        it 'allows paths with tildes' do
+          @platform.volume_manager.is_attachable_volume_path?('C:\\~Some~crazy~path').should == true
+        end
+      end
+
+      context :parse_volumes do
+        it 'can parse volumes from diskpart output' do
+          list_vol_resp = <<EOF
+  Volume ###  Ltr  Label        Fs     Type        Size     Status     Info
+  ----------  ---  -----------  -----  ----------  -------  ---------  --------
+  Volume 0     C   2008Boot     NTFS   Partition     80 GB  Healthy    System
+* Volume 1     D                NTFS   Partition   4094 MB  Healthy
+  Volume 2                      NTFS   Partition   4094 MB  Healthy
+EOF
+
+          volume_hash_ary = [
+            {:index => 0, :device => "C:", :label => "2008Boot", :filesystem => "NTFS", :type => "Partition", :total_size => 85899345920, :status => "Healthy", :info => "System"},
+            {:index => 1, :device => "D:", :label => nil, :filesystem => "NTFS", :type => "Partition", :total_size => 4292870144, :status => "Healthy", :info => nil},
+            {:index => 2, :device => nil, :label => nil, :filesystem => "NTFS", :type => "Partition", :total_size => 4292870144, :status => "Healthy", :info => nil}
+          ]
+
+          @platform.volume_manager.send(:parse_volumes, list_vol_resp).should == volume_hash_ary
+        end
+
+        it 'can parse volumes from diskpart output with mounted paths' do
+          list_vol_resp = <<EOF
+  Volume ###  Ltr  Label        Fs     Type        Size     Status     Info
+  ----------  ---  -----------  -----  ----------  -------  ---------  --------
+  Volume 0     C                NTFS   Partition     80 GB  Healthy    System
+* Volume 1                      FAT32  Partition   1023 MB  Healthy
+    C:\\Program Files\\RightScale\\Mount\\Softlayer\\
+EOF
+
+          volume_hash_ary = [
+            {:index => 0, :device => "C:", :label => nil, :filesystem => "NTFS", :type => "Partition", :total_size => 85899345920, :status => "Healthy", :info => "System"},
+            {:index => 1, :device => "C:\\Program Files\\RightScale\\Mount\\Softlayer\\", :label => nil, :filesystem => "FAT32", :type => "Partition", :total_size => 1072693248, :status => "Healthy", :info => nil}
+          ]
+
+          @platform.volume_manager.send(:parse_volumes, list_vol_resp).should == volume_hash_ary
+        end
+
+        it 'raises a parser error when diskpart output is malformed' do
+          list_vol_resp = "foobarbaz"
+
+          lambda { @platform.volume_manager.send(:parse_volumes, list_vol_resp) }.should raise_error(RightScale::Platform::VolumeManager::ParserError)
+        end
+
+        it 'can filter results with only one condition' do
+          list_vol_resp = <<EOF
+  Volume ###  Ltr  Label        Fs     Type        Size     Status     Info
+  ----------  ---  -----------  -----  ----------  -------  ---------  --------
+  Volume 0     C   2008Boot     NTFS   Partition     80 GB  Healthy    System
+* Volume 1     D                NTFS   Partition   4094 MB  Healthy
+  Volume 2                      NTFS   Partition   4094 MB  Healthy
+EOF
+
+          volume_hash_ary = [
+            {:index => 1, :device => "D:", :label => nil, :filesystem => "NTFS", :type => "Partition", :total_size => 4292870144, :status => "Healthy", :info => nil}
+          ]
+
+          condition = {:device => "D:"}
+
+          @platform.volume_manager.send(:parse_volumes, list_vol_resp, condition).should == volume_hash_ary
+        end
+
+        it 'can filter results with many conditions' do
+          list_vol_resp = <<EOF
+  Volume ###  Ltr  Label        Fs     Type        Size     Status     Info
+  ----------  ---  -----------  -----  ----------  -------  ---------  --------
+  Volume 0     C   2008Boot     NTFS   Partition     80 GB  Healthy    System
+* Volume 1     D                NTFS   Partition   4094 MB  Healthy
+  Volume 2                      NTFS   Partition   4094 MB  Healthy
+EOF
+
+          volume_hash_ary = [
+            {:index => 1, :device => "D:", :label => nil, :filesystem => "NTFS", :type => "Partition", :total_size => 4292870144, :status => "Healthy", :info => nil}
+          ]
+
+          condition = {:device => "D:", :filesystem => "NTFS", :type => "Partition"}
+
+          @platform.volume_manager.send(:parse_volumes, list_vol_resp, condition).should == volume_hash_ary
+        end
+      end
+
+      context :assign_device do
+        it 'assigns a device to a drive letter when a drive letter is specified' do
+          script = <<EOF
+rescan
+list volume
+select volume "0"
+attribute volume clear readonly noerr
+assign letter=S
+EOF
+
+          mount_resp = ''
+          flexmock(@platform.volume_manager).should_receive(:run_script).with(script).once.and_return([0, mount_resp])
+
+          @platform.volume_manager.assign_device('0', 'S:')
+        end
+
+        it 'assigns a device to a path when a mount point is specified' do
+          osinfo = flexmock(:major => 6)
+
+          @platform.volume_manager.extend(OsInfoExtensions)
+          old_osinfo = @platform.volume_manager.get_osinfo
+          @platform.volume_manager.set_osinfo(osinfo)
+
+          script = <<EOF
+rescan
+list volume
+select volume "0"
+attribute volume clear readonly noerr
+assign mount="C:\\Program Files\\RightScale\\Mount\\Softlayer"
+EOF
+
+          flexmock(@platform.volume_manager).should_receive(:run_script).with(script).once.and_return([0, ''])
+
+          @platform.volume_manager.assign_device('0', "C:\\Program Files\\RightScale\\Mount\\Softlayer")
+          @platform.volume_manager.set_osinfo(old_osinfo)
+        end
+
+        it 'raises an exception when an invalid drive letter is specified' do
+          lambda{@platform.volume_manager.assign_device('0', 'C:')}.should raise_error(RightScale::Platform::VolumeManager::ArgumentError)
+        end
+
+        it 'raises an exception when an invalid path is specified' do
+          lambda{@platform.volume_manager.assign_device('0', 'This is not a path')}.should raise_error(RightScale::Platform::VolumeManager::ArgumentError)
+        end
+
+        it 'raises an exception when a mount path is specified and OS is pre 2008' do
+          osinfo = flexmock(:major => 5)
+
+          @platform.volume_manager.extend(OsInfoExtensions)
+          old_osinfo = @platform.volume_manager.get_osinfo
+          @platform.volume_manager.set_osinfo(osinfo)
+
+          lambda{@platform.volume_manager.assign_device(0, "C:\\Somepath")}.should raise_error(RightScale::Platform::VolumeManager::ArgumentError)
+          @platform.volume_manager.set_osinfo(old_osinfo)
+        end
+      end
+
+      context :format_disk do
+        it 'formats and assigns a drive to a drive letter when a drive letter is specified' do
+          osinfo = flexmock(:major => 6)
+          @platform.volume_manager.extend(OsInfoExtensions)
+          old_osinfo = @platform.volume_manager.get_osinfo
+          @platform.volume_manager.set_osinfo(osinfo)
+
+          script = <<EOF
+rescan
+list disk
+select disk 0
+attribute disk clear readonly noerr
+online disk noerr
+clean
+create partition primary
+assign letter=S
+format FS=NTFS quick
+EOF
+
+          flexmock(@platform.volume_manager).should_receive(:run_script).with(script).once.and_return([0,''])
+          @platform.volume_manager.format_disk(0, 'S:')
+          @platform.volume_manager.set_osinfo(old_osinfo)
+        end
+
+        it 'formats and assigns a drive to a path when a mount point is specified' do
+          osinfo = flexmock(:major => 6)
+          @platform.volume_manager.extend(OsInfoExtensions)
+          old_osinfo = @platform.volume_manager.get_osinfo
+          @platform.volume_manager.set_osinfo(osinfo)
+
+          script = <<EOF
+rescan
+list disk
+select disk 0
+attribute disk clear readonly noerr
+online disk noerr
+clean
+create partition primary
+assign mount="C:\\Somepath"
+format FS=NTFS quick
+EOF
+
+          flexmock(@platform.volume_manager).should_receive(:run_script).with(script).once.and_return([0,''])
+          @platform.volume_manager.format_disk(0, 'C:\\Somepath')
+          @platform.volume_manager.set_osinfo(old_osinfo)
+        end
+
+        it 'raises an exception when a mount path is specified and OS is pre 2008' do
+          osinfo = flexmock(:major => 5)
+
+          @platform.volume_manager.extend(OsInfoExtensions)
+          old_osinfo = @platform.volume_manager.get_osinfo
+          @platform.volume_manager.set_osinfo(osinfo)
+
+          lambda{@platform.volume_manager.format_disk(0, "C:\\Somepath")}.should raise_error(RightScale::Platform::VolumeManager::ArgumentError)
+          @platform.volume_manager.set_osinfo(old_osinfo)
+        end
+
+      end
+    end
+  end
+end

data/spec/serialize/serializer_spec.rb

@@ -104,14 +104,18 @@ describe RightScale::Serializer do
         serializer = RightScale::Serializer.new(:msgpack)
         date = Date.today
         data = serializer.dump(date)
-        Date.parse(serializer.load(data)).should == date
+        Date.strptime(serializer.load(data), "%Y-%m-%d").should == date
       end
 
       it "should serialize Time object" do
         serializer = RightScale::Serializer.new(:msgpack)
         time = Time.now
         data = serializer.dump(time)
-        Time.parse(serializer.load(data)).to_i.should == time.to_i
+        if RUBY_VERSION < "1.9.0"
+          Time.parse(serializer.load(data)).to_i.should == time.to_i
+        else
+          DateTime.parse(serializer.load(data)).to_time.to_i.should == time.to_i
+        end
       end
 
       it "should serialize DateTime object" do

data/spec/spec.win32.opts

@@ -0,0 +1 @@
+--format=nested

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 11
-  version: 0.9.11
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 -07:00
+date: 2012-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 13
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 3
+        version: "0.3"
   requirement: *id002
   name: right_amqp
   prerelease: false
@@ -271,6 +271,7 @@ files:
 - spec/platform/linux_volume_manager_spec.rb
 - spec/platform/platform_spec.rb
 - spec/platform/windows.rb
+- spec/platform/windows_volume_manager_spec.rb
 - spec/results_mock.rb
 - spec/secure_identity_spec.rb
 - spec/security/cached_certificate_store_proxy_spec.rb
@@ -287,6 +288,7 @@ files:
 - spec/serialize/serializable_spec.rb
 - spec/serialize/serializer_spec.rb
 - spec/spec.opts
+- spec/spec.win32.opts
 - spec/spec_helper.rb
 - spec/tracer_spec.rb
 has_rdoc: true