alki 0.12.0 → 0.12.1

data/lib/alki/overrides.rb

@@ -0,0 +1,4 @@
+require 'concurrent/immutable_struct'
+module Alki
+  Overrides = Concurrent::ImmutableStruct.new(:root,:meta)
+end

data/lib/alki/version.rb

@@ -1,3 +1,3 @@
 module Alki
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/test/feature/mounts_test.rb

@@ -0,0 +1,15 @@
+require 'alki/feature_test'
+
+describe 'Mounts' do
+  it 'should attach assembly to main assembly as a group' do
+    Alki.create_assembly(name: 'alki_test') do
+      set :val, :test
+    end
+
+    assembly = Alki.singleton_assembly do
+      mount :mounted, AlkiTest
+    end
+
+    assembly.mounted.val.must_equal :test
+  end
+end

data/test/feature/multithreading_test.rb

@@ -23,9 +23,6 @@ describe 'Multithreading' do
     sleep 0.1
     thread2.alive?.must_equal true
     e.set
-    sleep 0.1
-    thread2.alive?.must_equal false
-
     thread.join
     thread2.join
   end

data/test/feature/overlays_test.rb

@@ -196,12 +196,12 @@ describe 'Overlays' do
         :test
       end
       mount :mounted, child do
-        overlay 'original.svc1', :test_overlay
+        overlay 'svc1', :test_overlay
         set :test_overlay, ->(value) {:parent}
       end
     end
     obj = assembly.new do
-      overlay 'original.svc2', :test_overlay
+      overlay 'svc2', :test_overlay
       set :test_overlay, ->(value) {:child}
     end
     obj.svc2.must_equal :child

data/test/feature/overrides_test.rb

@@ -5,6 +5,10 @@ require 'stringio'
 describe 'Overrides' do
   before do
     @assembly = Alki.create_assembly do
+      set :val do
+        :value
+      end
+
       set :log_io do
         raise "Must set log_io"
       end
@@ -39,11 +43,32 @@ describe 'Overrides' do
       set :log_io, io
       group :util do
         service :logger do
-          logger_class.new original.log_io
+          logger_class.new log_io
         end
       end
     end
     instance.util.logger.info "test"
     io.string.must_equal "INFO test"
   end
+
+  it 'should allow calling original when mounted' do
+    other = @assembly
+    instance = Alki.singleton_assembly do
+      mount :assembly, other do
+        set :val do
+          original.val
+        end
+      end
+    end
+    instance.assembly.val.must_equal :value
+  end
+
+  it 'should allow calling original service' do
+    instance = @assembly.new do
+      set :val do
+        original.val
+      end
+    end
+    instance.val.must_equal :value
+  end
 end

data/test/feature/references_test.rb

@@ -0,0 +1,35 @@
+require 'alki/feature_test'
+
+describe 'References' do
+  describe 'circular references' do
+    before do
+      @assembly = Alki.singleton_assembly do
+        set :a do
+          b
+        end
+
+        set :b do
+          c
+        end
+
+        set :c do
+          a
+        end
+
+        set :d do
+          a
+        end
+      end
+    end
+
+    it 'should raise CircularReferenceError' do
+      err = assert_raises Alki::CircularReferenceError do
+        @assembly.d
+      end
+
+      err.to_s.split("\n")[1..-1].must_equal(
+        [ '  d', '> a', '  b', '  c', '> a' ]
+      )
+    end
+  end
+end

data/test/feature/try_mounts_test.rb

@@ -0,0 +1,23 @@
+require 'alki/feature_test'
+
+describe 'Try mounts' do
+  it 'should not mount if other assembly can be found' do
+    obj = Alki.singleton_assembly do
+      try_mount :other, 'missing_assembly'
+      set :val do
+        respond_to? :other
+      end
+    end
+    obj.val.must_equal false
+  end
+
+  it 'should mount if other assembly can be found' do
+    obj = Alki.singleton_assembly do
+      try_mount :other, 'example' # example fixture assembly
+      set :val do
+        respond_to? :other
+      end
+    end
+    obj.val.must_equal true
+  end
+end

data/test/feature/values_test.rb

@@ -0,0 +1,14 @@
+require 'alki/feature_test'
+
+describe 'Values' do
+  it 'should not be altered' do
+    obj = Class.new(MiniTest::Mock) do
+      def respond_to?(*_)
+        true
+      end
+    end.new
+    Alki.singleton_assembly do
+      set :obj, obj
+    end
+  end
+end

data/test/feature_test_helper.rb

@@ -27,6 +27,7 @@ class Minitest::Spec
     undefine :Example, false
     undefine :Tlogger, false
     undefine :AutoGroupTest, false
+    undefine :AlkiTest, false
   end
 
   def undefine(sym,force=true)

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

@@ -5,17 +5,26 @@ Alki do
   load :handlers
 
   factory :log_overlay do
-    require 'log_overlay'
+    require 'example/log_overlay'
     -> (obj) {
-      alki.delegate_overlay obj, LogOverlay.new(log), name: meta[:building]
+      # Don't overlay services in subgroups (names with multiple periods)
+      if meta[:building] =~ /\..*\./
+        obj
+      else
+        alki.delegate_overlay(
+          obj,
+          Example::LogOverlay.new(log),
+          name: meta[:building]
+        )
+      end
     }
   end
 
   overlay :handlers, :log_overlay
 
   service :handler do
-    require 'switch_handler'
-    SwitchHandler.new [
+    require 'example/switch_handler'
+    Example::SwitchHandler.new [
                         handlers.fizzbuzz,
                         handlers.fizz,
                         handlers.buzz,
@@ -28,13 +37,13 @@ Alki do
   end
 
   service :range_handler do
-    require 'range_handler'
-    RangeHandler.new lazy('handler')
+    require 'example/range_handler'
+    Example::RangeHandler.new lazy('handler')
   end
 
   service :output do
-    require 'array_output'
-    ArrayOutput.new
+    require 'example/array_output'
+    Example::ArrayOutput.new
   end
 
   service :log_io do

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

@@ -2,16 +2,21 @@ Alki do
   use 'example/dsls/num_handler'
 
   factory :num_handler do
-    require 'num_handler'
+    require 'example/num_handler'
     -> (num,str) {
-      NumHandler.new(num, str, output)
+      Example::NumHandler.new(num, str, output)
     }
   end
 
   num_handler :fizz, 3
 
+
+  group :handlers do
+    num_handler :buzz, 5
+  end
+
   service :buzz do
-    num_handler 5, settings.buzz
+    handlers.buzz
   end
 
   service :fizzbuzz do
@@ -19,7 +24,7 @@ Alki do
   end
 
   service :echo do
-    require 'echo_handler'
-    EchoHandler.new output
+    require 'example/echo_handler'
+    Example::EchoHandler.new output
   end
 end

data/test/fixtures/example/lib/dsls/num_handler.rb

@@ -1,8 +1,8 @@
 Alki do
   dsl_method :num_handler do |name, num|
     ctx[:module].service name do
-      require 'num_handler'
-      NumHandler.new(num,settings.send(name),output)
+      require 'example/num_handler'
+      Example::NumHandler.new(num,settings.send(name),output)
     end
   end
 end

data/test/fixtures/example/lib/example/array_output.rb

@@ -0,0 +1,13 @@
+module Example
+  class ArrayOutput
+    def initialize
+      @output = []
+    end
+    def <<(val)
+      @output << val
+    end
+    def to_a
+      @output.dup
+    end
+  end
+end

data/test/fixtures/example/lib/example/echo_handler.rb

@@ -0,0 +1,11 @@
+module Example
+  class EchoHandler
+    def initialize(output)
+      @output = output
+    end
+
+    def handle(val)
+      @output << val.to_s
+    end
+  end
+end

data/test/fixtures/example/lib/example/log_overlay.rb

@@ -0,0 +1,12 @@
+module Example
+  class LogOverlay
+    def initialize(log)
+      @log = log
+    end
+
+    def overlay_send(obj,info,method,*args,&blk)
+      @log << "Calling #{info[:name]}##{method} #{args.join(", ")}\n"
+      obj.public_send method, *args, &blk
+    end
+  end
+end

data/test/fixtures/example/lib/example/num_handler.rb

@@ -0,0 +1,13 @@
+module Example
+  class NumHandler
+    def initialize(num,message,output)
+      @num = num
+      @msg = message
+      @output = output
+    end
+
+    def handle(val)
+      @output << @msg if val % @num == 0
+    end
+  end
+end

data/test/fixtures/example/lib/example/range_handler.rb

@@ -0,0 +1,13 @@
+module Example
+  class RangeHandler
+    def initialize(subhandler)
+      @subhandler = subhandler
+    end
+
+    def handle(range)
+      range.each do |i|
+        @subhandler.handle i
+      end
+    end
+  end
+end

data/test/fixtures/example/lib/example/switch_handler.rb

@@ -0,0 +1,11 @@
+module Example
+  class SwitchHandler
+    def initialize(handlers)
+      @types = handlers
+    end
+
+    def handle(val)
+      @types.find {|h| h.handle val }
+    end
+  end
+end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: alki-dsl
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: alki-support
   requirement: !ruby/object:Gem::Requirement
@@ -110,30 +88,35 @@ files:
 - Rakefile
 - alki.gemspec
 - bin/alki
+- bin/bundler
+- bin/rake
 - config/assembly.rb
 - doc/assemblies.adoc
 - doc/assembly_dsl.adoc
+- doc/executables.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.rb
 - lib/alki/assembly/instance.rb
+- lib/alki/assembly/instance_builder.rb
 - lib/alki/assembly/meta/overlay.rb
 - lib/alki/assembly/meta/tags.rb
 - lib/alki/assembly/type.rb
+- lib/alki/assembly/types.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/original.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/circular_reference_error.rb
 - lib/alki/dsls/assembly.rb
 - lib/alki/dsls/assembly_group.rb
 - lib/alki/dsls/assembly_type.rb
@@ -143,13 +126,17 @@ files:
 - lib/alki/execution/context_class_builder.rb
 - lib/alki/execution/factory.rb
 - lib/alki/execution/helpers.rb
+- lib/alki/execution/overlay_map.rb
 - lib/alki/execution/reference.rb
+- lib/alki/execution/tag_map.rb
 - lib/alki/execution/value_helpers.rb
+- lib/alki/executor.rb
 - lib/alki/generator.rb
 - lib/alki/invalid_path_error.rb
 - lib/alki/overlay_delegator.rb
 - lib/alki/overlay_info.rb
 - lib/alki/override_builder.rb
+- lib/alki/overrides.rb
 - lib/alki/service_delegator.rb
 - lib/alki/version.rb
 - lib/alki_loader.rb
@@ -157,13 +144,17 @@ files:
 - test/feature/auto_group_test.rb
 - test/feature/example_test.rb
 - test/feature/factories_test.rb
+- test/feature/mounts_test.rb
 - test/feature/multithreading_test.rb
 - test/feature/overlays_test.rb
 - test/feature/overrides_test.rb
 - test/feature/pseudo_elements_test.rb
 - test/feature/reference_overlays_test.rb
+- test/feature/references_test.rb
 - test/feature/reload_test.rb
 - test/feature/tags_test.rb
+- test/feature/try_mounts_test.rb
+- test/feature/values_test.rb
 - test/feature_test_helper.rb
 - test/fixtures/auto_group/lib/alki_loader.rb
 - test/fixtures/auto_group/lib/auto_group_dsl.rb
@@ -173,14 +164,14 @@ files:
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
 - test/fixtures/example/lib/alki_loader.rb
-- test/fixtures/example/lib/array_output.rb
 - test/fixtures/example/lib/dsls/num_handler.rb
-- test/fixtures/example/lib/echo_handler.rb
 - test/fixtures/example/lib/example.rb
-- test/fixtures/example/lib/log_overlay.rb
-- test/fixtures/example/lib/num_handler.rb
-- test/fixtures/example/lib/range_handler.rb
-- test/fixtures/example/lib/switch_handler.rb
+- test/fixtures/example/lib/example/array_output.rb
+- test/fixtures/example/lib/example/echo_handler.rb
+- test/fixtures/example/lib/example/log_overlay.rb
+- test/fixtures/example/lib/example/num_handler.rb
+- test/fixtures/example/lib/example/range_handler.rb
+- test/fixtures/example/lib/example/switch_handler.rb
 - test/fixtures/tlogger/config/assembly.rb
 - test/fixtures/tlogger/lib/tlogger.rb
 - test/integration/dsls/assembly_test.rb
@@ -215,13 +206,17 @@ test_files:
 - test/feature/auto_group_test.rb
 - test/feature/example_test.rb
 - test/feature/factories_test.rb
+- test/feature/mounts_test.rb
 - test/feature/multithreading_test.rb
 - test/feature/overlays_test.rb
 - test/feature/overrides_test.rb
 - test/feature/pseudo_elements_test.rb
 - test/feature/reference_overlays_test.rb
+- test/feature/references_test.rb
 - test/feature/reload_test.rb
 - test/feature/tags_test.rb
+- test/feature/try_mounts_test.rb
+- test/feature/values_test.rb
 - test/feature_test_helper.rb
 - test/fixtures/auto_group/lib/alki_loader.rb
 - test/fixtures/auto_group/lib/auto_group_dsl.rb
@@ -231,14 +226,14 @@ test_files:
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
 - test/fixtures/example/lib/alki_loader.rb
-- test/fixtures/example/lib/array_output.rb
 - test/fixtures/example/lib/dsls/num_handler.rb
-- test/fixtures/example/lib/echo_handler.rb
 - test/fixtures/example/lib/example.rb
-- test/fixtures/example/lib/log_overlay.rb
-- test/fixtures/example/lib/num_handler.rb
-- test/fixtures/example/lib/range_handler.rb
-- test/fixtures/example/lib/switch_handler.rb
+- test/fixtures/example/lib/example/array_output.rb
+- test/fixtures/example/lib/example/echo_handler.rb
+- test/fixtures/example/lib/example/log_overlay.rb
+- test/fixtures/example/lib/example/num_handler.rb
+- test/fixtures/example/lib/example/range_handler.rb
+- test/fixtures/example/lib/example/switch_handler.rb
 - test/fixtures/tlogger/config/assembly.rb
 - test/fixtures/tlogger/lib/tlogger.rb
 - test/integration/dsls/assembly_test.rb