knife-topo 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d8793bcf153624c108933962031fa78522ad5a92
+  data.tar.gz: ccb909fe254ec685604d94a36bdacb342be00ae0
+SHA512:
+  metadata.gz: e0fcdc312e8574d8dd7575ac1a22c9115fd2ea1e24235b92752bf1b6f4939f08d4ccdfb9078aa00ea1b46bbb4eb94d577afbb633e3f742dd2e0997daa954a7bd
+  data.tar.gz: fd58817d5fd0479352bcabcaa390086fd61504dc797ed6266fafd29b4c2683419a1237ea28c20bcec2390644599cd071d073ffda1f078aa40eebaae1caa49c25

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.9.zip -d ~
-	$ cd ~/knife-topo-0.0.9
+	$ unzip knife-topo-0.0.10.zip -d ~
+	$ cd ~/knife-topo-0.0.10
 	$ mkdir -p ~/.chef/plugins/knife
 	$ cp lib/chef/knife/* ~/.chef/plugins/knife
 
@@ -33,7 +33,8 @@ or install knife-topo as a gem
 
 You may need to use `sudo gem install knife-topo`, depending on your setup.
 
-This plugin has been tested with Chef Version 11.12 on Ubuntu 14.04 LTS, and run on Windows and Mac.
+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.
 
 Note: I've encountered a case (on a Mac) where knife was not configured to use
  gems on the gem path. If the gem install succeeds but `knife topo`

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

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/lib/chef/knife/topo_cookbook_create.rb

@@ -85,7 +85,7 @@ class Chef
             cookbook_spec['filename'] + ".rb", cookbook_spec)
           end
         else
-          ui.info "No cookbook attributes found for topology #{@topo_name}"
+          ui.info "No topology cookbook has been specified for topology #{@topo_name}"
         end
       end
 
@@ -99,7 +99,7 @@ class Chef
           command = run_cmd(Chef::Knife::CookbookCreate, @cookbook_create_args)
         rescue Exception => e
           raise if Chef::Config[:verbosity] == 2
-          ui.warn "create of cookbook #{cookbook_name} exited with error"
+          ui.warn "Create of cookbook #{cookbook_name} exited with error"
           humanize_exception(e)
         end
 

data/lib/chef/knife/topo_create.rb

@@ -84,8 +84,8 @@ class Chef
           topo.create
          rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^409/
-          msg = "Topology already exists - do you want to update it"
-          msg = msg + " to version " + topo['version'] if topo['version']
+          msg = "Topology #{display_name(topo)} 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
         end
@@ -114,9 +114,6 @@ class Chef
         ui.info("Build information: " + topo_hash['buildstamp']) if topo_hash['buildstamp']
               
       end
-      
-
-
 
       include Chef::Knife::TopologyHelper      
 

data/lib/chef/knife/topo_import.rb

@@ -63,6 +63,7 @@ class Chef
         
           topo_name = topo_data['name'] || topo_data['id']
           topo_data['id'] ||= topo_name
+          topo_data['name'] ||= 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"
@@ -83,17 +84,19 @@ class Chef
           File.open(path,"w") do |f|
             f.write(Chef::JSONCompat.to_json_pretty(topo_data))
             f.close()
-            ui.info "Imported topology #{display_name(topo_data)} into  #{path}"
+            ui.info "Created topology data bag in  #{path}"
           end
           
           # run topo cookbook to generate the cookbooks for this topology
           @topo_cookbook_args[2] = topo_name
           @topo_cookbook_args[3] = topo_file
           run_cmd(Chef::Knife::TopoCookbookCreate, @topo_cookbook_args)
-          
+          ui.info "Imported topology #{display_name(topo_data)}"
+          ui.info("Build information: " + topo_data['buildstamp']) if topo_data['buildstamp']
+       
         end
             
-        ui.info "Did not find topologies #{topo_names.join(', ')} in the exchange file"  if topo_names && topo_names.length > 0
+        ui.info "Did not find topologies #{topo_names.join(', ')} in the topology json file"  if topo_names && topo_names.length > 0
         ui.info "Import finished"
         
       end

data/lib/chef/knife/topo_update.rb

@@ -72,13 +72,15 @@ class Chef
             ui.info "No topology found in #{topologies_path}/#{bag_name}/#{topo_name}.json - exiting  without action"
             exit(0)
           end
-          
+                    
           msg = "Updating topology #{display_name(current_topo)}"
-          msg = msg + " to version " + topo['version'] if topo['version']
+          msg = msg + " to version " + format_topo_version(topo) if topo['version']
           ui.info msg
-          ui.info("Build information: " + topo['buildstamp']) if topo['buildstamp']
 
           update_topo(topo)
+          
+          ui.info "Updated topology " + display_name(topo)
+          ui.info("Build information: " + topo['buildstamp']) if topo['buildstamp']
 
         else
           # find all topologies from server then update them from file, skipping any that have no file
@@ -96,12 +98,16 @@ class Chef
               # do not update topologies that are not in the local workspace
               ui.info("No topology file found in #{topologies_path}/#{bag_name}/#{topo_name}.json - skipping")
             else
-              ui.info("Updating topology #{display_name(topo)}")
+              msg = "Updating topology " + topo_name
+              msg = msg + " to version " + format_topo_version(topo) if topo['version']
+              ui.info msg
+              ui.info("Build information: " + topo['buildstamp']) if topo['buildstamp']
               update_topo(topo)
             end
           end
+          ui.info "Updated topologies"
+
         end
-        ui.info "Updates done"
  
       end
 

data/lib/chef/knife/topology_helper.rb

@@ -294,7 +294,18 @@ class Chef
       end
       
       def display_name (topo)
-        topo['name'] + ((topo['version']) ? " version " + topo['version'] : "")
+        topo['name'] + ((topo['version']) ? " version " + format_topo_version(topo) : "")
+      end
+
+      # Topology version
+      def format_topo_version(topo)
+        version = nil
+        if topo['version'] 
+          version = topo['version']
+          version = version + '-' + topo['buildid'] if (topo['buildid'])
+        end
+        
+        version
       end
 
     end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Knife plugin that to manage topologies of nodes
 email:
@@ -18,42 +17,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/chef/knife/topo_export.rb
-- lib/chef/knife/topo_bootstrap.rb
+- LICENSE
+- README.md
+- knife-topo.gemspec
 - lib/chef/knife/topo/version.rb
+- lib/chef/knife/topo_bootstrap.rb
 - lib/chef/knife/topo_cookbook_create.rb
+- lib/chef/knife/topo_cookbook_upload.rb
 - lib/chef/knife/topo_create.rb
-- lib/chef/knife/topo_update.rb
+- lib/chef/knife/topo_export.rb
 - lib/chef/knife/topo_import.rb
+- lib/chef/knife/topo_update.rb
 - lib/chef/knife/topology_helper.rb
-- lib/chef/knife/topo_cookbook_upload.rb
-- LICENSE
-- README.md
-- knife-topo.gemspec
 homepage: https://github.com/christinedraper/knife-topo
 licenses:
 - Apache License (2.0)
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Knife plugin that to manage topologies of nodes
 test_files: []
 has_rdoc: