itamae 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4842b27c4ba16379169c4bc7bbfdfff7bc45b44
-  data.tar.gz: 1e5a9a87bb3a4fe69b46877882013ca8a03f5dad
+  metadata.gz: 0fddee080e3424d311b0bcac35fcd5f91b2da227
+  data.tar.gz: 17283f41482ec965cd35a615f21074cbd9609a04
 SHA512:
-  metadata.gz: abb1822d970c0505c4712498712982bc91e73fda3cc9b637087ff506e25424909412bf9eaa89af5de9a28bcc1d647dfb746bef73c455b4f967cf17a68a1e1d24
-  data.tar.gz: 8387eafd45ca3ee9fb52cac8d317e4ef59d293d9f4cb6404e6e0b740edc6d90b81512f0903813a3bb641ee3bd90e76342ad2d6f1bbf9b436eac140829bf6b7ca
+  metadata.gz: 0f7a9211a591f1a5cff1171da061bfc899ffe653759a76beb41aba25171820c808c60cec3107f1c8461cd08f748c7dc5b495ff791f49e3b89356320a4a4107e5
+  data.tar.gz: bb9325ae57e1a3358566bb9aa43cce58a6837d683b5aa985d8c738cf2d6ad7b8be7f65b3c64dbce38e8503bc5e13d8d6ae30f448ea3a99d3067efa9bacd475d2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.4.0
+
+Improvements
+
+- Make `cwd` a common attribute. (idea by @tacahilo)
+  - It was an attribute for execute resource
+- When `user` attribute is set, change directory to the user's home directory. (idea by @tacahilo)
+  - even if cd command fail, it will be ignored
+  - directory specified by cwd will take precedence over this
+
 ## v1.3.6
 
 Bugfixes

data/lib/itamae/backend.rb

@@ -163,7 +163,7 @@ module Itamae
       def build_command(commands, options)
         if commands.is_a?(Array)
           command = commands.map do |cmd|
-            Shellwords.escape(cmd)
+            cmd.shellescape
           end.join(' ')
         else
           command = commands
@@ -171,12 +171,13 @@ module Itamae
 
         cwd = options[:cwd]
         if cwd
-          command = "cd #{Shellwords.escape(cwd)} && #{command}"
+          command = "cd #{cwd.shellescape} && #{command}"
         end
 
         user = options[:user]
         if user
-          command = "sudo -H -u #{Shellwords.escape(user)} -- /bin/sh -c #{Shellwords.escape(command)}"
+          command = "cd ~#{user.shellescape} ; #{command}"
+          command = "sudo -H -u #{user.shellescape} -- /bin/sh -c #{command.shellescape}"
         end
 
         command

data/lib/itamae/resource/base.rb

@@ -91,6 +91,7 @@ module Itamae
 
       define_attribute :action, type: [Symbol, Array], required: true
       define_attribute :user, type: String
+      define_attribute :cwd, type: String
 
       attr_reader :recipe
       attr_reader :resource_name
@@ -286,6 +287,7 @@ module Itamae
         end
 
         args.last[:user] ||= attributes.user
+        args.last[:cwd]  ||= attributes.cwd
 
         backend.run_command(*args)
       end
@@ -311,7 +313,7 @@ module Itamae
       end
 
       def shell_escape(str)
-        Shellwords.escape(str)
+        str.shellescape
       end
 
       def updated!

data/lib/itamae/resource/execute.rb

@@ -5,7 +5,6 @@ module Itamae
     class Execute < Base
       define_attribute :action, default: :run
       define_attribute :command, type: String, default_name: true
-      define_attribute :cwd, type: String
 
       def pre_action
         case @current_action
@@ -19,7 +18,7 @@ module Itamae
       end
 
       def action_run(options)
-        run_command(attributes.command, cwd: attributes.cwd)
+        run_command(attributes.command)
         updated!
       end
     end

data/lib/itamae/resource/file.rb

@@ -48,7 +48,7 @@ module Itamae
 
         super
 
-        if current.exist
+        if current.exist && @temppath
           show_file_diff
         end
       end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.3.6
+1.4.0

data/spec/integration/default_spec.rb

@@ -116,7 +116,7 @@ end
 describe file('/tmp/created_by_itamae_user') do
   it { should be_file }
   it { should be_owned_by 'itamae' }
-  its(:content) { should eq('/home/itamae') }
+  its(:content) { should eq("/home/itamae\n/home/itamae") }
 end
 
 describe file('/tmp/created_in_default2') do

data/spec/integration/recipes/default.rb

@@ -26,6 +26,12 @@ user "update itamae user" do
   shell '/bin/dash'
 end
 
+directory "/home/itamae" do
+  mode "755"
+  owner "itamae"
+  group "itamae"
+end
+
 user "create itamae2 user with create home directory" do
   username "itamae2"
   create_home true
@@ -218,7 +224,7 @@ end
 
 #####
 
-execute "echo -n $HOME > /tmp/created_by_itamae_user" do
+execute "echo -n \"$HOME\n$(pwd)\" > /tmp/created_by_itamae_user" do
   user "itamae"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor