specinfra 2.87.1 → 2.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50ea94541eea4de681f5c0490c0042efaa9d32733e77170a36c395fa9997c36
-  data.tar.gz: aad5becf5ccb1ba86243f9b53cf402c4409d37e04db03a879ce0f2e7bde4bc9d
+  metadata.gz: 5653294259d7e35a26af3b0841cb507c5a7bd69668d022af79f4f32ae7299810
+  data.tar.gz: c0c2cef79bb876c01ce2dc8fbb21ab138a6a0e367186c34ba94e7f35772ec12d
 SHA512:
-  metadata.gz: 26096c32f4c426f8bcb5d961b3fa988cc2c85bef201a3663424c2482ec5a6d44a2e1e7583a196bfe7227ced8bb75623dff1c105bd9d1eba64d31baeaa8d7b8eb
-  data.tar.gz: b0f53c294311bc1f3fbe40da1c8d081d89857d2baa3ada13f85de1933148caf3e2dfc060087fd7deb60942a0aaf3c9f0a1151be809d1ef4a3b5bba53ed0846ef
+  metadata.gz: 18f97e98b911c4354b87de096cc6af94d8d4c7e793d8fab46ed72cea47b95ee4803cce160e2dcd54d7c61e3b076877018d904641050d99fa28b3a354afff4a58
+  data.tar.gz: 14eebac1837c79a17e352eada2496dbea730463de4a94782fe366e6f72f172e37715ec7c6068bc1c63259882f0865124f8fafc12d61171e6dc586b2d8c462acf

data/README.md

@@ -20,6 +20,11 @@ Or install it yourself as:
   gem install specinfra
   ```
 
+For Ruby versions older than 2.3.0, pin net-telnet to version 0.1.1 in your `Gemfile` or `*.gemspec`.
+See also [pin net-telnet dependency to keep ruby support for < 2.3 #665][issue665].
+
+[issue665]: https://github.com/mizzy/specinfra/pull/665
+
 ## Running tests
 
   ```

data/lib/specinfra/backend/lxd.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'fileutils'
+require 'shellwords'
+require 'sfl' if Specinfra.ruby_is_older_than?(1, 9, 0)
+
+module Specinfra
+  module Backend
+    # LXD transport
+    class Lxd < Exec
+      def initialize(config = {})
+        super
+
+        raise 'Please specify lxd_instance' unless (@instance = get_config(:lxd_instance))
+        raise 'Please specify lxd_remote' unless (@remote = get_config(:lxd_remote))
+
+        @remote_instance = [@remote, @instance].compact.join(':')
+      end
+
+      class << self
+        protected
+
+        def run_command(cmd, opts = {})
+          cmd = build_command(cmd)
+          run_pre_command(opts)
+          stdout, stderr, exit_status = with_env do
+            spawn_command(cmd)
+          end
+
+          if @example
+            @example.metadata[:command] = cmd
+            @example.metadata[:stdout]  = stdout
+          end
+
+          CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => exit_status
+        end
+
+        def build_command(cmd)
+          cmd = super(cmd)
+          "lxc exec #{@remote_instance} -- #{cmd}"
+        end
+
+        def send_file(source, destination)
+          flags = %w[--create-dirs]
+          if File.directory?(source)
+            flags << '--recursive'
+            destination = Pathname.new(destination).dirname.to_s
+          end
+          cmd = %W[lxc file push #{source} #{@remote_instance}#{destination}] + flags
+          spawn_command(cmd.join(' '))
+        end
+
+        private
+
+        def run_pre_command(_opts)
+          return unless get_config(:pre_command)
+
+          cmd = build_command(get_config(:pre_command))
+          spawn_command(cmd)
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/backend.rb

@@ -6,6 +6,7 @@ require 'specinfra/backend/powershell/command'
 require 'specinfra/backend/cmd'
 require 'specinfra/backend/docker'
 require 'specinfra/backend/lxc'
+require 'specinfra/backend/lxd'
 require 'specinfra/backend/winrm'
 require 'specinfra/backend/shell_script'
 require 'specinfra/backend/dockerfile'

data/lib/specinfra/configuration.rb

@@ -20,6 +20,8 @@ module Specinfra
         :docker_image,
         :docker_url,
         :lxc,
+        :lxd_remote,
+        :lxd_instance,
         :request_pty,
         :ssh_options,
         :ssh_without_env,

data/lib/specinfra/version.rb

@@ -1,5 +1,5 @@
 module Specinfra
-  VERSION = "2.87.1"
+  VERSION = "2.88.0"
 
   def self.ruby_is_older_than?(*version)
     (RUBY_VERSION.split('.').map(&:to_i) <=> version) < 0

data/spec/backend/exec/build_command_spec.rb

@@ -18,7 +18,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should escape quotes' do
-        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.7')
           expect(Specinfra.backend.build_command(%Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +[\\"']?http://ppa.launchpad.net/gluster/glusterfs-3.7"})).to eq('/bin/sh -c find\ /etc/apt/\ -name\ \*.list\ \|\ xargs\ grep\ -o\ -E\ \"\^deb\ \+\[\\\\\"\\\'\]\?http://ppa.launchpad.net/gluster/glusterfs-3.7\"')
         else
           # Since Ruby 2.7, `+` is not escaped.

data/specinfra.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "net-scp"
   spec.add_runtime_dependency "net-ssh", ">= 2.7"
-  spec.add_runtime_dependency "net-telnet", *(Specinfra.ruby_is_older_than?(2, 3, 0) ? ["0.1.1"] : [])
-  spec.add_runtime_dependency "sfl" if Specinfra.ruby_is_older_than?(1, 9, 0)
+  spec.add_runtime_dependency "net-telnet" # intentionally version-unspecified for Ruby older than 2.3.0
+  spec.add_runtime_dependency "sfl" # required for Ruby older than 1.9.0
 
-  spec.add_development_dependency "rake", "~> 10.1.1"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.87.1
+  version: 2.88.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -52,20 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sfl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,7 @@ files:
 - lib/specinfra/backend/exec.rb
 - lib/specinfra/backend/jexec.rb
 - lib/specinfra/backend/lxc.rb
+- lib/specinfra/backend/lxd.rb
 - lib/specinfra/backend/powershell/command.rb
 - lib/specinfra/backend/powershell/script_helper.rb
 - lib/specinfra/backend/powershell/support/check_file_access_rules.ps1