serverkit 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174dabbbd261022d8472541f073f877df3e18d14
-  data.tar.gz: 9a640c7f32fd916751f6d975852b6020f6c0a301
+  metadata.gz: a36fe579bf7780e6e75bb199039675897a356768
+  data.tar.gz: f3b1295d4b074e6350b4062e63cea098830f4340
 SHA512:
-  metadata.gz: 39d435b1b256e029edb9019cc1496a03ff8480fb5edd2f0165757eb88313e8eb99251f76535144eaf54347bced62c1ebd57d431bee95a8fa40c25154b5f94abe
-  data.tar.gz: d08d24dca2751a11a4a6bc3fec77f4086753a7108b7bea749ac34952388e25639300b8e3224e7c25e71868bc9e8a539f1ad5d6dee82c396228c1331b27d2d9bf
+  metadata.gz: 92942f4878c772f8fddfa275deaf9947212a315404538218d38a20d1e2230b0979336a190aafc76b6d3bbac5b59569d20617e7c0a8b568361bd613db84a9924b
+  data.tar.gz: fcde5f4a9b5643e16dc408280c8342f66ff4bb2d26bbc194691da5efabb85112470dc7af1f5848a1da2062349342f9b73bd0006818e1e9daa0244d1eea7d48e4

data/.gitignore

@@ -1,9 +1,10 @@
+/_yardoc/
 /.bundle/
+/.vagrant
 /.yardoc
-/Gemfile.lock
-/_yardoc/
 /coverage/
 /doc/
+/Gemfile.lock
 /pkg/
 /spec/reports/
 /tmp/

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.1
+- Add user resource
+
 ## 0.4.0
 - Deprecate homebrew & homebrew_cask resources
 - Add check_script and recheck_script to all resources

data/README.md

@@ -13,6 +13,7 @@ Configuration management toolkit for IT automation.
   - [Variables](#variables)
   - [Example](#example)
 - [Resource](#resource)
+  - [Attributes](#attributes)
   - [Type](#type)
   - [Example](#example-1)
 - [Handler](#handler)
@@ -180,6 +181,16 @@ resources:
 ## Resource
 A resource is a statement of configuration policy that describes the desired state for an item.
 
+### Attributes
+Each resource has different attributes along with its type.
+By default, all types of resource can or must have the following attributes:
+
+- type - what type this resource represents (required)
+- check_script - pass shell script to override the `#check` phase
+- recheck_script - pass shell script to override the `#recheck` phase (runned after `#apply`)
+- id - change resource identifier used in log, and also used for `notify`
+- notify - specify an Array of handler ids that should be applied after changed
+
 ### Type
 A resource must have a type attribute. Currently the following types are available:
 
@@ -191,6 +202,7 @@ A resource must have a type attribute. Currently the following types are availab
 - recipe
 - service
 - symlink
+- user
 
 ### Example
 An example package resource that has type and name attributes.

data/Vagrantfile

@@ -0,0 +1,12 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.plugin.add_dependency "vagrant-multiplug"
+  config.plugin.add_dependency "vagrant-serverkit", "0.0.5"
+
+  config.vm.provision :serverkit do |serverkit_config|
+    serverkit_config.log_level = "DEBUG"
+    serverkit_config.recipe_path = "example/recipes/recipe.yml"
+    serverkit_config.variables_path = "example/variables"
+  end
+end

data/example/recipes/recipe.yml

@@ -1,20 +1,7 @@
 resources:
-  - type: recipe
-    path: example/recipes/homebrew.yml
-  - type: recipe
-    path: example/recipes/homebrew_cask.yml
-  - type: recipe
-    path: example/recipes/dotfiles.yml.erb
-  - type: nothing
-    notify:
-      - handler_test
-  - type: nothing
-    notify:
-      - handler_test
-  - type: command
-    check_script: foo
-    script: echo test
-    recheck_script: "true"
+  - type: user
+    name: test
+    password: test
 handlers:
   - id: handler_test
     type: nothing

data/lib/serverkit/resource_builder.rb

@@ -9,6 +9,7 @@ require "serverkit/resources/recipe"
 require "serverkit/resources/service"
 require "serverkit/resources/symlink"
 require "serverkit/resources/unknown"
+require "serverkit/resources/user"
 
 module Serverkit
   class ResourceBuilder

data/lib/serverkit/resources/user.rb

@@ -0,0 +1,103 @@
+require "serverkit/resources/base"
+require "unix_crypt"
+
+module Serverkit
+  module Resources
+    class User < Base
+      attribute :gid, type: [Integer, String]
+      attribute :home_directory, type: String
+      attribute :name, type: String, required: true
+      attribute :password, type: String
+      attribute :system_user, type: [FalseClass, TrueClass]
+      attribute :uid, type: Integer
+
+      # @note Override
+      def apply
+        if has_correct_user?
+          update_user_encrypted_password unless has_correct_password?
+          update_user_gid unless has_correct_gid?
+          update_user_home_directory unless has_correct_home_directory?
+          update_user_uid unless has_correct_uid?
+        else
+          add_user
+        end
+      end
+
+      # @note Override
+      def check
+        case
+        when !has_correct_user?
+          false
+        when gid && !has_correct_gid?
+          false
+        when home_directory && !has_correct_home_directory?
+          false
+        when password && !has_correct_password?
+          false
+        when uid && !has_correct_uid?
+          false
+        else
+          true
+        end
+      end
+
+      private
+
+      def add_user
+        run_command_from_identifier(
+          :add_user,
+          name,
+          gid: gid,
+          home_directory: home_directory,
+          password: encrypted_password,
+          system_user: system_user,
+          uid: uid,
+        )
+      end
+
+      def encrypted_password
+        @encrypted_password ||= UnixCrypt::SHA512.build(password)
+      end
+
+      def get_remote_encrypted_password
+        run_command_from_identifier(:get_user_encrypted_password, name).stdout
+      end
+
+      def has_correct_gid?
+        check_command_from_identifier(:check_user_belongs_to_group, name, gid)
+      end
+
+      def has_correct_home_directory?
+        check_command_from_identifier(:check_user_has_home_directory, name, home_directory)
+      end
+
+      def has_correct_password?
+        ::UnixCrypt.valid?(password, get_remote_encrypted_password)
+      end
+
+      def has_correct_uid?
+        check_command_from_identifier(:check_user_has_uid, name, uid)
+      end
+
+      def has_correct_user?
+        check_command_from_identifier(:check_user_exists, name)
+      end
+
+      def update_user_encrypted_password
+        run_command_from_identifier(:update_user_encrypted_password, name, encrypted_password)
+      end
+
+      def update_user_gid
+        run_command_from_identifier(:update_user_gid, name, gid)
+      end
+
+      def update_user_home_directory
+        run_command_from_identifier(:update_user_home_directory, name, home_directory)
+      end
+
+      def update_user_uid
+        run_command_from_identifier(:update_user_uid, name, uid)
+      end
+    end
+  end
+end

data/lib/serverkit/version.rb

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

data/serverkit.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow"
   spec.add_runtime_dependency "slop", "~> 3.4"
   spec.add_runtime_dependency "specinfra"
+  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unix-crypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -195,12 +209,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/serverkit
 - example/recipes/dotfiles.yml.erb
-- example/recipes/homebrew.yml
-- example/recipes/homebrew_cask.yml
-- example/recipes/recipe.json
-- example/recipes/recipe.rb
 - example/recipes/recipe.yml
 - example/variables/variables.yml
 - lib/readable_validator.rb
@@ -242,6 +253,7 @@ files:
 - lib/serverkit/resources/service.rb
 - lib/serverkit/resources/symlink.rb
 - lib/serverkit/resources/unknown.rb
+- lib/serverkit/resources/user.rb
 - lib/serverkit/variables.rb
 - lib/serverkit/version.rb
 - lib/type_validator.rb

data/example/recipes/homebrew.yml

@@ -1,5 +0,0 @@
-resources:
-  - type: homebrew
-    name: mysql
-  - type: homebrew
-    name: redis

data/example/recipes/homebrew_cask.yml

@@ -1,5 +0,0 @@
-resources:
-  - type: homebrew_cask
-    name: licecap
-  - type: homebrew_cask
-    name: alfred

data/example/recipes/recipe.json

@@ -1,16 +0,0 @@
-{
-  "resources": [
-    {
-      "type": "recipe",
-      "path": "example/recipes/homebrew.yml"
-    },
-    {
-      "type": "recipe",
-      "path": "example/recipes/homebrew_cask.yml"
-    },
-    {
-      "type": "recipe",
-      "path": "example/recipes/dotfiles.yml.erb"
-    }
-  ]
-}

data/example/recipes/recipe.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require "json"
-require "yaml"
-
-puts YAML.load_file(File.expand_path("../recipe.yml", __FILE__)).to_json