alki 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bbada7ba7f3a9320332e73d98ec87b1e19162ad
-  data.tar.gz: 328c2661e806dee2d265da56e59e64683809954e
+  metadata.gz: c45abd42f73d63b3416055e3d9b7083a987a933d
+  data.tar.gz: 9eb429b7597cb856e731f0eb46a6e3094db4464a
 SHA512:
-  metadata.gz: 9604a0947cb69443b966621bc337200e48dd9589e380b93039cc81af6fb5479316406d3c19a2112cfbfe72ae2d2b5f5d0e08201977d4ccfff6d23e31f166aaf0
-  data.tar.gz: 235b0dc2ebd06d5be3d5d0777f25f0081f225e120e5b492c1172dd933ae26358d943d43562218bb5351a2d603507856159d3902f285ab4f414cae6724aba0861
+  metadata.gz: d15a85dc3d44267dafe127f76dd7c54faa594b163926ff2d8198afe3a2493297904d0d778b82bbd649ee0c47dea2f0aa18961c7ef3ad7be00f8ba66c846af854
+  data.tar.gz: 6bd49d1cd77f45018e376e059555f17b066d0c5be9c0cf40f6be653bb8518b737df5ef69811a673c0943aba3b1603bea42ae3ba84fce1d5127ade5c40ca8f3fd

data/lib/alki/assembly/instance_builder.rb

@@ -14,7 +14,7 @@ module Alki
           overrides = inject_assembly_instance overrides, instance_wrapper
 
           executor.root = Types.build :assembly, assembly.root, overrides.root
-          executor.meta = IceNine.deep_freeze(assembly.meta+overrides.meta)
+          executor.meta = IceNine.deep_freeze(assembly.meta.dup.append! overrides.meta)
 
           executor.call [:assembly_instance]
         end
@@ -24,7 +24,7 @@ module Alki
         def inject_assembly_instance(overrides,instance_wrapper)
           root = overrides.root.dup
           root.children = root.children.merge(assembly_instance: assembly_instance)
-          meta = overrides.meta + [wrap_assembly_instance(instance_wrapper)]
+          meta = wrap_assembly_instance(overrides.meta,instance_wrapper)
           Overrides.new(root,meta)
         end
 
@@ -32,13 +32,13 @@ module Alki
           Types.build(:service,-> { root })
         end
 
-        def wrap_assembly_instance(wrapper)
-          [[],Meta::Overlay.new(
+        def wrap_assembly_instance(meta,wrapper)
+          meta.dup.add Meta::Overlay.new(
             :value,
             [:assembly_instance],
             wrapper,
             []
-          )]
+          )
         end
       end
     end

data/lib/alki/assembly/meta_list.rb

@@ -0,0 +1,52 @@
+module Alki
+  module Assembly
+    class MetaList
+      attr_reader :list
+
+      def initialize(list = [])
+        @list = list
+      end
+
+      def add(name=nil,meta)
+        path = name ? [name.to_sym] : []
+        @list << [path,meta]
+        self
+      end
+
+      def prefix(*prefix)
+        @list.each do |(path,_)|
+          path.unshift *prefix
+        end
+        self
+      end
+
+      def append(*prefix, meta_list)
+        append! *prefix, meta_list.dup
+        self
+      end
+
+      def append!(*prefix, meta_list)
+        @list.push *meta_list.prefix(*prefix).list
+        self
+      end
+
+      def each
+        enum_for(:each) unless block_given?
+        @list.each do |(path,meta)|
+          yield path, meta
+        end
+        self
+      end
+
+      def to_a
+        @list.map do |(path,meta)|
+          [path.dup,meta]
+        end
+      end
+
+      def dup
+        self.class.new to_a
+      end
+    end
+  end
+end

data/lib/alki/dsls/assembly_group.rb

@@ -1,11 +1,12 @@
 require 'alki/override_builder'
 require 'alki/support'
 require 'alki/overlay_info'
+require 'alki/assembly/meta_list'
 
 Alki do
   init do
     ctx[:root] = build(:group,{})
-    ctx[:meta] = []
+    ctx[:meta] = Alki::Assembly::MetaList.new
     ctx[:addons] ||= []
     ctx[:addons].each do |addon|
       require_dsl addon
@@ -14,7 +15,7 @@ Alki do
 
   helper :add do |name,elem|
     if defined?(@tags) && @tags
-      ctx[:meta] << [[name.to_sym],build_meta(:tags,@tags)]
+      ctx[:meta].add name, build_meta(:tags,@tags)
       @tags = nil
     end
     ctx[:root].children[name.to_sym] = elem
@@ -30,15 +31,12 @@ Alki do
   end
 
   helper :add_overlay do |type,target,overlay,args|
-    (ctx[:meta]||=[]) << [
-      [],
-      build_meta(
-        :overlay,
-        type, target.to_s.split('.').map(&:to_sym),
-        overlay.to_s.split('.').map(&:to_sym),
-        args
-      )
-    ]
+    ctx[:meta].add build_meta(
+      :overlay,
+      type, target.to_s.split('.').map(&:to_sym),
+      overlay.to_s.split('.').map(&:to_sym),
+      args
+    )
   end
 
   helper :prefix_meta do |*prefix,meta|
@@ -48,10 +46,6 @@ Alki do
     meta
   end
 
-  helper :update_meta do |*prefix,meta|
-    ctx[:meta].push *prefix_meta(*prefix,meta)
-  end
-
   dsl_method :use do |addon_name|
     addon = Alki.load addon_name
     if addon.respond_to?(:alki_addon)
@@ -96,7 +90,7 @@ Alki do
   dsl_method :group do |name,&blk|
     grp = Alki::Dsls::AssemblyGroup.build(addons: ctx[:addons], &blk)
     add name, grp[:root]
-    update_meta name, grp[:meta]
+    ctx[:meta].append! name, grp[:meta]
   end
 
   dsl_method :auto_group do |name,dir,callable,*args|
@@ -124,18 +118,15 @@ Alki do
     end
     grp = Alki.load(File.join(ctx[:prefix],name))
     add group_name, grp.root
-    update_meta group_name, grp.meta
+    ctx[:meta].append group_name, grp.meta
   end
 
   dsl_method :mount do |name,pkg=name.to_s,**overrides,&blk|
     klass = Alki.load pkg
-    mounted_meta = klass.meta.map do |(path,type,info)|
-      [path.dup,type,info]
-    end
-    update_meta name, mounted_meta
+    ctx[:meta].append name, klass.meta
 
     overrides = Alki::OverrideBuilder.build overrides, &blk
-    update_meta name, overrides.meta
+    ctx[:meta].append! name, overrides.meta
 
     add name, build(:assembly, klass.root, overrides.root)
   end

data/lib/alki/executor.rb

@@ -90,7 +90,7 @@ module Alki
     def data_copy
       unless @data
         @data = {}
-        @meta.each do |(from,meta)|
+        @meta.each do |from, meta|
           meta.process self, from, @data
         end
         IceNine.deep_freeze @data

data/lib/alki/override_builder.rb

@@ -1,6 +1,7 @@
 require 'alki/dsl'
 require 'alki/overrides'
 require 'alki/assembly/types'
+require 'alki/assembly/meta_list'
 
 module Alki
   module OverrideBuilder
@@ -10,9 +11,9 @@ module Alki
           data = Alki::Dsl.build('alki/dsls/assembly_group',&blk)
           Overrides.new data[:root], data[:meta]
         elsif override_hash && !override_hash.empty?
-          Overrides.new create_override_group(override_hash), []
+          Overrides.new create_override_group(override_hash), Alki::Assembly::MetaList.new
         else
-          Overrides.new build_type(:group), []
+          Overrides.new build_type(:group), Alki::Assembly::MetaList.new
         end
       end
 

data/lib/alki/version.rb

@@ -1,3 +1,3 @@
 module Alki
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

data/test/fixtures/example/config/handlers.rb

@@ -10,7 +10,6 @@ Alki do
 
   num_handler :fizz, 3
 
-
   group :handlers do
     num_handler :buzz, 5
   end
@@ -23,6 +22,7 @@ Alki do
     num_handler 15, settings.fizzbuzz
   end
 
+  tag :io
   service :echo do
     require 'example/echo_handler'
     Example::EchoHandler.new output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-dsl
@@ -104,6 +104,7 @@ files:
 - lib/alki/assembly/instance_builder.rb
 - lib/alki/assembly/meta/overlay.rb
 - lib/alki/assembly/meta/tags.rb
+- lib/alki/assembly/meta_list.rb
 - lib/alki/assembly/type.rb
 - lib/alki/assembly/types.rb
 - lib/alki/assembly/types/assembly.rb