itamae 1.10.7 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14acdfa4894556d3fcf3b3463f869b2e6d67b36897da33d4104d6e0309724117
-  data.tar.gz: cfb6529c9da828e28bc3f9b33563333e87e6764e2570301fc604f1bb58b553df
+  metadata.gz: 2213250f28fa9b34d4c8d149add25c33f9955b6dd30dfab4fc7ddd9f4e438e61
+  data.tar.gz: 12b67ddfa15210dfb1ea8d35b5aa02db9e4985f4e141c66d7102628b09b5f914
 SHA512:
-  metadata.gz: e72d8fd33859995abfe62bbc74f31af2bce16ea7f410b4c9ddef84b1a142a5c92182cf0845bff4043092e571e546cf7e57171c82f73a0ca6d39200d0908d9829
-  data.tar.gz: 2cd158d444b8553131c38e5962c674a0a84b3e7f3a13637d1765042bfd896a80767f6bdc53cb467981bd3510e7e165cf19edb713d14b957fc1b4f8ba26210077
+  metadata.gz: 4a83817032655a372418a0c2aeef5561e2b669c075b16a0b56f3522d94883396cc535b44cad5d3e2b7c2b8c8c4fdbf400eb95a9efe986b97effaa587cf8d5564
+  data.tar.gz: 96380efa8166f7629035be66884c3526c4c521eaababb5303bf0c520bbb914ebcb8de2e2492bd0ffbc1681d8285d62e011853476565b409486f040422101007a

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - ruby-head
 bundler_args: "--jobs=4 --retry=3"
 cache:
@@ -29,6 +30,10 @@ matrix:
   include:
   - rvm: 2.6
     env: SPEC_RUBYOPT="--jit"
+  - rvm: 2.7
+    env: SPEC_RUBYOPT="--jit"
+  - rvm: 3.0
+    env: SPEC_RUBYOPT="--jit"
   - rvm: ruby-head
     env: SPEC_RUBYOPT="--jit"
 branches:

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.7...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.11.1...master)
+
+## v1.11.1
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.11.0...v1.11.1)
+
+Improvements
+
+- [Support Ruby 3.0.0](https://github.com/itamae-kitchen/itamae/pull/326)
+- [file: improve diff output (by @terceiro)](https://github.com/itamae-kitchen/itamae/pull/327)
+
+## v1.11.0
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.10.10...v1.11.0)
+
+Improvements
+
+- [file: add support for sensitive files (by @terceiro)](https://github.com/itamae-kitchen/itamae/pull/325)
+
+## 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)

data/README.md

@@ -1,6 +1,6 @@
 # [![](https://raw.githubusercontent.com/itamae-kitchen/itamae-logos/master/small/FA-Itamae-horizontal-01-180x72.png)](https://github.com/itamae-kitchen/itamae)
 
-[![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![Build Status](https://travis-ci.org/itamae-kitchen/itamae.svg?branch=master)](https://travis-ci.org/itamae-kitchen/itamae) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://join.slack.com/t/itamae/shared_invite/enQtNTExNTI3ODM1NTY5LTM5MWJlZTgwODE0YTUwMThiNzZjN2I1MGNlZjE2NjlmNzg5NTNlOTliMDhkNDNmNTQ2ZTgwMzZjNjI5NDJiZGI)
+[![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![Build Status](https://travis-ci.com/itamae-kitchen/itamae.svg?branch=master)](https://travis-ci.com/itamae-kitchen/itamae) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://join.slack.com/t/itamae/shared_invite/enQtNTExNTI3ODM1NTY5LTM5MWJlZTgwODE0YTUwMThiNzZjN2I1MGNlZjE2NjlmNzg5NTNlOTliMDhkNDNmNTQ2ZTgwMzZjNjI5NDJiZGI)
 
 Simple and lightweight configuration management tool inspired by Chef.
 
@@ -97,4 +97,3 @@ If you have a problem, please [create an issue](https://github.com/itamae-kitche
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-

data/itamae.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "serverspec", "~> 2.1"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "docker-api", "~> 1.20"
+  spec.add_development_dependency "docker-api", "~> 2"
   spec.add_development_dependency "fakefs"
   spec.add_development_dependency "fluent-logger"
 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/node.rb

@@ -1,6 +1,7 @@
 require 'hashie'
 require 'json'
 require 'schash'
+require 'itamae/mash'
 
 module Itamae
   class Node

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

@@ -4,6 +4,7 @@ module Itamae
       define_attribute :action, default: :create
       define_attribute :path, type: String, default_name: true
       define_attribute :content, type: String, default: nil
+      define_attribute :sensitive, default: false
       define_attribute :mode, type: String
       define_attribute :owner, type: String
       define_attribute :group, type: String
@@ -156,9 +157,14 @@ module Itamae
       end
 
       def show_content_diff
+        if attributes.sensitive
+          Itamae.logger.info("diff exists, but not displaying sensitive content")
+          return
+        end
+
         if attributes.modified
           Itamae.logger.info "diff:"
-          diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
+          diff = run_command(["diff", "-u", "--label=#{attributes.path} (BEFORE)", compare_to, "--label=#{attributes.path} (AFTER)", @temppath], error: false)
           diff.stdout.each_line do |line|
             color = if line.start_with?('+')
                       :green
@@ -193,7 +199,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

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.7"
+  VERSION = "1.11.1"
 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.11.1
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -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.4
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool