serverkit 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc4285bf5a80516d782219e3e1c39e2293bd149
-  data.tar.gz: e5aa09260d3f3312d59387e4b6d5be6931194a08
+  metadata.gz: 6ee2916ff42d02d386e7e2bc58ea31a1df7bbd8c
+  data.tar.gz: 2cbeeb2c02e1c8a3fef9dc58a5aa518907b653c1
 SHA512:
-  metadata.gz: 4a8adc794c2315262a5bf14713fef1d36d069fe0c7776b64402de888a66bc364b22ee601205f0c13ff5144dd5561cf900959055faba6a8b5d5fb4a7afe658ef9
-  data.tar.gz: ed16eac1e8ba241522920ec7fd5137063588e1e78fd3993e1ffa9c802f2e3111f7663a3a0d3fb3be14140cbc1bcca406dd337f7fcd0673dfd47342095b1f35c2
+  metadata.gz: 1541640d4ec471ea758ef42334d143d0bfdd71c2bb39322527f8c08716901c68bc331ec36f50993dfb399a012931908bb367f0a74e81428a171616ebe6c9aab7
+  data.tar.gz: 4a2e87212542457d96cba9407b5c30428a0f87b68957be2193ff9f023dfbd1b880f40cf2b477441a87a5a7be55926e4c608e663d68879ead6965453a73efce1e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.5
+- Add group resource
+- Raise KeyError when missing key is referred from ERB
+- Show its file path on error from ERB template
+
 ## 0.4.4
 - Add template resource
 - Prevent abstract class from being used as resource type

data/README.md

@@ -198,6 +198,7 @@ A resource must have a valid type attribute like:
 - [directory](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/directory.rb)
 - [file](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/file.rb)
 - [git](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/git.rb)
+- [group](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/group.rb)
 - [nothing](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/nothing.rb)
 - [package](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/package.rb)
 - [recipe](https://github.com/r7kamura/serverkit/blob/master/lib/serverkit/resources/recipe.rb)

data/Vagrantfile

@@ -7,5 +7,6 @@ Vagrant.configure("2") do |config|
   config.vm.provision :serverkit do |serverkit_config|
     serverkit_config.log_level = "DEBUG"
     serverkit_config.recipe_path = "example/recipe.yml"
+    serverkit_config.variables_path = "example/variables.yml"
   end
 end

data/example/recipe.yml

@@ -16,3 +16,6 @@ resources:
   - type: template
     source: example/template.erb
     destination: /tmp/template_test
+  - type: group
+    name: wheel
+    gid: 10000

data/lib/serverkit/loaders/base_loader.rb

@@ -40,6 +40,13 @@ module Serverkit
         loaded_class.new({})
       end
 
+      # @return [ERB]
+      def erb
+        _erb = ERB.new(pathname.read, nil, "-")
+        _erb.filename = pathname.to_s
+        _erb
+      end
+
       # @return [String]
       def execute
         `#{pathname}`
@@ -47,7 +54,7 @@ module Serverkit
 
       # @return [String]
       def expand_erb
-        ERB.new(pathname.read, nil, "-").result(binding_for_erb)
+        erb.result(binding_for_erb)
       end
 
       # @return [String]

data/lib/serverkit/resource_builder.rb

@@ -3,6 +3,7 @@ require "serverkit/resources/command"
 require "serverkit/resources/directory"
 require "serverkit/resources/file"
 require "serverkit/resources/git"
+require "serverkit/resources/group"
 require "serverkit/resources/missing"
 require "serverkit/resources/nothing"
 require "serverkit/resources/package"

data/lib/serverkit/resources/file.rb

@@ -1,5 +1,4 @@
 require "serverkit/resources/entry"
-require "tempfile"
 
 module Serverkit
   module Resources

data/lib/serverkit/resources/group.rb

@@ -0,0 +1,39 @@
+require "serverkit/resources/base"
+
+module Serverkit
+  module Resources
+    class Group < Base
+      attribute :name, required: true, type: String
+      attribute :gid, type: Integer
+
+      # @note Override
+      def apply
+        if has_correct_group?
+          run_command_from_identifier(:add_group, name, gid: gid)
+        else
+          run_command_from_identifier(:update_group_gid, name, gid)
+        end
+      end
+
+      # @note Override
+      def check
+        has_correct_group? && has_correct_gid?
+      end
+
+      private
+
+      def has_correct_gid?
+        gid.nil? || gid == remote_gid
+      end
+
+      def has_correct_group?
+        run_command_from_identifier(:check_group_exists, name)
+      end
+
+      # @return [Integer]
+      def remote_gid
+        run_command_from_identifier(:get_group_gid, name).stdout.strip.to_i
+      end
+    end
+  end
+end

data/lib/serverkit/resources/template.rb

@@ -1,7 +1,6 @@
 require "erb"
 require "serverkit/loaders/variables_loader"
-require "serverkit/resources/entry"
-require "tempfile"
+require "serverkit/resources/remote_file"
 
 module Serverkit
   module Resources
@@ -12,7 +11,14 @@ module Serverkit
 
       # @note Override
       def content
-        @content ||= ::ERB.new(template_content, nil, "-").result(variables.to_mash.binding)
+        @content ||= erb.result(variables.to_mash.binding)
+      end
+
+      # @return [ERB]
+      def erb
+        _erb = ::ERB.new(template_content, nil, "-")
+        _erb.filename = source
+        _erb
       end
 
       # @return [String] ERB content

data/lib/serverkit/variables.rb

@@ -22,6 +22,16 @@ module Serverkit
     end
 
     class BindableMash < Hashie::Mash
+      DEFAULT_PROC = -> (hash, key) do
+        raise KeyError, "key not found: #{key.inspect} (perhaps variables are wrong?)"
+      end
+
+      # @note Override to raise KeyError on missing key
+      def initialize(*, &block)
+        super
+        self.default_proc = DEFAULT_PROC
+      end
+
       # @note Override visibility from private to public
       def binding
         super

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -248,6 +248,7 @@ files:
 - lib/serverkit/resources/entry.rb
 - lib/serverkit/resources/file.rb
 - lib/serverkit/resources/git.rb
+- lib/serverkit/resources/group.rb
 - lib/serverkit/resources/missing.rb
 - lib/serverkit/resources/nothing.rb
 - lib/serverkit/resources/package.rb