fog 0.8.0 → 0.8.1

data/Rakefile

@@ -97,6 +97,7 @@ task :release => :build do
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
+  Rake::Task[:docs].invoke
 end
 
 task :build => :gemspec do
@@ -132,6 +133,45 @@ task :validate do
   end
 end
 
+task :changelog do
+  timestamp = Time.now.utc.strftime('%m/%d/%Y')
+  sha = `git log | head -1`.split(' ').last
+  changelog = ["#{version} #{timestamp} #{sha}"]
+  changelog << ('=' * changelog[0].length)
+  changelog << ''
+
+  last_sha = `cat changelog.txt | head -1`.split(' ').last
+  shortlog = `git shortlog #{last_sha}..HEAD`
+  changes = {}
+  for line in shortlog.split("\n")
+    if line =~ /^\S/
+      committer = line.split(' (', 2).first
+    elsif line =~ /^\s*(Merge.*)?$/
+      # skip empty lines and Merge commits
+    else
+      unless line[-1..-1] == '.'
+        line << '.'
+      end
+      line.gsub!(/^\s*\[([^\]]*)\] /, '')
+      tag = $1 || 'misc'
+      changes[tag] ||= []
+      changes[tag] << (line << ' thanks ' << committer)
+    end
+  end
+
+  for tag in changes.keys.sort
+    changelog << ('[' << tag << ']')
+    for commit in changes[tag]
+      changelog << ('  ' << commit)
+    end
+    changelog << ''
+  end
+
+  for line in changelog
+    print(line << "\n")
+  end
+end
+
 task :docs do
   # build the docs locally
   sh "jekyll docs docs/_site"

data/changelog.txt

@@ -1,5 +1,5 @@
-0.8.0 05/12/2011
-================
+0.8.0 05/12/2011 27bf76d1f881bec0f900cd11d5c2a10dce4856ca
+=========================================================
 
 MVP! ktheory
 

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.8.0'
-  s.date              = '2011-05-12'
+  s.version           = '0.8.1'
+  s.date              = '2011-05-13'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 
 end

data/lib/fog/compute/aws.rb

@@ -58,6 +58,7 @@ module Fog
       request :detach_volume
       request :disassociate_address
       request :get_console_output
+      request :get_password_data
       request :import_key_pair
       request :modify_image_attributes
       request :modify_snapshot_attribute

data/lib/fog/compute/parsers/aws/get_password_data.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module Compute
+
+        class GetPasswordData < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'instanceId', 'requestId', 'passwordData'
+              @response[name] = @value
+            when 'timestamp'
+              @response[name] = Time.parse(@value)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/aws/describe_instances.rb

@@ -56,9 +56,9 @@ module Fog
             filters = {'instance-id' => [*filters]}
           end
           params = {}
-          # when seeking single instance id, old param style is most up to date
+          # when seeking single instance id, old param style provides more accurate data sooner
           if filters['instance-id'] && !filters['instance-id'].is_a?(Array)
-            params.merge('InstanceId' => filters.delete('instance-id'))
+            params.merge!('InstanceId' => filters.delete('instance-id'))
           end
           params.merge!(AWS.indexed_filters(filters))
 

data/lib/fog/compute/requests/aws/get_password_data.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/aws/get_password_data'
+
+        # Retrieves the encrypted administrator password for an instance running Windows.
+        #
+        # ==== Parameters
+        # * instance_id<~String> - A Windows instance ID
+        #
+        # ==== Returns
+        # # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'instanceId'<~String> - Id of instance
+        #     * 'passwordData'<~String> - The encrypted, base64-encoded password of the instance.
+        #     * 'requestId'<~String> - Id of request
+        #     * 'timestamp'<~Time> - Timestamp of last update to output
+        #
+        # See http://docs.amazonwebservices.com/AWSEC2/2010-08-31/APIReference/index.html?ApiReference-query-GetPasswordData.html
+        def get_password_data(instance_id)
+          request(
+            'Action'      => 'GetPasswordData',
+            'InstanceId'  => instance_id,
+            :idempotent   => true,
+            :parser       => Fog::Parsers::AWS::Compute::GetPasswordData.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_password_data(instance_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/core/credentials.rb

@@ -19,7 +19,7 @@ module Fog
   # @return [String] The path for configuration_file
   def self.credentials_path
     @credential_path ||= begin
-      path = ENV["FOG_RC"] || (ENV['HOME'] && '~/.fog')
+      path = ENV["FOG_RC"] || (ENV['HOME'] && File.directory?(ENV['HOME']) && '~/.fog')
       File.expand_path(path) if path
     end
   end

data/tests/compute/requests/aws/instance_tests.rb

@@ -11,16 +11,16 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     'instanceState'       => {'code' => Integer, 'name' => String},
     'instanceType'        => String,
     # 'ipAddress'           => String,
-    'kernelId'            => String,
-    # 'keyName'             => String,
+    'kernelId'            => Fog::Nullable::String,
+    'keyName'             => Fog::Nullable::String,
     'launchTime'          => Time,
     'monitoring'          => {'state' => Fog::Boolean},
     'placement'           => {'availabilityZone' => String},
     'privateDnsName'      => NilClass,
     # 'privateIpAddress'    => String,
     'productCodes'        => [],
-    'ramdiskId'           => String,
-    'reason'              => NilClass,
+    'ramdiskId'           => Fog::Nullable::String,
+    'reason'              => Fog::Nullable::String,
     # 'rootDeviceName'      => String,
     'rootDeviceType'      => String,
   }
@@ -38,12 +38,12 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
       'groupSet'      => [String],
       'instancesSet'  => [@instance_format.merge(
         'architecture'      => String,
-        'dnsName'           => String,
-        'ipAddress'         => String,
-        'privateDnsName'    => String,
-        'privateIpAddress'  => String,
-        'stateReason'       => {},
-        'tagSet'            => {}
+        'dnsName'           => Fog::Nullable::String,
+        'ipAddress'         => Fog::Nullable::String,
+        'privateDnsName'    => Fog::Nullable::String,
+        'privateIpAddress'  => Fog::Nullable::String,
+        'stateReason'       => Hash,
+        'tagSet'            => Hash
       )],
       'ownerId'       => String,
       'reservationId' => String
@@ -58,6 +58,14 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     'timestamp'   => Time
   }
 
+  @get_password_data_format = {
+    'instanceId'   => String,
+    'passwordData' => String,
+    'requestId'    => String,
+    'timestamp'    => Time
+  }
+
+
   @terminate_instances_format = {
     'instancesSet'  => [{
       'currentState' => {'code' => Integer, 'name' => String},
@@ -70,28 +78,64 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
   tests('success') do
 
     @instance_id = nil
+    # Use a MS Windows AMI to test #get_password_data
+    @windows_ami = 'ami-ee926087' # Microsoft Windows Server 2008 R2 Base 64-bit
+
+    # Create a keypair for decrypting the password
+    key_name = 'fog-test-key'
+    key = AWS.key_pairs.create(:name => key_name)
 
-    tests("#run_instances('#{GENTOO_AMI}', 1, 1)").formats(@run_instances_format) do
-      data = AWS[:compute].run_instances(GENTOO_AMI, 1, 1).body
+    tests("#run_instances").formats(@run_instances_format) do
+      data = AWS[:compute].run_instances(@windows_ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
       @instance_id = data['instancesSet'].first['instanceId']
       data
     end
 
-    AWS[:compute].servers.get(@instance_id).wait_for { ready? }
+    server = AWS[:compute].servers.get(@instance_id)
+    while server.nil? do
+      # It may take a moment to get the server after launching it
+      sleep 0.1
+      server = AWS[:compute].servers.get(@instance_id)
+    end
+    server.wait_for { ready? }
+
+    tests("#describe_instances").formats(@describe_instances_format) do
+       AWS[:compute].describe_instances.body
+    end
 
-    # The format changes depending on state of instance, so this would be brittle
-    # tests("#describe_instances").formats(@describe_instances_format) do
-    #   AWS[:compute].describe_instances.body
-    # end
+    # Launch another instance to test filters
+    another_server = AWS[:compute].servers.create
 
     tests("#describe_instances('instance-id' => '#{@instance_id}')").formats(@describe_instances_format) do
-      AWS[:compute].describe_instances('instance-id' => @instance_id).body
+      body = AWS[:compute].describe_instances('instance-id' => @instance_id).body
+      tests("returns 1 instance").returns(1) { body['reservationSet'].size }
+      body
     end
 
+    another_server.destroy
+
     tests("#get_console_output('#{@instance_id}')").formats(@get_console_output_format) do
       AWS[:compute].get_console_output(@instance_id).body
     end
 
+    tests("#get_password_data('#{@instance_id}')").formats(@get_password_data_format) do
+      pending if Fog.mock?
+      result = nil
+      Fog.wait_for do
+         result = AWS[:compute].get_password_data(@instance_id).body
+         !result['passwordData'].nil?
+      end
+
+      tests("key can decrypt passwordData").returns(true) do
+        decoded_password = Base64.decode64(result['passwordData'])
+        pkey = OpenSSL::PKey::RSA.new(key.private_key)
+        String === pkey.private_decrypt(decoded_password)
+      end
+      result
+    end
+
+    key.destroy
+
     tests("#reboot_instances('#{@instance_id}')").formats(AWS::Compute::Formats::BASIC) do
       AWS[:compute].reboot_instances(@instance_id).body
     end
@@ -108,6 +152,10 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
       AWS[:compute].get_console_output('i-00000000')
     end
 
+    tests("#get_password_data('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].get_password_data('i-00000000')
+    end
+
     tests("#reboot_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       AWS[:compute].reboot_instances('i-00000000')
     end

data/tests/core/parser_tests.rb

@@ -0,0 +1,67 @@
+Shindo.tests('Fog::Parsers', 'core') do
+
+  class TestParser < Fog::Parsers::Base
+    def reset
+      super
+      reset_my_array
+    end
+
+    def reset_my_array
+      @my_array = []
+    end
+
+    def end_element(name)
+      case name
+      when 'key1', 'key2', 'key3', 'longText'
+        @response[name] = value
+      when 'myArray'
+        @response[name] = @my_array
+        reset_my_array
+      when 'id'
+        @my_array << value.to_i
+      end
+
+    end
+  end
+
+  @xml = %{
+<MyResponse>
+  <MyObject>
+    <key1>value1</key1>
+    <key2>value2</key2>
+    <myArray>
+      <id>1</id>
+      <id>2</id>
+      <id>3</id>
+    </myArray>
+    <longText>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Donec quis metus arcu, quis cursus turpis.
+Aliquam leo lacus, luctus vel iaculis id,
+posuere eu odio. Donec sodales, ante porta condimentum
+</longText>
+    <key3>value3</key3>
+  </MyObject>
+<MyResponse>
+}
+
+  @response = {
+    'key1' => 'value1',
+    'key2' => 'value2',
+    'key3' => 'value3',
+    'myArray' => [1,2,3],
+    'longText' => %{
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Donec quis metus arcu, quis cursus turpis.
+Aliquam leo lacus, luctus vel iaculis id,
+posuere eu odio. Donec sodales, ante porta condimentum
+}
+  }
+
+
+  tests('TestParser').returns(@response) do
+    test_parser = TestParser.new
+    Nokogiri::XML::SAX::Parser.new(test_parser).parse(@xml)
+    test_parser.response
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -626,6 +626,7 @@ files:
 - lib/fog/compute/parsers/aws/describe_volumes.rb
 - lib/fog/compute/parsers/aws/detach_volume.rb
 - lib/fog/compute/parsers/aws/get_console_output.rb
+- lib/fog/compute/parsers/aws/get_password_data.rb
 - lib/fog/compute/parsers/aws/import_key_pair.rb
 - lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb
 - lib/fog/compute/parsers/aws/register_image.rb
@@ -678,6 +679,7 @@ files:
 - lib/fog/compute/requests/aws/detach_volume.rb
 - lib/fog/compute/requests/aws/disassociate_address.rb
 - lib/fog/compute/requests/aws/get_console_output.rb
+- lib/fog/compute/requests/aws/get_password_data.rb
 - lib/fog/compute/requests/aws/import_key_pair.rb
 - lib/fog/compute/requests/aws/modify_image_attributes.rb
 - lib/fog/compute/requests/aws/modify_snapshot_attribute.rb
@@ -1318,6 +1320,7 @@ files:
 - tests/compute/requests/voxel/server_tests.rb
 - tests/core/attribute_tests.rb
 - tests/core/credential_tests.rb
+- tests/core/parser_tests.rb
 - tests/dns/helper.rb
 - tests/dns/models/record_tests.rb
 - tests/dns/models/records_tests.rb
@@ -1521,6 +1524,7 @@ test_files:
 - tests/compute/requests/voxel/server_tests.rb
 - tests/core/attribute_tests.rb
 - tests/core/credential_tests.rb
+- tests/core/parser_tests.rb
 - tests/dns/helper.rb
 - tests/dns/models/record_tests.rb
 - tests/dns/models/records_tests.rb