itamae 1.9.11 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 217d5dd79f8f883f0224aaebe09cf2e0eef4e1c1
-  data.tar.gz: 80a27dfa6ee6b0d04200001eb2ab57a1480264f9
+SHA256:
+  metadata.gz: 8d9449b41e179eee46bdba56f3c099d58c652d48116f7927f7cc12fcf6d0f015
+  data.tar.gz: 63f4dd7419342509efa326830783d421d97c1295074c231b7f8de854fab47f87
 SHA512:
-  metadata.gz: b980d16ac6c8ee8eb112c4a55bd7f0bab97ae4eaa148d783fc5af741b9afb9a3275b1ebbba8a9bb5dd34dc07f1a8d13ab7e4d2320e601993316024646182d318
-  data.tar.gz: c6400d880e7f96d67a55af5973881fe9c6f5e6b1678a7faad4fb094e74af5a157629eda2ad20f75366b58b1465e41d1bdd740eb8dd25af498d1a0a9503eef2aa
+  metadata.gz: e1925e7d871bc4622c9c10ce086d735e203093a3b533a348cff643912aa9798cc26561a46cc4e6b9245b1c5ccfa93199b9e8df4c9e3a0a4b2f258c9297c79ef5
+  data.tar.gz: 18649f349ddb64abfb85215a00ea56b9aeca3ee809916853aa3f10a461e2dbfe0acc2bd5ca9b1bed077c64aa634b3e6277d8cc54015d51e31bd49a1afdb3abc2

data/.travis.yml

@@ -0,0 +1,39 @@
+language: ruby
+sudo: required
+services:
+  - docker
+rvm:
+  - 2.3
+  - 2.4
+  - 2.5
+  - ruby-head
+bundler_args: "--jobs=4 --retry=3"
+cache:
+  bundler: true
+  directories:
+    - $HOME/docker
+
+before_cache:
+  # Save tagged docker images
+  - >
+    mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
+    | xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
+
+before_install:
+  - gem update --system --no-document
+  - gem install bundler --no-document
+  # Load cached docker images
+  - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
+
+script:
+  - bundle exec rake spec
+notifications:
+  email: false
+  slack:
+    secure: PcecHsVS6lw89K5PllW8xFlzu0d04p6lYfxlUZL0/yp9flAczElJME4RshSMSkbnu5e2Iw8KUA2xB1jkAzDo9qYoXveaKyjkFUOb1ZxYIVxzzfoDDwUNTMmSoyjZjvbeBUcpxxmxy6nXa3zS+gA2ohqWhS9WTTlTqyM5RriDjZ8=
+matrix:
+  allow_failures:
+  - rvm: ruby-head
+branches:
+  only:
+  - master

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## Unreleased
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.12...master)
+
+## v1.9.12
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.11...v1.9.12)
+
+Features
+
+- [jail backend: add support of FreeBSD Jail (`itamae jail`)](https://github.com/itamae-kitchen/itamae/pull/249)
+
+Bugfixes
+
+- [docker backend: Fixed edit action of file resource doesn't work with docker backend](https://github.com/itamae-kitchen/itamae/pull/257)
+
+Improvements
+
+- [Print '(dry-run)' first in dry-run mode](https://github.com/itamae-kitchen/itamae/pull/252)
+
 ## v1.9.11
 
 Features
@@ -451,7 +469,7 @@ Feature
 
 Improvements
 
-- `source :auto` accepts a template without .erb extention. (by @ryotarai)
+- `source :auto` accepts a template without .erb extension. (by @ryotarai)
 
 ## v1.1.21
 

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in itamae.gemspec
 gemspec
 
-gem 'vagrant', github: 'ryotarai/vagrant', branch: 'latest-bundler'
-gem 'vagrant-digitalocean'
-
 path = Pathname.new("Gemfile.local")
 eval(path.read) if path.exist?
 

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) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://itamae-slackin.herokuapp.com/)
+[![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://itamae-slackin.herokuapp.com/)
 
 Simple and lightweight configuration management tool inspired by Chef.
 

data/Rakefile

@@ -3,8 +3,6 @@ require 'rspec/core/rake_task'
 require 'tempfile'
 require 'net/ssh'
 
-vagrant_bin = 'vagrant'
-
 desc 'Run unit and integration specs.'
 task :spec => ['spec:unit', 'spec:integration:all']
 
@@ -15,30 +13,22 @@ namespace :spec do
   end
 
   namespace :integration do
-    targets = []
-    status = `cd spec/integration && #{vagrant_bin} status`
-    unless $?.exitstatus == 0
-      raise "vagrant status failed.\n#{status}"
-    end
-
-    status.split("\n\n")[1].each_line do |line|
-      targets << line.match(/^[^ ]+/)[0]
-    end
+    targets = ["ubuntu:trusty"]
 
     task :all     => targets
 
     targets.each do |target|
       desc "Run provision and specs to #{target}"
-      task target => ["provision:#{target}", "serverspec:#{target}"]
+      task target => ["docker:#{target}", "provision:#{target}", "serverspec:#{target}"]
 
-      namespace :provision do
+      namespace :docker do
         task target do
-          config = Tempfile.new('', Dir.tmpdir)
-          env = {"VAGRANT_CWD" => File.expand_path('./spec/integration')}
-          system env, "#{vagrant_bin} up #{target}"
-          system env, "#{vagrant_bin} ssh-config #{target} > #{config.path}"
-          options = Net::SSH::Config.for(target, [config.path])
+          sh "docker run --privileged -d --name itamae #{target} /sbin/init"
+        end
+      end
 
+      namespace :provision do
+        task target do
           suites = [
             [
               "spec/integration/recipes/default.rb",
@@ -51,13 +41,11 @@ namespace :spec do
             ],
           ]
           suites.each do |suite|
-            cmd = %w!bundle exec bin/itamae ssh!
-            cmd << "-h" << options[:host_name]
-            cmd << "-u" << options[:user]
-            cmd << "-p" << options[:port].to_s
-            cmd << "-i" << options[:keys].first
+            cmd = %w!bundle exec bin/itamae docker!
             cmd << "-l" << (ENV['LOG_LEVEL'] || 'debug')
             cmd << "-j" << "spec/integration/recipes/node.json"
+            cmd << "--container" << "itamae"
+            cmd << "--tag" << "itamae:latest"
             cmd += suite
 
             p cmd
@@ -71,7 +59,7 @@ namespace :spec do
       namespace :serverspec do
         desc "Run serverspec tests to #{target}"
         RSpec::Core::RakeTask.new(target.to_sym) do |t|
-          ENV['TARGET_HOST'] = target
+          ENV['DOCKER_CONTAINER'] = "itamae"
           t.ruby_opts = '-I ./spec/integration'
           t.pattern = "spec/integration/*_spec.rb"
         end

data/itamae.gemspec

@@ -6,12 +6,21 @@ require 'itamae/version'
 Gem::Specification.new do |spec|
   spec.name          = "itamae"
   spec.version       = Itamae::VERSION
-  spec.authors       = ["Ryota Arai"]
-  spec.email         = ["ryota.arai@gmail.com"]
+  spec.authors       = ["Ryota Arai", "Yusuke Nakamura", "sue445"]
+  spec.email         = ["ryota.arai@gmail.com", "yusuke1994525@gmail.com", "sue445@sue445.net"]
   spec.summary       = %q{Simple Configuration Management Tool}
-  spec.homepage      = "https://github.com/itamae-kitchen/itamae"
+  spec.homepage      = "https://itamae.kitchen/"
   spec.license       = "MIT"
 
+  if spec.respond_to?(:metadata)
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = "https://github.com/itamae-kitchen/itamae"
+    spec.metadata["changelog_uri"] = "https://github.com/itamae-kitchen/itamae/blob/master/CHANGELOG.md"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/lib/itamae/backend.rb

@@ -212,6 +212,17 @@ module Itamae
       end
     end
 
+    class Jexec < Base
+      private
+      def create_specinfra_backend
+        Specinfra::Backend::Jexec.new(
+          shell: @options[:shell],
+          login_shell: @options[:login_shell],
+          jail_name: @options[:jail_name],
+        )
+      end
+    end
+
     class Ssh < Base
       private
       def create_specinfra_backend

data/lib/itamae/cli.rb

@@ -73,6 +73,17 @@ module Itamae
       run(recipe_files, :docker, options)
     end
 
+    desc "jail RECIPE [RECIPE...]", "Run Itamae in jail"
+    define_exec_options
+    option :jail_name, type: :string, desc: "Jail Hostname"
+    def jail(*recipe_files)
+      if recipe_files.empty?
+        raise "Please specify recipe files."
+      end
+
+      run(recipe_files, :jexec, options)
+    end
+
     desc "version", "Print version"
     def version
       puts "Itamae v#{Itamae::VERSION}"

data/lib/itamae/ext/specinfra.rb

@@ -18,6 +18,16 @@ module Specinfra
       end
     end
 
+    class Docker < Exec
+      def receive_file(from, to = nil)
+        if to
+          send_file(from, to)
+        else
+          run_command("cat #{from}").stdout
+        end
+      end
+    end
+
     class Ssh < Exec
       def receive_file(from, to = nil)
         scp_download!(from, to)

data/lib/itamae/runner.rb

@@ -6,7 +6,7 @@ module Itamae
   class Runner
     class << self
       def run(recipe_files, backend_type, options)
-        Itamae.logger.info "Starting Itamae..."
+        Itamae.logger.info "Starting Itamae... #{options[:dry_run] ? '(dry-run)' : ''}"
 
         backend = Backend.create(backend_type, options)
         runner = self.new(backend, options)

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.11"
+  VERSION = "1.9.12"
 end

data/spec/integration/default_spec.rb

@@ -79,38 +79,34 @@ end
 
 describe file('/tmp/http_request.html') do
   it { should be_file }
-  its(:content) { should match(/"from": "itamae"/) }
+  its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
 describe file('/tmp/http_request_delete.html') do
   it { should be_file }
-  its(:content) { should match(/"from": "itamae"/) }
+  its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
 describe file('/tmp/http_request_post.html') do
   it { should be_file }
-  its(:content) do
-    should match(/"from": "itamae"/)
-    should match(/"love": "sushi"/)
-  end
+  its(:content) { should match(/"from":\s*"itamae"/) }
+  its(:content) { should match(/"love":\s*"sushi"/) }
 end
 
 describe file('/tmp/http_request_put.html') do
   it { should be_file }
-  its(:content) do
-    should match(/"from": "itamae"/)
-    should match(/"love": "sushi"/)
-  end
+  its(:content) { should match(/"from":\s*"itamae"/) }
+  its(:content) { should match(/"love":\s*"sushi"/) }
 end
 
 describe file('/tmp/http_request_headers.html') do
   it { should be_file }
-  its(:content) { should match(/"User-Agent": "Itamae"/) }
+  its(:content) { should match(/"User-Agent":\s*"Itamae"/) }
 end
 
 describe file('/tmp/http_request_redirect.html') do
   it { should be_file }
-  its(:content) { should match(/"from": "itamae"/) }
+  its(:content) { should match(/"from":\s*"itamae"/) }
 end
 
 describe file('/tmp/notifies') do
@@ -130,12 +126,26 @@ describe file('/tmp/cron_stopped') do
   end
 end
 
-describe file('/tmp/cron_running') do
-  it { should be_file }
-  its(:content) do
-    expect(subject.content.lines.size).to eq 2
-  end
-end
+# FIXME: cron service is not running in docker...
+#
+# root@3450c6da6ea5:/# ps -C cron
+#   PID TTY          TIME CMD
+# root@3450c6da6ea5:/# service cron start
+# Rather than invoking init scripts through /etc/init.d, use the service(8)
+# utility, e.g. service cron start
+#
+# Since the script you are attempting to invoke has been converted to an
+# Upstart job, you may also use the start(8) utility, e.g. start cron
+# root@3450c6da6ea5:/# ps -C cron
+#   PID TTY          TIME CMD
+# root@3450c6da6ea5:/#
+
+# describe file('/tmp/cron_running') do
+#   it { should be_file }
+#   its(:content) do
+#     expect(subject.content.lines.size).to eq 2
+#   end
+# end
 
 describe file('/tmp-link') do
   it { should be_linked_to '/tmp' }

data/spec/integration/recipes/default.rb

@@ -83,11 +83,11 @@ gem_package 'rake' do
 end
 
 gem_package 'test-unit' do
-  version '3.2.0'
+  version '2.5.5'
 end
 
 gem_package 'test-unit' do
-  version '3.1.9'
+  version '2.4.9'
 end
 
 gem_package 'test-unit' do

data/spec/integration/spec_helper.rb

@@ -1,36 +1,10 @@
-require 'serverspec'
-require 'net/ssh'
-require 'tempfile'
+require "serverspec"
+require "docker"
 
-set :backend, :ssh
+set :backend, :docker
 
-def vagrant(cmd)
-  env = {"VAGRANT_CWD" => File.dirname(__FILE__)}
-  system(env, "vagrant #{cmd}")
-end
-
-if ENV['ASK_SUDO_PASSWORD']
-  begin
-    require 'highline/import'
-  rescue LoadError
-    fail "highline is not available. Try installing it."
-  end
-  set :sudo_password, ask("Enter sudo password: ") { |q| q.echo = false }
-else
-  set :sudo_password, ENV['SUDO_PASSWORD']
-end
-
-host = ENV['TARGET_HOST']
-
-config = Tempfile.new('', Dir.tmpdir)
-vagrant "ssh-config #{host} > #{config.path}"
-
-options = Net::SSH::Config.for(host, [config.path])
-
-options[:user] ||= Etc.getlogin
-
-set :host,        options[:host_name] || host
-set :ssh_options, options
+set :docker_image, ENV["DOCKER_IMAGE"]
+set :docker_container, ENV["DOCKER_CONTAINER"]
 
 # Disable sudo
 # set :disable_sudo, true

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.12
 platform: ruby
 authors:
 - Ryota Arai
+- Yusuke Nakamura
+- sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -201,6 +203,8 @@ dependencies:
 description: 
 email:
 - ryota.arai@gmail.com
+- yusuke1994525@gmail.com
+- sue445@sue445.net
 executables:
 - itamae
 extensions: []
@@ -208,13 +212,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/itamae
-- ci/destroy_old_droplets.rb
 - itamae.gemspec
 - lib/itamae.rb
 - lib/itamae/backend.rb
@@ -265,7 +269,6 @@ files:
 - lib/itamae/resource/user.rb
 - lib/itamae/runner.rb
 - lib/itamae/version.rb
-- spec/integration/Vagrantfile
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb
@@ -292,11 +295,13 @@ files:
 - spec/unit/lib/itamae/resource_spec.rb
 - spec/unit/lib/itamae/runner_spec.rb
 - spec/unit/spec_helper.rb
-- wercker.yml
-homepage: https://github.com/itamae-kitchen/itamae
+homepage: https://itamae.kitchen/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://itamae.kitchen/
+  source_code_uri: https://github.com/itamae-kitchen/itamae
+  changelog_uri: https://github.com/itamae-kitchen/itamae/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -313,12 +318,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool
 test_files:
-- spec/integration/Vagrantfile
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb

data/ci/destroy_old_droplets.rb

@@ -1,22 +0,0 @@
-require 'net/https'
-require 'json'
-require 'time'
-
-http = Net::HTTP.new("api.digitalocean.com", 443)
-http.use_ssl = true
-
-res = http.start do
-  http.get("/v2/droplets", "Authorization" => "Bearer #{ENV['DIGITALOCEAN_TOKEN']}")
-end
-
-droplets = JSON.parse(res.body)['droplets']
-droplets.each do |droplet|
-  next unless /^itamae-/ =~ droplet['name']
-  if Time.now - Time.parse(droplet['created_at']) >= 60 * 60
-    puts "destroying #{droplet}..."
-    res = http.start do
-      http.delete("/v2/droplets/#{droplet['id']}", "Authorization" => "Bearer #{ENV['DIGITALOCEAN_TOKEN']}")
-    end
-  end
-end
-

data/spec/integration/Vagrantfile

@@ -1,37 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-require 'vagrant-digitalocean'
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.define :trusty do |c|
-    c.vm.hostname  = 'itamae-trusty'
-    c.vm.hostname += "-#{ENV['WERCKER_BUILD_ID']}" if ENV['WERCKER_BUILD_ID']
-    c.vm.provider :virtualbox do |provider, override|
-      override.vm.box = "ubuntu/trusty64"
-      override.vm.provision :shell, inline: <<-EOC
-  cat /etc/apt/sources.list | sed -e 's|http://[^ ]*|mirror://mirrors.ubuntu.com/mirrors.txt|g' > /tmp/sources.list
-  if !(diff -q /etc/apt/sources.list /tmp/sources.list); then
-    mv /tmp/sources.list /etc/apt/sources.list
-    apt-get update
-  fi
-  echo America/New_York > /etc/timezone
-  dpkg-reconfigure --frontend noninteractive tzdata
-      EOC
-    end
-
-    c.vm.provider :digital_ocean do |provider, override|
-      override.ssh.private_key_path = '~/.ssh/id_rsa.vagrant'
-      override.vm.box = 'digital_ocean'
-      override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-
-      provider.ssh_key_name = ENV['WERCKER'] ? 'vagrant/wercker/itamae' : 'Vagrant'
-      provider.token = ENV['DIGITALOCEAN_TOKEN']
-      provider.image = 'ubuntu-14-04-x64' # ubuntu
-      provider.region = 'nyc3'
-      provider.size = '512mb'
-    end
-  end
-end

data/wercker.yml

@@ -1,77 +0,0 @@
-box: wercker/rvm
-# Build definition
-build:
-  # The steps that will be executed on build
-  # See the Ruby section on the wercker devcenter:
-  # http://devcenter.wercker.com/articles/languages/ruby.html
-  steps:
-    # Uncomment this to force RVM to use a specific Ruby version
-    - rvm-use:
-        version: 2.2.3
-
-    - script:
-        name: update bundler
-        code: gem update bundler
-
-    # A step that executes `bundle install` command
-    - bundle-install
-
-    # A custom script step, name value is used in the UI
-    # and the code value contains the command that get executed
-    - script:
-        name: echo ruby information
-        code: |
-          echo "ruby version $(ruby --version) running"
-          echo "from location $(which ruby)"
-          echo -p "gem list: $(gem list)"
-
-    - script:
-        name: create .ssh directory
-        code: mkdir -p $HOME/.ssh
-
-    - create-file:
-        name: put private key
-        filename: $HOME/.ssh/id_rsa.vagrant
-        overwrite: true
-        hide-from-log: true
-        content: $DIGITALOCEAN_PRIVATE_KEY
-
-    - create-file:
-        name: put public key
-        filename: $HOME/.ssh/id_rsa.vagrant.pub
-        overwrite: true
-        hide-from-log: true
-        content: $DIGITALOCEAN_PUBLIC_KEY
-
-    - script:
-        name: chmod 600 id_rsa
-        code: chmod 600 $HOME/.ssh/id_rsa.vagrant
-
-    - script:
-        name: install libxml and libxslt
-        code: sudo apt-get install libxml2-dev libxslt1-dev
-
-    - script:
-        name: bundle install
-        code: bundle install --deployment -j4
-
-    - script:
-        name: start vm
-        code: bundle exec vagrant up --provider=digital_ocean
-        cwd: spec/integration
-
-    # Add more steps here:
-    - script:
-        name: rspec
-        code: bundle exec rake spec
-
-  after-steps:
-    - script:
-        name: shutdown vm
-        code: bundle exec vagrant destroy -f
-        cwd: spec/integration
-
-    - script:
-        name: shutdown old vms
-        code: bundle exec ruby ci/destroy_old_droplets.rb
-