fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/zerigo/models/dns/record.rb

@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_host(identity)
+          service.delete_host(identity)
           true
         end
 
@@ -45,12 +45,12 @@ module Fog
           options[:priority]  = priority if priority
           options[:ttl]       = ttl if ttl
 
-          if identity
+          if persisted?
             options[:host_type] = type
             options[:data]      = value
-            connection.update_host(identity, options)
+            service.update_host(identity, options)
           else
-            data = connection.create_host(@zone.id, type, value, options)
+            data = service.create_host(@zone.id, type, value, options)
             merge_attributes(data.body)
           end
 

data/lib/fog/zerigo/models/dns/records.rb

@@ -23,7 +23,7 @@ module Fog
         end
 
         def get(record_id)
-          data = connection.get_host(record_id).body
+          data = service.get_host(record_id).body
           new(data)
         rescue Fog::Service::NotFound
           nil
@@ -35,7 +35,7 @@ module Fog
         end
 
         def find(fqdn)
-          hosts = connection.find_hosts(fqdn, zone.id).body['hosts']
+          hosts = service.find_hosts(fqdn, zone.id).body['hosts']
           hosts.collect { |host| new(host) }
         end
 

data/lib/fog/zerigo/models/dns/zone.rb

@@ -16,8 +16,8 @@ module Fog
         attribute :updated_at,  :aliases => 'updated-at'
 
         # <custom-nameservers>ns1.example.com,ns2.example.com</custom-nameservers>
-        # <custom-ns type="boolean">true</custom-ns> 
-        # <hostmaster>dnsadmin@example.com</hostmaster> 
+        # <custom-ns type="boolean">true</custom-ns>
+        # <hostmaster>dnsadmin@example.com</hostmaster>
         # <notes nil="true"/>
         # <ns1 nil="true"/>
         # <nx-ttl nil="true"></nx-ttl>
@@ -33,7 +33,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_zone(identity)
+          service.delete_zone(identity)
           true
         end
 
@@ -41,7 +41,7 @@ module Fog
           @records ||= begin
             Fog::DNS::Zerigo::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -71,11 +71,11 @@ module Fog
           #   * restrict_axfr<~String> - indicates if AXFR transfers should be restricted to IPs in axfr-ips
           #   * tag_list<~String> - List of all tags associated with this domain
           data = unless identity
-            connection.create_zone(domain, ttl, type, options)
+            service.create_zone(domain, ttl, type, options)
           else
             options[:default_ttl] = ttl
             options[:ns_type]     = type
-            connection.update_zone(identity, options)
+            service.update_zone(identity, options)
           end
           merge_attributes(data.body)
           true

data/lib/fog/zerigo/models/dns/zones.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::DNS::Zerigo::Zone
 
         def all
-          data = connection.list_zones.body['zones']
+          data = service.list_zones.body['zones']
           load(data)
         end
 
         def get(zone_id_or_domain)
-          data = connection.get_zone(zone_id_or_domain).body
+          data = service.get_zone(zone_id_or_domain).body
           zone = new(data)
           zone.records.load(data['hosts'])
           zone

data/lib/tasks/changelog_task.rb

@@ -0,0 +1,98 @@
+require "rake"
+require "rake/tasklib"
+
+module Fog
+  module Rake
+    class ChangelogTask < ::Rake::TaskLib
+
+      def initialize
+        desc "Update the changelog since the last release"
+        task(:changelog) do
+          timestamp = Time.now.utc.strftime('%m/%d/%Y')
+          sha = `git log | head -1`.split(' ').last
+          changelog = ["#{Fog::VERSION} #{timestamp} #{sha}"]
+          changelog << ('=' * changelog[0].length)
+          changelog << ''
+
+          require 'multi_json'
+          github_repo_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog').body)
+          data = github_repo_data.reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
+          github_collaborator_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog/collaborators').body)
+          data['collaborators'] = github_collaborator_data.length
+          rubygems_data = Fog::JSON.decode(Excon.get('https://rubygems.org/api/v1/gems/fog.json').body)
+          data['downloads'] = rubygems_data['downloads']
+          stats = []
+          for key in data.keys.sort
+            stats << "'#{key}' => #{data[key]}"
+          end
+          changelog << "Stats! { #{stats.join(', ')} }"
+          changelog << ''
+
+          last_sha = `cat changelog.txt | head -1`.split(' ').last
+          shortlog = `git shortlog #{last_sha}..HEAD`
+          changes = {}
+          committers = {}
+          for line in shortlog.split("\n")
+            if line =~ /^\S/
+              committer = line.split(' (', 2).first
+              committers[committer] = 0
+            elsif line =~ /^\s*((Merge.*)|(Release.*))?$/
+              # skip empty lines, Merge and Release commits
+            else
+              unless line[-1..-1] == '.'
+                line << '.'
+              end
+              line.lstrip!
+              line.gsub!(/^\[([^\]]*)\] /, '')
+              tag = $1 || 'misc'
+              changes[tag] ||= []
+              changes[tag] << (line << ' thanks ' << committer)
+              committers[committer] += 1
+            end
+          end
+
+          for committer, commits in committers.to_a.sort {|x,y| y[1] <=> x[1]}
+            if [
+              'Aaron Suggs',
+              'Brian Hartsock',
+              'Christopher Oliver',
+              'Decklin Foster',
+              'Dylan Egan',
+              'geemus',
+              'Henry Addison',
+              'Kevin Menard',
+              'Lincoln Stoll',
+              'Luqman Amjad',
+              'Michael Zeng',
+              'Nick Osborn',
+              'nightshade427',
+              'Patrick Debois',
+              'Stepan G. Fedorov',
+              'Wesley Beary'
+            ].include?(committer)
+            next
+            end
+            changelog << "MVP! #{committer}"
+            changelog << ''
+            break
+          end
+
+          for tag in changes.keys.sort
+            changelog << ('[' << tag << ']')
+            for commit in changes[tag]
+              changelog << ('  ' << commit)
+            end
+            changelog << ''
+          end
+
+          old_changelog = File.read('changelog.txt')
+          File.open('changelog.txt', 'w') do |file|
+            file.write(changelog.join("\n"))
+            file.write("\n\n")
+            file.write(old_changelog)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/test_task.rb

@@ -0,0 +1,46 @@
+require "rake"
+require "rake/tasklib"
+
+module Fog
+  module Rake
+    class TestTask < ::Rake::TaskLib
+
+      def initialize
+        desc "Run the mocked tests"
+        task :test do
+          ::Rake::Task[:mock_tests].invoke
+        end
+
+        task :mock_tests do
+          tests(true)
+        end
+
+        task :real_tests do
+          tests(false)
+        end
+      end
+
+      def tests(mocked)
+        Formatador.display_line
+        start = Time.now.to_i
+        threads = []
+        Thread.main[:results] = []
+        Fog.providers.each do |key, value|
+          threads << Thread.new do
+            Thread.main[:results] << {
+              :provider => value,
+              :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
+            }
+          end
+        end
+        threads.each do |thread|
+          thread.join
+        end
+        Formatador.display_table(Thread.main[:results].sort {|x,y| x[:provider] <=> y[:provider]})
+        Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
+        Formatador.display_line
+      end
+
+    end
+  end
+end

data/tests/aws/models/cloud_watch/metrics_tests.rb

@@ -14,4 +14,19 @@ Shindo.tests("AWS::CloudWatch | metrics", ['aws', 'cloudwatch']) do
     
   end
 
-end
+  tests('#each') do
+    Fog.mock!
+    tests("handle NextToken").returns(1001) do
+      count = 0      
+      Fog::AWS[:cloud_watch].metrics.each {|e| count += 1 }
+      count
+    end
+
+    tests("yields Metrics instances").succeeds do
+      all = []
+      Fog::AWS[:cloud_watch].metrics.each {|e| all << e }
+      all.all? {|e| e.is_a?(Fog::AWS::CloudWatch::Metric) }
+    end
+  end
+
+end

data/tests/aws/models/iam/users_tests.rb

@@ -4,12 +4,16 @@ Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
   @iam = Fog::AWS[:iam]
   @user_one_name = 'fake_user_one'
   @user_two_name = 'fake_user_two'
-  
+
+  @user_three_name = 'fake_user_three'
+  @user_three_path = '/path/to/fake_user_three/'
+  @user_four_name = 'fake_user_four'
+
   tests('#create').succeeds do
     @user_one = @iam.users.create(:id => @user_one_name)
     @user_one.id == @user_one_name
   end
-  
+
   tests('#all','there is only one user').succeeds do
     @iam.users.size == 1
   end
@@ -43,6 +47,16 @@ Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
     @iam.users.get(@user_one_name).access_keys.empty?
   end
   
+  tests('#create', 'assigns path').succeeds do
+    @user_three = @iam.users.create(:id => @user_three_name, :path => @user_three_path)
+    @user_three.path == @user_three_path
+  end
+
+  tests('#create', 'defaults path to /').succeeds do
+    @user_four = @iam.users.create(:id => @user_four_name)
+    @user_four.path == '/'
+  end
+
   tests('#destroy','an existing user').succeeds do
     @iam.users.get(@user_one_name).destroy
   end

data/tests/aws/requests/auto_scaling/model_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
 
   tests('success') do
-    pending if Fog.mocking?
-
     lc = nil
     lc_id = 'fog-model-lc'
 
@@ -62,7 +60,7 @@ Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
 
       tests('suspend processes') do
         asg.suspend_processes()
-        #tests('processes suspended').returns([]) { asg.suspended_processes }
+        tests('processes suspended').returns([]) { asg.suspended_processes }
       end
 
       tests('resume processes') do

data/tests/aws/requests/auto_scaling/notification_configuration_tests.rb

@@ -3,6 +3,7 @@ Shindo.tests('AWS::AutoScaling | notification configuration requests', ['aws', '
   image_id = {  # Ubuntu 12.04 LTS 64-bit EBS
     'ap-northeast-1' => 'ami-60c77761',
     'ap-southeast-1' => 'ami-a4ca8df6',
+    'ap-southeast-2' => 'ami-fb8611c1',
     'eu-west-1'      => 'ami-e1e8d395',
     'sa-east-1'      => 'ami-8cd80691',
     'us-east-1'      => 'ami-a29943cb',

data/tests/aws/requests/auto_scaling/tag_tests.rb

@@ -3,6 +3,7 @@ Shindo.tests('AWS::AutoScaling | tag requests', ['aws', 'auto_scaling']) do
   image_id = {  # Ubuntu 12.04 LTS 64-bit EBS
     'ap-northeast-1' => 'ami-60c77761',
     'ap-southeast-1' => 'ami-a4ca8df6',
+    'ap-southeast-2' => 'ami-fb8611c1',
     'eu-west-1'      => 'ami-e1e8d395',
     'sa-east-1'      => 'ami-8cd80691',
     'us-east-1'      => 'ami-a29943cb',

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

@@ -92,6 +92,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       'availabilityZone'                => String,
       'duration'                        => Integer,
       'fixedPrice'                      => Float,
+      'offeringType'                    => String,
       'usagePrice'                      => Float,
       'productDescription'              => String,
       'instanceTenancy'                 => String,
@@ -115,6 +116,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       'fixedPrice'          => Float,
       'usagePrice'          => Float,
       'instanceCount'       => Integer,
+      'offeringType'        => String,
       'productDescription'  => String,
       'state'               => String,
       'tagSet'              => [{

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

@@ -16,6 +16,11 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
     'snapshotSet' => [@snapshot_format.merge('tagSet' => {})]
   }
 
+  @snapshot_copy_result = {
+    'requestId'   => String,
+    'snapshotId'  => String
+  }
+
   @volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
 
   tests('success') do
@@ -39,10 +44,24 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
       Fog::Compute[:aws].describe_snapshots('snapshot-id' => @snapshot_id).body
     end
 
+    tests("#copy_snapshot (#{@snapshot_id}, 'us-east-1')").formats(@snapshot_copy_result) do
+      data = Fog::Compute.new(:provider => :aws, :region => "us-west-1").copy_snapshot(@snapshot_id, "us-east-1").body
+      @west_snapshot_id = data['snapshotId']
+      data
+    end
+
     tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_snapshot(@snapshot_id).body
     end
 
+    #NOTE: waiting for the copy to complete can sometimes take up to 5 minutes (but sometimes it's nearly instant)
+    #for faster tests: comment out the rest of this block
+    Fog.wait_for { Fog::Compute.new(:provider => :aws, :region => "us-west-1").snapshots.get(@west_snapshot_id) }
+
+    tests("#delete_snapshots(#{@west_snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute.new(:provider => :aws, :region => "us-west-1").delete_snapshot(@west_snapshot_id).body
+    end
+
   end
   tests('failure') do
 

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

@@ -12,13 +12,15 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
         'imageId'             => String,
         'instanceType'        => String,
         'monitoring'          => Fog::Boolean,
-        'subnetId'            => String
+        'subnetId'            => Fog::Nullable::String,
+        'iamInstanceProfile'  => Fog::Nullable::Hash,
       },
       'productDescription'        => String,
       'spotInstanceRequestId'     => String,
       'spotPrice'                 => Float,
       'state'                     => String,
-      'type'                      => String
+      'type'                      => String,
+      'fault'                     => Fog::Nullable::Hash,
     }],
     'requestId' => String
   }

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

@@ -136,6 +136,10 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
     Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
 
+    tests("#modify_volume_attribute('#{@volume_id}', true)").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].modify_volume_attribute(@volume_id, true).body
+    end
+
     tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_volume(@volume_id).body
     end
@@ -156,6 +160,10 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
+    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].modify_volume_attribute('vol-00000000', true)
+    end
+
     tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
       Fog::Compute[:aws].detach_volume(@volume.identity)
     end

data/tests/aws/requests/storage/bucket_tests.rb

@@ -241,6 +241,20 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       end
     end
 
+    tests("put_bucket_cors('#{@aws_bucket_name}', cors)").succeeds do
+      cors =  {'CORSConfiguration' =>
+                  [
+                    {
+                      'AllowedOrigin' => 'http://localhost:3000',
+                      'AllowedMethod' => ['POST', 'GET'],
+                      'AllowedHeader' => '*',
+                      'MaxAgeSeconds' => 3000
+                    }
+                  ]
+              }
+      Fog::Storage[:aws].put_bucket_cors(@aws_bucket_name, cors)
+    end
+
     tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
       Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
     end