itamae 1.0.0.beta28 → 1.0.0.beta29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710ad7e0b74c9481270f46dbd3770667d7f976b1
-  data.tar.gz: 87341f1c3733b3bc88733013fb3f3dd620ef7adc
+  metadata.gz: 1e6c40f7ec418f602cc9c3656ab52e2911ef569a
+  data.tar.gz: ae5a65e894d475f4001ba6e81ceee410eee7a2a2
 SHA512:
-  metadata.gz: 9ed18ecbf3dfd0f0ba72b6112c07712f23c386e698a42601e925454c0841469c08b60fbc978f2587206f5f8edb2ff1bc3ef5e1e8d7d469ef0b04a5128457d360
-  data.tar.gz: 6a9e781b54749f87d0c4c9f35add213d302ec133dde426697a650d1c0697d87a5a9b0d4d9c7d9e634fef40abbb9e6de1c5d9613029c4ebd9bebc9c7f74586b20
+  metadata.gz: 8bb64b1eeb4a24e68384acb26cbac4f3bf71f152b7df88c9daeb13a271db796b9162d945d31871ea500cd5309db4ba627f2346dedaf709b9147fb8f08cf6fb4b
+  data.tar.gz: c806857b5bc48e363d19320926e21db59833b38da307a9db0615591edf2c232495d13a030bbd3a22f81601e0ac3ead9b09a9bb7be938768701250a01de3ef968

data/lib/itamae/cli.rb

@@ -15,7 +15,7 @@ module Itamae
 
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
     option :node_json, type: :string, aliases: ['-j']
-    option :dry_run, type: :string, aliases: ['-n']
+    option :dry_run, type: :boolean, aliases: ['-n']
     option :ohai, type: :boolean, default: false
     def local(*recipe_files)
       Runner.run(recipe_files, :local, options)
@@ -23,7 +23,7 @@ module Itamae
 
     desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
     option :node_json, type: :string, aliases: ['-j']
-    option :dry_run, type: :string, aliases: ['-n']
+    option :dry_run, type: :boolean, aliases: ['-n']
     option :host, required: true, type: :string, aliases: ['-h']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']

data/lib/itamae/resource/user.rb

@@ -15,6 +15,7 @@ module Itamae
         @current_attributes[:exist?] = exist?
 
         if @current_attributes[:exist?]
+          # TODO: delegate to Specinfra
           @current_attributes[:uid] = run_command(["id", "-u", username]).stdout.strip
           @current_attributes[:gid] = run_command(["id", "-g", username]).stdout.strip
           @current_attributes[:home] = run_command("echo ~#{shell_escape(username)}").stdout.strip
@@ -25,20 +26,24 @@ module Itamae
       def create_action
         if run_specinfra(:check_user_exists, username)
           if uid && uid.to_s != @current_attributes[:uid]
+            # TODO: delegate to Specinfra
             run_command(["usermod", "-u", uid, username]) 
             updated!
           end
 
           if gid && gid.to_s != @current_attributes[:gid]
+            # TODO: delegate to Specinfra
             run_command(["usermod", "-g", gid, username])
             updated!
           end
 
           if password && password != current_password
+            # TODO: delegate to Specinfra
             run_command("echo #{shell_escape("#{username}:#{password}")} | chpasswd -e")
             updated!
           end
         else
+          # TODO: delegate to Specinfra
           args = ["useradd"]
           args << "-g" << gid if gid
           args << "-d" << home if home
@@ -58,6 +63,7 @@ module Itamae
       end
 
       def current_password
+        # TODO: delegate to Specinfra
         result = run_command("cat /etc/shadow | grep -E ^#{shell_escape(username)}:", error: false)
 
         if result.exit_status == 0

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta28
+1.0.0.beta29

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta28
+  version: 1.0.0.beta29
 platform: ruby
 authors:
 - Ryota Arai