hetzner-bootstrap 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c046fd83b8ed81c4c74dfe015a5940f058fa12da1201f81e44255edc9e3e1393
-  data.tar.gz: 55e2a6efaac4d0740f19155460c3f61b4954f6b93f5001b617235583e4305abd
+  metadata.gz: d36bf429c8c67652f1e5887e8f99db50574d4cc8398ea718f634dc14acac31fb
+  data.tar.gz: df374d346e10b4af10624878a6dc0821dc30ecd106c84920fb44c449e1a3508c
 SHA512:
-  metadata.gz: d5e34d87321153b348a88e7a1f9eab7144a6cf65338aed28198ba8ced434b6ddc8c9ea16ef7968c24bd9ebfff71f8f6bf1dcb267f0c11d3e9d3a4e3a1793832a
-  data.tar.gz: 445f109cd2029f0b530ae757a5603c6539e42d001d827f34bec57f1bb0ea196d761ba0c91e202bf9e11242f51eec48f6301e4477875dfbe3e2af4db0d28a8753
+  metadata.gz: f1e5c12ee923b2798351be615267e4b76ba101fe21abf5f5ef3ef092b4a89e727ec864d051532d13b21de483c5b7c4e7f26771d9adbb0842b2e27cc5367b3bcb
+  data.tar.gz: 20724e0ec289640e9f40416de839f40cd8fba8a9d5eed81d42e3371afd4d856fc4fb4eb63630c5f25128c34d6c491c7dd4d2ced896acde379dc935300a72e8d9

data/.rubocop.yml

@@ -1,7 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
+  NewCops: enable
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:
@@ -13,9 +14,6 @@ Naming/FileName:
 Style/Documentation:
   Enabled: false
 
-Layout/IndentHeredoc:
-  EnforcedStyle: squiggly
-
 Metrics/ClassLength:
   Enabled: false
 

data/.ruby-version

@@ -0,0 +1 @@
+3.0.0

data/hetzner-bootstrap.gemspec

@@ -13,16 +13,17 @@ Gem::Specification.new do |s|
   s.summary     = 'Easy bootstrapping of hetzner.de rootservers using hetzner-api'
   s.description = 'Easy bootstrapping of hetzner.de rootservers using hetzner-api'
 
-  s.add_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
-  s.add_dependency 'ed25519',      '>= 1.2', '< 2.0'
-  s.add_dependency 'hetzner-api',  '>= 1.1.0'
-  s.add_dependency 'net-ssh',      '>= 5.1.0'
-
+  s.required_ruby_version = '~> 3.0'
   s.add_dependency 'erubis', '>= 2.7.0'
+  s.add_dependency 'hetzner-api', '>= 1.1.0'
+  s.add_dependency 'net-ssh', '~> 6.1'
+  s.add_dependency 'rexml'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.4.0'
-  s.add_development_dependency 'rubocop', '~> 0.63.1'
+  s.add_development_dependency 'rubocop', '~> 1.10'
+  s.add_development_dependency 'rubocop-rake'
+  s.add_development_dependency 'rubocop-rspec'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/hetzner-bootstrap.rb

@@ -10,10 +10,7 @@ require 'hetzner/bootstrap/template'
 
 module Hetzner
   class Bootstrap
-    attr_accessor :targets
-    attr_accessor :api
-    attr_accessor :actions
-    attr_accessor :logger
+    attr_accessor :targets, :api, :actions, :logger
 
     def initialize(options = {})
       @targets     = []
@@ -31,7 +28,7 @@ module Hetzner
                         post_install
                         post_install_remote]
       @api         = options[:api]
-      @logger      = options[:logger] || Logger.new(STDOUT)
+      @logger      = options[:logger] || Logger.new($stdout)
     end
 
     def add_target(param)

data/lib/hetzner/bootstrap/target.rb

@@ -8,19 +8,8 @@ require 'timeout'
 module Hetzner
   class Bootstrap
     class Target
-      attr_accessor :ip
-      attr_accessor :login
-      attr_accessor :password
-      attr_accessor :template
-      attr_accessor :rescue_os
-      attr_accessor :rescue_os_bit
-      attr_accessor :actions
-      attr_accessor :hostname
-      attr_writer   :post_install
-      attr_writer   :post_install_remote
-      attr_accessor :public_keys
-      attr_accessor :bootstrap_cmd
-      attr_accessor :logger
+      attr_accessor :ip, :login, :password, :template, :rescue_os, :rescue_os_bit, :actions, :hostname, :public_keys, :bootstrap_cmd, :logger
+      attr_writer :post_install, :post_install_remote
 
       def initialize(options = {})
         @rescue_os           = 'linux'
@@ -215,13 +204,11 @@ module Hetzner
         @logger.formatter = default_log_formatter
       end
 
-      def remote(options = {})
+      def remote(options = {}, &block)
         default = { verify_host_key: :never, password: @password }
         default.merge! options
 
-        Net::SSH.start(@ip, @login, default) do |ssh|
-          yield ssh
-        end
+        Net::SSH.start(@ip, @login, default, &block)
       end
 
       def local
@@ -246,8 +233,11 @@ module Hetzner
       end
 
       class NoTemplateProvidedError < ArgumentError; end
+
       class CantActivateRescueSystemError < StandardError; end
+
       class CantResetSystemError < StandardError; end
+
       class InstallationError < StandardError; end
     end
   end

data/lib/hetzner/bootstrap/template.rb

@@ -14,9 +14,10 @@ module Hetzner
         #
         # also run:   $ installimage -h
         #
-        if param.is_a? Hetzner::Bootstrap::Template
+        case param
+        when Hetzner::Bootstrap::Template
           param
-        elsif param.is_a? String
+        when String
           @raw_template = param
         end
       end

data/lib/hetzner/bootstrap/version.rb

@@ -2,6 +2,6 @@
 
 module Hetzner
   class Bootstrap
-    VERSION = '1.4.1'
+    VERSION = '2.0.0'
   end
 end

data/spec/hetzner_bootstrap_spec.rb

@@ -36,7 +36,7 @@ describe 'Bootstrap' do
   end
 
   def improper_target_without_template
-    proper_target.reject { |k, _v| k == :template }
+    proper_target.except(:template)
   end
 
   def default_template

metadata

@@ -1,55 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Roland Moriz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: ed25519
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: hetzner-api
   requirement: !ruby/object:Gem::Requirement
@@ -68,30 +42,30 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy bootstrapping of hetzner.de rootservers using hetzner-api
 email:
 - roland@moriz.de
@@ -144,6 +146,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -159,24 +162,23 @@ files:
 homepage: https://github.com/rmoriz/hetzner-bootstrap
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Easy bootstrapping of hetzner.de rootservers using hetzner-api
 test_files: