knife-topo 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 567dce9e707b529d85df97a58de7c9a180ef57d4
+  data.tar.gz: 0550b76dc324cd4966d013d41f0efe34fd2264ee
+SHA512:
+  metadata.gz: 3bbc66a61636b8d1563cfe271ef6772839b875cbf1fe56c0f23e031b278f4a7a76dd9f4bf1007ae60c13a97ddd31165618c0acb2f34f725391991b4b19c54a53
+  data.tar.gz: 66260591db0aa228aab5e4a5648012d313f9ff7df9b78ed671d7d37af9004682391b600c3f41b4a33d8d364d6c571925092ca0220a6f531dbed10bef0a2ea105

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.7.zip -d ~
-	$ cd ~/knife-topo-0.0.7
+	$ unzip knife-topo-0.0.9.zip -d ~
+	$ cd ~/knife-topo-0.0.9
 	$ mkdir -p ~/.chef/plugins/knife
 	$ cp lib/chef/knife/* ~/.chef/plugins/knife
 
@@ -33,7 +33,7 @@ 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. 
+This plugin has been tested with Chef Version 11.12 on Ubuntu 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`
@@ -59,6 +59,25 @@ and unzip it, then follow the [Instructions](test-repo/Instructions.md) for the
 The instructions assume you have [chefDK](http://www.getchef.com/downloads/chef-dk/)
  or equivalent installed and working with Vagrant and VirtualBox, but
  none of these are requirements to use the knife-topo plugin. 
+ 
+ If you're the sort of person who just wants to jump in and try it, here's some hints.
+ 
+Generate a topology file for a topology called test1 from existing nodes node1 and node2:
+
+	knife topo export test1 node1 node2 > topology.json
+
+Import a topology json file, generating all of the necessary artifacts in your workspace:
+
+	knife topo import topology1.json
+
+Create the topology using existing nodes:
+
+	knife topo create test1
+	
+Create the topology bootstrapping new nodes in vagrant (you will need to add the 
+host details for bootstrap to the file before importing):
+
+	knife topo create test1 --bootstrap -xvagrant -Pvagrant --sudo 
 
 # Topology File <a name="topology-file"></a>#
 
@@ -240,7 +259,7 @@ See [knife bootstrap](http://docs.opscode.com/knife_bootstrap.html)  | Options s
 The following will bootstrap nodes in the test1 topology, using a
 user name of vagrant, password of vagrant, and running using sudo.
 
-	$ knife topo bootstrap sys1_test test1 -x vagrant -P vagrant --sudo
+	$ knife topo bootstrap test1 -x vagrant -P vagrant --sudo
 
 ## knife topo cookbook create <a name="cookbook-create"></a>
 
@@ -329,10 +348,24 @@ to any nodes that are in the topology.
 
 If no topology is specified, all defined topologies will be exported.
 
+### Options:
+
+The knife topo export subcommand supports the following additional options.
+
+Option        | Description
+------------  | -----------
+--min-priority    | Only export attributes with a priority equal or above this priority.
+
 ### Examples:
-The following will export all topologies to a file called 'sys1_test.json'.
 
-	$ knife topo export sys1_test > sys1_test.json
+The following will export the data for nodes n1 and n2 as part of a topology called  'new_topo':
+
+	$ 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
 	
 The following will create an outline for a new topology called  'christine_test':
 

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

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/chef/knife/topo_bootstrap.rb

@@ -79,10 +79,10 @@ class Chef
             end
 
           end
-          ui.info "Bootstrapped #{nodes.length - (@failed.length + skipped)} nodes and skipped #{skipped} nodes of #{nodes.length} in topology #{@bag_name}/#{@topo_name}"
+          ui.info "Bootstrapped #{nodes.length - (@failed.length + skipped)} nodes and skipped #{skipped} nodes of #{nodes.length} in topology #{display_name(topo)}"
           ui.warn "#{@failed.length} nodes [ #{@failed.join(', ')} ] failed to bootstrap" if @failed.length > 0
         else
-          ui.info "No nodes found for topology #{@topo_name}"
+          ui.info "No nodes found for topology #{display_name(topo)}"
         end
       end
 

data/lib/chef/knife/topo_cookbook_create.rb

@@ -132,7 +132,8 @@ class Chef
                 print_attr(file, "#{lhs}['#{key}']", value2)
               end                           
             else
-              file.write "#{lhs} = \"#{value1}\"\n"
+              rubyString = (value1 == nil) ? "nil" : Chef::JSONCompat.to_json(value1);
+              file.write "#{lhs} = " + rubyString + " \n"
             end
           end
           

data/lib/chef/knife/topo_cookbook_upload.rb

@@ -76,7 +76,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 #{display_name[topo]}")
         end                      
       end
 

data/lib/chef/knife/topo_create.rb

@@ -84,7 +84,9 @@ class Chef
           topo.create
          rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^409/
-          ui.confirm("Topology already exists - do you want to re-create it", true, false)
+          msg = "Topology already exists - do you want to update it";
+          msg + " to version " + topo['version'] if topo['version']
+          ui.confirm(msg, true, false)
           topo.save
         end
 
@@ -105,10 +107,10 @@ 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 #{display_name(topo_hash)}"
         end
            
-        ui.info("Topology created")
+        ui.info("Topology #{display_name(topo_hash)} created")
               
       end
       

data/lib/chef/knife/topo_export.rb

@@ -20,7 +20,7 @@ require 'chef/knife'
 
 require_relative 'topology_helper'
 
-# NOTE: This command exports to stdout - do not add ui messages (other than fatal) to this command
+# NOTE: This command exports to stdout 
 
 class Chef
   class Knife
@@ -35,7 +35,18 @@ class Chef
       :short => '-D DATA_BAG',
       :long => "--data-bag DATA_BAG",
       :description => "The data bag the topologies are stored in"
-
+      
+      option :min_priority,
+      :long => "--min-priority PRIORITY",
+      :default => "default",
+      :description => "Export attributes with this priority or above"
+
+      def most_common (vals)
+        vals.group_by do |val|
+          val
+        end.values.max_by(&:size).first
+      end
+      
       def run
 
         @bag_name = topo_bag_name(config[:data_bag])
@@ -43,6 +54,10 @@ class Chef
         @topo_name = @name_args[0]
         @node_names = @name_args[1..-1]
         
+        unless ['default', 'normal', 'override'].include?(config[:min_priority])
+          ui.warn("--min-priority should be one of 'default', 'normal' or 'override'")
+        end
+        
         if @topo_name
           if topo = load_from_server(@bag_name, @topo_name)
             export = topo.raw_data
@@ -55,6 +70,15 @@ class Chef
           @node_names.each do |node_name|
             merge_node_properties!(export['nodes'], node_name)
           end
+          
+          # if a new topo, pick an topo environment based on the nodes
+          if !topo && @node_names.length != 0
+            envs = []
+            export['nodes'].each do |node| 
+              envs << node['chef_environment'] if node['chef_environment']
+            end
+            export['chef_environment'] = most_common(envs) if envs.length > 0
+          end
 
         else
           # export all topologies
@@ -78,7 +102,6 @@ class Chef
           "name" => @topo_name || "topo1",
           "chef_environment" => "_default",
           "tags" => [ ],
-          "normal" => { },
           "nodes" => [ ],
           "cookbook_attributes" => [{
             "cookbook" =>  @topo_name || "topo1",
@@ -109,8 +132,12 @@ class Chef
           node_data['name'] = node.name
           node_data['tags'] = node.tags
           node_data['chef_environment'] = node.chef_environment
-          node_data['normal'] = node.normal
           node_data['run_list'] = node.run_list
+
+          pri = config[:min_priority]
+          node_data['default'] = node.default if pri == "default"
+          node_data['normal'] = node.normal if pri == "default" || pri == "normal"
+          node_data['override'] = node.override
           
         rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^404/

data/lib/chef/knife/topo_import.rb

@@ -83,7 +83,7 @@ class Chef
           File.open(path,"w") do |f|
             f.write(Chef::JSONCompat.to_json_pretty(topo_data))
             f.close()
-            ui.info "Imported topology #{topo_name} into  #{path}"
+            ui.info "Imported topology #{display_name(topo_data)} into  #{path}"
           end
           
           # run topo cookbook to generate the cookbooks for this topology

data/lib/chef/knife/topo_update.rb

@@ -62,7 +62,6 @@ class Chef
         
         if topo_name
           # update a specific topo
-          ui.info "Updating topology: #{topo_name} in data bag: #{bag_name}"
           
           unless current_topo = load_from_server(bag_name, topo_name)
             ui.fatal "Topology #{bag_name}/#{topo_name} does not exist on server - use 'knife topo create' first"
@@ -73,6 +72,10 @@ 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']
+          ui.info msg
 
           update_topo(topo)
 
@@ -92,7 +95,7 @@ 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 #{topo_name}")
+              ui.info("Updating topology #{display_name(topo)}")
               update_topo(topo)
             end
           end

data/lib/chef/knife/topology_helper.rb

@@ -18,6 +18,7 @@
 
 require 'chef/data_bag'
 require 'chef/encrypted_data_bag_item'
+require 'chef/environment'
 require 'chef/knife/core/object_loader'
 
 class Chef
@@ -191,8 +192,10 @@ class Chef
 
       # Load a topology from local data bag item file
       def load_from_file(bag_name, topo_name)
-        return unless topo_file = loader.find_file("#{topologies_path}", bag_name, topo_name + '.json')
-
+        
+        topo_file = File.join(Dir.pwd, "#{topologies_path}", bag_name, topo_name + '.json')
+        return unless (loader.file_exists_and_is_readable?(topo_file))
+ 
         item_data = loader.object_from_file(topo_file)
         item_data = if use_encryption
           secret = read_secret
@@ -288,6 +291,10 @@ class Chef
             raise if Chef::Config[:verbosity] == 2
         end        
       end
+      
+      def display_name (topo)
+        topo['name'] + ((topo['version']) ? " version " + topo['version'] : "")
+      end
 
     end
   end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-09-27 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.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Knife plugin that to manage topologies of nodes
 test_files: []
 has_rdoc: