nodeattr_utils 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39fef993b43ef064b092d281015a4688b5cacc6c2a9b8c843ad0b4ccca54b2c
-  data.tar.gz: 71130f30dad3a8d60535201f52126c6e87270bb78f23576da99aaf3ba17f4c14
+  metadata.gz: 167cc1e6ee18b4dba9038c19fe44b526834ddbe4a60f4dfc1ce97787c0181e73
+  data.tar.gz: 63d2c6ed0f8d386243733b951b9676785806ca6600f0e7c1b1575e97713c764c
 SHA512:
-  metadata.gz: ba494a31a4823798431e3609552e949893e781803ce1e0f59d242ec5e37bb0bdd6d15ffc946441118f89b4212ea53578fd6022de97f0b6478ee1ffe2eda16758
-  data.tar.gz: bf350c8ac1f1b3cba1fa93980d3b0dbf32f56196de7cfff426e992985d93afe158ffcb566e1d617eb7faa23c8b102b9dfb4e25a16a38c821618306642ae79543
+  metadata.gz: c0b8f32802e049dd7683337ef9b57f4c46a2880edc6ba1e3191e4026d161c280a2cb15f4dd378acf2380dc1d62a758a4e0d5e2deef2346573ab8f89449d60e3a
+  data.tar.gz: 43b9ede227685ede6e33c958d479515fafad34025f8e7fcf52c8e096c6a29c6821531983c0f0a0a34b000a47f5286944efda250afdf6e73872b860aed707d87f

data/lib/nodeattr_utils.rb

@@ -29,5 +29,16 @@ require 'nodeattr_utils/node_parser'
 require 'nodeattr_utils/exceptions'
 
 module NodeattrUtils
+  module Nodes
+    def self.expand(string)
+      NodeattrUtils::NodeParser.expand(string)
+    end
+
+    # TODO: Actually collapse the nodes array instead of joining them as a single
+    # string
+    def self.collapse(*nodes)
+      nodes.flatten.join(',')
+    end
+  end
 end
 

data/lib/nodeattr_utils/config.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+#==============================================================================
+# Copyright (C) 2019-present Alces Flight Ltd.
+#
+# This file is part of flight-metal.
+#
+# This program and the accompanying materials are made available under
+# the terms of the Eclipse Public License 2.0 which is available at
+# <https://www.eclipse.org/legal/epl-2.0>, or alternative license
+# terms made available by Alces Flight Ltd - please direct inquiries
+# about licensing to licensing@alces-flight.com.
+#
+# This project is distributed in the hope that it will be useful, but
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS
+# OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+# PARTICULAR PURPOSE. See the Eclipse Public License 2.0 for more
+# details.
+#
+# You should have received a copy of the Eclipse Public License 2.0
+# along with this project. If not, see:
+#
+#  https://opensource.org/licenses/EPL-2.0
+#
+# For more information on flight-account, please visit:
+# https://github.com/alces-software/flight-metal
+#===============================================================================
+
+require 'flight_config'
+require 'nodeattr_utils/exceptions'
+
+module NodeattrUtils
+  class Config
+    include FlightConfig::Updater
+
+    def self.path(_cluster)
+      raise NotImplementedError
+    end
+
+    def __data__
+      super().tap { |d| d.set_if_empty(:groups, value: ['orphan']) }
+    end
+
+    def cluster
+      __inputs__.first
+    end
+
+    def raw_groups
+      __data__.fetch(:groups)
+    end
+
+    def raw_nodes
+      __data__.fetch(:nodes, default: {})
+    end
+
+    def nodes_list
+      raw_nodes.keys
+    end
+
+    def groups_hash
+      raw_groups.reject(&:nil?).map do |group|
+        [group, group_index(group)]
+      end.to_h
+    end
+
+    def group_index(group)
+      return nil if group.nil?
+      raw_groups.find_index(group)
+    end
+
+    def groups_for_node(node)
+      __data__.fetch(:nodes, node, default: []).dup.tap do |groups|
+        groups.push 'orphan' if groups.empty?
+      end
+    end
+
+    def nodes_in_group(group)
+      nodes_list.select { |node| groups_for_node(node).include?(group) }
+    end
+
+    def nodes_in_primary_group(group)
+      nodes_list.select { |n| groups_for_node(n).first == group }
+    end
+
+    def add_group(group_name)
+      return if raw_groups.include?(group_name)
+      __data__.append(group_name, to: :groups)
+    end
+
+    def remove_group(group_name)
+      error_if_removing_orphan_group(group_name)
+      nodes_list.select { |n| groups_for_node(n).first == group_name }
+                .join(',')
+                .tap { |node_str| remove_nodes(node_str) }
+      __data__.fetch(:groups).map! { |g| g == group_name ? nil : g }
+    end
+
+    def add_nodes(node_string, groups: [])
+      groups = groups.is_a?(Array) ? groups : [groups]
+      add_group(groups.first) unless groups.empty?
+      NodeattrUtils::Nodes.expand(node_string).each do |node|
+        __data__.set(:nodes, node, value: groups)
+      end
+    end
+
+    def remove_nodes(node_string)
+      NodeattrUtils::Nodes.expand(node_string).map do |node|
+        __data__.delete(:nodes, node)
+      end
+    end
+
+    def orphans
+      nodes_in_group('orphan')
+    end
+
+    private
+
+    def error_if_removing_orphan_group(group)
+      return unless group == 'orphan'
+      raise RemovingOrphanGroupError, <<~ERROR.chomp
+        Can not remove the orphan group
+      ERROR
+    end
+  end
+end
+

data/lib/nodeattr_utils/exceptions.rb

@@ -30,5 +30,7 @@ module NodeattrUtils
 
   class NodeSyntaxError < NodeattrUtilsError
   end
+
+  class RemovingOrphanGroupError < NodeattrUtilsError; end
 end
 

data/lib/nodeattr_utils/version.rb

@@ -25,5 +25,5 @@
 # https://github.com/openflighthpc/nodeattr_utils
 #==============================================================================m
 module NodeattrUtils
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/nodeattr_utils.gemspec

@@ -46,6 +46,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'flight_config', '~>0.2'
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nodeattr_utils
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alces Flight Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: flight_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - README.md
 - Rakefile
 - lib/nodeattr_utils.rb
+- lib/nodeattr_utils/config.rb
 - lib/nodeattr_utils/exceptions.rb
 - lib/nodeattr_utils/node_parser.rb
 - lib/nodeattr_utils/version.rb
@@ -120,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of nodeattr behaviour