cheftacular 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432e618db73dd2f0c3c13dde66a0ba2d48139404
-  data.tar.gz: 24eba2f067f13d14f95075101b1eaabdbd2b767d
+  metadata.gz: c20403e9a06c24107c229161f34ed5ae10eb2360
+  data.tar.gz: e9edf5b27994a98c4dbbc5aa07eab3907d5303ab
 SHA512:
-  metadata.gz: 879cda27b14935f3e68ef5570d24c1e60bcfd2e33b3a25fd0126fb25b0f1669b4b5f8f9d55716f7b5e9de50046d7099fbaebc710c6074aca7e0e710630efa874
-  data.tar.gz: 745b5247a4393cda8a083a8215230d9e6d1a41c0653e91e8d537c13fd2f7ab7be8b387ac1d11cde2c71cf9e73f5bb52d32a66ade4c3f8b7519714bdb6449a6bb
+  metadata.gz: e1a81ce225e84ab00701c15cee3d7cc5c519134795b4b382f55e4e9a4c8a59183d934cecc85e8afdedd2e49dafc80e1913da1e480cf4631f2e67836724001877
+  data.tar.gz: 294dda1dc967aca367b832dcee99e6a2b5dac916b4ae877af379727ad9f71c3f5f7ad649701c60a6a075eb7b5d62519895f7f3ac2de9c61f774660e9d54cdc2e

data/lib/cheftacular/chef/data_bag.rb

@@ -28,6 +28,8 @@ class Cheftacular
       item = @config[env]['logs_bag'].reload
 
       #TODO use zlib gem to store and display logs https://stackoverflow.com/questions/17882463/compressing-large-string-in-ruby
+      #Zlib::Deflate.deflate(data_to_compress)
+      #Zlib::Inflate.inflate(data_compressed)
       item.attributes = item.attributes.deep_merge(@config[env]['logs_bag_hash'].dup)
 
       begin

data/lib/cheftacular/cheftacular.rb

@@ -21,6 +21,7 @@ require 'net/http'
 require 'timeout'
 require 'slack-notifier'
 require 'cloudflare'
+require 'zlib'
 
 Dir["#{File.dirname(__FILE__)}/../**/*.rb"].each { |f| require f }
 

data/lib/cheftacular/dns.rb

@@ -142,7 +142,7 @@ class Cheftacular
     end
 
     def compile_address_hash_for_server_from_options *args
-      target_serv_index = nil
+      target_serv_index = args.include?('set_hash_to_nil') ? nil : @config[@options['env']]['addresses_bag_hash']['addresses'].count
       tld               = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld']
 
       args.each do |arg|
@@ -155,6 +155,8 @@ class Cheftacular
 
       full_domain ||= "#{ @options['node_name'] }.#{ tld }"
 
+      @config[@options['env']]['addresses_bag_hash'] = @config[@options['env']]['addresses_bag'].reload.to_hash
+
       @config[@options['env']]['addresses_bag_hash']['addresses'].each do |serv_hash|
         target_serv_index = @config[@options['env']]['addresses_bag_hash']['addresses'].index(serv_hash) if serv_hash['name'] == @options['node_name']
       end

data/lib/cheftacular/helper.rb

@@ -10,15 +10,21 @@ class Cheftacular
       Cheftacular.to_s.underscore.dasherize
     end
 
-    def is_command? command
+    def is_command? command=''
+      command ||= ''
+
       @config['action'].public_methods(false).include?(command.to_sym)
     end
 
-    def is_stateless_command? command
+    def is_stateless_command? command=''
+      command ||= ''
+      
       @config['stateless_action'].public_methods(false).include?(command.to_sym)
     end
 
-    def is_not_command_or_stateless_command? command
+    def is_not_command_or_stateless_command? command=''
+      command ||= ''
+
       !@config['action'].public_methods(false).include?(command.to_sym) && !@config['stateless_action'].public_methods(false).include?(command.to_sym)
     end
 

data/lib/cheftacular/parser.rb

@@ -42,7 +42,7 @@ class Cheftacular
 
         parse_repository(@options['repository'])
 
-        @options['command']    = ARGV[0] unless @config['helper'].is_not_command_or_stateless_command?(ARGV[0])
+        @options['command'] = ARGV[0] unless @config['helper'].is_not_command_or_stateless_command?(ARGV[0])
       end
 
       return if !@options['codebase'].nil? && !@options['role'].nil? && !@options['command'].nil?

data/lib/cheftacular/stateless_actions/cloud_bootstrap.rb

@@ -70,8 +70,6 @@ class Cheftacular
       @config['DNS'].create_dns_record_for_domain_from_address_hash(@options['with_dn'], address_hash, "specific_domain_mode") if @options['with_dn']
 
       @config['DNS'].create_dns_record_for_domain_from_address_hash(tld, address_hash)
-
-      @config[@options['env']]['addresses_bag_hash'] = @config[@options['env']]['addresses_bag'].reload.to_hash
       
       @config['ChefDataBag'].save_addresses_bag
 

data/lib/cheftacular/stateless_actions/upload_nodes.rb

@@ -82,6 +82,16 @@ class Cheftacular
         allowed_changes_hash = bag_hash
       end
 
+      #force add any roles that are not in the bag in the event force yes is turned on
+      (node_roles_hash.keys - bag_hash.keys).each do |role_not_in_node_roles_bag|
+
+        new_role = node_roles_hash[role_not_in_node_roles_bag]
+
+        allowed_changes_hash[role_not_in_node_roles_bag] = bag_hash[role_not_in_node_roles_bag]
+
+        @config[new_role['chef_environment']]['node_roles_bag_hash']['node_roles'][new_role['name']] = new_role
+      end if @options['force_yes'] && @config['helper'].running_in_mode?('devops')
+
       nodes.each do |node|
         # if there is a node_roles file that completely matches the name of the file, use it
         changes_for_current_node = false

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.2.0"
+  VERSION      = "2.2.1"
   RUBY_VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie