loom-core 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11bd9487c4e4752e294000493fe1fe04537f97bfcea9385b1cf16e90c2c79a71
-  data.tar.gz: 926227cb27d65b64103dd0f541acb1f523afdfac2df832180450f1aaaff4397f
+  metadata.gz: 76771b34a40961ff3eec048ed42682f49488cfd2f770d35ca2e19c255b534051
+  data.tar.gz: f9a8fec00bf59b419af9669b263ff09fa34224429640dd49d68aa110de49ea5c
 SHA512:
-  metadata.gz: 687255010d7a4c709cb95b2022151a95175ae88decb368cfac503dd3bfdb24c677abdbd2ef055f16a80a783bad2d24762ab856bf20c085ec08d1f51734c78c01
-  data.tar.gz: b789683f5aefd5a1997536e3f930f143bb7c12fc24be4e40d10fb0147e0c997c5af84798fad9e2da79d3cdbb7f5fe4a854d3f981f6deabe43ff08ab0092e3c68
+  metadata.gz: c1b14c69e8ce6a26d399f0f7bdc8fa71c2d41204b3199169d7c0ec00b37549c378bb50a7e30c4875661e43b0da7cead2aaa58936bf644d9bd9e716965bc39dd3
+  data.tar.gz: 152a387d0f25af816f35b6695c3a0827fe576acaf049be7c94931261d00f53b03402c2c79db0459854df0d25ba11aa4cb330649a786b67727bdf2d93b0250c2b

data/.rubocop.yml

@@ -0,0 +1,31 @@
+# https://rubocop.readthedocs.io/en/latest/cops_layout/
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+Layout/MultilineMethodCallBrace:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Lint/BooleanSymbol:
+  Enabled: false
+
+# https://rubocop.readthedocs.io/en/latest/cops_metrics/
+Metrics/LineLength:
+  Max: 100
+
+Naming/HeredocDelimiterNaming:
+  Enable: false
+
+# https://rubocop.readthedocs.io/en/latest/cops_style/
+Style/Alias:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Sylte/IfUnlessModifier:
+  Enabled: false

data/Gemfile.lock

@@ -1,33 +1,47 @@
 PATH
   remote: .
   specs:
-    loom-core (0.0.6)
+    loom-core (0.0.8)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       commander (~> 4.4)
       ed25519 (>= 1.0, < 2.0)
       net-ssh (>= 5)
-      rbnacl-libsodium (= 1.0.10)
-      sshkit (~> 1.11)
+      rbnacl-libsodium (= 1.0.16)
+      sshkit (~> 1.23)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bcrypt_pbkdf (1.0.0)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    commander (4.4.6)
-      highline (~> 1.7.2)
-    diff-lcs (1.2.5)
-    ed25519 (1.2.4)
-    ffi (1.9.14)
-    formatador (0.2.5)
-    guard (2.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    diff-lcs (1.5.1)
+    ed25519 (1.3.0)
+    ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
+    formatador (1.1.0)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -35,67 +49,105 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    highline (1.7.10)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
+    highline (2.0.3)
+    json (2.8.2)
+    language_server-protocol (3.17.0.3)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
     nenv (0.3.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
-    notiffany (0.1.1)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.3.0)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
+    ostruct (0.6.1)
+    parallel (1.26.3)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    racc (1.8.1)
+    rainbow (3.1.1)
     rake (11.3.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rbnacl (5.0.0)
-      ffi
-    rbnacl-libsodium (1.0.10)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rbnacl (7.1.2)
+      ffi (~> 1)
+    rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    regexp_parser (2.9.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.5.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.69.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.36.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    sshkit (1.17.0)
+    sshkit (1.23.2)
+      base64
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    thor (0.19.1)
+      ostruct
+    thor (1.3.2)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
   ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  bundler (~> 1.13)
+  bundler
   guard-rspec (~> 4.7)
   loom-core!
   pry (~> 0.10)
   pry-byebug
   rake (~> 11.3)
   rspec (~> 3.5)
+  rubocop
 
 BUNDLED WITH
-   1.16.2
+   2.5.23

data/Rakefile

@@ -1,3 +1,5 @@
+# TODO: I can replace this with Loom now.
+# TODO: Make a Loom mod that converts Rake Tasks into Loom Patterns.
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/bin/loom

@@ -158,6 +158,9 @@ EOS
           end
         end
       end
+      # TODO: p and patterns produce different output on failure, p is a
+      # truncated stack. Figure out why, and fix that. This is going to be
+      # somewhere in Commander.
       alias_command :"p", :"patterns"
 
       command :"config" do |c|

data/gentags.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+find lib -name \*.rb | etags -l ruby --output=loom.TAGS -

data/lib/loom/all.rb

@@ -9,12 +9,12 @@ require_relative "config"
 
 require_relative "shell"
 require_relative "host_spec"
-require_relative "dsl"
 
 require_relative "inventory"
 require_relative "facts"
 require_relative "pattern"
 require_relative "mods"
+require_relative "runner/all"
 require_relative "runner"
 
 require_relative "version"

data/lib/loom/config.rb

@@ -69,7 +69,7 @@ module Loom
         map = config ? config.config_map : CONFIG_VARS.dup
         config_struct = OpenStruct.new **map
         yield config_struct if block_given?
-        Config.new config_struct.to_h
+        Config.new **config_struct.to_h
       end
     end
 
@@ -77,7 +77,7 @@ module Loom
     class FileManager
 
       def initialize(config)
-        @loom_search_paths = config.loom_search_paths
+        @loom_search_paths = [config.loom_search_paths].flatten
         @loom_files = config.loom_files
         @loom_file_patterns = config.loom_file_patterns
       end

data/lib/loom/method_signature.rb

@@ -64,7 +64,7 @@ module Loom
         end
 
         def build
-          MatchSpec.new(@map || {})
+          MatchSpec.new(**(@map || {}))
         end
       end
 

data/lib/loom/mods/action_proxy.rb

@@ -40,7 +40,7 @@ module Loom::Mods
           # idiomatic.
           bound_action_name = tuple[1]
 
-          define_method public_action_name do |*args, &block|
+          define_method public_action_name do |*args, **kwargs, &block|
             # TODO[P0]: Effectively this is the API for all mods, but it's
             # burried here in the middle of nowhere. Add documentation - or make
             # it easier to read.
@@ -48,7 +48,7 @@ module Loom::Mods
               "proxy to mod action: #{public_action_name} => #{bound_action_name}, #{@mod}"
             end
 
-            @mod.send bound_action_name, *args, &block
+            @mod.send bound_action_name, *args, **kwargs, &block
           end
           Loom.log.debug2 self do
             "defined action proxy action: #{public_action_name} => #{bound_action_name}"

data/lib/loom/mods/mod_loader.rb

@@ -10,7 +10,12 @@ module Loom::Mods
       @loom_config = loom_config
     end
 
-    def verify_shell_cmds(shell, mod_klass)
+    def load_mod_klass(mod_klass, shell)
+      verify_shell_cmds mod_klass, shell
+    end
+
+    private
+    def verify_shell_cmds(mod_klass, shell)
       Loom.log.debug2(self) { "verifying cmds for mod => #{mod_klass}" }
       mod_klass.required_commands.each do |cmd|
         begin
@@ -49,14 +54,14 @@ module Loom::Mods
         raise ModDefinedError, name if instance_methods.include? name
         registered_mods[mod_klass.name] = [name]
 
-        define_method name do |shell, *args, &pattern_block|
+        define_method name do |shell, *args, **kwargs, &pattern_block|
           Loom.log.debug3(self) do
-            "handling mod call => #{mod_klass}##{name} #{args} #{pattern_block}"
+            "handling mod call => #{mod_klass}##{name} #{args} #{kwargs} #{pattern_block}"
           end
-          verify_shell_cmds shell, mod_klass
+          load_mod_klass mod_klass, shell
 
           mod = mod_klass.new shell, @loom_config
-          mod.execute *args, &pattern_block
+          mod.execute *args, **kwargs, &pattern_block
         end
       end
 

data/lib/loom/mods/module.rb

@@ -32,13 +32,13 @@ module Loom::Mods
       @action_block = pattern_block
     end
 
-    def execute(*args, &pattern_block)
+    def execute(*args, **kwargs, &pattern_block)
       if respond_to? :mod_block
         Loom.log.debug3(self) { "executing mod block => #{args} #{pattern_block}" }
-        mod_block *args, &pattern_block
+        mod_block *args, **kwargs, &pattern_block
       else
         Loom.log.debug3(self) { "initing action => #{args}" }
-        init_action *args, &pattern_block
+        init_action *args, **kwargs, &pattern_block
 
         # TODO: ooohhh... the action_proxy code path is fucking
         # crazy. ActionProxy needs some documentation.
@@ -99,11 +99,12 @@ module Loom::Mods
         # (e.g.) to each instance of Module. (actually I think it's because this
         # is executing from the subclass (via import_actions), so it's only that
         # class). in any case, add more docs and code pointers.
-        define_method bound_method_name do |*args, &block|
+        define_method bound_method_name do |*args, **kwargs, &block|
           Loom.log.debug1(self) { "exec mod action #{self.class}##{bound_method_name}" }
 
           bound_method = unbound_method.bind self
-          bound_method.call *args, &block
+
+          bound_method.call *args, **kwargs, &block
         end
         Loom.log.debug2(self) { "bound mod action => #{self.class.name}##{action_name}" }
 

data/lib/loom/pattern/all.rb

@@ -1,6 +1,7 @@
 require_relative "dsl"
 require_relative "hook"
 require_relative "definition_context"
+require_relative "pattern"
 require_relative "reference"
 require_relative "expanding_reference"
 require_relative "reference_set"

data/lib/loom/pattern/definition_context.rb

@@ -8,11 +8,11 @@ module Loom::Pattern
 
     NilLetValueError = Class.new Loom::LoomError
 
-    def initialize(pattern_module, parent_context=nil)
-      @fact_map = pattern_module.facts.dup
-      @let_map = pattern_module.let_map.dup
+    def initialize(dsl_builder, parent_context=nil)
+      @fact_map = dsl_builder.facts.dup
+      @let_map = dsl_builder.let_map.dup
 
-      @hooks = pattern_module.hooks.dup
+      @hooks = dsl_builder.hooks.dup
       @parent_context = parent_context
 
       @merged_fact_map = merged_fact_map
@@ -46,7 +46,9 @@ module Loom::Pattern
 
         if value.nil? || value.equal?(Loom::Facts::EMPTY)
           Loom.log.error "value of let expression[:#{let_key}] is nil"
-          raise NilLetValueError, let_key
+          # TODO: I'm not sure what to do here, but raising an error isn't
+          # very user friendly.... as I just learned.
+#          raise NilLetValueError, "empty value for let[#{let_key}]"
         end
         scope_object.define_singleton_method(let_key) { value }
       end