serverkit 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a4d86f76bbf1a6d2d6bec6525dc21c83c6589b4
-  data.tar.gz: 1d830d60b2cfda0a6fb116bc9655c27cf7918037
+  metadata.gz: 174dabbbd261022d8472541f073f877df3e18d14
+  data.tar.gz: 9a640c7f32fd916751f6d975852b6020f6c0a301
 SHA512:
-  metadata.gz: a7b0c470e401472711cfa0806c26d4d9b33fc1fd6c685b74e5adf6b3c4363f6cc7e17ebb8c9c95813cc1249da8b64bf57259de722f70793c0a0c216a41b4137a
-  data.tar.gz: a1aa16f2bacb3c84ca27a59541b06ce6e133a0bac4638ab88183437484edaafd4773156c303f1130da893b8f13337a9abee4cb50edd192a5868d5c4d40750f76
+  metadata.gz: 39d435b1b256e029edb9019cc1496a03ff8480fb5edd2f0165757eb88313e8eb99251f76535144eaf54347bced62c1ebd57d431bee95a8fa40c25154b5f94abe
+  data.tar.gz: d08d24dca2751a11a4a6bc3fec77f4086753a7108b7bea749ac34952388e25639300b8e3224e7c25e71868bc9e8a539f1ad5d6dee82c396228c1331b27d2d9bf

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.0
+- Deprecate homebrew & homebrew_cask resources
+- Add check_script and recheck_script to all resources
+- Disable original color from command result
+- Change symlink default_id so that only source is displayed
+
 ## 0.3.5
 - Add logger with `--log-level=` and `--no-color` options
 

data/lib/serverkit/logger.rb

@@ -23,7 +23,7 @@ module Serverkit
 
     class Formatter
       def call(severity, time, program_name, message)
-        message = message.to_s.gsub(/\n\z/, "") + "\n"
+        message = message.to_s.gsub(/\n\z/, "").gsub(/\e\[(\d+)(;\d+)*m/, "") + "\n"
         message = Rainbow(message).black.bright if severity == "DEBUG"
         message
       end

data/lib/serverkit/resource_builder.rb

@@ -2,8 +2,6 @@ require "active_support/core_ext/string/inflections"
 require "serverkit/resources/command"
 require "serverkit/resources/file"
 require "serverkit/resources/git"
-require "serverkit/resources/homebrew_cask"
-require "serverkit/resources/homebrew"
 require "serverkit/resources/missing"
 require "serverkit/resources/nothing"
 require "serverkit/resources/package"

data/lib/serverkit/resources/base.rb

@@ -25,8 +25,10 @@ module Serverkit
 
       attr_reader :attributes, :check_result, :recheck_result, :recipe
 
+      attribute :check_script, type: String
       attribute :id, type: String
       attribute :notify, type: Array
+      attribute :recheck_script, type: String
       attribute :type, type: String
 
       delegate(
@@ -76,14 +78,14 @@ module Serverkit
       def run_apply
         unless run_check
           apply
-          @recheck_result = !!recheck
+          @recheck_result = !!recheck_with_script
         end
       end
 
       # @note #check wrapper
       # @return [true, false]
       def run_check
-        @check_result = !!check
+        @check_result = !!check_with_script
       end
 
       def successful?
@@ -114,6 +116,15 @@ module Serverkit
         end
       end
 
+      # @note Prior check_script attribute to resource's #check implementation
+      def check_with_script
+        if check_script
+          check_command(check_script)
+        else
+          check
+        end
+      end
+
       # @note For override
       # @return [String]
       def default_id
@@ -126,6 +137,15 @@ module Serverkit
         check
       end
 
+      # @note Prior recheck_script attribute to resource's #recheck implementation
+      def recheck_with_script
+        if recheck_script
+          check_command(recheck_script)
+        else
+          recheck
+        end
+      end
+
       # @return [Array<Symbol>]
       def required_attribute_names
         _validators.select do |key, validators|

data/lib/serverkit/resources/command.rb

@@ -3,9 +3,7 @@ require "serverkit/resources/base"
 module Serverkit
   module Resources
     class Command < Base
-      attribute :check_script, type: String
       attribute :script, required: true, type: String
-      attribute :recheck_script, type: String
 
       # @note Override
       def apply
@@ -14,21 +12,14 @@ module Serverkit
 
       # @note Override
       def check
-        if check_script
-          check_command(check_script)
-        else
-          false
-        end
+        false
       end
 
       private
 
       # @note Override
       def recheck
-        case
-        when recheck_script
-          check_command(recheck_script)
-        when check_script
+        if check_script
           check_command(check_script)
         else
           true

data/lib/serverkit/resources/symlink.rb

@@ -16,6 +16,13 @@ module Serverkit
       def check
         check_command_from_identifier(:check_file_is_linked_to, source, destination)
       end
+
+      private
+
+      # @note Override
+      def default_id
+        source
+      end
     end
   end
 end

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -235,8 +235,6 @@ files:
 - lib/serverkit/resources/command.rb
 - lib/serverkit/resources/file.rb
 - lib/serverkit/resources/git.rb
-- lib/serverkit/resources/homebrew.rb
-- lib/serverkit/resources/homebrew_cask.rb
 - lib/serverkit/resources/missing.rb
 - lib/serverkit/resources/nothing.rb
 - lib/serverkit/resources/package.rb

data/lib/serverkit/resources/homebrew.rb

@@ -1,9 +0,0 @@
-require "serverkit/resources/package"
-
-module Serverkit
-  module Resources
-    # @note Homebrew is an alias class of Package.
-    class Homebrew < Package
-    end
-  end
-end

data/lib/serverkit/resources/homebrew_cask.rb

@@ -1,19 +0,0 @@
-require "serverkit/resources/base"
-
-module Serverkit
-  module Resources
-    class HomebrewCask < Base
-      attribute :name, required: true, type: String
-
-      # @note Override
-      def apply
-        run_command("brew cask install #{name}")
-      end
-
-      # @note Override
-      def check
-        check_command("/usr/local/bin/brew cask list -1 | grep -E '^#{name}$'")
-      end
-    end
-  end
-end