itamae 1.10.4 → 1.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82dd01a32c405393a246ff76a24d38dd8c8d2be8e9d12d7caee8d4b2217422b0
-  data.tar.gz: 90fb7f261a2bebf3ce508f02aeff0f85aafb85aa9be8f3ee269a6c7331601eb4
+  metadata.gz: 0b1e0ffadc899b7ad59eeb372ad485595d898fdf11e5f279de47444288979ebc
+  data.tar.gz: d2828953d4691b589fd18764b29f3e8c70b8acf0cfc228b661e2b219784b6216
 SHA512:
-  metadata.gz: bdc1dd2ca515d96d8f533b76eea22f870a0b4801d2ac99609db426d010cf903898c260fc0a70e3a37b14491e27c7760052a43442ba1d9f8da3f0928371a3120b
-  data.tar.gz: 1acf2132716dbd46c378c8093a3c21d00bb2fe210030634264e8cbcc8830a3a3760ba467857c55221a1a46501dcc92fd60494a931f14f39aa71cd1f79bd54c7c
+  metadata.gz: 14cb2f5ad0ae3a821da90bd47269fb8eec3310f1d0b51cde4157db7de48bec0103e02e8d88e05c0a86e760b79c20bbe52abe8aa2180b7486db8bcc6c9f429134
+  data.tar.gz: 453a4f3d089ec55b0241c228873c5afed2bfe2b5a6ac63e9d0dae7a159ce9853cfea83e7153298385e91c4740ce32199ceb49ae2f99008cefe2f2e5b9253ed5f

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .vagrant
 Gemfile.local
+.ruby-version

data/.travis.yml

@@ -8,17 +8,17 @@ 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:
-  - bundle exec rake spec
+  - RUBYOPT=$SPEC_RUBYOPT bundle exec rake spec
 notifications:
   email: false
   slack:
@@ -28,9 +28,11 @@ matrix:
   - rvm: ruby-head
   include:
   - rvm: 2.6
-    env: RUBYOPT="--jit"
+    env: SPEC_RUBYOPT="--jit"
+  - rvm: 2.7
+    env: SPEC_RUBYOPT="--jit"
   - rvm: ruby-head
-    env: RUBYOPT="--jit"
+    env: SPEC_RUBYOPT="--jit"
 branches:
   only:
   - master

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.4...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.9...master)
+
+## 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)
+
+Improvements
+
+- [Check http status code in `http_request` resource (by @takumin)](https://github.com/itamae-kitchen/itamae/pull/296)
 
 ## v1.10.4
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.3...v1.10.4)

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/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/http_request.rb

@@ -5,6 +5,9 @@ module Itamae
   module Resource
     class HttpRequest < File
       RedirectLimitExceeded = Class.new(StandardError)
+      HTTPClientError = Class.new(StandardError)
+      HTTPServerError = Class.new(StandardError)
+      HTTPUnknownError = Class.new(StandardError)
 
       alias_method :_action_create, :action_create
       undef_method :action_create, :action_delete, :action_edit
@@ -48,7 +51,10 @@ module Itamae
             response = http.method(attributes.action).call(uri.request_uri, attributes.message, attributes.headers)
           end
 
-          if response.kind_of?(Net::HTTPRedirection)
+          case response
+          when Net::HTTPSuccess
+            break
+          when Net::HTTPRedirection
             if redirects_followed < attributes.redirect_limit
               uri = URI.parse(response["location"])
               redirects_followed += 1
@@ -56,8 +62,12 @@ module Itamae
             else
               raise RedirectLimitExceeded
             end
+          when Net::HTTPClientError
+            raise HTTPClientError
+          when Net::HTTPServerError
+            raise HTTPServerError
           else
-            break
+            raise HTTPUnknownError
           end
         end
 

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.4"
+  VERSION = "1.10.9"
 end

data/spec/integration/recipes/local.rb

@@ -1,6 +1,4 @@
-package 'sl' do
-  version '3.03-17+b2'
-end
+package 'sl'
 
 ######
 

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.4
+  version: 1.10.9
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-06-04 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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool