serverkit 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00c2ac80338e61da1d1b07403cd86449a4a1ac9
-  data.tar.gz: c835c29a91aa4dd642b24b7f9057cd808a208327
+  metadata.gz: f40c38c419fd96b3e97a018266dccf0e33b61840
+  data.tar.gz: 88d12492f9067a4b315659ede04688121467a050
 SHA512:
-  metadata.gz: 7d8390a050502e6348bb951c88a26e47254c3d013a67de78bca8169e23b7b2260a77c1e4f000aed05522f8d306c6a4fccb7202c6fd47abf608a965e485277cb2
-  data.tar.gz: c80d55fc927edf108dfdaae10d2d10bd1b57976ba3aaffe542425da940a155385816ce060e667f81159d5daa07165a79ddff64818b512ae25393eb6404181adf
+  metadata.gz: f05703924e9cb0f31d9930b90562805c8eabff0f8bf84485aaf910d602985bac4bf3bd46173f4d2e585fa8998c8e1285659da7dcc17ac078b4a831277bd08ab1
+  data.tar.gz: 9094021c5a28689cc70cafcbaac895486a2fd44a4fbc447a6d61d29a55b66dfe5c6ec9506f8cc14161adf16046de0329cacc3bfb4e8ca4a5b85839aaf38497da

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.4
+- Add -f option on symlink resource
+- Change attributes naming rule: status -> state
+
 ## 0.3.3
 - Return exit code 1 if any resource failed
 

data/README.md

@@ -24,6 +24,7 @@ Write a recipe, then run `serverkit` executable to validate, inspect, check, and
 ### serverkit validate
 Validates recipe schema, resources, and attributes.
 For instance, it shows validation error if `source` attributes is missing in `file` resource.
+If any validation error is detected, it returns exit status 1.
 
 ```
 $ serverkit validate recipe.yml
@@ -70,6 +71,7 @@ $ serverkit inspect recipe.yml
 
 ### serverkit check
 Shows the difference between your recipe and the state of the target host.
+If any difference is detected, it returns exit status 1.
 
 ```
 $ serverkit check recipe.yml
@@ -83,6 +85,7 @@ $ serverkit check recipe.yml
 
 ### serverkit apply
 Executes migration process to fill-in the gaps.
+If any failure is detected, it returns exit status 1.
 
 ```
 $ serverkit apply recipe.yml

data/lib/serverkit/resources/base.rb

@@ -135,7 +135,7 @@ module Serverkit
       # @note For override
       # @return [String]
       def default_id
-        type
+        required_values.join(" ")
       end
 
       # @note For override
@@ -158,6 +158,20 @@ module Serverkit
       def run_command_from_identifier(*args)
         run_command(backend.command.get(*args))
       end
+
+      # @return [Array<Symbol>]
+      def required_attribute_names
+        _validators.select do |key, validators|
+          validators.grep(::RequiredValidator).any?
+        end.keys
+      end
+
+      # @return [Array]
+      def required_values
+        required_attribute_names.map do |required_attribute_name|
+          send(required_attribute_name)
+        end
+      end
     end
   end
 end

data/lib/serverkit/resources/command.rb

@@ -23,10 +23,6 @@ module Serverkit
 
       private
 
-      def default_id
-        script
-      end
-
       # @note Override
       def recheck
         case

data/lib/serverkit/resources/file.rb

@@ -31,11 +31,6 @@ module Serverkit
         run_command_from_identifier(:change_file_owner, destination, owner)
       end
 
-      # @note Override
-      def default_id
-        destination
-      end
-
       def file_sendable?
         !has_file? || !has_same_content?
       end

data/lib/serverkit/resources/git.rb

@@ -3,11 +3,11 @@ require "serverkit/resources/base"
 module Serverkit
   module Resources
     class Git < Base
-      DEFAULT_STATUS = "cloned"
+      DEFAULT_STATE = "cloned"
 
       attribute :path, required: true, type: String
       attribute :repository, required: true, type: String
-      attribute :status, default: DEFAULT_STATUS, type: String
+      attribute :state, default: DEFAULT_STATE, type: String
 
       # @note Override
       def apply
@@ -35,11 +35,6 @@ module Serverkit
         check_command_from_identifier(:check_file_is_directory, git_path)
       end
 
-      # @note Override
-      def default_id
-        repository
-      end
-
       # @return [String] Path to .git directory in the cloned repository
       def git_path
         ::File.join(path, ".git")
@@ -60,7 +55,7 @@ module Serverkit
       end
 
       def updatable?
-        status == "updated" && !updated?
+        state == "updated" && !updated?
       end
 
       def update

data/lib/serverkit/resources/homebrew_cask.rb

@@ -14,13 +14,6 @@ module Serverkit
       def check
         check_command("/usr/local/bin/brew cask list -1 | grep -E '^#{name}$'")
       end
-
-      private
-
-      # @note Override
-      def default_id
-        name
-      end
     end
   end
 end

data/lib/serverkit/resources/package.rb

@@ -16,13 +16,6 @@ module Serverkit
       def check
         check_command_from_identifier(:check_package_is_installed, name, version)
       end
-
-      private
-
-      # @note Override
-      def default_id
-        name
-      end
     end
   end
 end

data/lib/serverkit/resources/service.rb

@@ -14,13 +14,6 @@ module Serverkit
       def check
         check_command_from_identifier(:check_service_is_running, name)
       end
-
-      private
-
-      # @note Override
-      def default_id
-        name
-      end
     end
   end
 end

data/lib/serverkit/resources/symlink.rb

@@ -6,22 +6,16 @@ module Serverkit
       attribute :destination, required: true, type: String
       attribute :source, required: true, type: String
 
+      # @note Specinfra's #link_to command does not support -f option for now
       # @note Override
       def apply
-        run_command_from_identifier(:link_file_to, source, destination)
+        run_command("ln -fs #{destination} #{source}")
       end
 
       # @note Override
       def check
         check_command_from_identifier(:check_file_is_linked_to, source, destination)
       end
-
-      private
-
-      # @note Override
-      def default_id
-        destination
-      end
     end
   end
 end

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -255,4 +255,3 @@ signing_key:
 specification_version: 4
 summary: Configuration management toolkit for IT automation.
 test_files: []
-has_rdoc: