itamae 1.12.0 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0be9dd39ba8a2f1e7bf014cab6c6de61ac8c310cfa2e9e95176f586148322a0
-  data.tar.gz: d36a91d8b5c86c640a21e8759f12decf02cfb2c1ae96babf3121c35a69e6390d
+  metadata.gz: dd2755f33211c89faf48c7aaa7156c90dc8f2a6228eea1531914c24e8c23242d
+  data.tar.gz: 38c011974e040f00ce5818f3bf490bae833dc6560146e093a0f0655495c923c8
 SHA512:
-  metadata.gz: 682cfc3e44a44b40b72403057613083f14445e62a8e472d6deddcd91bfa8a981a31de9ae1622b75986db1c7af6de03524f6b512036ae5e235cb92108364b37f5
-  data.tar.gz: 55a70e71f38241a5809e0e857553475675102a3bc17deda94982ff25175f5537ac48e1902629705e79f0acd5642f7d54ecdb6fa727338f90de6cd5abf1ea4e8a
+  metadata.gz: f3faba704d1dec3f3bfc21428a4574b2c72a6e2804b8f91a8274881325c6b61f9ca30de5b0fadfa3a81726c543d7bcdbe43408022fbcae952c6ba170fa8f0f53
+  data.tar.gz: 9f3e1aa52bc4d1cbc9b4a4c1687856746738efdec9f43b8988dee73eb43ffa1362501ae0008e1938fb367e763925e292a9930a5d634d4071c54796964549369a

data/.github/workflows/test.yml

@@ -0,0 +1,202 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 0 * * 5" # JST 9:00 (Fri)
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - "2.3"
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+        rubyopt:
+          - ""
+          - "--jit"
+        exclude:
+          # --jit is available since MRI 2.6
+          - ruby:    "2.3"
+            rubyopt: "--jit"
+          - ruby:    "2.4"
+            rubyopt: "--jit"
+          - ruby:    "2.5"
+            rubyopt: "--jit"
+
+    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"
+        rubyopt:
+          - ""
+          - "--jit"
+        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"
+
+    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"
+        rubyopt:
+          - ""
+          - "--jit"
+        exclude:
+          # --jit is available since MRI 2.6
+          - ruby:    "2.3"
+            rubyopt: "--jit"
+          - ruby:    "2.4"
+            rubyopt: "--jit"
+          - ruby:    "2.5"
+            rubyopt: "--jit"
+
+    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
+
+      - 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 }}
+
+  notify:
+    needs:
+      - unit
+      - integration-docker
+      - integration-local
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Slack Notification (success)
+        uses: lazy-actions/slatify@master
+        if: always()
+        continue-on-error: true
+        with:
+          job_name: '*notify*'
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.0...master)
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.4...master)
+
+## v1.12.4
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.3...v1.12.4)
+
+Improvements
+
+- [Initialize tmp_dir if no tmpdir option was specified.](https://github.com/itamae-kitchen/itamae/pull/341)
+
+## v1.12.3
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.2...v1.12.3)
+
+Bugfixes
+
+- [Fix Chef install script URL (by @NPoi)](https://github.com/itamae-kitchen/itamae/pull/339)
+
+## v1.12.2
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.1...v1.12.2)
+
+Improvements
+
+- [remote_directory: add diff -r option](https://github.com/itamae-kitchen/itamae/pull/338)
+
+## v1.12.1
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.12.0...v1.12.1)
+
+Improvements
+
+- [Allow defining top-level modules without `::`](https://github.com/itamae-kitchen/itamae/pull/332)
 
 ## v1.12.0
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.11.2...v1.12.0)

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.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)
+[![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)
 
 Simple and lightweight configuration management tool inspired by Chef.
 

data/Rakefile

@@ -10,6 +10,8 @@ end
 desc 'Run unit and integration specs.'
 task :spec => ['spec:unit', 'spec:integration:all']
 
+TEST_IMAGE = ENV["TEST_IMAGE"] || "ubuntu:trusty"
+
 namespace :spec do
   RSpec::Core::RakeTask.new("unit") do |task|
     task.ruby_opts = '-I ./spec/unit'
@@ -17,60 +19,54 @@ namespace :spec do
   end
 
   namespace :integration do
-    targets = ["ubuntu:trusty"]
     container_name = 'itamae'
 
-    task :all     => targets + ['spec:integration:local']
+    task :all => ['spec:integration:docker' 'spec:integration:local']
 
-    targets.each do |target|
-      desc "Run provision and specs to #{target}"
-      task target => ["docker:#{target}", "provision:#{target}", "serverspec:#{target}", 'clean_docker_container']
+    desc "Run provision and specs"
+    task :docker => ["docker:boot", "docker:provision", "docker:serverspec", 'docker:clean_docker_container']
 
-      namespace :docker do
-        desc "Run docker for #{target}"
-        task target do
-          sh "docker run --privileged -d --name #{container_name} #{target} /sbin/init"
-        end
+    namespace :docker do
+      desc "Run docker"
+      task :boot do
+        sh "docker run --privileged -d --name #{container_name} #{TEST_IMAGE} /sbin/init"
       end
 
-      namespace :provision do
-        desc "Run itamae to #{target}"
-        task target do
-          suites = [
-            [
-              "spec/integration/recipes/default.rb",
-              "spec/integration/recipes/default2.rb",
-              "spec/integration/recipes/redefine.rb",
-              "spec/integration/recipes/docker.rb",
-            ],
-            [
-              "--dry-run",
-              "spec/integration/recipes/dry_run.rb",
-            ],
-          ]
-          suites.each do |suite|
-            cmd = %w!bundle exec ruby -w bin/itamae docker!
-            cmd << "-l" << (ENV['LOG_LEVEL'] || 'debug')
-            cmd << "-j" << "spec/integration/recipes/node.json"
-            cmd << "--container" << container_name
-            cmd << "--tag" << "itamae:latest"
-            cmd += suite
+      desc "Run itamae"
+      task :provision do
+        suites = [
+          [
+            "spec/integration/recipes/default.rb",
+            "spec/integration/recipes/default2.rb",
+            "spec/integration/recipes/redefine.rb",
+            "spec/integration/recipes/docker.rb",
+          ],
+          [
+            "--dry-run",
+            "spec/integration/recipes/dry_run.rb",
+          ],
+        ]
+        suites.each do |suite|
+          cmd = %w!bundle exec ruby -w bin/itamae docker!
+          cmd << "-l" << (ENV['LOG_LEVEL'] || 'debug')
+          cmd << "-j" << "spec/integration/recipes/node.json"
+          cmd << "--container" << container_name
+          cmd << "--tag" << "itamae:latest"
+          cmd << "--tmp-dir" << (ENV['ITAMAE_TMP_DIR'] || '/tmp/itamae_tmp')
+          cmd += suite
 
-            p cmd
-            unless system(*cmd)
-              raise "#{cmd} failed"
-            end
+          p cmd
+          unless system(*cmd)
+            raise "#{cmd} failed"
           end
         end
       end
 
-      namespace :serverspec do
-        desc "Run serverspec tests to #{target}"
-        RSpec::Core::RakeTask.new(target.to_sym) do |t|
-          ENV['DOCKER_CONTAINER'] = container_name
-          t.ruby_opts = '-I ./spec/integration'
-          t.pattern = "spec/integration/{default,docker}_spec.rb"
-        end
+      desc "Run serverspec tests"
+      RSpec::Core::RakeTask.new(:serverspec) do |t|
+        ENV['DOCKER_CONTAINER'] = container_name
+        t.ruby_opts = '-I ./spec/integration'
+        t.pattern = "spec/integration/{default,docker}_spec.rb"
       end
 
       desc 'Clean a docker container for test'

data/lib/itamae/recipe.rb

@@ -53,7 +53,7 @@ module Itamae
 
     def load(vars = {})
       context = EvalContext.new(self, vars)
-      context.instance_eval(File.read(path), path, 1)
+      InstanceEval.new(File.read(path), path, 1, context: context).call
     end
 
     def run
@@ -151,6 +151,25 @@ module Itamae
       end
     end
 
+    class InstanceEval
+      def initialize(src, path, lineno, context:)
+        # Using instance_eval + eval to allow top-level class/module definition without `::`.
+        # To pass args without introducing any local/instance variables, this code is also eval-ed.
+        @code = <<-RUBY
+          @context.instance_eval do
+            eval(#{src.dump}, nil, #{path.dump}, #{lineno})
+          end
+        RUBY
+        @context = context
+      end
+
+      # This method has no local variables to avoid spilling them to recipes.
+      def call
+        eval(@code)
+      end
+    end
+    private_constant :InstanceEval
+
     class RecipeFromDefinition < Recipe
       attr_accessor :definition
 

data/lib/itamae/resource/remote_directory.rb

@@ -39,7 +39,7 @@ module Itamae
         super
 
         if current.exist
-          diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
+          diff = run_command(["diff", "-u", "-r", attributes.path, @temppath], error: false)
           if diff.exit_status == 0
             # no change
             Itamae.logger.debug "directory content will not change"

data/lib/itamae/runner.rb

@@ -30,7 +30,7 @@ module Itamae
       prepare_handler
 
       @node = create_node
-      @tmpdir = options[:tmp_dir]
+      @tmpdir = options[:tmp_dir] || '/tmp/itamae_tmp'
       @children = RecipeChildren.new
       @diff = false
 
@@ -98,7 +98,7 @@ module Itamae
         unless @backend.run_command("which ohai", error: false).exit_status == 0
           # install Ohai
           Itamae.logger.info "Installing Chef package... (to use Ohai)"
-          @backend.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
+          @backend.run_command("curl -L https://omnitruck.chef.io/install.sh | bash")
         end
 
         Itamae.logger.info "Loading node data via ohai..."

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.12.0"
+  VERSION = "1.12.4"
 end

data/spec/integration/default_spec.rb

@@ -333,3 +333,21 @@ describe file('/tmp/empty_file3') do
   it { should be_file }
   its(:content) { should eq "" }
 end
+
+describe file('/tmp/toplevel_module') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "helper" }
+end
+
+describe file('/tmp/local_variables') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "[]" }
+end
+
+describe file('/tmp/instance_variables') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "[:@recipe]" } # backward compatibility
+end

data/spec/integration/recipes/default.rb

@@ -556,3 +556,9 @@ unless v1 == v2 && v2 == v3 && v1 =~ /\A\d+kB\z/
   raise "failed to fetch host inventory value (#{v1}, #{v2}, #{v3})"
 end
 
+include_recipe "toplevel_module"
+file "/tmp/toplevel_module" do
+  content ToplevelModule.helper
+end
+
+include_recipe "variables"

data/spec/integration/recipes/toplevel_module.rb

@@ -0,0 +1,6 @@
+# Testing you don't need to write `module ::ToplevelModule`
+module ToplevelModule
+  def self.helper
+    "helper"
+  end
+end

data/spec/integration/recipes/variables.rb

@@ -0,0 +1,14 @@
+node.reverse_merge!(
+  variables: {
+    lvars: binding.local_variables,
+    ivars: instance_variables,
+  }
+)
+
+file "/tmp/local_variables" do
+  content node[:variables][:lvars].to_s
+end
+
+file "/tmp/instance_variables" do
+  content node[:variables][:ivars].to_s
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.4
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -210,9 +210,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -293,6 +293,8 @@ files:
 - spec/integration/recipes/redefine.rb
 - spec/integration/recipes/templates/empty_file.erb
 - spec/integration/recipes/templates/template_auto.erb
+- spec/integration/recipes/toplevel_module.rb
+- spec/integration/recipes/variables.rb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/handler/base_spec.rb
@@ -329,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Simple Configuration Management Tool
@@ -357,6 +359,8 @@ test_files:
 - spec/integration/recipes/redefine.rb
 - spec/integration/recipes/templates/empty_file.erb
 - spec/integration/recipes/templates/template_auto.erb
+- spec/integration/recipes/toplevel_module.rb
+- spec/integration/recipes/variables.rb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/handler/base_spec.rb

data/.travis.yml

@@ -1,41 +0,0 @@
-language: ruby
-sudo: required
-dist: xenial
-services:
-  - docker
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - ruby-head
-bundler_args: "--jobs=4 --retry=3"
-cache:
-  bundler: true
-
-before_install:
-  - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
-
-script:
-  - RUBYOPT=$SPEC_RUBYOPT bundle exec rake spec
-notifications:
-  email: false
-  slack:
-    secure: PcecHsVS6lw89K5PllW8xFlzu0d04p6lYfxlUZL0/yp9flAczElJME4RshSMSkbnu5e2Iw8KUA2xB1jkAzDo9qYoXveaKyjkFUOb1ZxYIVxzzfoDDwUNTMmSoyjZjvbeBUcpxxmxy6nXa3zS+gA2ohqWhS9WTTlTqyM5RriDjZ8=
-matrix:
-  allow_failures:
-  - rvm: ruby-head
-  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:
-  only:
-  - master