itamae 1.10.5 → 1.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fef6667e949b9833a0d5f44b09982bbb0c6415ec44c57baa8e0f27eab322e8
-  data.tar.gz: b772ed894784fdbb1c739f4b75a6af0bc0adb5a88b009fd87d0dbca8d39e8077
+  metadata.gz: a27b553f519a4e36fdc40534d8033528f3dfbbca42133fed38c8af9bafc0234c
+  data.tar.gz: d3b9da92d9ebaa0c4f3ceff9f483944e1fa02d2a28741c921c3b16f283b083cf
 SHA512:
-  metadata.gz: 38cb17e76859562485e7f2520fb6eacafd442b3e73cd30c4b8b1c0bf883f9c838c5d57c9978314a08fde591bfdac6b1ee5d52ad26c40b4374744e8cc22d5d716
-  data.tar.gz: 16d2e0043cbc92b65882c4d5d3684cd82e60fe09d59f7c30f7e995942475b4bbd74383cde73c4188fc387966a654578d3a540865d65e04e5210d6772c1770a43
+  metadata.gz: 5cf3758a3778d8a22128d08263f03bbf10c2ea53246128013786bda0c44549a14b89792798db43e5de573264fe06a5c3e8049cf52837db46d086e84f528c10c6
+  data.tar.gz: 86f33c85a7deed7cb93993abe8e811e0dd6e84861350ac48f7fae462a6fdca9e3c9b9a1c6ccf8438af326fc77829a5f0eb1d4e848aed6efe36d29739393467f3

data/.travis.yml

@@ -8,13 +8,13 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 bundler_args: "--jobs=4 --retry=3"
 cache:
   bundler: true
 
 before_install:
-  - travis_retry gem update --system || travis_retry gem update --system 2.7.8
   - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
 
 script:
@@ -29,6 +29,8 @@ matrix:
   include:
   - rvm: 2.6
     env: SPEC_RUBYOPT="--jit"
+  - rvm: 2.7
+    env: SPEC_RUBYOPT="--jit"
   - rvm: ruby-head
     env: SPEC_RUBYOPT="--jit"
 branches:

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.5...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.10...master)
+
+## v1.10.10
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.9...v1.10.10)
+
+Improvements
+
+- [Make output unbuffered](https://github.com/itamae-kitchen/itamae/pull/317)
+
+## v1.10.9
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.8...v1.10.9)
+
+Improvements
+
+- [Fix CRLF problem in windows](https://github.com/itamae-kitchen/itamae/pull/316)
+
+## v1.10.8
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.7...v1.10.8)
+
+Improvements
+
+- [Print "(in action_XXX)" as a debug log](https://github.com/itamae-kitchen/itamae/pull/315)
+- [Reduce `check_package_is_installed` calling when package version is not specified](https://github.com/itamae-kitchen/itamae/pull/314)
+- [Simplify Git resource's get_revision method](https://github.com/itamae-kitchen/itamae/pull/313)
+
+## v1.10.7
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.6...v1.10.7)
+
+Improvements
+
+- [Improve `file` resource performance](https://github.com/itamae-kitchen/itamae/pull/310)
+
+## v1.10.6
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.5...v1.10.6)
+
+Improvements
+
+- [Don't use `sudo` when `--no-sudo` is passed](https://github.com/itamae-kitchen/itamae/pull/302)
 
 ## v1.10.5
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.4...v1.10.5)

data/README.md

@@ -77,7 +77,7 @@ $ bundle exec rake spec
 
 ## Get Involved
 
-- [Join Slack team](https://join.slack.com/t/itamae/shared_invite/enQtNTExNTI3ODM1NTY5LTM5MWJlZTgwODE0YTUwMThiNzZjN2I1MGNlZjE2NjlmNzg5NTNlOTliMDhkNDNmNTQ2ZTgwMzZjNjI5NDJiZGI)
+- [Join Slack team](https://itamae-slackin.herokuapp.com)
 
 ## Presentations / Articles
 

data/Rakefile

@@ -81,3 +81,4 @@ namespace :spec do
   end
 end
 
+task :default => :spec

data/lib/itamae/backend.rb

@@ -188,7 +188,7 @@ module Itamae
         end
 
         user = options[:user]
-        if user
+        if user && use_sudo?
           command = "cd ~#{user.shellescape} ; #{command}"
           command = "sudo -H -u #{user.shellescape} -- #{shell.shellescape} -c #{command.shellescape}"
         end
@@ -196,6 +196,11 @@ module Itamae
         command
       end
 
+      def use_sudo?
+        return true unless @options.key?(:sudo)
+        !!@options[:sudo]
+      end
+
       def shell
         @options[:shell] || '/bin/sh'
       end

data/lib/itamae/logger.rb

@@ -126,6 +126,7 @@ module Itamae
   @logger = ::Logger.new($stdout).tap do |l|
     l.formatter = Itamae::Logger::Formatter.new
   end.extend(Itamae::Logger::Helper)
+  $stdout.sync = true
 
   class << self
     def logger

data/lib/itamae/resource/base.rb

@@ -195,6 +195,7 @@ module Itamae
             show_differences
 
             method_name = "action_#{action}"
+            Itamae.logger.debug "(in #{method_name})"
             if runner.dry_run?
               unless respond_to?(method_name)
                 Itamae.logger.error "action #{action.inspect} is unavailable"

data/lib/itamae/resource/file.rb

@@ -9,6 +9,10 @@ module Itamae
       define_attribute :group, type: String
       define_attribute :block, type: Proc, default: proc {}
 
+      class << self
+        attr_accessor :sha256sum_available
+      end
+
       def pre_action
         current.exist = run_specinfra(:check_file_is_file, attributes.path)
 
@@ -27,6 +31,11 @@ module Itamae
           end
         end
 
+        if exists_and_not_modified?
+          attributes.modified = false
+          return
+        end
+
         send_tempfile
         compare_file
       end
@@ -133,6 +142,19 @@ module Itamae
         end
       end
 
+      def exists_and_not_modified?
+        return false unless current.exist && sha256sum_available?
+
+        current_digest = run_command(["sha256sum", attributes.path]).stdout.split(/\s/, 2).first
+        digest = if content_file
+          Digest::SHA256.file(content_file).hexdigest
+        else
+          Digest::SHA256.hexdigest(attributes.content.to_s)
+        end
+
+        current_digest == digest
+      end
+
       def show_content_diff
         if attributes.modified
           Itamae.logger.info "diff:"
@@ -171,7 +193,12 @@ module Itamae
           src = if content_file
                   content_file
                 else
-                  f = Tempfile.open('itamae')
+                  f = 
+                    if Gem.win_platform?
+                      Tempfile.open('itamae', :mode=>IO::BINARY)
+                    else
+                      Tempfile.open('itamae')
+                    end
                   f.write(attributes.content)
                   f.close
                   f.path
@@ -194,6 +221,12 @@ module Itamae
           f.unlink if f
         end
       end
+
+      def sha256sum_available?
+        return self.class.sha256sum_available unless self.class.sha256sum_available.nil?
+
+        self.class.sha256sum_available = run_command(["sha256sum", "--version"], error: false).exit_status == 0
+      end
     end
   end
 end

data/lib/itamae/resource/git.rb

@@ -84,11 +84,11 @@ module Itamae
       end
 
       def get_revision(branch)
-        result = run_command_in_repo("git rev-list #{shell_escape(branch)}", error: false)
-        unless result.exit_status == 0
-          fetch_origin!
-        end
-        run_command_in_repo("git rev-list #{shell_escape(branch)}").stdout.lines.first.strip
+        result = run_command_in_repo("git rev-parse #{shell_escape(branch)}", error: false)
+        return result.stdout.strip if result.exit_status == 0
+
+        fetch_origin!
+        run_command_in_repo("git rev-parse #{shell_escape(branch)}").stdout.strip
       end
 
       def fetch_origin!

data/lib/itamae/resource/package.rb

@@ -24,6 +24,8 @@ module Itamae
       end
 
       def action_install(action_options)
+        return if !attributes.version && current.installed
+
         unless run_specinfra(:check_package_is_installed, attributes.name, attributes.version)
           run_specinfra(:install_package, attributes.name, attributes.version, attributes.options)
           updated!
@@ -31,7 +33,7 @@ module Itamae
       end
 
       def action_remove(action_options)
-        if run_specinfra(:check_package_is_installed, attributes.name, nil)
+        if current.installed
           run_specinfra(:remove_package, attributes.name, attributes.options)
           updated!
         end

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.10.5"
+  VERSION = "1.10.10"
 end

data/spec/integration/default_spec.rb

@@ -104,7 +104,7 @@ describe file('/tmp/http_request_headers.html') do
   its(:content) { should match(/"User-Agent":\s*"Itamae"/) }
 end
 
-describe file('/tmp/http_request_redirect.html') do
+xdescribe file('/tmp/http_request_redirect.html') do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
 end

data/spec/integration/recipes/default.rb

@@ -210,10 +210,10 @@ http_request "/tmp/http_request_headers.html" do
   url "https://httpbin.org/get"
 end
 
-http_request "/tmp/http_request_redirect.html" do
-  redirect_limit 1
-  url "https://httpbin.org/redirect-to?url=https%3A%2F%2Fhttpbin.org%2Fget%3Ffrom%3Ditamae"
-end
+# http_request "/tmp/http_request_redirect.html" do
+#   redirect_limit 1
+#   url "https://httpbin.org/redirect-to?url=https%3A%2F%2Fhttpbin.org%2Fget%3Ffrom%3Ditamae"
+# end
 
 link "/tmp-link" do
   to "/tmp"

data/spec/unit/lib/itamae/backend_spec.rb

@@ -17,38 +17,38 @@ module Itamae
 
       describe ".send_file" do
         context "the source file doesn't exist" do
-          subject { -> { itamae_backend.send_file("src", "dst") } }
-          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The file 'src' doesn't exist.") }
+          subject { itamae_backend.send_file("src", "dst") }
+          it { expect{ subject }.to raise_error(Itamae::Backend::SourceNotExistError, "The file 'src' doesn't exist.") }
         end
 
         context "the source file exist, but it is not a regular file" do
           before { Dir.mkdir("src")  }
-          subject { -> { itamae_backend.send_file("src", "dst") } }
-          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a file.") }
+          subject { itamae_backend.send_file("src", "dst") }
+          it { expect{ subject }.to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a file.") }
         end
 
         context "the source file is a regular file" do
           before { FileUtils.touch("src")  }
-          subject { -> { itamae_backend.send_file("src", "dst") } }
+          subject { itamae_backend.send_file("src", "dst") }
           it { expect { subject }.not_to raise_error }
         end
       end
 
       describe ".send_directory" do
         context "the source directory doesn't exist" do
-          subject { -> { itamae_backend.send_directory("src", "dst") } }
-          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The directory 'src' doesn't exist.") }
+          subject { itamae_backend.send_directory("src", "dst") }
+          it { expect{ subject }.to raise_error(Itamae::Backend::SourceNotExistError, "The directory 'src' doesn't exist.") }
         end
 
         context "the source directory exist, but it is not a directory" do
           before { FileUtils.touch("src")  }
-          subject { -> { itamae_backend.send_directory("src", "dst") } }
-          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a directory.") }
+          subject { itamae_backend.send_directory("src", "dst") }
+          it { expect{ subject }.to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a directory.") }
         end
 
         context "the source directory is a directory" do
           before { Dir.mkdir("src")  }
-          subject { -> { itamae_backend.send_directory("src", "dst") } }
+          subject { itamae_backend.send_directory("src", "dst") }
           it { expect { subject }.not_to raise_error }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.10.10
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool