serverkit 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a19549e48aec67507673ddb4fd2306f262eaa4b94d66105ac207e607f60986a3
-  data.tar.gz: 16e6d1314f01e30e3f326a5f14eb29ce3de86dcb1e89e08f3b676e9dc33e1169
+  metadata.gz: 0ce764896945d0b12f9f53a0fd4c63372468bf07525fe8759fb98af0e7f8e4cf
+  data.tar.gz: 7238d155e7572c6cc15ce468a04297edfe908abd2c1d9bc008ce0f1f52351238
 SHA512:
-  metadata.gz: d754418fabd3cc6fd58f7d243f6756925cc7ed123c70b5bb81407698cbf949e7c25b112614fbf339da0b2b78f4d68a7748ba4f63223cf85595c2e9e4b8b072e0
-  data.tar.gz: 88513efe848853cdbd8c45105d6afd9c0418dc155be038dc2c567427a86afa4fdbceb71420127ffe6ec79bab719164b5f551a91d3957f65f450124df86d5392d
+  metadata.gz: 30bc8a1686266af21c76d45509b3977dcba32bb80e9eb120faf61eb2f1145e8e48c52589e4e74870387cc33f84a50ade184afb76ea104be801f76f3a61aaba75
+  data.tar.gz: f84ae0f215bc5ee7091745792a60cd61a0ec3e93acfbc3952db7601132537502a99aff17e25df98add6eed210bcc478bccd7408876dd4a2fab98da62c3fcbff2

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
 Lint/AssignmentInCondition:
   Enabled: false
 
@@ -19,6 +22,9 @@ Lint/UnusedMethodArgument:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -34,7 +40,13 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/PredicateName:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
   Enabled: false
 
 Style/AndOr:
@@ -46,6 +58,12 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
+Style/EmptyMethod:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+  
 Style/FormatString:
   Enabled: false
 
@@ -64,11 +82,8 @@ Style/MultilineBlockChain:
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-Style/PredicateName:
-  Enabled: false
-
 Style/RegexpLiteral:
-  MaxSlashes: 0
+  AllowInnerSlashes: false
 
 Style/SignalException:
   Enabled: false
@@ -76,7 +91,16 @@ Style/SignalException:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/TrailingComma:
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   Enabled: false
 
 Style/TrivialAccessors:

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.3.0
+  - 2.7.7
+  - 3.0.5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.8.0
+- Add Ruby 3.0 support.
+
 ## 0.7.0
 - Drop Ruby 2.2 support.
 

data/README.md

@@ -47,6 +47,7 @@ $ serverkit apply recipe.yml
  - [serverkit-karabiner](https://github.com/serverkit/serverkit-karabiner)
  - [serverkit-rbenv](https://github.com/serverkit/serverkit-rbenv)
  - [serverkit-login_items](https://github.com/take/serverkit-login_items)
+ - [serverkit-vscode](https://github.com/toshimaru/serverkit-vscode)
 - [Vagrant integration](/doc/vagrant_integration.md)
 
 ## Similar tools

data/bin/serverkit

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 require "serverkit"
 
 Serverkit::Command.new(ARGV).call

data/lib/serverkit/actions/apply.rb

@@ -1,5 +1,4 @@
 require "serverkit/actions/base"
-require "thread"
 
 module Serverkit
   module Actions

data/lib/serverkit/actions/check.rb

@@ -1,5 +1,4 @@
 require "serverkit/actions/base"
-require "thread"
 
 module Serverkit
   module Actions

data/lib/serverkit/backends/local_backend.rb

@@ -4,7 +4,7 @@ require "specinfra"
 module Serverkit
   module Backends
     class LocalBackend < BaseBackend
-      HOST = "localhost"
+      HOST = "localhost".freeze
 
       # @note Override
       def host

data/lib/serverkit/backends/ssh_backend.rb

@@ -6,7 +6,7 @@ require "specinfra"
 module Serverkit
   module Backends
     class SshBackend < BaseBackend
-      DEFAULT_SSH_OPTIONS = {}
+      DEFAULT_SSH_OPTIONS = {}.freeze
 
       attr_reader :host
 

data/lib/serverkit/command.rb

@@ -28,7 +28,7 @@ module Serverkit
       "FATAL" => Logger::FATAL,
       "INFO" => Logger::INFO,
       "WARN" => Logger::WARN,
-    }
+    }.freeze
 
     # @param [Array<String>] argv
     def initialize(argv)
@@ -51,15 +51,15 @@ module Serverkit
       else
         raise Errors::UnknownActionNameError, action_name
       end
-    rescue Errors::Base, Psych::SyntaxError, Slop::MissingArgumentError, Slop::MissingOptionError => exception
-      abort "Error: #{exception}"
+    rescue Errors::Base, Psych::SyntaxError, Slop::MissingArgumentError, Slop::MissingOptionError => e
+      abort "Error: #{e}"
     end
 
     private
 
     # @note #inspect is reserved ;(
     def _inspect
-      Actions::Inspect.new(action_options).call
+      Actions::Inspect.new(**action_options).call
     end
 
     # @return [String, nil]
@@ -81,11 +81,11 @@ module Serverkit
     end
 
     def apply
-      Actions::Apply.new(action_options).call
+      Actions::Apply.new(**action_options).call
     end
 
     def check
-      Actions::Check.new(action_options).call
+      Actions::Check.new(**action_options).call
     end
 
     # @note This options are commonly used from all actions for now, however,
@@ -123,7 +123,7 @@ module Serverkit
     end
 
     def validate
-      Actions::Validate.new(action_options).call
+      Actions::Validate.new(**action_options).call
     end
 
     def variables_path

data/lib/serverkit/loaders/base_loader.rb

@@ -8,7 +8,7 @@ require "yaml"
 module Serverkit
   module Loaders
     class BaseLoader
-      YAML_EXTNAMES = [".yaml", ".yml"]
+      YAML_EXTNAMES = [".yaml", ".yml"].freeze
 
       # @param [String] path
       def initialize(path)
@@ -16,12 +16,11 @@ module Serverkit
       end
 
       def load
-        case
-        when !pathname.exist?
+        if !pathname.exist?
           raise Errors::NonExistentPathError, pathname
-        when has_directory_path?
+        elsif has_directory_path?
           load_from_directory
-        when has_erb_path?
+        elsif has_erb_path?
           load_from_erb
         else
           load_from_data
@@ -68,7 +67,6 @@ module Serverkit
         @expanded_erb_tempfile ||= Tempfile.new(["", expanded_erb_path_suffix]).tap do |tempfile|
           tempfile << expand_erb
           tempfile.close
-          tempfile
         end
       end
 
@@ -90,10 +88,9 @@ module Serverkit
 
       # @return [Hash]
       def load_data
-        case
-        when has_executable_path?
+        if has_executable_path?
           load_data_from_executable
-        when has_yaml_path?
+        elsif has_yaml_path?
           load_data_from_yaml
         else
           load_data_from_json

data/lib/serverkit/loaders/recipe_loader.rb

@@ -5,7 +5,7 @@ require "serverkit/recipe"
 module Serverkit
   module Loaders
     class RecipeLoader < BaseLoader
-      DEFAULT_VARIABLES_DATA = {}
+      DEFAULT_VARIABLES_DATA = {}.freeze
 
       # @param [String] path
       # @param [String, nil] variables_path

data/lib/serverkit/recipe.rb

@@ -17,10 +17,9 @@ module Serverkit
     # @return [Array<Serverkit::Errors::Base>]
     def errors
       @errors ||= begin
-        case
-        when !has_valid_typed_recipe_data?
+        if !has_valid_typed_recipe_data?
           errors_for_invalid_typed_recipe_data
-        when !has_valid_typed_resources_property?
+        elsif !has_valid_typed_resources_property?
           errors_for_invalid_typed_resources_property
         else
           errors_in_resources

data/lib/serverkit/resource_builder.rb

@@ -46,10 +46,9 @@ module Serverkit
 
     # @return [Class]
     def resource_class
-      case
-      when type.nil?
+      if type.nil?
         Resources::Missing
-      when has_known_type?
+      elsif has_known_type?
         Resources.const_get(resource_class_name, false)
       else
         Resources::Unknown

data/lib/serverkit/resources/base.rb

@@ -226,10 +226,9 @@ module Serverkit
       # @param [String] command one-line shell script to be executed on remote machine
       # @return [Specinfra::CommandResult]
       def run_command(command)
-        case
-        when cwd
+        if cwd
           command = "cd #{Shellwords.escape(cwd)} && #{command}"
-        when user
+        elsif user
           command = "cd && #{command}"
         end
         unless user.nil?

data/lib/serverkit/resources/git.rb

@@ -3,7 +3,7 @@ require "serverkit/resources/base"
 module Serverkit
   module Resources
     class Git < Base
-      DEFAULT_STATE = "cloned"
+      DEFAULT_STATE = "cloned".freeze
 
       attribute :path, required: true, type: String
       attribute :repository, required: true, type: String

data/lib/serverkit/resources/line.rb

@@ -8,7 +8,7 @@ module Serverkit
     #     path: /etc/sudoers
     #     line: "#includedir /etc/sudoers.d"
     class Line < Base
-      DEFAULT_STATE = "present"
+      DEFAULT_STATE = "present".freeze
 
       attribute :path, required: true, type: String
       attribute :insert_after, type: String
@@ -42,12 +42,11 @@ module Serverkit
 
       # @return [String]
       def applied_remote_file_content
-        case
-        when absent?
+        if absent?
           content.delete(line)
-        when insert_after
+        elsif insert_after
           content.insert_after(Regexp.new(insert_after), line)
-        when insert_before
+        elsif insert_before
           content.insert_before(Regexp.new(insert_before), line)
         else
           content.append(line)
@@ -69,10 +68,9 @@ module Serverkit
       end
 
       def has_correct_line?
-        case
-        when present? && !has_matched_line?
+        if present? && !has_matched_line?
           false
-        when !present? && has_matched_line?
+        elsif !present? && has_matched_line?
           false
         else
           true

data/lib/serverkit/resources/template.rb

@@ -5,7 +5,7 @@ require "serverkit/resources/remote_file"
 module Serverkit
   module Resources
     class Template < RemoteFile
-      DEFAULT_VARIABLES_DATA = {}
+      DEFAULT_VARIABLES_DATA = {}.freeze
 
       private
 
@@ -23,7 +23,7 @@ module Serverkit
 
       # @return [String] ERB content
       def template_content
-        @template ||= ::File.read(source)
+        @template_content ||= ::File.read(source)
       end
 
       # @note Override

data/lib/serverkit/resources/user.rb

@@ -27,18 +27,17 @@ module Serverkit
 
       # @note Override
       def check
-        case
-        when !has_correct_user?
+        if !has_correct_user?
           false
-        when !has_correct_gid?
+        elsif !has_correct_gid?
           false
-        when !has_correct_home_directory?
+        elsif !has_correct_home_directory?
           false
-        when !has_correct_password?
+        elsif !has_correct_password?
           false
-        when !has_correct_login_shell?
+        elsif !has_correct_login_shell?
           false
-        when !has_correct_uid?
+        elsif !has_correct_uid?
           false
         else
           true

data/lib/serverkit/variables.rb

@@ -22,7 +22,7 @@ module Serverkit
     end
 
     class BindableMash < Hashie::Mash
-      DEFAULT_PROC = -> (hash, key) do
+      DEFAULT_PROC = ->(hash, key) do
         raise KeyError, "key not found: #{key.inspect} (perhaps variables are wrong?)"
       end
 

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.7.0"
+  VERSION = "0.8.0".freeze
 end

data/serverkit.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "serverkit/version"
 
@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "slop", "~> 3.4"
   spec.add_runtime_dependency "specinfra", ">= 2.31.0"
   spec.add_runtime_dependency "unix-crypt"
-  spec.add_development_dependency "pry", "0.10.1"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "3.2.0"
-  spec.add_development_dependency "rubocop", "0.29.1"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop", "~> 0.75.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -140,59 +140,59 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
-description: 
+        version: 0.75.0
+description:
 email:
 - r7kamura@gmail.com
 executables:
@@ -296,7 +296,7 @@ homepage: https://github.com/serverkit/serverkit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,9 +311,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Assemble servers from your recipe.
 test_files: []