itamae 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83dedd045d05da0413cae3765fdb4a0c97f44121
-  data.tar.gz: d45bcc5ae690ed0044ccfddc06eadbbc6bfe9690
+  metadata.gz: c5c2bbaa65e9c33670186255fd00fcd0ec14a7d9
+  data.tar.gz: 71f925946fb5f63bd562b918c28756d389caa5e9
 SHA512:
-  metadata.gz: 872059daf89a6e4a7ae772278b618055cbe03325e67d45bf4dc0e4cfd3e4ccac9ade93f6a20e9789d7bfb997b577c9ec05d819b96197084bb8a55bd61dc99d35
-  data.tar.gz: 4e27434ae02d17fb5613dd1693462e8f714ecd759aeef3430f24561de9244629fc5b72af3e79ec3f326544aa1bc38ef5eba591d3c8fc67516bbcc818e833b7e7
+  metadata.gz: 1c7e267d4bcf255cdebb1b88a83821664a4de6ef43a9757ca963ad74fa94fb79f3fbe7bb1f2f71c1ed472b02160f0d0bb11e081dc16e4ad208498a71de17a2b0
+  data.tar.gz: 4500e83e08902ab1ab61abd886f5be02f74c351df2a8e9465e4dbf4bc430317255a3640c68f78607235c16ae544c98c15cc025b7c94008fe9b35942801e7c110

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v1.9.10
+
+Features
+
+- [Add depth attribute to git resource](https://github.com/itamae-kitchen/itamae/pull/219)
+- [Support force link a direcotory](https://github.com/itamae-kitchen/itamae/pull/229)
+- [Add support password authentication for ssh](https://github.com/itamae-kitchen/itamae/pull/227)
+
+Bugfixes
+
+- [Run a resource subscribing a resource in child recipe](https://github.com/itamae-kitchen/itamae/pull/224)
+- [Change file owner first, then change file permissions](https://github.com/itamae-kitchen/itamae/pull/228)
+
+Improvements
+
+- [Dir.exists? is deprecated, use Dir.exist?](https://github.com/itamae-kitchen/itamae/pull/226)
+
 ## v1.9.9
 
 Features

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", [">= 2.37.0", "< 3.0.0"]
+  spec.add_runtime_dependency "specinfra", [">= 2.64.0", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"

data/lib/itamae/backend.rb

@@ -234,6 +234,7 @@ module Itamae
         ssh_config_files = @options[:ssh_config] ? [@options[:ssh_config]] : Net::SSH::Config.default_files
         opts.merge!(Net::SSH::Config.for(@options[:host], ssh_config_files))
         opts[:user] = @options[:user] || opts[:user] || Etc.getlogin
+        opts[:password] = @options[:password] if @options[:password]
         opts[:keys] = [@options[:key]] if @options[:key]
         opts[:port] = @options[:port] if @options[:port]
 

data/lib/itamae/recipe.rb

@@ -121,7 +121,7 @@ module Itamae
 
       def include_recipe(target)
         expanded_path = ::File.expand_path(target, File.dirname(@recipe.path))
-        expanded_path = ::File.join(expanded_path, 'default.rb') if ::Dir.exists?(expanded_path)
+        expanded_path = ::File.join(expanded_path, 'default.rb') if ::Dir.exist?(expanded_path)
         expanded_path.concat('.rb') unless expanded_path.end_with?('.rb')
         candidate_paths = [expanded_path, Recipe.find_recipe_in_gem(target)].compact
         path = candidate_paths.find {|path| File.exist?(path) }

data/lib/itamae/resource/base.rb

@@ -337,7 +337,7 @@ module Itamae
       end
 
       def notify
-        (notifications + recipe.children.subscribing(self)).each do |notification|
+        (notifications + runner.children.subscribing(self)).each do |notification|
           message = "Notifying #{notification.action} to #{notification.action_resource.resource_type} resource '#{notification.action_resource.resource_name}'"
 
           if notification.delayed?

data/lib/itamae/resource/file.rb

@@ -64,14 +64,14 @@ module Itamae
 
         change_target = attributes.modified ? @temppath : attributes.path
 
-        if attributes.mode
-          run_specinfra(:change_file_mode, change_target, attributes.mode)
-        end
-
         if attributes.owner || attributes.group
           run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
         end
 
+        if attributes.mode
+          run_specinfra(:change_file_mode, change_target, attributes.mode)
+        end
+
         if attributes.modified
           run_specinfra(:move_file, @temppath, attributes.path)
         end
@@ -86,17 +86,17 @@ module Itamae
       def action_edit(options)
         change_target = attributes.modified ? @temppath : attributes.path
 
-        if attributes.mode || attributes.modified
-          mode = attributes.mode || run_specinfra(:get_file_mode, attributes.path).stdout.chomp
-          run_specinfra(:change_file_mode, change_target, mode)
-        end
-
         if attributes.owner || attributes.group || attributes.modified
           owner = attributes.owner || run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
           group = attributes.group || run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
           run_specinfra(:change_file_owner, change_target, owner, group)
         end
 
+        if attributes.mode || attributes.modified
+          mode = attributes.mode || run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          run_specinfra(:change_file_mode, change_target, mode)
+        end
+
         if attributes.modified
           run_specinfra(:move_file, @temppath, attributes.path)
         end

data/lib/itamae/resource/git.rb

@@ -10,6 +10,7 @@ module Itamae
       define_attribute :repository, type: String, required: true
       define_attribute :revision, type: String
       define_attribute :recursive, type: [TrueClass, FalseClass], default: false
+      define_attribute :depth, type: Integer
 
       def pre_action
         case @current_action
@@ -30,6 +31,7 @@ module Itamae
         if check_empty_dir
           cmd = ['git', 'clone']
           cmd << '--recursive' if attributes.recursive
+          cmd += ['--depth', attributes.depth.to_s] if attributes.depth
           cmd << attributes.repository << attributes.destination
           run_command(cmd)
           new_repository = true

data/lib/itamae/resource/link.rb

@@ -25,7 +25,8 @@ module Itamae
 
       def action_create(options)
         unless run_specinfra(:check_file_is_linked_to, attributes.link, attributes.to)
-          run_specinfra(:link_file_to, attributes.link, attributes.to, force: attributes.force)
+          run_specinfra(:link_file_to, attributes.link, attributes.to,
+            force: attributes.force, no_dereference: attributes.force)
         end
       end
     end

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.9"
+  VERSION = "1.9.10"
 end

data/spec/integration/default_spec.rb

@@ -57,6 +57,13 @@ describe file('/tmp/file') do
   it { should be_mode 777 }
 end
 
+describe file('/tmp/file_with_suid') do
+  it { should be_file }
+  it { should be_mode 4755 }
+  it { should be_owned_by "itamae" }
+  it { should be_grouped_into "itamae" }
+end
+
 describe file('/tmp/execute') do
   it { should be_file }
   its(:content) { should match(/Hello Execute/) }
@@ -141,6 +148,14 @@ describe file('/tmp-link-force') do
   it { should be_linked_to '/tmp' }
 end
 
+describe file('/tmp/link-force-no-dereference') do
+  it { should be_linked_to 'link-force-no-dereference2' }
+end
+
+describe file('/tmp/link-force-no-dereference/link-force-no-dereference2') do
+  it { should_not exist }
+end
+
 describe command('cd /tmp/git_repo && git rev-parse HEAD') do
   its(:stdout) { should match(/3116e170b89dc0f7315b69c1c1e1fd7fab23ac0d/) }
 end
@@ -149,6 +164,10 @@ describe command('cd /tmp/git_repo_submodule/empty_repo && cat README.md') do
   its(:stdout) { should match(/Empty Repo/) }
 end
 
+describe command('cd /tmp/git_repo_depth_1 && git rev-list --count HEAD') do
+  its(:stdout) { should eq "1\n" }
+end
+
 describe file('/tmp/created_by_itamae_user') do
   it { should be_file }
   it { should be_owned_by 'itamae' }
@@ -216,6 +235,13 @@ describe file('/tmp/file_edit_sample') do
   it { should be_grouped_into "itamae2" }
 end
 
+describe file('/tmp/file_edit_with_suid') do
+  it { should be_file }
+  it { should be_mode 4755 }
+  it { should be_owned_by "itamae2" }
+  it { should be_grouped_into "itamae2" }
+end
+
 describe file('/tmp/file_edit_keeping_mode_owner') do
   it { should be_file }
   its(:content) { should eq("Hello, Itamae") }
@@ -263,3 +289,7 @@ end
 describe file('/tmp/file_without_content_change_keeping_timestamp') do
   its(:mtime) { should eq(DateTime.iso8601("2016-05-01T12:34:56Z")) }
 end
+
+describe file('/tmp/subscribed_from_parent') do
+  it { should be_file }
+end

data/spec/integration/recipes/default.rb

@@ -173,6 +173,13 @@ file "/tmp/file" do
   mode "777"
 end
 
+file "/tmp/file_with_suid" do
+  content "Hello World"
+  mode "4755"
+  owner "itamae"
+  group "itamae"
+end
+
 execute "echo 'Hello Execute' > /tmp/execute"
 
 file "/tmp/never_exist1" do
@@ -262,6 +269,22 @@ link "/tmp-link-force" do
   force true
 end
 
+######
+
+execute "mkdir /tmp/link-force-no-dereference1"
+link "link-force-no-dereference" do
+  cwd "/tmp"
+  to "link-force-no-dereference1"
+  force true
+end
+
+execute "mkdir /tmp/link-force-no-dereference2"
+link "link-force-no-dereference" do
+  cwd "/tmp"
+  to "link-force-no-dereference2"
+  force true
+end
+
 #####
 
 local_ruby_block "greeting" do
@@ -284,6 +307,11 @@ git "/tmp/git_repo_submodule" do
   recursive true
 end
 
+git "/tmp/git_repo_depth_1" do
+  repository "https://github.com/ryotarai/infrataster.git"
+  depth 1
+end
+
 #####
 
 execute "echo -n \"$HOME\n$(pwd)\" > /tmp/created_by_itamae_user" do
@@ -411,6 +439,20 @@ file '/tmp/file_edit_sample' do
   notifies :run, "execute[echo -n 1 > /tmp/file_edit_notifies]"
 end
 
+file '/tmp/file_edit_with_suid' do
+  content 'Hello, world'
+  owner 'itamae'
+  group 'itamae'
+  mode '600'
+end
+
+file '/tmp/file_edit_with_suid' do
+  action :edit
+  owner 'itamae2'
+  group 'itamae2'
+  mode '4755'
+end
+
 file '/tmp/file_edit_keeping_mode_owner' do
   content 'Hello, world'
   owner 'itamae'
@@ -507,6 +549,11 @@ local_ruby_block 'execute run_command' do
   end
 end
 
+execute "touch /tmp/subscribed_from_parent" do
+  action :nothing
+  subscribes :run, 'execute[subscribed from parent]'
+end
+
 ###
 
 v1 = node.memory.total
@@ -516,3 +563,4 @@ v3 = node['memory']['total']
 unless v1 == v2 && v2 == v3 && v1 =~ /\A\d+kB\z/
   raise "failed to fetch host inventory value (#{v1}, #{v2}, #{v3})"
 end
+

data/spec/integration/recipes/included.rb

@@ -7,3 +7,7 @@ else
 end
 
 execute "touch /tmp/included_recipe"
+
+execute "subscribed from parent" do
+  command "true"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.37.0
+        version: 2.64.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.37.0
+        version: 2.64.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0