dev-lxc 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325efef6d895b0c1a50eda5b5fa7a83288036324
-  data.tar.gz: b21fa16693ab0f68a9b3588c40e809f26b09da95
+  metadata.gz: e58108e0d97dc0aa6ce9c46beb31240ec9f30d5c
+  data.tar.gz: 699291d15a022d54b90cbc31069ac15099555cad
 SHA512:
-  metadata.gz: b32a36d756fa23c7cead5c03891212da4864a1e9a8d42bab010b2b3c46bb792a02eed10e8152de47c23a9eb8069d9f7be381ca003cf54b92321391dd78493e25
-  data.tar.gz: 4bdb524fc69e72c06ca10ef0c1ae63717ea845986370803a6e7cda55f74732aae65ca9f187b05f1811ab24d73f0cd84b9d014ed1054519a8c651120efe541631
+  metadata.gz: a7e24b0f8733f118903ff96d8885b5c1bb29432d3fa0bb3c94676c475db4047023ecd60ad41da77e688f7c923bb52e5d5c35d7987b3e0b8f537e8318f3ce8e30
+  data.tar.gz: c3758b895fc91a3b764e845dd41ddadb5b95669de2b68cfad93f78180c0918c3169cf009a35941242aba148a414ad513ed7bd160bbcce4e9b0bc9a4c653b9352

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # dev-lxc Change Log
 
+## 2.2.1 (2016-07-20)
+
+* Add --include-products option to show-config command
+
 ## 2.2.0 (2016-07-20)
 
 * Make build nodes reregister to Chef Server

data/lib/dev-lxc/cli.rb

@@ -24,8 +24,9 @@ module DevLXC::CLI
 
     desc "show-config", "Show calculated configuration"
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :include_products, :type => :boolean, :desc => "Calculate required products"
     def show_config
-      get_cluster(options[:config]).show_config
+      get_cluster(options[:config]).show_config(options[:include_products])
     end
 
     desc "create-base-container [BASE_CONTAINER_NAME]", "Create a base container"

data/lib/dev-lxc/cluster.rb

@@ -237,8 +237,9 @@ module DevLXC
       end
     end
 
-    def show_config
+    def show_config(include_products=false)
       require 'pp'
+      calculate_required_products(get_sorted_servers, true) if include_products
       puts "Cluster config:"
       pp @config
       puts
@@ -484,7 +485,7 @@ module DevLXC
       artifact.url
     end
 
-    def prep_product_cache(servers, force=false)
+    def calculate_required_products(servers, force=false)
       all_required_products = Hash.new
       servers.each do |server|
         products = @server_configs[server.name][:products]
@@ -506,6 +507,11 @@ module DevLXC
           end
         end
       end
+      all_required_products
+    end
+
+    def prep_product_cache(servers, force=false)
+      all_required_products = calculate_required_products(servers, force)
       all_required_products.each do |package_source, product_name|
         if package_source.start_with?('http')
           product_cache_path = "/var/dev-lxc/cache/chef-products/#{product_name}/#{File.basename(package_source)}"

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jeremiah Snapp