palletjack-tools 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b2e6d3100dfd7ca28d45f9a8b549a9f1788b74c
-  data.tar.gz: 7a260f0932900de7c14979b98b06fdfb35dfe20f
+  metadata.gz: 0ecc29649c0b152d19482c91b6f8fe8520516744
+  data.tar.gz: fb8bc8d57f9088c9a75807133a21db6e0a16b101
 SHA512:
-  metadata.gz: 379923a2b20867bb022573661424926fd78ce314c5a305200cfaae68c9058eb39b1d5739ea59c3e80af2866f4185564a3a7bd5542d59fb0659c8a9123583c90c
-  data.tar.gz: 362a13e767e93511d8105e372fc224af14e52aa76fbd16bd9a9188c1daf937a7d9eec4c0085258a814913803d3c7b59c6d870954d4b43d0829b2a993bc44e673
+  metadata.gz: 1ef02ba48e7cc6cb9019dd6f2057e3757f23b9c70b3fab0c8e0602937254dcbac822a724ac38064171e2952bb17a04ba565d1fdc7fe99fab67155633f8470b71
+  data.tar.gz: f203988f774dcfede6fa9e6d76a1a10a820f0eb2524774f0a12567728325b789b2366521f5ea9ed013a17f3e5bc67ef955b41a9617b39b165696c6ee24b46238

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/exe/create_domain

@@ -29,21 +29,21 @@ Create domain and ipv4_network objects in a warehouse"
 
     pallet_dir 'ipv4_network', :network
     pallet_box 'ipv4_network', :network, 'dhcp' do
-      { net:{ dhcp:{ 'tftp-server' => '', 'boot-file' => '' } } }
+      { net: { dhcp: { 'tftp-server' => '', 'boot-file' => '' } } }
     end
     pallet_box 'ipv4_network', :network, 'identity' do
-      { net:{ ipv4:{ gateway:'' },
-          dns:{ resolver:[''] } } }
+      { net: { ipv4: { gateway: '' },
+               dns: { resolver: [''] } } }
     end
 
     # Create the DNS domain object
 
     pallet_dir 'domain', :domain
     pallet_box 'domain', :domain, 'dns' do
-      { net:{ dns:{ ns:[''], 'soa-ns' => '', 'soa-contact' => '' } } }
+      { net: { dns: { ns: [''], 'soa-ns' => '', 'soa-contact' => '' } } }
     end
     pallet_box 'domain', :domain, 'services' do
-      { net:{ service:{ syslog:[{address:'', port:'514', protocol:'udp' } ] } } }
+      { net: { service: { syslog: [{address: '', port: '514', protocol: 'udp' }] } } }
     end
     pallet_links 'domain', :domain, 'ipv4_network' => ['ipv4_network', :network]
   end

data/exe/create_ipv4_interface

@@ -14,7 +14,7 @@ Create phy_nic and ipv4_interface objects in a warehouse"
 
     opts.on('-s SYSTEM', '--system SYSTEM', 'system name', String) {|system|
       options[:system] = system }
-    opts.on('-d DOMAIN', '--domain DOMAIN', 'domain name',String) {|domain|
+    opts.on('-d DOMAIN', '--domain DOMAIN', 'domain name', String) {|domain|
       options[:domain] = domain }
     opts.on('-m MAC', '--mac MAC', 'MAC address', String) {|mac|
       options[:mac] = mac }
@@ -35,7 +35,7 @@ Create phy_nic and ipv4_interface objects in a warehouse"
 
     pallet_dir 'phy_nic', :mac
     pallet_box 'phy_nic', :mac, 'identity' do
-      { net:{ layer2:{ name:'' } } }
+      { net: { layer2: { name: '' } } }
     end
 
     # Create IPv4 Interface object

data/exe/create_system

@@ -30,7 +30,7 @@ Create system objects in a warehouse"
   def output
     pallet_dir 'system', :system
     pallet_box 'system', :system, 'role' do
-      { system:{ role:[ '' ] } }
+      { system: { role: [''] } }
     end
     pallet_links 'system', :system, 'domain' => ['domain', :domain]
     pallet_links 'system', :system,

data/exe/dump_pallet

@@ -6,7 +6,6 @@ require 'palletjack/tool'
 
 class DumpPallet < PalletJack::Tool
   def parse_options(parser)
-
     parser.banner = "Usage: #{$PROGRAM_NAME} [options] [<name> ...]
 
 Dump the YAML representation of all named pallets in a Palletjack warehouse
@@ -18,7 +17,7 @@ pallets of the specified type."
     # the parse! method of the parser is eventually run and finds
     # a --type option. Keep declarations in that order for clarity.
 
-    options[:type]='system'
+    options[:type] = 'system'
     parser.on('-t TYPE', '--type TYPE',
               'type (default "system")',
               String) {|type| options[:type] = type }
@@ -26,17 +25,17 @@ pallets of the specified type."
     options[:match_name] = :leaf_name
     parser.on('-f', '--[no-]full-name',
               'match full_name of pallets instead of leaf_name'
-              ) {|maybe| options[:match_name] = if maybe
-                                                  :full_name
-                                                else
-                                                  :leaf_name
-                                                end
+             ) {|maybe| options[:match_name] = if maybe
+                                                 :full_name
+                                               else
+                                                 :leaf_name
+                                               end
     }
 
     options[:position] = false
     parser.on('-p', '--[no-]position',
               'output source file name and position of each value'
-              ) {|maybe| TraceableString.debug = maybe }
+             ) {|maybe| TraceableString.debug = maybe }
   end
 
   # Dump the yaml contents of all pallets given to STDOUT
@@ -45,7 +44,7 @@ pallets of the specified type."
     abort('No matching pallets found.') if pallets.empty?
 
     pallets.each do |p|
-      puts "---"
+      puts '---'
       puts "# #{p.kind}: #{p.name}"
       puts p.to_yaml.gsub(' =^.^= ', '   # ')
     end

data/exe/palletjack2kea

@@ -36,17 +36,17 @@ Write configuration for the Kea DHCP server from a Palletjack warehouse"
 
   def process
     @kea_config = { 'Dhcp4' =>
-        jack.fetch(kind:'service',
-                   parent_name:'dhcp-server',
-                   name:options[:service])['service.kea_v4']
+        jack.fetch(kind: 'service',
+                   parent_name: 'dhcp-server',
+                   name: options[:service])['service.kea_v4']
       }
 
     @kea_config['Dhcp4']['subnet4'] = []
 
-    jack.each(kind:'ipv4_network') do |net|
+    jack.each(kind: 'ipv4_network') do |net|
       net_config = {'subnet' => net['net.ipv4.cidr'],
-        'reservations' => [],
-        'option-data' => []}
+                    'reservations' => [],
+                    'option-data' => []}
       if net['net.ipv4.gateway']
         net_config['option-data'] <<
           dhcp4_option(3, 'routers', net['net.ipv4.gateway'])
@@ -77,8 +77,8 @@ Write configuration for the Kea DHCP server from a Palletjack warehouse"
           dhcp4_option(67, 'boot-file-name', net['net.dhcp.boot-file'])
       end
 
-      net.children(kind:'ipv4_interface',
-                   none?:{ 'net.layer2.address' => nil }
+      net.children(kind: 'ipv4_interface',
+                   none?: { 'net.layer2.address' => nil }
                   ) do |interface|
         net_config['reservations'] << {
           'hw-address' => interface['net.layer2.address'],
@@ -87,7 +87,7 @@ Write configuration for the Kea DHCP server from a Palletjack warehouse"
           'option-data' =>
           [
             dhcp4_option(15, 'domain-name',
-                         interface.parents(kind:'system').first['net.dns.domain'])
+                         interface.parents(kind: 'system').first['net.dns.domain'])
           ]
         }
       end

data/exe/palletjack2knot

@@ -24,7 +24,7 @@ Write DNS server zone files from a Palletjack warehouse"
 
     opts.on('-o DIR', '--output DIR', 'output directory', String) {|dir|
       options[:output] = dir
-      options[:zone_dir] = config_path(:output, "zones")
+      options[:zone_dir] = config_path(:output, 'zones')
     }
 
     required_option :output
@@ -94,7 +94,7 @@ Write DNS server zone files from a Palletjack warehouse"
       end
     end
 
-    domain.children(kind:'ipv4_interface') do |interface|
+    domain.children(kind: 'ipv4_interface') do |interface|
       a = DNS::Zone::RR::A.new
       a.label = interface['net.dns.name']
       a.address = interface['net.ipv4.address']
@@ -113,7 +113,6 @@ Write DNS server zone files from a Palletjack warehouse"
     @forward_zones[domain['net.dns.domain']] = zone
   end
 
-
   # Generate and store reverse zone data for the IPv4 network
   # associated with a Pallet Jack domain object.
 
@@ -126,7 +125,7 @@ Write DNS server zone files from a Palletjack warehouse"
     absolute_reverse_zone_name = IP.new(domain['net.ipv4.cidr']).to_arpa
 
     prefix_octets, _ = domain['net.ipv4.prefixlen'].to_i.divmod(8)
-    zone_file_name = absolute_reverse_zone_name.split('.')[-(2 + prefix_octets) .. 5].join('.')
+    zone_file_name = absolute_reverse_zone_name.split('.')[-(2 + prefix_octets)..5].join('.')
     reverse_zone.origin = zone_file_name + '.'
 
     reverse_zone.ttl = domain['net.dns.ttl']
@@ -143,7 +142,7 @@ Write DNS server zone files from a Palletjack warehouse"
       reverse_zone.records << ns
     end
 
-    domain.children(kind:'ipv4_interface') do |interface|
+    domain.children(kind: 'ipv4_interface') do |interface|
       ptr = DNS::Zone::RR::PTR.new
       ptr.label = IP.new(interface['net.ipv4.address']).to_arpa
       ptr.name = "#{interface['net.dns.fqdn']}."
@@ -153,7 +152,6 @@ Write DNS server zone files from a Palletjack warehouse"
     @reverse_zones[zone_file_name] = reverse_zone
   end
 
-
   def process
     config_dir :zone_dir
 
@@ -165,13 +163,12 @@ Write DNS server zone files from a Palletjack warehouse"
     # the same one
     @serial = Time.now.utc.to_i
 
-    jack.each(kind:'domain') do |domain|
+    jack.each(kind: 'domain') do |domain|
       process_forward_zone(domain)
       process_reverse_zone(domain)
     end
   end
 
-
   def output
     config_file :output, 'zones.conf' do |conf_file|
       conf_file << git_header('palletjack2knot')

data/exe/palletjack2pxelinux

@@ -51,7 +51,6 @@ require 'palletjack/tool'
 require 'fileutils'
 
 class PalletJack2PXELinux < PalletJack::Tool
-
   def parse_options(opts)
     opts.banner =
 "Usage: #{$PROGRAM_NAME} -w <warehouse> -o <output directory>
@@ -67,11 +66,11 @@ Write PXELINUX boot configuration files from a Palletjack warehouse"
   # Generate pxe menus for each OS configuration
 
   def pxemenu_for_netinstall(netinstall)
-    config=netinstall['host.pxelinux.config']
-    os_label=netinstall['system.os'].gsub(/-/, ' ')
-    ks_label=netinstall['host.kickstart.label']
-    kernel=netinstall['host.pxelinux.kernel']
-    append=netinstall['host.pxelinux.append']
+    config = netinstall['host.pxelinux.config']
+    os_label = netinstall['system.os'].gsub(/-/, ' ')
+    ks_label = netinstall['host.kickstart.label']
+    kernel = netinstall['host.pxelinux.kernel']
+    append = netinstall['host.pxelinux.append']
 
     config_file :output, 'config', "#{config}.menu" do |menufile|
       menufile << git_header('palletjack2pxelinux')
@@ -101,10 +100,10 @@ LABEL MainMenu
   # Generate pxe menus for each OS version
 
   def pxemenu_for_operating_system(os)
-    config=os['host.pxelinux.config']
-    os_label=config.gsub(/-/, ' ')
-    kernel=os['host.pxelinux.kernel']
-    append=os['host.pxelinux.append']
+    config = os['host.pxelinux.config']
+    os_label = config.gsub(/-/, ' ')
+    kernel = os['host.pxelinux.kernel']
+    append = os['host.pxelinux.append']
 
     config_file :output, 'config', "#{config}.menu" do |menufile|
       menufile << git_header('palletjack2pxelinux')
@@ -116,11 +115,11 @@ MENU INCLUDE /config/graphics.conf
 MENU TITLE #{os_label} Installation Menu
 "
 
-      os.descendants(kind:'netinstall') do |netinstall|
-        next unless ks_label=netinstall['host.kickstart.label']
-        config=netinstall['host.pxelinux.config']
-        kernel=netinstall['host.pxelinux.kernel']
-        append=netinstall['host.pxelinux.append']
+      os.descendants(kind: 'netinstall') do |netinstall|
+        next unless ks_label = netinstall['host.kickstart.label']
+        config = netinstall['host.pxelinux.config']
+        kernel = netinstall['host.pxelinux.kernel']
+        append = netinstall['host.pxelinux.append']
 
         pxemenu_for_netinstall(netinstall)
 
@@ -155,10 +154,10 @@ MENU INCLUDE /config/graphics.conf
 MENU TITLE Linux Installation Menu
 "
 
-      jack.each(kind:'os') do |os|
-        next unless config=os['host.pxelinux.config']
+      jack.each(kind: 'os') do |os|
+        next unless config = os['host.pxelinux.config']
 
-        label=config.gsub(/-/, ' ')
+        label = config.gsub(/-/, ' ')
 
         pxemenu_for_operating_system(os)
 
@@ -173,8 +172,8 @@ LABEL #{config}
 
     # Generate pxe default menu links for each system
 
-    jack.each(kind:'system') do |system|
-      system.children(kind:'ipv4_interface') do |nic|
+    jack.each(kind: 'system') do |system|
+      system.children(kind: 'ipv4_interface') do |nic|
         if system['host.pxelinux.config']
           menuname = "#{system['host.pxelinux.config']}.menu"
           linkname = "01-#{nic['net.layer2.address'].gsub(':', '-').downcase}"

data/exe/palletjack2salt

@@ -47,7 +47,7 @@ class PalletJack2Salt < PalletJack::Tool
 Write Salt pillar data from a Palletjack warehouse."
 
     opts.on('-g DIR', '--global DIR', 'global pillar directory',
-            String ) {|dir| options[:global_pillar] = dir }
+            String) {|dir| options[:global_pillar] = dir }
     opts.on('-m DIR', '--minion DIR', 'per-minion pillar directory',
             String) {|dir| options[:minion_pillar] = dir }
 
@@ -75,7 +75,7 @@ Write Salt pillar data from a Palletjack warehouse."
   def ipv4_interfaces(system)
     result = Hash.new
 
-    system.children(kind:'ipv4_interface') do |interface|
+    system.children(kind: 'ipv4_interface') do |interface|
       result[interface['net.layer2.name']] = {
         interface['net.ipv4.address'] =>
         interface.filter('net.ipv4', 'net.layer2').to_hash
@@ -88,7 +88,7 @@ Write Salt pillar data from a Palletjack warehouse."
   def process_minion_pillars
     result = {}
 
-    jack.each(kind:'system') do |system|
+    jack.each(kind: 'system') do |system|
       yaml_output = {}
       yaml_output['ipv4_interfaces'] = ipv4_interfaces(system)
 

data/exe/palletjack2unbound

@@ -18,11 +18,9 @@ require 'ip'
 require 'resolv'
 
 class PalletJack2Unbound < PalletJack::Tool
-
   # Representation of a stub zone configuration for Unbound
 
   class StubZone
-
     # :call-seq:
     # new(TOOL, ZONE, AUTH-NS, ...)
     # new(TOOL, ZONE, AUTH-NS, ..., transparent: true)
@@ -66,7 +64,7 @@ stub-zone:
     def initialize(service_name)
       @tool = PalletJack2Unbound.instance
       @service_name = service_name
-      @service_config = @tool.jack.fetch(kind:'service',
+      @service_config = @tool.jack.fetch(kind: 'service',
                                          parent_name: 'dns-resolver',
                                          name: @service_name)
     end
@@ -76,7 +74,7 @@ stub-zone:
     def output
       @tool.config_file :local_dir, "#{@service_name}.conf" do |configfile|
         configfile << @tool.git_header('palletjack2unbound')
-        @service_config["service.unbound.server"].each do |config|
+        @service_config['service.unbound.server'].each do |config|
           config.each do |key, value|
             configfile << "#{key}: #{value}\n"
           end
@@ -126,7 +124,7 @@ E.g.
   def process_stub_zones
     @stub_zones = []
 
-    jack.each(kind:'domain') do |domain|
+    jack.each(kind: 'domain') do |domain|
       zone = domain['net.dns.domain']
       stub_addrs = []
 
@@ -135,8 +133,8 @@ E.g.
         nsname =
           Resolv::DNS::Name.create("#{ns}.#{zone}.") unless nsname.absolute?
 
-        jack.each(kind:'ipv4_interface',
-                  all?:{'net.dns.fqdn' => nsname.to_s}) do |ipv4|
+        jack.each(kind: 'ipv4_interface',
+                  all?: {'net.dns.fqdn' => nsname.to_s}) do |ipv4|
           stub_addrs << ipv4['net.ipv4.address']
         end
       end
@@ -152,7 +150,7 @@ E.g.
       reverse_zone = ip_net.to_arpa
       prefix_octets, _ = domain['net.ipv4.prefixlen'].to_i.divmod(8)
       reverse_zone =
-        ip_net.to_arpa.split('.')[-(2 + prefix_octets) .. 5].join('.')
+        ip_net.to_arpa.split('.')[-(2 + prefix_octets)..5].join('.')
 
       # Make the same assumption that palletjack2knot does;
       # reverse delegations are made to the same nameserver

data/palletjack-tools.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/saab-simc-admin/palletjack'
   spec.license	= 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   spec.platform	= Gem::Platform::RUBY
@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dns-zone', '~> 0.3'
   spec.add_runtime_dependency 'ruby-ip', '~> 0.9'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_structure_matcher", "~> 0.0.6"
-  spec.add_development_dependency "rspec-collection_matchers", "~> 1.1.2"
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec_structure_matcher', '~> 0.0.6'
+  spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1.2'
 
   spec.has_rdoc	= true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: palletjack-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Karl-Johan Karlsson
@@ -31,7 +31,7 @@ cert_chain:
   f8wtQllq82VF0AXUYeLtTh1f+DW3WW5BO1e2OCu5eOV7dbyaVPaNK/+rHjCN8kM/
   DGZSwUoNADmVkQ==
   -----END CERTIFICATE-----
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palletjack
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: dns-zone
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Tools for the Pallet Jack Lightweight Configuration Management Database