arc_weld 0.3.1 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930cfc559a14797468e987a6a4575d503e489e75
-  data.tar.gz: b09b4ced15f5fbe5866f0049de01b1bdf2556196
+  metadata.gz: 2277081def68f14e24ea8e16833d31d2e76f0859
+  data.tar.gz: 69b941694b14d6177b71a0505b1fccf9dc4cecfa
 SHA512:
-  metadata.gz: a0d31f18c19fdefd8c9b6b8b7fb5c8d355e53201722fdc6d4d9a1b11d5edf98bcdbc0d7768a5ef6f087263c888a0b6fc4b2a88e51005fe34afa127530207bc26
-  data.tar.gz: 8d15eb767e6c467306d08a0417831f8d9ed6270bd75ad84a29391980b8a563519841ab883e28eba2789eb80d3088215e70cddd7d4b3efe396d7a693088e80340
+  metadata.gz: 592531f511cffde34bea7c5e44e708f6b41f51f35a67abd12544dfc2552d49ade60f41a00b851b29099b6f1b64823f17856d295a8782ee0bf75234b2f7f71c67
+  data.tar.gz: 5ffcaba2a98a99596ec9b65a9583dc4ad68bbf8157e1f79fad3b3eaece44c5f353f7d6c02f35d9d501c69345ace178f508c994f4048158c7370156e0289cbd70

data/.gitignore

@@ -1,5 +1,7 @@
+/.idea/
 /.bundle/
 /.yardoc
+/Gemfile
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/bin/weld

@@ -5,4 +5,4 @@ if Dir.exist?(local_lib=File.join(Dir.pwd,'lib'))
   Dir[File.join(local_lib,'*.rb')]. each {|local_lib| require local_lib }
 end
 
-ArcWeld::WeldCli.start(ARGV)
+ArcWeld::Cli.start(ARGV)

data/lib/arc_weld/cli/project.rb

@@ -14,19 +14,22 @@ module ArcWeld
         ArcWeld.const_get(constantize(resource_type))
       end
 
-      def resource_input_path(resource_type)
-        File.join(self.input_dir, resource_inputs.fetch(resource_type))
+      def input_file(filename)
+        File.join(self.input_dir, filename)
       end
 
-      def resource_reader(resource_type)
+      def resource_reader(resource_type,filename)
         klass = ArcWeld::Cli::ResourceReaders.const_get(constantize(resource_driver))
-        klass.new( path:         resource_input_path(resource_type),
+        klass.new( path:         input_file(filename),
                    target_class: resource_class_for(resource_type) )
       end
 
       def reader
         @readers ||= Hash[
-          resource_inputs.keys.map { |type| [type, resource_reader(type)]}
+          resource_inputs.map  do |resource_type,*filenames| 
+            resource_type_readers = filenames.flatten.map {|filename| resource_reader(resource_type,filename)}
+            [resource_type, resource_type_readers]
+          end
         ]
       end
 
@@ -43,8 +46,8 @@ module ArcWeld
       end
 
       def load_resources
-        reader.each do |type, type_reader|
-          res=type_reader.to_a
+        reader.each do |type, type_readers|
+          res=type_readers.flat_map &:to_a
           resources[type].push(*res)
         end
       end
@@ -91,21 +94,19 @@ module ArcWeld
       end
 
       def assign_resource_groups
-        resource_roots['zone'].add_children(*resources['zone'])
-
-        zone_assets
-
         unzoned = resources['asset'].select {|a| a.in_zone.nil?}
         resource_roots['asset'].add_children(*unzoned)
 
-        %w{ network customer location asset_category }.each do |type|
-          resource_roots[type].add_children(*resources[type])
+        %w{ network customer location asset_category zone }.each do |type|
+          unrooted = resources[type].select {|instance| instance.parent_ref==instance.class.toplevel }
+          resource_roots[type].add_children(*unrooted)
         end
       end
 
       def generate_archive
         resource_roots
         load_resources
+        zone_assets
         assign_resource_groups
         assign_model_relations
         archive.add(*resources.values.flatten)

data/lib/arc_weld/cli/readers/relation_csv.rb

@@ -34,11 +34,14 @@ module ArcWeld
             src_instance=sources(inputs).find {|s| s.send(src_select) == selected_src }
             dst_instance=destinations(inputs).find {|s| s.send(dst_select) == selected_dst}
             
-            if (src_instance.nil? || dst_instance.nil?)
-              STDERR.puts format('could not %s %s/%s',
+            if src_instance.nil?
+              STDERR.puts format('could not %s from %s to %s (source resource not found)',
                                  relationship_type,
-                                 selected_src,
-                                 selected_dst)
+                                 selected_src, selected_dst)
+            elsif dst_instance.nil?
+              STDERR.puts format('could not %s from %s to %s (destination resource not found)',
+                                 relationship_type,
+                                 selected_src, selected_dst)
             else
                src_instance.send(relationship_type,dst_instance)
             end

data/lib/arc_weld/cli/readers/relation_csv_category_uri.rb

@@ -30,13 +30,17 @@ module ArcWeld
         def relate(inputs)
           csv.each do |selected_src, category_uri|
             src_instance=sources(inputs).find {|s| s.send(src_select)==selected_src}
-            
+
             if (src_instance.nil?)
-              STDERR.puts format('could not %s %s/%s',
-                                 relationship_type,
+              STDERR.puts format('could not add category uri %s to %s (resource nil)',
+                                 category_uri,
                                  selected_src)
+              next
+            end
+            if ac_resource = inputs['asset_category'].find {|ac| ac.ref_uri==category_uri}
+              src_instance.add_category(ac_resource)
             else
-               src_instance.send(relationship_type,category_uri)
+              src_instance.send(relationship_type,category_uri)
             end
           end
         end

data/lib/arc_weld/version.rb

@@ -1,3 +1,3 @@
 module ArcWeld
-  VERSION = '0.3.1'
+  VERSION = '0.3.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arc_weld
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.12
 platform: ruby
 authors:
 - Ryan Breed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gyoku
@@ -182,7 +182,6 @@ description: Toolkit for building ArcSight resources
 email:
 - opensource@breed.org
 executables:
-- setup
 - weld
 extensions: []
 extra_rdoc_files: []
@@ -196,7 +195,6 @@ files:
 - README.md
 - Rakefile
 - arc_weld.gemspec
-- bin/setup
 - bin/weld
 - lib/arc_weld.rb
 - lib/arc_weld/archive.rb
@@ -262,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Toolkit for building ArcSight resources

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here