itamae 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 941bb9ea78dc5e3f6f91c1c6e423d086659eeaee58ffcdb41c66f0b99dc08667
-  data.tar.gz: a796304a86594b08468cf5f14c9a326ff22c7fa1987f6e1aedcd64440ff64dc9
+  metadata.gz: a4e4d3ac8c4c594f8721621e3ac992482d8f89a4391525e7f40ae7bbf6c492d1
+  data.tar.gz: fdb3b1e0f358f66453c9097a1f3bc8577eb606f76522059885dbde4b938d92d8
 SHA512:
-  metadata.gz: ebe3d6b48795534aecab054b5f46b1a65f139810a5c65f3ad3efa3a42f4a01dbc36a2fbe5473c115a89fec39c7f29a2c49e6341ba7db9498a954970e2e351e2e
-  data.tar.gz: 926e1637d9372bc22a17d79af0e2456c142ed6a8e24c4b3e8ccd7c5af0dacd76b155848aec8d4b88fa78e27713c8831c27f8fb298acd6b72eab5008d799e0d85
+  metadata.gz: 4e47d72e5095bf93a0e11f2ac0686bb787693de09b84672be240a41addb09d7b2a56b205a10f3738fd8b2d64d0d75a6ea431861aef5e27c1eb147d40c444ca37
+  data.tar.gz: c03a588ab12d43ce1921b96e8d8581d9296f847ac127a0af956b6fba5edbc085a8eab53ff8876e93b4303854ecb60d34186b7dd49d68e1bac002d06eea0b7843

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+# c.f. https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly

data/.github/workflows/release.yml

@@ -0,0 +1,41 @@
+name: Publish gem to rubygems.org
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    if: github.repository == 'itamae-kitchen/itamae'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/itamae
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -13,9 +13,7 @@ on:
     - cron: "0 0 * * 5" # JST 9:00 (Fri)
 
 jobs:
-  unit:
-    runs-on: ubuntu-latest
-
+  test_main:
     strategy:
       fail-fast: false
 
@@ -28,6 +26,9 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
         rubyopt:
           - ""
           - "--jit"
@@ -53,183 +54,34 @@ jobs:
             rubyopt: "--yjit"
           - ruby:    "3.0"
             rubyopt: "--yjit"
-    env:
-      RUBYOPT: ${{ matrix.rubyopt }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle update
-
-      - run: bundle exec rake spec:unit
-
-      - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
-        if: "! success()"
-        continue-on-error: true
-        with:
-          job_name: ${{ format('*unit* ({0},{1})', matrix.ruby, matrix.rubyopt) }}
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-  integration-docker:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        ruby:
-          - "2.3"
-          - "2.4"
-          - "2.5"
-          - "2.6"
-          - "2.7"
-          - "3.0"
-          - "3.1"
-        rubyopt:
-          - ""
-          - "--jit"
-          - "--yjit"
-        image:
-          - ubuntu:trusty
-        exclude:
-          # --jit is available since MRI 2.6
-          - ruby:    "2.3"
-            rubyopt: "--jit"
-          - ruby:    "2.4"
-            rubyopt: "--jit"
-          - ruby:    "2.5"
-            rubyopt: "--jit"
-          # --yjit is available since MRI 3.1
-          - ruby:    "2.3"
-            rubyopt: "--yjit"
-          - ruby:    "2.4"
-            rubyopt: "--yjit"
-          - ruby:    "2.5"
-            rubyopt: "--yjit"
-          - ruby:    "2.6"
-            rubyopt: "--yjit"
-          - ruby:    "2.7"
-            rubyopt: "--yjit"
-          - ruby:    "3.0"
-            rubyopt: "--yjit"
-
-    env:
-      RUBYOPT: ${{ matrix.rubyopt }}
-      TEST_IMAGE: ${{ matrix.image }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
 
-      - run: bundle update
-
-      - run: bundle exec rake spec:integration:docker:boot
-
-      - run: bundle exec rake spec:integration:docker:provision
-        env:
-          # FIXME: avoid error for "Command `chmod 777 /tmp/itamae_tmp` failed. (exit status: 1)"
-          ITAMAE_TMP_DIR: /var/tmp/itamae_tmp
-
-      - run: bundle exec rake spec:integration:docker:serverspec
-      - run: bundle exec rake spec:integration:docker:clean_docker_container
-
-      - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
-        if: "! success()"
-        continue-on-error: true
-        with:
-          job_name: ${{ format('*integration-docker* ({0},{1},{2})', matrix.ruby, matrix.rubyopt, matrix.image) }}
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-  integration-local:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        ruby:
-          - "2.3"
-          - "2.4"
-          - "2.5"
-          - "2.6"
-          - "2.7"
-          - "3.0"
-          - "3.1"
-        rubyopt:
-          - ""
-          - "--jit"
-          - "--yjit"
-        exclude:
-          # --jit is available since MRI 2.6
-          - ruby:    "2.3"
-            rubyopt: "--jit"
-          - ruby:    "2.4"
-            rubyopt: "--jit"
-          - ruby:    "2.5"
-            rubyopt: "--jit"
-          # --yjit is available since MRI 3.1
-          - ruby:    "2.3"
-            rubyopt: "--yjit"
-          - ruby:    "2.4"
-            rubyopt: "--yjit"
-          - ruby:    "2.5"
-            rubyopt: "--yjit"
-          - ruby:    "2.6"
+          # --jit is same to --yjit since MRI 3.2 (don't test both `--jit` and `--yjit`)
+          - ruby:    "3.2"
             rubyopt: "--yjit"
-          - ruby:    "2.7"
+          - ruby:    "3.3"
             rubyopt: "--yjit"
-          - ruby:    "3.0"
+          - ruby:    "3.4"
             rubyopt: "--yjit"
 
-    env:
-      RUBYOPT: ${{ matrix.rubyopt }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle update
-
-      - run: bundle exec rake spec:integration:local:main
-      - run: bundle exec rake spec:integration:local:ordinary_user
+    uses: ./.github/workflows/test_main.yml
+    with:
+      ruby: ${{ matrix.ruby }}
+      rubyopt: ${{ matrix.rubyopt }}
 
-      - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
-        if: "! success()"
-        continue-on-error: true
-        with:
-          job_name: ${{ format('*integration-local* ({0},{1})', matrix.ruby, matrix.rubyopt) }}
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+      # This repository uses matrix to run 50+ builds in a pipeline.
+      # This results in simultaneous requests being sent to httpbin.org,
+      # similar to a DDoS attack, often causing 500 errors and test failures.
+      #
+      # e.g. https://github.com/itamae-kitchen/itamae/actions/runs/17045210601/job/48319099479?pr=379
+      #
+      # Therefore, I suppressed simultaneous requests to httpbin.org.
+      skip_http_request_test: ${{ (matrix.ruby == '2.3' && matrix.rubyopt == '') && 'false' || 'true' }}
+    secrets:
+      SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   notify:
     needs:
-      - unit
-      - integration-docker
-      - integration-local
+      - test_main
 
     runs-on: ubuntu-latest
 

data/.github/workflows/test_main.yml

@@ -0,0 +1,142 @@
+name: test_main
+
+on:
+  workflow_call:
+    inputs:
+      ruby:
+        required: true
+        type: string
+      rubyopt:
+        required: false
+        type: string
+        default: ""
+      skip_http_request_test:
+        required: true
+        type: string
+    secrets:
+      SLACK_WEBHOOK:
+        required: true
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ inputs.ruby }}
+          bundler-cache: true
+          bundler: default
+
+      - run: bundle update
+
+      - run: bundle exec rake spec:unit
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        if: "! success()"
+        continue-on-error: true
+        with:
+          job_name: ${{ format('*unit* ({0},{1})', inputs.ruby, inputs.rubyopt) }}
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  integration-docker:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        image:
+          - ubuntu:trusty
+
+    env:
+      TEST_IMAGE: ${{ matrix.image }}
+      SKIP_HTTP_REQUEST_TEST: ${{ inputs.skip_http_request_test }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ inputs.ruby }}
+          bundler-cache: true
+          bundler: default
+
+      - run: bundle update
+
+      - run: bundle exec rake spec:integration:docker:boot
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - run: bundle exec rake spec:integration:docker:provision
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+          # FIXME: avoid error for "Command `chmod 777 /tmp/itamae_tmp` failed. (exit status: 1)"
+          ITAMAE_TMP_DIR: /var/tmp/itamae_tmp
+
+      - run: bundle exec rake spec:integration:docker:serverspec
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - run: bundle exec rake spec:integration:docker:clean_docker_container
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        if: "! success()"
+        continue-on-error: true
+        with:
+          job_name: ${{ format('*integration-docker* ({0},{1},{2})', inputs.ruby, inputs.rubyopt, matrix.image) }}
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  integration-local:
+    runs-on: ubuntu-latest
+
+    # NOTE: When ruby is 2.5, tests run on buster. But buster is already EOL and didn't work apt-get
+    if: ${{ inputs.ruby >= '2.6' }}
+
+    env:
+      SKIP_HTTP_REQUEST_TEST: ${{ inputs.skip_http_request_test }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ inputs.ruby }}
+          bundler-cache: true
+          bundler: default
+
+      - run: bundle update
+
+      - run: bundle exec rake spec:integration:local:main
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - run: bundle exec rake spec:integration:local:ordinary_user
+        env:
+          RUBYOPT: ${{ inputs.rubyopt }}
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        if: "! success()"
+        continue-on-error: true
+        with:
+          job_name: ${{ format('*integration-local* ({0},{1})', inputs.ruby, inputs.rubyopt) }}
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.14.1...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.14.2...master)
+
+## v1.14.2
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.14.1...v1.14.2)
+
+Bugfixes
+
+- [Add workaround for `Gem::Package::TarWriter#add_file`](https://github.com/itamae-kitchen/itamae/pull/378)
 
 ## v1.14.1
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.14.0...v1.14.1)

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://github.com/itamae-kitchen/itamae/workflows/test/badge.svg?branch=master)](https://github.com/itamae-kitchen/itamae/actions?query=workflow%3Atest) [![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) [![Maintainability](https://api.codeclimate.com/v1/badges/1de79e271cff2a43091f/maintainability)](https://codeclimate.com/github/itamae-kitchen/itamae/maintainability) [![test](https://github.com/itamae-kitchen/itamae/actions/workflows/test.yml/badge.svg)](https://github.com/itamae-kitchen/itamae/actions/workflows/test.yml) [![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.
 

data/Rakefile

@@ -29,7 +29,7 @@ namespace :spec do
     namespace :docker do
       desc "Run docker"
       task :boot do
-        sh "docker run --privileged -d --name #{container_name} #{TEST_IMAGE} /sbin/init"
+        sh "docker run --env SKIP_HTTP_REQUEST_TEST --privileged -d --name #{container_name} #{TEST_IMAGE} /sbin/init"
       end
 
       desc "Run itamae"

data/lib/itamae/resource/file.rb

@@ -214,7 +214,19 @@ module Itamae
 
           if backend.is_a?(Itamae::Backend::Docker)
             run_command(["mkdir", @temppath])
+
+            # NOTE: From rubygems v3.6.7, Gem::Package::TarWriter#add_file uses SOURCE_DATE_EPOCH env var to set file mtime.
+            #   This is a workaround for Docker backend where Gem::Package::TarWriter#add_file used in Docker backend.
+            #   See also:
+            #     * https://github.com/ruby/rubygems/pull/8673
+            #     * https://github.com/itamae-kitchen/itamae/issues/377
+            #     * https://github.com/itamae-kitchen/itamae/pull/378
+            current_source_date_epoch_env = ENV["SOURCE_DATE_EPOCH"]
+            ENV["SOURCE_DATE_EPOCH"] = Time.now.to_i.to_s unless current_source_date_epoch_env
             backend.send_file(src, @temppath, user: attributes.user)
+            ENV["SOURCE_DATE_EPOCH"] = current_source_date_epoch_env
+            # end of NOTE
+
             @temppath = ::File.join(@temppath, ::File.basename(src))
           else
             run_command(["touch", @temppath])

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.14.1"
+  VERSION = "1.14.2"
 end

data/spec/integration/default_spec.rb

@@ -11,7 +11,7 @@ describe file('/tmp/included_recipe') do
   it { should be_file }
 end
 
-describe package('dstat') do
+describe package('jq') do
   it { should be_installed }
 end
 
@@ -77,34 +77,34 @@ describe file('/tmp/never_exist2') do
   it { should_not be_file }
 end
 
-describe file('/tmp/http_request.html') do
+describe file('/tmp/http_request.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
-describe file('/tmp/http_request_delete.html') do
+describe file('/tmp/http_request_delete.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
-describe file('/tmp/http_request_post.html') do
+describe file('/tmp/http_request_post.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
   its(:content) { should match(/"love":\s*"sushi"/) }
 end
 
-describe file('/tmp/http_request_put.html') do
+describe file('/tmp/http_request_put.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
   its(:content) { should match(/"love":\s*"sushi"/) }
 end
 
-describe file('/tmp/http_request_headers.html') do
+describe file('/tmp/http_request_headers.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"User-Agent":\s*"Itamae"/) }
 end
 
-xdescribe file('/tmp/http_request_redirect.html') do
+xdescribe file('/tmp/http_request_redirect.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   its(:content) { should match(/"from":\s*"itamae"/) }
 end
@@ -274,10 +274,12 @@ end
 
 describe file('/tmp/file_edit_with_content_change_updates_timestamp') do
   its(:mtime) { should be > DateTime.iso8601("2016-05-02T01:23:45Z") }
+  its(:content) { should eq "Hello, Itamae\n" }
 end
 
 describe file('/tmp/file_edit_without_content_change_keeping_timestamp') do
   its(:mtime) { should eq(DateTime.iso8601("2016-05-02T12:34:56Z")) }
+  its(:content) { should eq "" }
 end
 
 describe file('/home/itamae2') do
@@ -306,10 +308,12 @@ end
 
 describe file('/tmp/file_with_content_change_updates_timestamp') do
   its(:mtime) { should be > DateTime.iso8601("2016-05-01T01:23:45Z") }
+  its(:content) { should eq "Hello, world" }
 end
 
 describe file('/tmp/file_without_content_change_keeping_timestamp') do
   its(:mtime) { should eq(DateTime.iso8601("2016-05-01T12:34:56Z")) }
+  its(:content) { should eq "Hello, world\n" }
 end
 
 describe file('/tmp/subscribed_from_parent') do

data/spec/integration/ordinary_user_spec.rb

@@ -84,14 +84,14 @@ end
 
 ###
 
-describe file('/tmp/http_request.html') do
+describe file('/tmp/http_request.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true" do
   it { should be_file }
   it { should be_owned_by "ordinary_san" }
   it { should be_grouped_into "ordinary_san" }
   its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
-describe file('/tmp/http_request_root.html') do
+describe file('/tmp/http_request_root.html'), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
   it { should be_file }
   it { should be_owned_by "root" }
   it { should be_grouped_into "root" }
@@ -99,7 +99,7 @@ describe file('/tmp/http_request_root.html') do
 end
 
 %w[/tmp/http_request_another_ordinary.html /tmp/http_request_another_ordinary_with_root.html].each do |path|
-  describe file(path) do
+  describe file(path), unless: ENV["SKIP_HTTP_REQUEST_TEST"] == "true"  do
     it { should be_file }
     it { should be_owned_by "itamae" }
     it { should be_grouped_into "itamae" }

data/spec/integration/recipes/default.rb

@@ -41,7 +41,7 @@ end
 
 ######
 
-package 'dstat' do
+package 'jq' do
   action :install
 end
 
@@ -55,35 +55,43 @@ package "ruby"
 
 gem_package 'tzinfo' do
   version '1.1.0'
+  cwd '/tmp'
 end
 
 gem_package 'tzinfo' do
   version '1.2.2'
+  cwd '/tmp'
 end
 
 gem_package 'rake' do
   version '11.1.0'
+  cwd '/tmp'
 end
 
 gem_package 'rake' do
   version '11.2.2'
+  cwd '/tmp'
 end
 
 gem_package 'rake' do
   action :uninstall
   version '11.2.2'
+  cwd '/tmp'
 end
 
 gem_package 'test-unit' do
   version '2.5.5'
+  cwd '/tmp'
 end
 
 gem_package 'test-unit' do
   version '2.4.9'
+  cwd '/tmp'
 end
 
 gem_package 'test-unit' do
   action :uninstall
+  cwd '/tmp'
 end
 
 ######
@@ -184,36 +192,38 @@ end
 
 ######
 
-http_request "/tmp/http_request.html" do
-  url "https://httpbin.org/get?from=itamae"
-end
+unless ENV["SKIP_HTTP_REQUEST_TEST"] == "true"
+  http_request "/tmp/http_request.html" do
+    url "https://httpbin.org/get?from=itamae"
+  end
 
-http_request "/tmp/http_request_delete.html" do
-  action :delete
-  url "https://httpbin.org/delete?from=itamae"
-end
+  http_request "/tmp/http_request_delete.html" do
+    action :delete
+    url "https://httpbin.org/delete?from=itamae"
+  end
 
-http_request "/tmp/http_request_post.html" do
-  action :post
-  message "love=sushi"
-  url "https://httpbin.org/post?from=itamae"
-end
+  http_request "/tmp/http_request_post.html" do
+    action :post
+    message "love=sushi"
+    url "https://httpbin.org/post?from=itamae"
+  end
 
-http_request "/tmp/http_request_put.html" do
-  action :put
-  message "love=sushi"
-  url "https://httpbin.org/put?from=itamae"
-end
+  http_request "/tmp/http_request_put.html" do
+    action :put
+    message "love=sushi"
+    url "https://httpbin.org/put?from=itamae"
+  end
 
-http_request "/tmp/http_request_headers.html" do
-  headers "User-Agent" => "Itamae"
-  url "https://httpbin.org/get"
-end
+  http_request "/tmp/http_request_headers.html" do
+    headers "User-Agent" => "Itamae"
+    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
+end
 
 link "/tmp-link" do
   to "/tmp"

data/spec/integration/recipes/docker.rb

@@ -7,6 +7,7 @@ end
 gem_package 'ast' do
   version '2.0.0'
   options ['--no-ri', '--no-rdoc']
+  cwd '/tmp'
 end
 
 ######

data/spec/integration/recipes/local.rb

@@ -5,6 +5,7 @@ package 'sl'
 gem_package 'ast' do
   version '2.0.0'
   options ['--no-document']
+  cwd '/tmp'
 end
 
 ######

data/spec/integration/recipes/ordinary_user.rb

@@ -83,27 +83,29 @@ end
 
 ###
 
-http_request "/tmp/http_request.html" do
-  url "https://httpbin.org/get?from=itamae"
-end
-
-http_request "/tmp/http_request_root.html" do
-  user 'root'
-  owner 'root'
-  group 'root'
-  url "https://httpbin.org/get?from=itamae"
-end
-
-http_request "/tmp/http_request_another_ordinary.html" do
-  user 'itamae'
-  owner 'itamae'
-  group 'itamae'
-  url "https://httpbin.org/get?from=itamae"
-end
-
-http_request "/tmp/http_request_another_ordinary_with_root.html" do
-  user 'root'
-  owner 'itamae'
-  group 'itamae'
-  url "https://httpbin.org/get?from=itamae"
+unless ENV["SKIP_HTTP_REQUEST_TEST"] == "true"
+  http_request "/tmp/http_request.html" do
+    url "https://httpbin.org/get?from=itamae"
+  end
+
+  http_request "/tmp/http_request_root.html" do
+    user 'root'
+    owner 'root'
+    group 'root'
+    url "https://httpbin.org/get?from=itamae"
+  end
+
+  http_request "/tmp/http_request_another_ordinary.html" do
+    user 'itamae'
+    owner 'itamae'
+    group 'itamae'
+    url "https://httpbin.org/get?from=itamae"
+  end
+
+  http_request "/tmp/http_request_another_ordinary_with_root.html" do
+    user 'root'
+    owner 'itamae'
+    group 'itamae'
+    url "https://httpbin.org/get?from=itamae"
+  end
 end

data/tasks/integration_local_spec.rb

@@ -78,11 +78,14 @@ class IntegrationLocalSpecRunner
 
   def docker_run
     mount_dir = Pathname(__dir__).join('../').to_s
-    sh 'docker', 'run', '--privileged', '-d', '--name', CONTAINER_NAME, '-v', "#{mount_dir}:/itamae", "ruby:#{@ruby_version}", 'sleep', '1d'
+    sh 'docker', 'run', '--env', 'SKIP_HTTP_REQUEST_TEST', '--privileged', '-d', '--name', CONTAINER_NAME, '-v', "#{mount_dir}:/itamae", "ruby:#{@ruby_version}", 'sleep', '1d'
   end
 
   def prepare
-    docker_exec 'gem', 'install', 'bundler'
+    # Install the same version of bundler into the Docker container as is installed locally
+    current_bundler_version = /([0-9.]+)/.match(`bundle -v`).captures[0]
+    docker_exec 'gem', 'install', 'bundler', '-v', current_bundler_version
+
     docker_exec 'bundle', 'install', options: %w[--workdir /itamae]
     docker_exec 'apt-get', 'update', '-y'
     docker_exec 'apt-get', 'install', 'locales', 'sudo', '-y'
@@ -112,6 +115,6 @@ class IntegrationLocalSpecRunner
   end
 
   def docker_exec(*cmd, options: [])
-    sh 'docker', 'exec', '--env', 'LANG=en_US.utf8', *options, CONTAINER_NAME, *cmd
+    sh 'docker', 'exec', '--env', 'LANG=en_US.utf8', '--env', 'SKIP_HTTP_REQUEST_TEST', *options, CONTAINER_NAME, *cmd
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Ryota Arai
 - Yusuke Nakamura
 - sue445
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -200,7 +199,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - ryota.arai@gmail.com
 - yusuke1994525@gmail.com
@@ -210,7 +208,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/test_main.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -317,7 +318,6 @@ metadata:
   source_code_uri: https://github.com/itamae-kitchen/itamae
   changelog_uri: https://github.com/itamae-kitchen/itamae/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -332,8 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Simple Configuration Management Tool
 test_files: