fog 0.0.40 → 0.0.41

data/spec/aws/requests/simpledb/domain_metadata_spec.rb

@@ -5,15 +5,15 @@ describe 'SimpleDB.domain_metadata' do
 
     before(:each) do
       @domain_name = "fog_domain_#{Time.now.to_i}"
-      sdb.create_domain(@domain_name)
+      AWS[:sdb].create_domain(@domain_name)
     end
 
     after(:each) do
-      sdb.delete_domain(@domain_name)
+      AWS[:sdb].delete_domain(@domain_name)
     end
 
     it 'should return proper attributes when there are no items' do
-      results = sdb.domain_metadata(@domain_name)
+      results = AWS[:sdb].domain_metadata(@domain_name)
       results.body['AttributeNameCount'].should == 0
       results.body['AttributeNamesSizeBytes'].should == 0
       results.body['AttributeValueCount'].should == 0
@@ -26,8 +26,8 @@ describe 'SimpleDB.domain_metadata' do
     end
 
     it 'should return proper attributes with items' do
-      sdb.put_attributes(@domain_name, 'foo', { :bar => :baz })
-      results = sdb.domain_metadata(@domain_name)
+      AWS[:sdb].put_attributes(@domain_name, 'foo', { :bar => :baz })
+      results = AWS[:sdb].domain_metadata(@domain_name)
       results.body['AttributeNameCount'].should == 1
       results.body['AttributeNamesSizeBytes'].should == 3
       results.body['AttributeValueCount'].should == 1
@@ -44,7 +44,7 @@ describe 'SimpleDB.domain_metadata' do
 
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
-        sdb.domain_metadata('notadomain')
+        AWS[:sdb].domain_metadata('notadomain')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

data/spec/aws/requests/simpledb/get_attributes_spec.rb

@@ -5,24 +5,24 @@ describe 'SimpleDB.get_attributes' do
 
     before(:each) do
       @domain_name = "fog_domain_#{Time.now.to_i}"
-      sdb.create_domain(@domain_name)
+      AWS[:sdb].create_domain(@domain_name)
     end
 
     after(:each) do
-      sdb.delete_domain(@domain_name)
+      AWS[:sdb].delete_domain(@domain_name)
     end
 
     it 'should have no attributes for foo before put_attributes' do
       eventually do
-        actual = sdb.get_attributes(@domain_name, 'foo')
+        actual = AWS[:sdb].get_attributes(@domain_name, 'foo')
         actual.body['Attributes'].should be_empty
       end
     end
 
     it 'should have attributes for foo after put_attributes' do
-      sdb.put_attributes(@domain_name, 'foo', { :bar => :baz })
+      AWS[:sdb].put_attributes(@domain_name, 'foo', { :bar => :baz })
       eventually do
-        actual = sdb.get_attributes(@domain_name, 'foo')
+        actual = AWS[:sdb].get_attributes(@domain_name, 'foo')
         actual.body['Attributes'].should == { 'bar' => ['baz'] }
       end
     end
@@ -32,15 +32,15 @@ describe 'SimpleDB.get_attributes' do
 
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
-        sdb.get_attributes('notadomain', 'notanattribute')
+        AWS[:sdb].get_attributes('notadomain', 'notanattribute')
       }.should raise_error(Excon::Errors::BadRequest)
     end
 
     it 'should not raise an error if the attribute does not exist' do
       @domain_name = "fog_domain_#{Time.now.to_i}"
-      sdb.create_domain(@domain_name)
-      sdb.get_attributes(@domain_name, 'notanattribute')
-      sdb.delete_domain(@domain_name)
+      AWS[:sdb].create_domain(@domain_name)
+      AWS[:sdb].get_attributes(@domain_name, 'notanattribute')
+      AWS[:sdb].delete_domain(@domain_name)
     end
 
   end

data/spec/aws/requests/simpledb/list_domains_spec.rb

@@ -8,20 +8,20 @@ describe 'SimpleDB.list_domains' do
     end
 
     after(:each) do
-      sdb.delete_domain(@domain_name)
+      AWS[:sdb].delete_domain(@domain_name)
     end
 
     it 'should return proper attributes' do
-      results = sdb.list_domains
+      results = AWS[:sdb].list_domains
       results.body['BoxUsage'].should be_a(Float)
       results.body['Domains'].should be_an(Array)
       results.body['RequestId'].should be_a(String)
     end
 
     it 'should include created domains' do
-      sdb.create_domain(@domain_name)
+      AWS[:sdb].create_domain(@domain_name)
       eventually do
-        actual = sdb.list_domains
+        actual = AWS[:sdb].list_domains
         actual.body['Domains'].should include(@domain_name)
       end
     end

data/spec/aws/requests/simpledb/put_attributes_spec.rb

@@ -5,15 +5,15 @@ describe 'SimpleDB.put_attributes' do
 
     before(:each) do
       @domain_name = "fog_domain_#{Time.now.to_i}"
-      sdb.create_domain(@domain_name)
+      AWS[:sdb].create_domain(@domain_name)
     end
 
     after(:each) do
-      sdb.delete_domain(@domain_name)
+      AWS[:sdb].delete_domain(@domain_name)
     end
 
     it 'should return proper attributes from put_attributes' do
-      actual = sdb.put_attributes(@domain_name, 'foo', { 'bar' => 'baz' })
+      actual = AWS[:sdb].put_attributes(@domain_name, 'foo', { 'bar' => 'baz' })
       actual.body['RequestId'].should be_a(String)
       actual.body['BoxUsage'].should be_a(Float)
     end
@@ -23,7 +23,7 @@ describe 'SimpleDB.put_attributes' do
 
     it 'should raise a BadRequest error if the domain does not exist' do
       lambda {
-        sdb.put_attributes(@domain_name, 'notadomain', { 'notanattribute' => 'value' })
+        AWS[:sdb].put_attributes(@domain_name, 'notadomain', { 'notanattribute' => 'value' })
       }.should raise_error(Excon::Errors::BadRequest)
     end
 

data/spec/compact_progress_bar_formatter.rb

@@ -0,0 +1,195 @@
+# Copyright (c) 2008 Nicholas A. Evans
+# http://ekenosen.net/nick/devblog/2008/12/better-progress-bar-for-rspec/
+#
+# With some tweaks (slow spec profiler, growl support)
+# By Nick Zadrozny
+# http://gist.github.com/71340
+#  
+# Further tweaks (formatador, elapsed time instead of eta)
+# By geemus (Wesley Beary)
+# http://gist.github.com/266221
+#
+# 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 'spec/runner/formatter/base_text_formatter'
+require "rubygems"
+require 'formatador'
+
+module Spec
+  module Runner
+    module Formatter
+      class CompactProgressBarFormatter < BaseTextFormatter
+        # Threshold for slow specs, in seconds.
+        # Anything that takes longer than this will be printed out
+        # It would be great to get this down to 0.5 or less...
+        SLOW_SPEC_THRESHOLD = 2.0
+
+        # Keep track the slowest specs and print a report at the end
+        SLOW_SPEC_REPORT = 3
+
+        attr_reader :total, :current
+
+        def start(example_count)
+          @current     = 0
+          @started_at  = Time.now
+          @total       = example_count
+          @error_state = :all_passing
+          @slow_specs  = []
+          @formatador  = Formatador.new
+          @formatador.display_line
+        end
+
+        def example_started(example)
+          super
+          @start_time = Time.now
+        end
+
+        def example_passed(example)
+          elapsed = Time.now - @start_time
+          profile_example(example_group.description, example.description, elapsed)
+          increment
+        end
+
+        # third param is optional, because earlier versions of rspec sent only two args
+        def example_pending(example, message, pending_caller=nil)
+          immediately_dump_pending(example.description, message, pending_caller)
+          mark_error_state_pending
+          increment
+        end
+
+        def example_failed(example, counter, failure)
+          immediately_dump_failure(counter, failure)
+          notify_failure(counter, failure)
+          mark_error_state_failed
+          increment
+        end
+
+        def start_dump
+          @formatador.display_line("\n")
+          report_slow_specs
+        end
+
+        def dump_failure(*args)
+          # no-op; we summarized failures as we were running
+        end
+
+        def method_missing(sym, *args)
+          # ignore
+        end
+
+        def notify(title, message, priority)
+          title = title.gsub(/\s+/, ' ').gsub(/"/,'\"').gsub(/'/, "\'")
+          message = message.gsub(/\s+/, ' ').gsub(/"/,'\"').gsub(/'/, "\'").gsub(/`/,'\`')
+          notify_command = case RUBY_PLATFORM
+          when /darwin/
+            "test -x `which growlnotify` && growlnotify -n autotest -p #{priority} -m \"#{message}\" \"#{title}\""
+          when /linux/
+            "test -x `which notify-send` && notify-send \"#{title}\" \"#{message}\""
+          end
+          # puts notify_command # use this for debugging purposes
+          system notify_command if notify_command
+        end
+
+        def notify_failure(counter, failure)
+          notify failure.header, failure.exception.message, 2
+        end
+
+        # stolen and slightly modified from BaseTextFormatter#dump_failure
+        def immediately_dump_failure(counter, failure)
+          @formatador.redisplay("#{' ' * progress_bar.length}\n")
+          @formatador.redisplay("[red]#{counter.to_s})[/]")
+          @formatador.display_line("[red]#{failure.header}[/]")
+          @formatador.indent do
+            @formatador.display_line("[red]#{failure.exception.message}[/]")
+            @formatador.display_line
+            failure.exception.backtrace.each do |line|
+              @formatador.display_line("[red]#{line}[/]")
+            end
+            @formatador.display_line
+          end
+        end
+
+        # stolen and modified from BaseTextFormatter#dump_pending
+        def immediately_dump_pending(desc, msg, called_from)
+          @formatador.indent do
+            @formatador.redisplay("#{' ' * progress_bar.length}\r")
+            @formatador.display_line("[yellow]PENDING SPEC:[/] #{desc} (#{msg})\n")
+          end
+          # output.puts "  Called from #{called_from}" if called_from
+        end
+
+        def increment
+          @current += 1
+          @formatador.redisplay(progress_bar)
+        end
+
+        def mark_error_state_failed
+          @error_state = :some_failed
+        end
+
+        def mark_error_state_pending
+          @error_state = :some_pending unless @error_state == :some_failed
+        end
+
+        def progress_bar
+          color = case @error_state
+          when :some_failed
+            'red'
+          when :some_pending
+            'yellow'
+          else
+            'green'
+          end
+          ratio = "#{(' ' * (@total.to_s.size - @current.to_s.size))}#{@current}/#{@total}"
+          fraction = "[#{color}]#{(' ' * (@total.to_s.size - @current.to_s.size))}#{@current}/#{@total}[/]"
+          percent  = @current.to_f / @total.to_f
+          progress = "[_white_]|[/][#{color}][_#{color}_]#{'*' * (percent * 50).ceil}[/]#{' ' * (50 - (percent * 50).ceil)}[_white_]|[/]"
+          microseconds = Time.now - @started_at
+          minutes = (microseconds / 60).round.to_s
+          seconds = (microseconds % 60).round.to_s
+          elapsed = "#{minutes}:#{'0' if seconds.size < 2}#{seconds}"
+          [fraction, progress, elapsed, ''].join('  ')
+        end
+
+        def profile_example(group, example, elapsed)
+          @slow_specs = (@slow_specs + [[elapsed, group, example]]).sort.reverse[0, SLOW_SPEC_REPORT]
+          print_warning_if_really_slow(group, example, elapsed)
+        end
+        
+        def print_warning_if_really_slow(group, example, elapsed)
+          if elapsed > SLOW_SPEC_THRESHOLD
+            @formatador.indent do
+              @formatador.redisplay("#{' ' * progress_bar.length}\r")
+              @formatador.display_line("[yellow]SLOW SPEC (#{sprintf("%.4f", elapsed)})[/]: #{group} #{example}\n")
+            end
+          end
+        end
+        
+        def report_slow_specs
+          @formatador.display_line("[yellow]Top #{@slow_specs.size} slowest specs:[/]")
+          @slow_specs.each do |elapsed, group, example|
+            @formatador.display_line("[yellow]  #{yellow(sprintf('%.4f', elapsed))} #{group} #{example}[/]")
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/rackspace/models/servers/server_spec.rb

@@ -9,7 +9,7 @@ describe 'Fog::AWS::EC2::Server' do
   subject { @server = @servers.new(:flavor_id => 1, :image_id => 3, :name => 'name') }
 
   before(:each) do
-    @servers = servers.servers
+    @servers = Rackspace[:servers].servers
   end
 
   after(:each) do

data/spec/rackspace/requests/files/delete_container_spec.rb

@@ -4,11 +4,11 @@ describe 'Rackspace::Files.delete_container' do
   describe 'success' do
 
     before(:each) do
-      files.put_container('container_name')
+      Rackspace[:files].put_container('container_name')
     end
 
     it "should return proper attributes" do
-      files.delete_container('container_name')
+      Rackspace[:files].delete_container('container_name')
     end
 
   end
@@ -16,7 +16,7 @@ describe 'Rackspace::Files.delete_container' do
 
     it "should raise a NotFound error if the container does not exist" do
       lambda do
-        files.delete_container('container_name')
+        Rackspace[:files].delete_container('container_name')
       end.should raise_error(Excon::Errors::NotFound)
     end
 

data/spec/rackspace/requests/files/delete_object_spec.rb

@@ -4,16 +4,16 @@ describe 'Rackspace::Files.delete_object' do
   describe 'success' do
 
     before(:each) do
-      files.put_container('container_name')
-      files.put_object('container_name', 'object_name', lorem_file)
+      Rackspace[:files].put_container('container_name')
+      Rackspace[:files].put_object('container_name', 'object_name', lorem_file)
     end
     
     after(:each) do
-      files.delete_container('container_name')
+      Rackspace[:files].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      files.delete_object('container_name', 'object_name')
+      Rackspace[:files].delete_object('container_name', 'object_name')
     end
 
   end
@@ -21,16 +21,16 @@ describe 'Rackspace::Files.delete_object' do
 
     it "should raise a NotFound error if the container does not exist" do
       lambda do
-        files.delete_object('container_name', 'object_name')
+        Rackspace[:files].delete_object('container_name', 'object_name')
       end.should raise_error(Excon::Errors::NotFound)
     end
 
     it "should raise a NotFound error if the object does not exist" do
-      files.put_container('container_name')
+      Rackspace[:files].put_container('container_name')
       lambda do
-        files.delete_object('container_name', 'object_name')
+        Rackspace[:files].delete_object('container_name', 'object_name')
       end.should raise_error(Excon::Errors::NotFound)
-      files.delete_container('container_name')
+      Rackspace[:files].delete_container('container_name')
     end
 
   end

data/spec/rackspace/requests/files/get_container_spec.rb

@@ -4,17 +4,17 @@ describe 'Rackspace::Files.get_container' do
   describe 'success' do
 
     before(:each) do
-      files.put_container('container_name')
-      files.put_object('container_name', 'object_name', lorem_file)
+      Rackspace[:files].put_container('container_name')
+      Rackspace[:files].put_object('container_name', 'object_name', lorem_file)
     end
     
     after(:each) do
-      files.delete_object('container_name', 'object_name')
-      files.delete_container('container_name')
+      Rackspace[:files].delete_object('container_name', 'object_name')
+      Rackspace[:files].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      actual = files.get_container('container_name').body
+      actual = Rackspace[:files].get_container('container_name').body
       actual.first['bytes'].should be_an(Integer)
       actual.first['content_type'].should be_a(String)
       actual.first['hash'].should be_a(String)
@@ -26,7 +26,7 @@ describe 'Rackspace::Files.get_container' do
   describe 'failure' do
 
     it "should not raise an if the container does not exist" do
-      files.get_container('container_name')
+      Rackspace[:files].get_container('container_name')
     end
 
   end

data/spec/rackspace/requests/files/get_containers_spec.rb

@@ -4,15 +4,15 @@ describe 'Rackspace::Files.get_containers' do
   describe 'success' do
 
     before(:each) do
-      files.put_container('container_name')
+      Rackspace[:files].put_container('container_name')
     end
 
     after(:each) do
-      files.delete_container('container_name')
+      Rackspace[:files].delete_container('container_name')
     end
 
     it "should return proper attributes" do
-      actual = files.get_containers.body
+      actual = Rackspace[:files].get_containers.body
       actual.first['bytes'].should be_an(Integer)
       actual.first['count'].should be_an(Integer)
       actual.first['name'].should be_a(String)