fog-core 1.27.3 → 1.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05926065513096bbd243c048472185d94fff85dc
-  data.tar.gz: 07586ba0a3850cb661496316589f8e691bd38972
+  metadata.gz: e822a212a0601171bf7a7d5f61f5bc46211c66b7
+  data.tar.gz: 6abeed4e74994de0b27874fa1beefe93ff8c8fa3
 SHA512:
-  metadata.gz: b3c1803c12f6e915226ec157457d769ede0c28debdd5ce9651a253f662d6b651df268ff8748a3070e6836fa3cd84badfb805fd4b9aea0fc3a3ad0065f51544d2
-  data.tar.gz: 29295752f87c18ae39bed3385f9976ff3140106d6446d339c370c3015bad8f4b13dec7cdb0d1a7b76cde270459d68be2e3a09d60e7d744dbcb0b0a2b9327799d
+  metadata.gz: c475dd52859470ac196901f374efab07bc3f7171b43fdc326ca0f637915c3e689dc7f85bf0720c6c6728d00dbcf76e88780494e70f5ca780c8963cb7ff37c85e
+  data.tar.gz: 47e064f9eabc07c9d8f8ef459456f4116745bba31dface8629b18ae64ff34618a96c911b798361904ecbbfaf5dd36b6dfc10e6e9153b45eb5e25dd7a4ffe6247

data/changelog.md

@@ -1,4 +1,10 @@
-1.27.3  12/01/2012
+1.27.4 01/26/2012
+==========================================================
+
+model fix for new formatador usage
+fixes around formatador delegation
+
+1.27.3 12/01/2012
 ==========================================================
 
 rubocop fixes for fog collection

data/lib/fog/core/collection.rb

@@ -70,7 +70,7 @@ module Fog
     end
 
     def inspect
-      Fog::Formatador.new(self)
+      Fog::Formatador.format(self)
     end
 
     def load(objects)
@@ -100,7 +100,7 @@ module Fog
     end
 
     def table(attributes = nil)
-      Formatador.display_table(map(&:attributes), attributes)
+      Fog::Formatador.display_table(map(&:attributes), attributes)
     end
 
     def to_json(_options = {})

data/lib/fog/core/logger.rb

@@ -31,9 +31,9 @@ module Fog
       channel = @channels[key]
       if channel
         message = if channel.tty?
-                    value.gsub(::Formatador::PARSE_REGEX) { "\e[#{::Formatador::STYLES[$1.to_sym]}m" }.gsub(::Formatador::INDENT_REGEX, "")
+                    value.gsub(Fog::Formatador::PARSE_REGEX) { "\e[#{Fog::Formatador::STYLES[$1.to_sym]}m" }.gsub(Fog::Formatador::INDENT_REGEX, "")
                   else
-                    value.gsub(::Formatador::PARSE_REGEX, "").gsub(::Formatador::INDENT_REGEX, "")
+                    value.gsub(Fog::Formatador::PARSE_REGEX, "").gsub(Fog::Formatador::INDENT_REGEX, "")
                   end
         channel.write(message)
       end

data/lib/fog/core/model.rb

@@ -21,16 +21,7 @@ module Fog
     end
 
     def inspect
-      Thread.current[:formatador] ||= Formatador.new
-      data = "#{Thread.current[:formatador].indentation}<#{self.class.name}"
-      Thread.current[:formatador].indent do
-        unless self.class.attributes.empty?
-          data << "\n#{Thread.current[:formatador].indentation}"
-          data << self.class.attributes.map { |attribute| "#{attribute}=#{send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
-        end
-      end
-      data << "\n#{Thread.current[:formatador].indentation}>"
-      data
+      Fog::Formatador.format(self)
     end
 
     def reload

data/lib/fog/core/ssh.rb

@@ -109,14 +109,14 @@ module Fog
       def display_stdout
         data = stdout.split("\r\n")
         if data.is_a?(String)
-          Formatador.display_line(data)
+          Fog::Formatador.display_line(data)
         elsif data.is_a?(Array)
-          Formatador.display_lines(data)
+          Fog::Formatador.display_lines(data)
         end
       end
 
       def display_stderr
-        Formatador.display_line(stderr.split("\r\n"))
+        Fog::Formatador.display_line(stderr.split("\r\n"))
       end
 
       def initialize(command)

data/lib/fog/core/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Core
-    VERSION = "1.27.3"
+    VERSION = "1.27.4"
   end
 end

data/lib/fog/formatador.rb

@@ -1,65 +1,89 @@
 module Fog
   # Fog::Formatador
-  class Formatador
-    attr_accessor :object, :string, :formatador
+  module Formatador
+    PARSE_REGEX   = ::Formatador::PARSE_REGEX
+    STYLES        = ::Formatador::STYLES
+    INDENT_REGEX  = ::Formatador::INDENT_REGEX
 
-    def initialize(obj)
-      @object = obj
-      @formatador ||= ::Formatador.new
+    def self.formatador
+      Thread.current[:formatador] ||= ::Formatador.new
     end
 
-    def to_s
-      return string unless string.nil?
-      init_string
-      indent { string << object_string }
-      (string << "#{indentation}>").dup
+    def self.format(object, opts = { :include_nested => true })
+      string = init_string(object)
+      indent { string << object_string(object, opts) }
+      string << "#{indentation}>"
+    end
+
+    
+
+    def self.display_line(data)
+      ::Formatador.display_line(data)
+    end
+
+    def self.display_lines(data)
+      ::Formatador.display_lines(data)
+    end
+
+    def self.display_compact_table(hashes, keys = nil, &block)
+      ::Formatador.display_compact_table(hashes, keys, &block)
+    end
+
+    def self.display_table(hashes, keys = nil, &block)
+      ::Formatador.display_table(hashes, keys, &block)
+    end
+
+    def self.redisplay_progressbar(current, total, options = {})
+      ::Formatador.redisplay_progressbar(current, total, options = {})
     end
 
     private
 
-    def indent(&block)
+    def self.indent(&block)
       formatador.indent(&block)
     end
 
-    def indentation
+    def self.indentation
       formatador.indentation
     end
 
-    def init_string
-      @string = "#{indentation}<#{object.class.name}\n"
+    def self.init_string(object)
+      "#{indentation}<#{object.class.name}\n"
     end
 
-    def object_string
-      "#{attribute_string}#{nested_objects_string}"
+    def self.object_string(object, opts)
+      string = "#{attribute_string(object)}"
+      string << "#{nested_objects_string(object)}" if opts[:include_nested]
+      string
     end
 
-    def attribute_string
-      if object.attributes.empty?
-        "#{indentation}#{object_attributes}\n"
-      else
+    def self.attribute_string(object)
+      return "" unless object.class.respond_to?(:attributes)
+      if object.class.attributes.empty?
         ""
+      else
+        "#{indentation}#{object_attributes(object)}\n"
       end
     end
 
-    def nested_objects_string
-      if object.empty?
-        nested = "#{indentation}[\n"
-        indent { nested << indentation + inspect_object }
-        nested << "#{indentation}\n#{indentation}]\n"
-        nested
-      else
-        ""
-      end
+    def self.nested_objects_string(object)
+      nested = ""
+      return nested if object.respond_to?(:empty) and object.empty?
+      return nested unless object.respond_to?(:map)
+      nested = "#{indentation}[\n"
+      indent { nested << indentation + inspect_object(object) }
+      nested << "#{indentation}\n#{indentation}]\n"
     end
 
-    def object_attributes
+    def self.object_attributes(object)
       attrs = object.class.attributes.map do |attr|
         "#{attr}=#{object.send(attr).inspect}"
       end
       attrs.join(",\n#{indentation}")
     end
 
-    def inspect_object
+    def self.inspect_object(object)
+      return "" unless object.respond_to?(:map)
       object.map { |o| indentation + o.inspect }.join(", \n#{indentation}")
     end
   end

data/lib/tasks/test_task.rb

@@ -20,7 +20,7 @@ module Fog
       end
 
       def tests(mocked)
-        Formatador.display_line
+        Fog::Formatador.display_line
         start = Time.now.to_i
         threads = []
         Thread.main[:results] = []
@@ -33,9 +33,9 @@ module Fog
           end
         end
         threads.each(&:join)
-        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
+        Fog::Formatador.display_table(Thread.main[:results].sort { |x, y| x[:provider] <=> y[:provider] })
+        Fog::Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
+        Fog::Formatador.display_line
       end
     end
   end

data/spec/formatador_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-class TestCase < Fog::Collection
+class CollectionTestCase < Fog::Collection
   def all
   end
   def map(*_args)
@@ -20,8 +20,11 @@ class TestCase < Fog::Collection
   end
 end
 
-test_case_str = <<-EOL
-  <TestCase
+class NonCollectionTestCase 
+end
+
+test_case_str1 = <<-EOL
+  <CollectionTestCase
     this=["this", "that"],
     that=["that", "this"]
     [
@@ -30,28 +33,40 @@ test_case_str = <<-EOL
     ]
   >
 EOL
+test_case_str1.chomp!
+
+test_case_str2 = <<-EOL
+  <CollectionTestCase
+    this=["this", "that"],
+    that=["that", "this"]
+  >
+EOL
+test_case_str2.chomp!
 
-test_case_str.chomp!
+test_case_str3 = <<-EOL
+  <NonCollectionTestCase
+  >
+EOL
+test_case_str3.chomp!
 
 describe Fog::Formatador do
 
   def setup
-    @formatador = Fog::Formatador.new(TestCase.new)
-  end
-
-  it "raises for missing required arguments" do
-    assert_raises(ArgumentError) { Fog::Formatador.new }
+    @collection_test = CollectionTestCase.new
+    @collection_test << 'this'
+    @non_collection_test = NonCollectionTestCase.new
   end
 
-  it "should instansiate" do
-    @formatador.must_be_instance_of Fog::Formatador
+  it "should give a string representation of object with proper indentation" do
+    Fog::Formatador.format(@collection_test).must_equal test_case_str1
   end
 
-  it "should respond to_s" do
-    @formatador.must_respond_to :to_s
-  end
+  it 'should not include nested objects' do
+    opts = { :include_nested => false }
+    Fog::Formatador.format(@collection_test, opts).must_equal test_case_str2
+  end 
 
-  it "should give a string representation of object with proper indentation" do
-    "#{@formatador}".must_equal test_case_str
+  it 'should not raise if object does not response to :empty? or :map' do
+    Fog::Formatador.format(@non_collection_test).must_equal test_case_str3
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-core
 version: !ruby/object:Gem::Version
-  version: 1.27.3
+  version: 1.27.4
 platform: ruby
 authors:
 - Evan Light
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder