knife-topo 0.0.6 → 0.0.7

data/README.md

@@ -22,8 +22,8 @@ topologies but differences in their configuration details.
 [Download the latest knife-topo release](http://github.com/christinedraper/knife-topo/releases/latest), 
 unzip and copy `lib/chef/knife` into your plugin directory, e.g.:
 
-	$ unzip knife-topo-0.0.6.zip -d ~
-	$ cd ~/knife-topo-0.0.6
+	$ unzip knife-topo-0.0.7.zip -d ~
+	$ cd ~/knife-topo-0.0.7
 	$ mkdir -p ~/.chef/plugins/knife
 	$ cp lib/chef/knife/* ~/.chef/plugins/knife
 
@@ -54,8 +54,7 @@ need to update software versions), import those changes and run one command
 
 Try out this plugin using a [test-repo](test-repo) provided in the knife-topo github repository.
 [Download the latest knife-topo release](http://github.com/christinedraper/knife-topo/releases/latest)
-and unzip it, then follow the [Instructions](test-repo/Instructions.md) for a
-demo script, explanation, and troubleshooting.
+and unzip it, then follow the [Instructions](test-repo/Instructions.md) for the example.
 
 The instructions assume you have [chefDK](http://www.getchef.com/downloads/chef-dk/)
  or equivalent installed and working with Vagrant and VirtualBox, but

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

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/chef/knife/topo_cookbook_upload.rb

@@ -65,7 +65,7 @@ class Chef
         end
         
         # Run cookbook upload command on the topology cookbooks
-        if topo['cookbook_attributes'].length > 0
+        if topo['cookbook_attributes'] && topo['cookbook_attributes'].length > 0
           argPos = 2
           topo['cookbook_attributes'].each do |entry|
             @topo_upload_args[argPos] = entry['cookbook']
@@ -73,7 +73,7 @@ class Chef
           end
           run_cmd(Chef::Knife::CookbookUpload, @topo_upload_args)
         else
-          ui.info("No cookbooks found for topology #{topo_name}.")
+          ui.info("No cookbooks found for topology #{topo_name}")
         end                      
       end
 

data/lib/chef/knife/topo_create.rb

@@ -97,7 +97,7 @@ class Chef
         nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
         config[:disable_editing] = true
         
-        if nodes.length > 0
+        if nodes && nodes.length > 0
           nodes.each do |updates|
             node_name = updates['name']
             node = update_node(updates)
@@ -105,7 +105,7 @@ class Chef
           # if bootstrap is specified, run the bootstrap command
           run_cmd(Chef::Knife::TopoBootstrap, @topo_bootstrap_args) if config[:bootstrap]
         else
-          ui.info "No nodes found for topology #{topo_hash.name}"
+          ui.info "No nodes found for topology #{topo_hash['name']}"
         end
            
         ui.info("Topology created")

data/lib/chef/knife/topo_import.rb

@@ -63,6 +63,11 @@ class Chef
         
           topo_name = topo_data['name'] || topo_data['id']
           topo_data['id'] ||= topo_name
+            
+          if (!topo_name)
+            ui.error "Could not find a topology name - #{topo_file} does not appear to be a valid topology JSON file"
+            exit(1)
+          end
           
           # check against specific topology list
           if topo_names

data/lib/chef/knife/topo_update.rb

@@ -110,14 +110,14 @@ class Chef
         nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
         config[:disable_editing] = true
         
-        if nodes.length > 0
+        if nodes && nodes.length > 0
           nodes.each do |updates|
             node_name = updates['name']
             node = update_node(updates)
             ui.info "Node #{node_name} does not exist - skipping update" if (!node)
           end
         else
-          ui.info "No nodes found for topology #{topo_hash.name}"
+          ui.info "No nodes found for topology #{topo_hash['name']}"
         end
       end
 

data/lib/chef/knife/topology_helper.rb

@@ -99,7 +99,7 @@ class Chef
       def merge_topo_properties(nodes, topo_hash)
 
         if nodes && nodes.length > 0
-          merged_nodes = nodes ? nodes.clone : {}
+          merged_nodes = nodes ? nodes.clone : []
           merged_nodes.each do |nodeprops|
 
             normal_defaults = topo_hash['normal'] ? topo_hash['normal'].clone : {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies: []
 description: Knife plugin that to manage topologies of nodes
 email: