itamae 1.0.0.beta23 → 1.0.0.beta24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e06a0ae4cf1116d4f4adc8965745ad028023900
-  data.tar.gz: a76dd8f567f9f0abc222ea7f3fab1c4b4d94281b
+  metadata.gz: ea6fc052b822e3cde537f8c2f7b78116d5ed5875
+  data.tar.gz: c291f27cb784245988bc80b6eb5b41afef44704f
 SHA512:
-  metadata.gz: 66f85f60c27e01d31d9d18ffbd4583135ecffb16347a8b4c4033ade2a2d3fc635d837ca1d13b77c4d810ea57c072474e713e7fd3b03f8fa80842bb1a124db720
-  data.tar.gz: f85fba9783ee770af7fd6030cb75dfd8629c5b49e278663a3aabffd9fcdd3345f754f868896723162d0e5904383112c6a89d036df10df6515a5eb8008bf5a11f
+  metadata.gz: 5e7c82107830eca10417bd2bc4c2f2e1312420fcee1852015862ab2c992939e12d282a834213b492783b1639d6472f9c1c175822b0931b7e700e05d7e2bf8104
+  data.tar.gz: 7a54dda4b3e814ec755ea74f3fee019236579ba0343cc2339a9cdbe1d64590d312bcb6f63eee0032aa76fcbef67f98a0f4b82ca07c28b4028a91f43f748c56a9

data/lib/itamae/logger.rb

@@ -39,6 +39,8 @@ module Itamae
         color_code = case severity
                      when "INFO"
                        :green
+                     when "WARN"
+                       :magenta
                      when "ERROR"
                        :red
                      else

data/lib/itamae/recipe.rb

@@ -21,6 +21,8 @@ module Itamae
     end
 
     def run(options = {})
+      Logger.info "> Applying recipe... (#{@path})"
+
       @dependencies.each do |resource|
         case resource
         when Resource::Base
@@ -33,6 +35,8 @@ module Itamae
       @delayed_actions.uniq.each do |action, resource|
         resource.run(action, dry_run: options[:dry_run])
       end
+
+      Logger.info "< Finished. (#{@path})"
     end
 
     private

data/lib/itamae/resource.rb

@@ -11,6 +11,7 @@ require 'itamae/resource/service'
 require 'itamae/resource/link'
 require 'itamae/resource/local_ruby_block'
 require 'itamae/resource/git'
+require 'itamae/resource/user'
 
 module Itamae
   module Resource

data/lib/itamae/resource/user.rb

@@ -0,0 +1,31 @@
+require 'itamae'
+
+module Itamae
+  module Resource
+    class User < Base
+      define_attribute :action, default: :create
+      define_attribute :username, type: String, default_name: true
+      define_attribute :gid, type: String
+      define_attribute :home, type: String
+      define_attribute :password, type: String
+      define_attribute :system_user, type: [TrueClass, FalseClass]
+      define_attribute :uid, type: [String, Integer]
+
+      def create_action
+        if run_specinfra(:check_user_exists, username)
+          Logger.warn "User already exists. Currently, user resources do not support to modify attributes."
+        else
+          args = ["useradd"]
+          args << "-g" << gid if gid
+          args << "-d" << home if home
+          args << "-p" << password if password
+          args << "-r" if system_user
+          args << "-u" << uid.to_s if uid
+          args << username
+          run_command(args)
+        end
+      end
+    end
+  end
+end
+

data/lib/itamae/runner.rb

@@ -5,6 +5,8 @@ module Itamae
   class Runner
     class << self
       def run(recipe_files, backend_type, options)
+        Logger.info "Starting Itamae..."
+
         set_backend_from_options(backend_type, options)
 
         runner = self.new(node_from_options(options))
@@ -20,6 +22,12 @@ module Itamae
         hash = {}
 
         if options[:ohai]
+          unless Backend.instance.run_command("which ohai", error: false).exit_status == 0
+            # install Chef (I'd like to replace Ohai with single binary...)
+            Logger.info "Installing Chef to use Ohai..."
+            Backend.instance.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
+          end
+
           Logger.info "Loading node data via ohai..."
           hash.merge!(JSON.parse(Backend.instance.run_command("ohai").stdout))
         end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta23
+1.0.0.beta24

data/spec/integration/default_spec.rb

@@ -1,5 +1,10 @@
 require 'spec_helper'
 
+describe user("itamae") do
+  it { should exist }
+  it { should have_uid 1234 }
+end
+
 describe file('/tmp/included_recipe') do
   it { should be_file }
 end

data/spec/integration/recipes/default.rb

@@ -1,7 +1,11 @@
 include_recipe "./included.rb"
 
 # TODO: replace with user resource
-execute 'id itamae || useradd itamae'
+#execute 'id itamae || useradd itamae'
+
+user "itamae" do
+  uid 1234
+end
 
 ######
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta23
+  version: 1.0.0.beta24
 platform: ruby
 authors:
 - Ryota Arai
@@ -173,6 +173,7 @@ files:
 - lib/itamae/resource/remote_file.rb
 - lib/itamae/resource/service.rb
 - lib/itamae/resource/template.rb
+- lib/itamae/resource/user.rb
 - lib/itamae/runner.rb
 - lib/itamae/version.rb
 - lib/itamae/version.txt