ztk 1.0.10 → 1.0.11

data/README.md

@@ -1,6 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/ztk.png)](http://badge.fury.io/rb/ztk)
+[![Dependency Status](https://gemnasium.com/zpatten/ztk.png)](https://gemnasium.com/zpatten/ztk)
 [![Build Status](https://secure.travis-ci.org/zpatten/ztk.png)](http://travis-ci.org/zpatten/ztk)
 [![Code Climate](https://codeclimate.com/github/zpatten/ztk.png)](https://codeclimate.com/github/zpatten/ztk)
-[![Dependency Status](https://gemnasium.com/zpatten/ztk.png)](https://gemnasium.com/zpatten/ztk)
 
 # ZTK
 

data/lib/ztk/report.rb

@@ -74,14 +74,8 @@ module ZTK
         rows << block.call(data)
       end
 
-      headers.each do |header|
-        maximum = [header, rows.collect{ |r| r.send(header) }].flatten.map(&:to_s).map(&:length).max
-        max_lengths.send("#{header}=", maximum)
-      end
-
-      header_line = headers.collect do |header|
-        "%-#{max_lengths.send(header)}s" % header.to_s.upcase
-      end
+      max_lengths = max_spreadsheet_lengths(headers, rows)
+      header_line = headers.collect { |header| "%-#{max_lengths.send(header)}s" % header.to_s.upcase }
       header_line = format_row(header_line)
 
       config.ui.stdout.puts(format_header(headers, max_lengths))
@@ -90,17 +84,23 @@ module ZTK
 
       rows.each do |row|
         row_line = headers.collect do |header|
-          "%-#{max_lengths.send(header)}s" % row.send(header)
+          header_length = max_lengths.send(header)
+          content = row.send(header)
+
+          "%-#{header_length}s" % content
         end
+
         row_line = format_row(row_line)
         config.ui.stdout.puts(row_line)
       end
 
       config.ui.stdout.puts(format_header(headers, max_lengths))
 
-      width = (2 + max_lengths.send(:table).values.reduce(:+) + ((headers.count * 3) - 3) + 2)
-
-      OpenStruct.new(:rows => rows, :max_lengths => max_lengths, :width => width)
+      OpenStruct.new(
+        :rows => rows,
+        :max_lengths => max_lengths,
+        :width => calculate_spreadsheet_width(headers, max_lengths)
+      )
     end
 
     # Displays data in a key-value list style.
@@ -155,6 +155,22 @@ module ZTK
 
   private
 
+    def max_spreadsheet_lengths(headers, rows)
+      max_lengths = OpenStruct.new
+      headers.each do |header|
+        collection = [header, rows.map(&header)].flatten
+        maximum = collection.map(&:to_s).map(&:length).max
+        max_lengths.send("#{header}=", maximum)
+      end
+      max_lengths
+    end
+
+    def calculate_spreadsheet_width(headers, max_lengths)
+      header_lengths = ((headers.count * 3) - 3)
+      max_length = max_lengths.send(:table).values.reduce(:+)
+      (2 + max_length + header_lengths + 2)
+    end
+
     def format_header(headers, lengths)
       line = headers.collect do |header|
         "-" * lengths.send(header)

data/lib/ztk/version.rb

@@ -21,6 +21,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 
 end

data/spec/spec_helper.rb

@@ -17,17 +17,15 @@
 #   limitations under the License.
 #
 ################################################################################
-
-require 'ztk'
 require 'tempfile'
 
-################################################################################
-
 require 'simplecov'
 SimpleCov.start do
   add_filter '/spec/'
 end if ENV["COVERAGE"]
 
+require 'ztk'
+
 ENV['LOG_LEVEL'] = "DEBUG"
 
 WAIT_SMALL = 3

metadata

@@ -1,184 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ztk
-version: !ruby/object:Gem::Version
-  version: 1.0.10
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.0.11
 platform: ruby
-authors:
+authors: 
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: erubis
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id010
 description: Zachary's (DevOp) Tool Kit
-email:
+email: 
 - zachary@jovelabs.com
-executables:
+executables: 
 - ztk
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc.template
@@ -240,35 +193,38 @@ files:
 - ztk.gemspec
 homepage: https://github.com/zpatten/ztk
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -3896273515373899790
+      segments: 
       - 0
-      hash: 4473587828937144611
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -3896273515373899790
+      segments: 
       - 0
-      hash: 4473587828937144611
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Contains various classes and utilities I find I regularly need.
-test_files:
+test_files: 
 - spec/spec_helper.rb
 - spec/support/test-config.rb
 - spec/support/test-template.txt.erb