ironfan 4.6.1 → 4.6.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.6.2:
+* Added a -f/--with-facet option to knife cluster list
+
 # v4.6.1:
 * Fixes nested array bug when computing list of AZs for an ELB (thanks @nickmarden)
 * Cleaning up overzealous Elastic IP inclusion (alternative fix to #222, thanks @nickmarden)

data/VERSION

@@ -1 +1 @@
-4.6.1
+4.6.2

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.6.1"
+  s.version = "4.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-12-11"
+  s.date = "2012-12-13"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/chef/knife/cluster_list.rb

@@ -27,23 +27,31 @@ class Chef
         require 'formatador'
       end
 
-      banner "knife cluster list (options)"
-
+      banner 'knife cluster list (options)'
+
+      option :facets,
+        :long        => '--with-facets',
+        :short       => '-f',
+        :description => 'List cluster facets along with names and paths',
+        :default     => false,
+        :boolean     => true
+      
       def run
         load_ironfan
         configure_dry_run
 
-        hash = Ironfan.cluster_filenames
-
-        table = []
-        hash.keys.sort.each do |key|
-          table.push( { :cluster => key, :path => hash[key] } )
+        data = Ironfan.cluster_filenames.map do |name, path|
+          as_table = { :cluster => name, :path => path }
+          if config[:facets]
+            facets = Ironfan.load_cluster(name).facets.to_a.map(&:name).join(', ')
+            as_table.merge!(:facets => facets)
+          end
+          as_table
         end
 
         ui.info "Cluster Path: #{ Ironfan.cluster_path.join ", " }"
-
-        Formatador.display_compact_table(table, [:cluster,:path])
-
+        headers = config[:facets] ? [:cluster, :facets, :path] : [:cluster, :path] 
+        Formatador.display_compact_table(data, headers)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 Z
+date: 2012-12-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1748752908376121561
+      hash: 4084772978397561372
       segments: 
       - 0
       version: "0"