fog 0.0.87 → 0.0.88

data/Gemfile

@@ -10,4 +10,3 @@ gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
 gem 'shindo', '>= 0'
-gem 'fog', :path => '.'

data/Gemfile.lock

@@ -2,34 +2,28 @@
 specs: 
 - rake: 
     version: 0.8.7
-- annals: 
-    version: 0.0.3
 - excon: 
     version: 0.0.21
 - formatador: 
-    version: 0.0.13
+    version: 0.0.14
+- gestalt: 
+    version: 0.0.6
 - json: 
-    version: 1.4.1
+    version: 1.4.2
 - mime-types: 
     version: "1.16"
 - net-ssh: 
     version: 2.0.22
 - nokogiri: 
     version: 1.4.1
-- ruby-hmac: 
-    version: 0.4.0
-- fog: 
-    version: 0.0.84
-    source: 0
 - rspec: 
     version: 1.3.0
+- ruby-hmac: 
+    version: 0.4.0
 - shindo: 
-    version: 0.0.17
-hash: 6cf30542dfb9f6105f2e82d59ca1b74d7285aa68
+    version: 0.0.18
+hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
 sources: 
-- Path: 
-    path: !ruby/object:Pathname 
-      path: .
 - Rubygems: 
     uri: http://gemcutter.org
 dependencies: 
@@ -41,19 +35,19 @@ dependencies:
     version: ">= 0"
     group: 
     - :default
-  rspec: 
+  rake: 
     version: ">= 0"
     group: 
     - :default
-  rake: 
+  rspec: 
     version: ">= 0"
     group: 
     - :default
-  mime-types: 
+  ruby-hmac: 
     version: ">= 0"
     group: 
     - :default
-  ruby-hmac: 
+  mime-types: 
     version: ">= 0"
     group: 
     - :default
@@ -61,7 +55,7 @@ dependencies:
     version: ">= 0"
     group: 
     - :default
-  fog: 
+  json: 
     version: ">= 0"
     group: 
     - :default
@@ -69,10 +63,6 @@ dependencies:
     version: ">= 0.0.21"
     group: 
     - :default
-  json: 
-    version: ">= 0"
-    group: 
-    - :default
   shindo: 
     version: ">= 0"
     group: 

data/bin/fog

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'fog'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 require 'fog/credentials'

data/fog.gemspec

@@ -7,7 +7,7 @@ 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.0.87'
+  s.version           = '0.0.88'
   s.date              = '2010-05-03'
   s.rubyforge_project = 'fog'
 
@@ -155,6 +155,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/detach_volume.rb
     lib/fog/aws/requests/ec2/disassociate_address.rb
     lib/fog/aws/requests/ec2/get_console_output.rb
+    lib/fog/aws/requests/ec2/modify_image_attributes.rb
     lib/fog/aws/requests/ec2/reboot_instances.rb
     lib/fog/aws/requests/ec2/release_address.rb
     lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb

data/lib/fog.rb

@@ -33,8 +33,8 @@ require 'fog/terremark'
 
 module Fog
 
-  unless VERSION
-    VERSION = '0.0.87'
+  unless const_defined?(:VERSION)
+    VERSION = '0.0.88'
   end
 
   module Mock

data/lib/fog/aws/ec2.rb

@@ -66,6 +66,7 @@ module Fog
           require 'fog/aws/requests/ec2/detach_volume'
           require 'fog/aws/requests/ec2/disassociate_address'
           require 'fog/aws/requests/ec2/get_console_output'
+          require 'fog/aws/requests/ec2/modify_image_attributes'
           require 'fog/aws/requests/ec2/reboot_instances'
           require 'fog/aws/requests/ec2/release_address'
           require 'fog/aws/requests/ec2/revoke_security_group_ingress'

data/lib/fog/aws/models/s3/file.rb

@@ -29,10 +29,10 @@ module Fog
           @directory
         end
 
-        def copy(target_directory_name, target_file_key)
+        def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          data = connection.copy_object(directory.name, @key, target_directory_name, target_file_key).body
-          target_directory = connection.directories.new(:name => target_directory_name)
+          data = connection.copy_object(directory.key, @key, target_directory_key, target_file_key).body
+          target_directory = connection.directories.new(:key => target_directory_key)
           target_file = target_directory.files.new(attributes.merge!(:key => target_file_key))
           copy_data = {}
           for key, value in data
@@ -46,7 +46,7 @@ module Fog
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.name, @key)
+          connection.delete_object(directory.key, @key)
           true
         end
 
@@ -61,7 +61,7 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
-          data = connection.put_object(directory.name, @key, @body, options)
+          data = connection.put_object(directory.key, @key, @body, options)
           @etag = data.headers['ETag']
           true
         end

data/lib/fog/aws/models/s3/files.rb

@@ -26,7 +26,7 @@ module Fog
           options = options.reject {|key,value| value.nil? || value.to_s.empty?}
           merge_attributes(options)
           parent = directory.collection.get(
-            directory.name,
+            directory.key,
             options
           )
           if parent
@@ -37,7 +37,7 @@ module Fog
         end
 
         def get(key, options = {}, &block)
-          data = connection.get_object(directory.name, key, options, &block)
+          data = connection.get_object(directory.key, key, options, &block)
           file_data = {
             :body => data.body,
             :key  => key
@@ -53,11 +53,11 @@ module Fog
         end
 
         def get_url(key, expires)
-          connection.get_object_url(directory.name, key, expires)
+          connection.get_object_url(directory.key, key, expires)
         end
 
         def head(key, options = {})
-          data = connection.head_object(directory.name, key, options)
+          data = connection.head_object(directory.key, key, options)
           file_data = {
             :key => key
           }

data/lib/fog/aws/requests/ec2/modify_image_attributes.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        # Modify image attributes
+        #
+        # ==== Parameters
+        # * image_id<~String> - Id of machine image to modify
+        # * attribute<~String> - Attribute to modify, in ['launchPermission', 'productCodes']
+        # * operation_type<~String> - Operation to perform on attribute, in ['add', 'remove']
+        #
+        def modify_image_attributes(image_id, attribute, operation_type, options = {})
+          params = {}
+          params.merge!(AWS.indexed_param('UserId', options['UserId']))
+          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup']))
+          params.merge!(AWS.indexed_param('ProductCode', options['ProductCode']))
+          request({
+            'Action'        => 'ModifyImageAttribute',
+            'Attribute'     => attribute,
+            'ImageId'       => image_id,
+            'OperationType' => operation,
+            :parser         => Fog::Parsers::AWS::EC2::Basic.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def modify_image_attributes(image_id, user_id, options = {})
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/deprecation.rb

@@ -4,7 +4,10 @@ module Fog
     def deprecate(older, newer)
       class_eval <<-EOS, __FILE__, __LINE__
         def #{older}(*args)
-          Formatador.display_line("[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/]")
+          location = caller.first
+          warning = "[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/]"
+          warning << " [light_black](" << location << ")[/] "
+          Formatador.display_line(warning)
           #{newer}(*args)
         end
       EOS

data/lib/fog/model.rb

@@ -51,6 +51,10 @@ module Fog
       send(self.class.instance_variable_get('@identity'))
     end
 
+    def identity=(new_identity)
+      send("#{identity}=", new_identity)
+    end
+
     def initialize(new_attributes = {})
       merge_attributes(new_attributes)
     end

data/spec/aws/models/s3/directories_spec.rb

@@ -5,8 +5,8 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#all" do
 
     it "should include persisted directories" do
-      @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
-      AWS[:s3].directories.all.map {|directory| @directory.name}.should include('fogdirectoryname')
+      @directory = AWS[:s3].directories.create(:key => 'fogdirectorykey')
+      AWS[:s3].directories.all.map {|directory| @directory.key}.should include('fogdirectorykey')
       @directory.destroy
     end
 
@@ -15,8 +15,8 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#create" do
 
     it "should exist on s3" do
-      directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
-      AWS[:s3].directories.get(directory.name).should_not be_nil
+      directory = AWS[:s3].directories.create(:key => 'fogdirectorykey')
+      AWS[:s3].directories.get(directory.key).should_not be_nil
       directory.destroy
     end
 
@@ -25,8 +25,8 @@ describe 'Fog::AWS::S3::Directories' do
   describe "#get" do
 
     it "should return a Fog::AWS::S3::Directory if a matching directory exists" do
-      directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
-      get = AWS[:s3].directories.get('fogdirectoryname')
+      directory = AWS[:s3].directories.create(:key => 'fogdirectorykey')
+      get = AWS[:s3].directories.get('fogdirectorykey')
       directory.attributes.should == get.attributes
       directory.destroy
     end

data/spec/aws/models/s3/directory_spec.rb

@@ -8,7 +8,7 @@ describe 'Fog::AWS::S3::Directory' do
       now = Time.now
       directory = Fog::AWS::S3::Directory.new(
         'CreationDate' => now,
-        'Key'         => 'directorykey'
+        'Name'         => 'directorykey'
       )
       directory.creation_date.should == now
       directory.key.should == 'directorykey'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 87
-  version: 0.0.87
+  - 88
+  version: 0.0.88
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -233,6 +233,7 @@ files:
 - lib/fog/aws/requests/ec2/detach_volume.rb
 - lib/fog/aws/requests/ec2/disassociate_address.rb
 - lib/fog/aws/requests/ec2/get_console_output.rb
+- lib/fog/aws/requests/ec2/modify_image_attributes.rb
 - lib/fog/aws/requests/ec2/reboot_instances.rb
 - lib/fog/aws/requests/ec2/release_address.rb
 - lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb