knife-topo 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488bca625279664d650e93473141dd3d57576865
-  data.tar.gz: acf17bee83f2a11852645ebb22d9354858b69d40
+  metadata.gz: 0be8df712b7387e67c6aba9af7e0433db88a6e56
+  data.tar.gz: 4cbd85eb38a152561f1db568868c955010babced
 SHA512:
-  metadata.gz: 381ee1dfd7e8a1c762fac1a23ac96fdca69588de951e1222dea8b5626bf3f5c9d28204de5d85737aff054151c638e755f1d567107a5152ef2bf2667f8e0ea111
-  data.tar.gz: 0c150297a462aae959207a402e448bee908309c3e16b6d0623d8792f47dcbe599135c2d6819fe8892bea4d831bc333e9bb63b07efd092ac78b09342a840d01fa
+  metadata.gz: 0cff13f858765854b3c791dcf15ce8fafcf054eeb99aab2eb04d1ecedb11a5343962c4c80631b2b2f9ecea8a29b384cde87200e65c2c58b17b12072754fa971d
+  data.tar.gz: 1f5316d287e3e018a03c6cb1f210bd771dc660a02eb5477a2f65396b80160daf37ff2c34445a835c5a580426ac4c5c20e6600e8e7da322c2e29fbc89edf82fce

data/README.md

@@ -31,7 +31,8 @@ or install knife-topo as a gem
 
     $ gem install knife-topo
 
-You may need to use `sudo gem install knife-topo`, depending on your setup.
+You may need to use `chef gem install knife-topo` (to install into the
+embedded chefdk gem path), and you may need `sudo` depending on your setup.
 
 This plugin has been tested with Chef Version 11.12 and 12.0.3 on Ubuntu 12.04 and 14.04 LTS, 
 and run on Windows and Mac.
@@ -349,9 +350,11 @@ which is used by `knife topo search`.
 
 ## knife topo export <a name="export"></a>
 
-	knife topo export [ TOPOLOGY [ NODE ... ] 
+	knife topo export [ NODE ... ] 
 
-Exports the specified topology as JSON. If the topology does not already exist, 
+Exports the nodes into a topology JSON. 
+
+If the topology does not already exist, 
 an outline for a new topology will be exported. The exported JSON
 can be used as the basis for a new topology definition.
 
@@ -366,23 +369,26 @@ The knife topo export subcommand supports the following additional options.
 
 Option        | Description
 ------------  | -----------
+--topo      | Name of the topology to export (defaults to 'topo1')
+--all       | Export all topologies
 --min-priority    | Only export attributes with a priority equal or above this priority.
 
 ### Examples:
 
-The following will export the data for nodes n1 and n2 as part of a topology called  'new_topo':
+The following will export the data for nodes n1 and n2 as part of a 
+topology called 'my_topo':
+
+	$ knife topo export n1 n2 --topo=my_topo > new_topo.json
 
-	$ knife topo export new_topo n1 n2 > new_topo.json
-	
 	
 The following will export all topologies to a file called 'all_topos.json'.
 
-	$ knife topo export  > all_topos.json
+	$ knife topo export --all > all_topos.json
 	
-The following will create an outline for a new topology called  'christine_test':
-
-	$ knife topo export christine_test > christine_test.json
+The following will create an outline for a new topology called  
+'christine_test', or export the current details if it already exists:
 
+	$ knife topo export --topo=christine_test > christine_test.json
 
 
 ## knife topo import <a name="import"></a>

data/lib/chef/knife/topo/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/chef/knife/topo_create.rb

@@ -84,7 +84,7 @@ class Chef
           topo.create
          rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^409/
-          msg = "Topology #{display_name(topo)} already exists - do you want to update it"
+          msg = "Topology #{topo_name} already exists - do you want to update it"
           msg = msg + " to version " + format_topo_version(topo) if topo['version']
           ui.confirm(msg, true, false)
           topo.save

data/lib/chef/knife/topo_export.rb

@@ -40,6 +40,17 @@ class Chef
       :long => "--min-priority PRIORITY",
       :default => "default",
       :description => "Export attributes with this priority or above"
+      
+      option :topo,
+      :long => "--topo TOPOLOGY",
+      :description => "Name to use for the topology",
+      :default => "topo1"
+      
+      option :all,
+      :long => "--all",
+      :description => "Export all topologies",
+      :boolean => true,
+      :default => false
 
       def most_common (vals)
         vals.group_by do |val|
@@ -51,8 +62,8 @@ class Chef
 
         @bag_name = topo_bag_name(config[:data_bag])
 
-        @topo_name = @name_args[0]
-        @node_names = @name_args[1..-1]
+        @topo_name = config[:topo] unless config[:all]
+        @node_names = @name_args
         
         unless ['default', 'normal', 'override'].include?(config[:min_priority])
           ui.warn("--min-priority should be one of 'default', 'normal' or 'override'")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Knife-topo uses a JSON file to capture a topology of nodes, which can
   be loaded into Chef and bootstrapped