xlogin 0.6.10 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98abe7c6cd9c9255968876d7c706d04b18e3239f
-  data.tar.gz: 179efb7905cd32999e5bd1fa9d0015cfc53ec78d
+  metadata.gz: 25a8fe59917ea8d5ae3e02e0e3f836242a6d0072
+  data.tar.gz: 94288f372cf3a2be910954a2de793fb6061a4573
 SHA512:
-  metadata.gz: 977ec69e4664dcf8ae38e47e5d16ae88532e338f478779dd240c75d0f7d5e2d2f37b82dde0e1e6497ae9275c5bff036b5faccb7f80888d6fe9f98f16e9efb7c3
-  data.tar.gz: d777b4a0f01d13a6268f619d374c8aa3315c067b1227af247eeb473b143d633701739bcb6fc7b12a672f9d0ea71b90186206f820ab03519a4c29674557045ca5
+  metadata.gz: 63d861e3a0f2e54ade3198d95551e9b7304f421d9e0741206cda4bd0f9344c8bf6e16768145d01d9e8b9b7190de919198dc8ebb7a811796908cb5c4f528dbd49
+  data.tar.gz: 5b07d914d65cfbcfee4b19065458d8b6228e9ebe19e2d8f77a3d37554a516965704710884a7ee78cee82125dbe40bac6e984fa74d815812d4611ecc9d385d5ec

data/lib/xlogin/rake_task.rb

@@ -9,30 +9,16 @@ module Xlogin
       include Rake::DSL
 
       def bulk(names, &block)
-        current_namespace do |path|
-          description = Rake.application.last_description
-
-          names = names.map(&:strip).grep(/^\s*[^#]/).uniq
-          names.each do |name|
-            desc description || "Run '#{path}:#{name}'"
-            RakeTask.new(name, &block)
-          end
-        end
-      end
+        names = names.map(&:strip).grep(/^\s*[^#]/).uniq
+        description = Rake.application.last_description
 
-      def current_namespace
-        Rake.application.current_scope.path.tap do |path|
-          if path.empty?
-            path = self.name.split('::').first.downcase
-            namespace(path) { yield(path) } if block_given?
-          else
-            yield(path) if block_given?
-          end
+        names.each do |name|
+          desc description
+          RakeTask.new(name, &block)
         end
       end
     end
 
-
     attr_reader   :name
     attr_accessor :lock
     attr_accessor :log
@@ -53,19 +39,19 @@ module Xlogin
 
     private
     def define_task
-      RakeTask.current_namespace do |path|
-        desc Rake.application.last_description || "Run '#{path}:#{name}'"
-
-        if lock
-          task(name => lock)
-          file(lock) do
-            invoke
-            mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace)
-            touch(lock, verbose: Rake.application.options.trace)
-          end
-        else
-          task(name) { invoke }
+      description = Rake.application.last_description
+      description = "#{description} - #{name}" if description
+      desc description
+
+      if lock
+        task(name => lock)
+        file(lock) do
+          invoke
+          mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace)
+          touch(lock, verbose: Rake.application.options.trace)
         end
+      else
+        task(name) { invoke }
       end
     end
 

data/lib/xlogin/session.rb

@@ -25,7 +25,7 @@ module Xlogin
       @username, @password = uri.userinfo.to_s.split(':')
       raise ArgumentError.new("Invalid URI - '#{uri}'") unless @host && @port
 
-      @output_logs    = opts.log
+      @output_logs    = [opts.log]
       @output_loggers = build_loggers
 
       ssh_tunnel(opts.via) if opts.via

data/lib/xlogin/template.rb

@@ -9,6 +9,7 @@ module Xlogin
     DEFAULT_PROMPT   = /[$%#>] ?\z/n
     RESERVED_METHODS = %i( login logout enable delegate )
 
+    attr_reader :name
     attr_reader :methods
 
     def initialize(name)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.10"
+  VERSION = "0.6.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.18
 platform: ruby
 authors:
 - haccht