j-enc 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a934c954e5b5bd24ade48c671b0b17f40d69bcf
-  data.tar.gz: ff58a8dcabcab3c8d69f51ae034a08a1a04d48fa
+  metadata.gz: 44582a9e44b82e6f3eb39499fdea2301e28825e1
+  data.tar.gz: a6721033a7fc4f6ec1a0b4f42c7148900008fed0
 SHA512:
-  metadata.gz: d19a735b2868c0f2e410afd5e12ce39f5d79c149967db2dca1df3813ce4a198a8c7a546ee0f2ca430ed9e36d034736d4b1f21fd453cd1a792d0ff2b0d5f5b615
-  data.tar.gz: ed5882e80c5c6aa84281fedd16ad6d93f64f6f299caa8639c0a2c47c141456de686c4a60929579e94e498e9cea9fd9e20d29cadb6ed50c1ec86e627658ec59fb
+  metadata.gz: 609a5d2d508e75a3cceb6f97eae2208b1d6a41b4f83ffe8996de6e844042766804fdadb00b231965ed0b4bc065772edfa26012003e26b5bd53a37a27da2421bc
+  data.tar.gz: 772bd9ce7407bf5567a07c239694da61fc2fdfb411cde3b21b79769cb0eddd92c800dd77c405ec1ae3018e47e4b291340994718fa05eb0830dee87b3b9525fb3

data/lib/enc/builder.rb

@@ -20,9 +20,18 @@ module Enc
       end
 
       # It's not strictly necessary, but nice to have the $collins parameter at the end of the output.
-      output['parameters']['collins'] = @asset.get_flattened_attributes
+      output['parameters']['collins'] = get_asset_extras.merge!(get_asset_attributes)
       output.to_yaml
     end
 
+    def get_asset_extras
+      {'TAG'    => @asset.tag,
+       'STATE'  => @asset.state.name,
+       'STATUS' => @asset.status}
+    end
+
+    def get_asset_attributes
+      @asset.get_flattened_attributes
+    end
   end
-end
+end

data/lib/enc/collins_helper/node/node_asset.rb

@@ -76,9 +76,9 @@ module Enc
 
         def get_datacenter
           begin
-            value = get_safe_attribute('PUPPET_DATACENTER')
+            value = get_safe_attribute('DATA_CENTER')
           rescue KeyError
-            raise NoDatacenter, 'The node does not have a puppet_datacenter tag set'
+            raise NoDatacenter, 'The node does not have a data_center tag set'
           end
           value
         end

data/lib/enc/version.rb

@@ -1,3 +1,3 @@
 module Enc
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/builder_spec.rb

@@ -28,7 +28,10 @@ describe 'ENC Builder' do
     expect(YAML.load(builder.to_yaml)['parameters']['role1']).to eq(node.get_roles_by_index[0])
     expect(YAML.load(builder.to_yaml)['parameters']['role2']).to eq(node.get_roles_by_index[1])
     expect(YAML.load(builder.to_yaml)['parameters']['role3']).to eq(node.get_roles_by_index[2])
-    expect(YAML.load(builder.to_yaml)['parameters']['collins']).to eq(node.get_flattened_attributes)
+    expect(YAML.load(builder.to_yaml)['parameters']['collins']).to eq({'TAG'    => node.tag,
+                                                                       'STATE'  => node.state.name,
+                                                                       'STATUS' => node.status}.
+                                                                        merge!(node.get_flattened_attributes))
     expect(YAML.load(builder.to_yaml)['parameters']['collins']['HOSTNAME']).to eq(node.get_hostname)
   end
 

data/spec/node_asset_spec.rb

@@ -35,7 +35,7 @@ describe 'Collins Node Asset' do
     node = FactoryGirl.build(:node_asset, datacenter: nil)
     expect(node.is_valid?).to eq(false)
     expect{node.get_datacenter}.to raise_exception(Enc::CollinsHelper::Node::NoDatacenter,
-                                                   'The node does not have a puppet_datacenter tag set')
+                                                   'The node does not have a data_center tag set')
   end
 
   it 'is not a valid asset due to missing deployment environment' do
@@ -51,4 +51,4 @@ describe 'Collins Node Asset' do
     expect{node.get_hostname}.to raise_exception(Enc::CollinsHelper::Node::NoHostname,
                                                  'The node does not have a hostname tag set')
   end
-end
+end

data/spec/support/utils.rb

@@ -9,6 +9,8 @@ module Utils
                      'NAME'        => 'RUNNING',
                      'LABEL'       => 'Running',
                      'DESCRIPTION' => 'A service in this state is operational.' },
+        'STATUS' => 'Allocated',
+        'TYPE'   => 'SERVER_NODE',
        'DISK'  => [],
        'BASE'  => { 'DESCRIPTION' => '',
                     'PRODUCT'     => '',
@@ -20,7 +22,7 @@ module Utils
        'ATTRIBS'   => { '2' => { 'CONFIGURATION_ROLES' => 'puppet-master-dev' },
                         '1' => { 'CONFIGURATION_ROLES' => 'fpm' },
                         '0' => { 'HOSTNAME'            => hostname,
-                                 'PUPPET_DATACENTER'   => datacenter,
+                                 'DATA_CENTER'         => datacenter,
                                  'PUPPET_ENC'          => puppet_enc,
                                  'DESCRIPTION'         => 'Test_server',
                                  'PRIMARY_ROLE'        => 'Infrastructure',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j-enc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jestin Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Puppet ENC using Collins.