alki 0.8.0 → 0.9.0

data/test/integration/dsls/assembly_type_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require 'alki/test'
 require 'alki/dsls/assembly_type'
 
 describe Alki::Dsls::AssemblyType do
@@ -55,4 +55,4 @@ describe Alki::Dsls::AssemblyType do
       obj.output(2).must_equal "12"
     end
   end
-end
+end

data/test/integration/dsls/service_dsl_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_helper'
+require 'alki/test'
 require 'alki/dsls/service'
 
 describe Alki::Dsls::Service do
@@ -54,4 +54,4 @@ describe Alki::Dsls::Service do
       end.uses.must_equal(['ts','ts2'])
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,26 +77,27 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: alki-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 description: Base library for building applications. Provides tools for organizing
   and connecting application units.
 email:
 - matt.edlefsen@gmail.com
-executables: []
+executables:
+- alki
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,35 +107,50 @@ files:
 - README.adoc
 - Rakefile
 - alki.gemspec
+- bin/alki
 - config/dsls.rb
 - doc/assemblies.adoc
 - doc/assembly_dsl.adoc
 - doc/index.adoc
 - doc/projects.adoc
+- exe/alki
 - lib/alki.rb
 - lib/alki/assembly.rb
-- lib/alki/assembly_builder.rb
-- lib/alki/assembly_executor.rb
-- lib/alki/assembly_handler_base.rb
+- lib/alki/assembly/builder.rb
+- lib/alki/assembly/executor.rb
+- lib/alki/assembly/handler_base.rb
+- lib/alki/assembly/instance.rb
+- lib/alki/assembly/types/assembly.rb
+- lib/alki/assembly/types/factory.rb
+- lib/alki/assembly/types/func.rb
+- lib/alki/assembly/types/group.rb
+- lib/alki/assembly/types/override.rb
+- lib/alki/assembly/types/proc_value.rb
+- lib/alki/assembly/types/service.rb
+- lib/alki/assembly/types/value.rb
 - lib/alki/bin.rb
 - lib/alki/dsls/assembly.rb
+- lib/alki/dsls/assembly_group.rb
 - lib/alki/dsls/assembly_type.rb
-- lib/alki/dsls/assembly_type_dsl.rb
-- lib/alki/dsls/assembly_types/assembly.rb
-- lib/alki/dsls/assembly_types/group.rb
-- lib/alki/dsls/assembly_types/load.rb
-- lib/alki/dsls/assembly_types/overlay.rb
-- lib/alki/dsls/assembly_types/value.rb
 - lib/alki/dsls/service.rb
+- lib/alki/execution/cache_entry.rb
+- lib/alki/execution/context.rb
+- lib/alki/execution/context_class_builder.rb
+- lib/alki/execution/value_context.rb
 - lib/alki/feature_test.rb
 - lib/alki/overlay_delegator.rb
+- lib/alki/overlay_info.rb
 - lib/alki/override_builder.rb
 - lib/alki/service_delegator.rb
 - lib/alki/test.rb
 - lib/alki/version.rb
 - test/feature/alki_test.rb
 - test/feature/example_test.rb
+- test/feature/factories_test.rb
+- test/feature/overlays_test.rb
 - test/feature/overrides_test.rb
+- test/feature/pseudo_elements_test.rb
+- test/feature_test_helper.rb
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
@@ -150,7 +166,6 @@ files:
 - test/integration/dsls/assembly_test.rb
 - test/integration/dsls/assembly_type_test.rb
 - test/integration/dsls/service_dsl_test.rb
-- test/test_helper.rb
 homepage: https://github.com/alki-project/alki
 licenses:
 - MIT
@@ -178,7 +193,11 @@ summary: Base library for building applications.
 test_files:
 - test/feature/alki_test.rb
 - test/feature/example_test.rb
+- test/feature/factories_test.rb
+- test/feature/overlays_test.rb
 - test/feature/overrides_test.rb
+- test/feature/pseudo_elements_test.rb
+- test/feature_test_helper.rb
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
@@ -194,4 +213,3 @@ test_files:
 - test/integration/dsls/assembly_test.rb
 - test/integration/dsls/assembly_type_test.rb
 - test/integration/dsls/service_dsl_test.rb
-- test/test_helper.rb

data/lib/alki/assembly_builder.rb

@@ -1,109 +0,0 @@
-require 'alki/assembly'
-require 'alki/class_builder'
-require 'alki/dsl'
-require 'alki/support'
-
-module Alki
-  class AssemblyBuilder
-    def initialize
-      @assembly_options = {}
-      @assembly_name = nil
-      @definition = nil
-    end
-
-    attr_reader :assembly_options, :assembly_name, :definition
-
-    def self.build(opts={},&blk)
-      new.build(opts,&blk)
-    end
-
-    def build(opts={},&blk)
-      build_assembly blk if blk
-      if opts[:config_dir]
-        context = if opts[:project_assembly]
-          File.dirname opts[:project_assembly]
-        else
-          Dir.pwd
-        end
-        set_config_directory File.expand_path opts[:config_dir], context
-      end
-      set_assembly_name opts[:name] if opts[:name]
-      setup_project_assembly opts[:project_assembly] if opts[:project_assembly]
-      load_assembly_file opts[:primary_config] unless definition
-      build_empty_assembly unless definition
-      build_class
-    end
-
-    def setup_project_assembly(path)
-      root = Alki::Support.find_root(path) do |dir|
-        File.exists?(File.join(dir,'config','assembly.rb')) ||
-          File.exists?(File.join(dir,'Gemfile')) ||
-          !Dir.glob(File.join(dir,'*.gemspec')).empty?
-      end
-      if root
-        unless @assembly_options[:load_path]
-          config_dir = File.join(root,'config')
-          set_config_directory config_dir if File.exists? config_dir
-        end
-
-        unless @assembly_name
-          lib_dir = File.join(root,'lib')
-          name = Alki::Support.path_name path, lib_dir
-          unless name
-            raise "Can't auto-detect name of assembly"
-          end
-          set_assembly_name name
-        end
-      end
-    end
-
-    def set_assembly_name(name)
-      @assembly_name = name
-    end
-
-    def set_config_directory(config_dir)
-      Alki::Dsl.register_dir config_dir, 'alki/dsls/assembly', {config_dir: config_dir}
-      @assembly_options[:load_path] = config_dir
-    end
-
-    def load_assembly_file(name = nil)
-      name ||= 'assembly'
-      if @assembly_options[:load_path]
-        assembly_config_path = File.join(@assembly_options[:load_path],"#{name}.rb")
-        if File.exists? assembly_config_path
-          @definition = Alki::Dsl.load(assembly_config_path)[:class]
-          true
-        end
-      end
-    end
-
-    def build_empty_assembly
-      build_assembly ->{}
-    end
-
-    def build_assembly(blk)
-      @definition = Alki::Dsl.build('alki/dsls/assembly', &blk)[:class]
-    end
-
-    def build_class
-      assembly_options = @assembly_options
-      definition = @definition
-      Alki::ClassBuilder.build(
-        prefix: '',
-        name: @assembly_name,
-        class_modules: [Alki::Assembly],
-        type: :module,
-        class_methods: {
-          definition: {
-            body: ->{
-              definition
-            }
-          },
-          assembly_options: {
-            body: ->{ assembly_options }
-          }
-        }
-      )
-    end
-  end
-end

data/lib/alki/assembly_executor.rb

@@ -1,129 +0,0 @@
-require 'alki/service_delegator'
-require 'alki/overlay_delegator'
-require 'alki/class_builder'
-
-module Alki
-  class AssemblyExecutor
-    class Resource
-      attr_reader :pkg, :cache, :elem
-      def initialize(pkg,cache,elem)
-        @pkg = pkg
-        @cache = cache
-        @elem = elem
-      end
-
-      def with_elem(elem)
-        Resource.new @pkg, @cache, elem
-      end
-    end
-
-    def initialize(data={})
-      @data = data
-    end
-
-    def call(assembly,cache,path,*args,&blk)
-      unless cache[path]
-        elem = assembly.lookup path, @data
-        raise "Path not found: #{path.join('.')}" unless elem
-        res = Resource.new assembly, cache, elem
-        cache[path] = case elem[:type]
-          when :value
-            value res, path
-          when :group
-            group res
-        end
-      end
-      cache[path].call *args, &blk
-    end
-
-    def value(res,path)
-      evaluator = -> (value_block,*args,&blk) {
-        with_scope_context(res,value_block) do |ctx|
-          val = ctx.__call__(*args,&blk)
-          if res.elem[:overlays]
-            val = apply_overlays res, path, val
-          end
-          val
-        end
-      }
-      res.elem[:block].call evaluator
-    end
-
-    def apply_overlays(res,path,obj)
-      res.elem[:overlays].inject(obj) do |obj,overlay_elem|
-        unless res.cache[overlay_elem[:block]]
-          with_scope_context(res.with_elem(overlay_elem)) do |ctx|
-            res.cache[overlay_elem[:block]] = ctx.__call__
-          end
-        end
-        local_path = path[overlay_elem[:scope][:root].size..-1].join('.')
-        Alki::OverlayDelegator.new local_path,obj, res.cache[overlay_elem[:block]]
-      end
-    end
-
-    def group(res)
-      proc = -> (name,*args,&blk) {
-        call res.pkg, res.cache, res.elem[:scope][name], *args, &blk
-      }
-      group = create_context(GroupContext,res)
-      -> { group }
-    end
-
-    def with_scope_context(res,blk = nil)
-      methods = {
-        __call__: { body: (blk || res.elem[:block])}
-      }
-      yield create_context(ValueContext,res,methods)
-    end
-
-    def create_context(super_class,res,methods={})
-      executor = self
-
-      res.elem[:scope].keys.each do |meth|
-        methods[meth] = {
-          body: ->(*args,&blk) {
-            executor.call res.pkg, res.cache, res.elem[:scope][meth], *args, &blk
-          }
-        }
-      end
-      context_class = Alki::ClassBuilder.build(
-        super_class: super_class,
-        instance_methods: methods
-      )
-      context_class.new
-    end
-
-    class Context
-    end
-
-    class ValueContext < Context
-      def lookup(path)
-        unless path.is_a?(String) or path.is_a?(Symbol)
-          raise ArgumentError.new("lookup can only take Strings or Symbols")
-        end
-        path.to_s.split('.').inject(self) do |group,name|
-          raise "Invalid lookup path" unless group.is_a? Context
-          group.send name.to_sym
-        end
-      end
-
-      def lazy(path)
-        unless path.is_a?(String) or path.is_a?(Symbol)
-          raise ArgumentError.new("lazy can only take Strings or Symbols")
-        end
-        Alki::ServiceDelegator.new assembly, path
-      end
-    end
-
-    class GroupContext < Context
-      def lookup(path)
-        unless path.is_a?(String) or path.is_a?(Symbol)
-          raise ArgumentError.new("lookup can only take Strings or Symbols")
-        end
-        path.to_s.split('.').inject(self) do |group,name|
-          group.send name.to_sym
-        end
-      end
-    end
-  end
-end

data/lib/alki/assembly_handler_base.rb

@@ -1,19 +0,0 @@
-module Alki
-  class AssemblyHandlerBase
-    def initialize(elem,data,key=nil)
-      @elem = elem
-      @data = data
-      @key = key
-    end
-
-    attr_reader :elem, :data, :key
-
-    def index
-      raise NotImplementedError.new("Can't index into this element")
-    end
-
-    def output
-      raise NotImplementedError.new("Can't output this element")
-    end
-  end
-end

data/lib/alki/dsls/assembly_type_dsl.rb

@@ -1,21 +0,0 @@
-require 'alki/dsls/assembly_type'
-
-Alki do
-  require_dsl 'alki/dsls/dsl'
-
-  dsl_method :element_type do |name,&blk|
-    data = Alki::Dsls::AssemblyType.build(prefix: 'alki/assembly_types', name: name,&blk)
-    klass = data[:class]
-    add_helper "build_#{name}".to_sym, &klass.method(:new)
-    add_helper "add_#{name}".to_sym do |name,*args|
-      add name, klass.new(*args)
-    end
-  end
-
-  finish do
-    add_method :add do |name,elem|
-      (ctx[:elems]||={})[name.to_sym] = elem
-      nil
-    end
-  end
-end

data/lib/alki/dsls/assembly_types/assembly.rb

@@ -1,101 +0,0 @@
-require 'alki/override_builder'
-require 'alki/support'
-
-Alki do
-  require_dsl 'alki/dsls/assembly_types/group'
-  require_dsl 'alki/dsls/assembly_types/value'
-
-  dsl_method :assembly do |name,pkg=name.to_s,**overrides,&blk|
-    klass = Alki::Support.load_class pkg
-    config_dir = klass.assembly_options[:load_path]
-    config_dir = build_value config_dir if config_dir
-    overrides = Alki::OverrideBuilder.build overrides, &blk
-
-    add_assembly name, klass.root, config_dir, overrides
-  end
-
-  element_type :assembly do
-    attr :root
-    attr :config_dir
-    attr :overrides, nil
-
-    index do
-      if key == :config_dir
-        data.merge! main_data
-        config_dir
-      elsif key == :original
-        root
-      else
-        if overrides
-          data.replace(
-            main: data.merge(main_data),
-            override: override_data,
-          )
-          override.index data, key
-        else
-          root.index data.merge!(main_data), key
-        end
-      end
-    end
-
-    output do
-      scope = root.output(data)[:scope]
-      scope[:config_dir] = (data[:prefix]||[]) + [:config_dir]
-      scope[:original] = (data[:prefix]||[]) + [:original]
-      scope.merge! overrides.output(data)[:scope] if overrides
-      {
-        type: :group,
-        scope: scope,
-      }
-    end
-
-    def override_data
-      od = data.dup
-      od[:scope] ||= {}
-      od[:scope].merge! original: ((data[:prefix]||[]) + [:original])
-      od
-    end
-
-    def main_data
-      assembly_path = data[:prefix] ? data[:prefix].dup : []
-      {scope: {assembly: assembly_path, root: [], config_dir: (assembly_path + [:config_dir])}, overlays: []}
-    end
-
-    def override
-      Alki::AssemblyTypes::Override.new root, overrides
-    end
-  end
-
-  element_type :override do
-    attr :main
-    attr :override
-
-    index do
-      main_child = main.index data[:main], key
-      override_child = override.index data[:override], key
-
-      if main_child && override_child
-        (data[:main][:scope]||={}).merge! (data[:override][:scope]||{})
-        (data[:main][:overlays]||=[]).push *(data[:override][:overlays]||[])
-        Alki::AssemblyTypes::Override.new main_child, override_child
-      elsif main_child
-        data.replace data[:main]
-        main_child
-      elsif override_child
-        data.replace data[:override]
-        override_child
-      end
-    end
-
-    output do
-      result = override.output(data[:override])
-      if result[:type] == :group
-        main_result = main.output(data[:main])
-        if main_result[:type] == :group
-          result[:scope] = main_result[:scope].merge result[:scope]
-        end
-      end
-      result
-    end
-  end
-end

data/lib/alki/dsls/assembly_types/group.rb

@@ -1,41 +0,0 @@
-require 'alki/dsls/assembly'
-
-Alki do
-  dsl_method :group do |name,&blk|
-    add name, Alki::Dsls::Assembly.build(&blk)[:root]
-  end
-
-  element_type :group do
-    attr :children, {}
-    attr :overlays, []
-
-    index do
-      data[:scope] ||= {}
-      data[:prefix] ||= []
-      update_scope children, data[:prefix], data[:scope]
-      data[:prefix] << key
-
-      if overlays
-        data[:overlays] = overlays.map do |o|
-          o == :clear ? o : {block: o, scope: data[:scope].merge(root: [])}
-        end
-      end
-
-      children[key]
-    end
-
-    output do
-      {
-        type: :group,
-        scope: update_scope(children,data[:prefix]||[],{})
-      }
-    end
-
-    def update_scope(children, prefix, scope)
-      children.keys.inject(scope) do |h,k|
-        h.merge! k => (prefix+[k])
-      end
-      scope
-    end
-  end
-end

data/lib/alki/dsls/assembly_types/load.rb

@@ -1,31 +0,0 @@
-require 'alki/support'
-
-Alki do
-  dsl_method :load do |group_name,name=group_name.to_s|
-    add_load group_name, name
-  end
-
-  element_type :load do
-    attr :name
-
-    index do
-      group.index data, key
-    end
-
-    output do
-      group.output data
-    end
-
-    def group
-      unless (data[:loaded]||={})[name]
-        path = if data[:load_path]
-          File.join(data[:load_path],"#{name}.rb")
-        else
-          name
-        end
-        data[:loaded][name] = Alki::Dsl.load(path)[:class].root
-      end
-      data[:loaded][name]
-    end
-  end
-end

data/lib/alki/dsls/assembly_types/overlay.rb

@@ -1,9 +0,0 @@
-Alki do
-  dsl_method :overlay do |&blk|
-    (ctx[:overlays]||=[]) << blk
-  end
-
-  dsl_method :clear_overlays do
-    (ctx[:overlays]||=[]) << :clear
-  end
-end