xlogin 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631f9e5c7fc58daf235b083b9061cc3f796f09e625d02d2bb025e674eeaf0eca
-  data.tar.gz: e0a5e98641e056661c1dcf4f4908732dc6098fce4bd52e41354d5a62bfbde806
+  metadata.gz: 7f2b4fad5df8aff6e1cf36374991f89dd823e47975a4fcb819b021af7552a426
+  data.tar.gz: 529c8aece9c76564da6d879dcf1f4c4049fe627b950ddac01c18389989e602e4
 SHA512:
-  metadata.gz: f11d11fe67c789fb66ff15aae97f812f1aed6e3957c28827ff97e211a0c4bb314b7f330ebf96ae0602f1b65f0e1436c318f5c3e91ba7632bbc148c71e3fc0c06
-  data.tar.gz: 63f64922ac9db0b7590eaa79fcf9325b23afa4b99520a305c39a515f604741cf9421283397aa855b4a89cd93a28b041ca8ea09a4f3f59683132d5e6bbeead437
+  metadata.gz: 9593c30807ba92ee2af2553abc097ac573e5cebb1c9da0ac4058f81d72b6a7637ddfe3dbadafff67f78c0e4efc06a6b84209d9f89fadd2e768e01d3fa9b63ad5
+  data.tar.gz: 7ed1285b83560b52fd00d19d1a7b0e95a35edf03524599bf4d6a2d32d6932d969bfdb14964ef57b3d097a1b6dbe8f9d6845a28e02cb8a69ab1dd660eced288a3

data/lib/xlogin/template.rb

@@ -8,13 +8,14 @@ module Xlogin
     DEFAULT_PROMPT   = /[$%#>] ?\z/n
     RESERVED_METHODS = %i( login logout enable disable delegate )
 
-    attr_reader :name
+    attr_reader :name, :scopes, :methods
 
     def initialize(name)
       @name    = name
+      @scopes  = Hash.new
       @timeout = DEFAULT_TIMEOUT
       @prompts = Array.new
-      @methods = Hash.new { |h, k| h[k] = {} }
+      @methods = Hash.new
       @interrupt = nil
     end
 
@@ -29,8 +30,12 @@ module Xlogin
       @prompts
     end
 
-    def bind(name = nil, scope: :default, &block)
-      @methods[scope][name] = block
+    def scope(name = nil, &block)
+      @scopes[name] = block
+    end
+
+    def bind(name = nil, &block)
+      @methods[name] = block
     end
 
     def interrupt!(&block)
@@ -40,15 +45,16 @@ module Xlogin
 
     def build(uri, **opts)
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
-      klass.class_exec(@methods) do |methods|
-        [:default, *opts[:scope]].uniq.each do |scope|
-          methods[scope].each do |name, block|
-            case name.to_s
-            when 'enable'
-              define_method(name) { |args = nil| instance_exec(args || opts[:enable], &block) }
-            else
-              define_method(name, &block)
-            end
+      klass.class_exec(self) do |template|
+        scopes = [*opts[:scope]].compact
+        scopes.each { |scope| template.instance_eval(&template.scopes[scope]) }
+
+        template.methods.each do |name, block|
+          case name.to_s
+          when 'enable'
+            define_method(name) { |args = nil| instance_exec(args || opts[:enable], &block) }
+          else
+            define_method(name, &block)
           end
         end
       end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.12.6"
+	VERSION = "0.12.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet