daddy 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d95dd5dc3da3b265f1cfc77dfae2595da6aad7bc991022073f9752e301594ad
-  data.tar.gz: 14c5b8a9da1e828026d615944f9ba0184bd1b559c2e9edbb8fcdd5106a6c62a0
+  metadata.gz: a807869b9be324429050f8632ba985428c113056433326f47bba3253ba5ba2bb
+  data.tar.gz: a68b6215e7a4b546c3b031f5cdbdbaa2777f4bc7d7c2f6845b76dc87af513ad9
 SHA512:
-  metadata.gz: cc1703285939bc56923581f95b2b55c29c751de1bb104581e0c9b74f77e55a5cf130377e4b3f5e1cbe5d1a97e83e3b862608b1ada9b63739d3cdef1e37a027f1
-  data.tar.gz: 19d2fa392d15dc97722f07cec68d2a50ec17c7b3a30f0cd60cd663f5b58a10851e38b518c974b773dd8ae732815fa8392d8e7b7c39b995789d8e39562d176d6a
+  metadata.gz: 9c34d3c93042748cf5bcb1134ef72c9c7e289f6e56203d375a715d97849763909f42c57ecfd77e959fadb0c2e47c591b052b2f344c50ffb0e62895f6e37bd54d
+  data.tar.gz: 2b02f6fd41ed2ace58aa88ddcf821d5fe361163af71e4dedd956ed50caa3ecb5f7f8111ff37e2e30e4ccc3e493468c921969b2ad9be58ee6ddcde19cc9e3e03e

data/itamae/environments/{base.rb → base/default.rb}

@@ -5,7 +5,9 @@
   epel-release
   gcc
   gcc-c++
+  git
   graphviz
+  make
   libcurl-devel
   libffi-devel
   libtool
@@ -16,6 +18,9 @@
   openssl-devel
   readline-devel
   sqlite-devel
+  sudo
+  wget
+  which
   zlib-devel
 }.each do |name|
   package name do

data/itamae/environments/docker.rb

@@ -0,0 +1,2 @@
+include_recipe 'docker'
+include_recipe 'docker/image'

data/itamae/environments/docker/Dockerfile.base

@@ -0,0 +1,20 @@
+FROM centos:7.6.1810
+MAINTAINER ichylinux@gmail.com
+
+RUN yum install -y sudo
+
+RUN useradd daddy && \
+    echo "daddy ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/daddy && \
+    sudo sed -i "s/\(^Defaults    secure_path = \).*/\1\/sbin:\/bin:\/usr\/sbin:\/usr\/bin:\/usr\/local\/bin/" /etc/sudoers
+
+USER daddy
+WORKDIR /home/daddy
+
+RUN sudo localedef -f UTF-8 -i ja_JP ja_JP && \
+    sudo sed -i "s/\(^LANG=\).*/\1ja_JP.UTF-8/" /etc/locale.conf && \
+    . /etc/locale.conf && \
+    sudo rm -f /etc/localtime && \
+    sudo ln -snf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+
+RUN sudo mkdir -p /var/daddy/tmp && \
+    sudo chown daddy:daddy /var/daddy/tmp

data/itamae/environments/docker/default.rb

@@ -0,0 +1,28 @@
+%w{ yum-utils device-mapper-persistent-data lvm2 }.each do |name|
+  package name do
+    user 'root'
+  end
+end
+
+execute 'yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo' do
+  user 'root'
+  not_if 'test -e /etc/yum.repos.d/docker-ce.repo'
+end
+
+package 'docker-ce' do
+  user 'root'
+end
+
+group 'docker' do
+  user 'root'
+end
+
+execute "add user to docker group" do
+  command "sudo usermod -a -G docker #{ENV['USER']} && newgrp docker"
+  not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
+end
+
+service 'docker' do
+  action [:enable, :start]
+  user 'root'
+end

data/itamae/environments/docker/image.rb

@@ -0,0 +1,4 @@
+dockerfile = File.join(File.dirname(__FILE__), 'Dockerfile.base')
+execute "docker build -t daddy-base:latest -f #{dockerfile} #{File.dirname(dockerfile)}/" do
+  not_if "docker images | grep daddy-base"
+end

data/itamae/environments/local.rb

@@ -0,0 +1,3 @@
+include_recipe 'base'
+include_recipe 'nodejs'
+include_recipe 'ruby'

data/itamae/environments/nodejs/default.rb

@@ -0,0 +1,19 @@
+template '/etc/yum.repos.d/nodesource-el7.repo' do
+  user 'root'
+end
+
+template '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL' do
+  user 'root'
+end
+
+package 'nodejs' do
+  user 'root'
+end
+
+template '/etc/yum.repos.d/yarn.repo' do
+  user 'root'
+end
+
+package 'yarn' do
+  user 'root'
+end

data/itamae/environments/nodejs/templates/etc/yum.repos.d/{nodesource.repo.erb → nodesource-el7.repo.erb}

@@ -1,6 +1,6 @@
 [nodesource]
 name=Node.js Packages for Enterprise Linux 7 - $basearch
-baseurl=https://rpm.nodesource.com/pub_8.x/el/7/$basearch
+baseurl=https://rpm.nodesource.com/pub_10.x/el/7/$basearch
 failovermethod=priority
 enabled=1
 gpgcheck=1
@@ -8,7 +8,7 @@ gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL
 
 [nodesource-source]
 name=Node.js for Enterprise Linux 7 - $basearch - Source
-baseurl=https://rpm.nodesource.com/pub_8.x/el/7/SRPMS
+baseurl=https://rpm.nodesource.com/pub_10.x/el/7/SRPMS
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL

data/itamae/environments/nodejs/templates/etc/yum.repos.d/yarn.repo.erb

@@ -0,0 +1,6 @@
+[yarn]
+name=Yarn Repository
+baseurl=https://dl.yarnpkg.com/rpm/
+enabled=1
+gpgcheck=1
+gpgkey=https://dl.yarnpkg.com/rpm/pubkey.gpg

data/itamae/environments/ruby/default.rb

@@ -0,0 +1,37 @@
+version = ENV['RUBY_VERSION'] || '2.5.3'
+short_version = version.split('.')[0..1].join('.')
+
+execute 'download ruby' do
+  cwd '/var/daddy/tmp'
+  command <<-EOF
+    set -eu
+    rm -f ruby-#{version}.tar.gz
+    wget https://cache.ruby-lang.org/pub/ruby/#{short_version}/ruby-#{version}.tar.gz
+  EOF
+  not_if "echo #{::File.read(::File.join(::File.dirname(__FILE__), "ruby-#{version}.tar.gz_sha256sum.txt")).strip} | sha256sum -c"
+end
+
+execute 'install ruby' do
+  cwd '/var/daddy/tmp'
+  command <<-EOF
+    set -eu
+    tar zxf ruby-#{version}.tar.gz
+    pushd ruby-#{version}
+      ./configure --disable-install-rdoc
+      make
+      sudo make install
+    popd
+  EOF
+  not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+) \""
+end
+
+%w[
+  rubygems-update
+  bundler
+  itamae
+  daddy
+].each do |name|
+  gem_package name do
+    user 'root'
+  end
+end

data/lib/daddy/rails/railtie.rb

@@ -1,5 +1,4 @@
 require 'rails_i18n'
-require 'holiday_jp'
 require 'daddy/helpers/html_helper'
 require 'daddy/model'
 require 'daddy/ocr'

data/lib/daddy/version.rb

@@ -2,6 +2,6 @@ module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
     VERSION_MINOR = '7',
-    VERSION_REVISION = '8'
+    VERSION_REVISION = '9'
   ].join('.')
 end

data/lib/tasks/dad.rake

@@ -23,7 +23,14 @@ namespace :dad do
       desc "ロール #{role} のセットアップを行います。"
       task role => :environment do
         role_file = "config/itamae/roles/#{role}.rb"
-        fail unless system("bundle exec itamae local --ohai --log-level=#{ENV['DEBUG'] ? 'debug' : 'info'} #{role_file}")
+        log_level = ENV['DEBUG'] ? 'debug' : 'info'
+        
+        if ENV['DOCKER']
+          tag = "#{Daddy.config.application}-#{role}"
+          fail unless system("bundle exec itamae docker --ohai --image daddy-base --tag #{tag} --log-level=#{log_level} #{role_file}")
+        else
+          fail unless system("bundle exec itamae local --ohai --log-level=#{log_level} #{role_file}")
+        end
       end
     end
 

data/lib/tasks/docker.rake

@@ -13,11 +13,6 @@ namespace :dad do
       end
     end
 
-    desc I18n.t('docker.install')
-    task :install do
-      run_itamae 'docker/install'
-    end
-
     namespace :registry do
 
       desc 'install Docker Registry'

data/lib/tasks/locale/en.yml

@@ -1,6 +1,4 @@
 en:
-  docker:
-    install: install Docker
   git:
     install: install Git with git-lfs extention
   god:

data/lib/tasks/locale/ja.yml

@@ -1,6 +1,4 @@
 ja:
-  docker:
-    install: Docker をインストールします
   git:
     install: Git をインストールします
   god:

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: holiday_jp
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: closer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: closer
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -275,7 +275,6 @@ files:
 - app/assets/stylesheets/ympicker.css.scss
 - itamae/cookbooks/app_base_dir.rb
 - itamae/cookbooks/chrome/install.rb
-- itamae/cookbooks/docker/install.rb
 - itamae/cookbooks/docker/registry/install.rb
 - itamae/cookbooks/epel/install.rb
 - itamae/cookbooks/git/install.rb
@@ -301,13 +300,17 @@ files:
 - itamae/cookbooks/unicorn/templates/systemd/app.service.erb
 - itamae/cookbooks/unicorn/templates/unicorn.rb.erb
 - itamae/cookbooks/vsftpd/install.rb
-- itamae/environments/base.rb
-- itamae/environments/nodejs.rb
-- itamae/environments/nodejs/install.rb
+- itamae/environments/base/default.rb
+- itamae/environments/docker.rb
+- itamae/environments/docker/Dockerfile.base
+- itamae/environments/docker/default.rb
+- itamae/environments/docker/image.rb
+- itamae/environments/local.rb
+- itamae/environments/nodejs/default.rb
 - itamae/environments/nodejs/templates/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL.erb
-- itamae/environments/nodejs/templates/etc/yum.repos.d/nodesource.repo.erb
-- itamae/environments/ruby.rb
-- itamae/environments/ruby/install.rb
+- itamae/environments/nodejs/templates/etc/yum.repos.d/nodesource-el7.repo.erb
+- itamae/environments/nodejs/templates/etc/yum.repos.d/yarn.repo.erb
+- itamae/environments/ruby/default.rb
 - itamae/environments/ruby/ruby-2.5.1.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-2.5.3.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
@@ -350,7 +353,6 @@ files:
 - lib/daddy/itamae/env/app_name.rb
 - lib/daddy/itamae/env/dad_env.rb
 - lib/daddy/itamae/env/os_version.rb
-- lib/daddy/itamae/ext/resource/file.rb
 - lib/daddy/itamae/ext/resource/remote_file.rb
 - lib/daddy/itamae/i18n.rb
 - lib/daddy/model.rb
@@ -439,7 +441,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -447,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: My rails dad

data/itamae/cookbooks/docker/install.rb

@@ -1,71 +0,0 @@
-require 'daddy/itamae'
-
-case os_version
-when /rhel-6\.(.*?)/
-  package 'epel-release' do
-    user 'root'
-  end
-
-  package 'docker-io' do
-    user 'root'
-  end
-
-  group 'docker' do
-    user 'root'
-  end
-
-  execute "add user to docker group" do
-    user 'root'
-    command "usermod -aG docker #{ENV['USER']}"
-    not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
-  end
-
-  local_ruby_block 'post install message' do
-    block do
-      message = I18n.t('itamae.messages.docker.after_install', :user => ENV['USER'])
-      message.split("\n").map {|line| Itamae.logger.info line }
-    end
-    action :nothing
-    subscribes :run, 'execute[add user to docker group]'
-  end
-
-  local_ruby_block 'post install message' do
-    block do
-      message = I18n.t('itamae.messages.docker.after_install', :user => ENV['USER'])
-      ['', message.split("\n"), ''].flatten.map {|line| Itamae.logger.info line }
-    end
-    action :nothing
-    subscribes :run, 'execute[add user to docker group]'
-  end
-when /rhel-7\.(.*?)/
-  %w{ yum-utils device-mapper-persistent-data lvm2 }.each do |name|
-    package name do
-      user 'root'
-    end
-  end
-
-  execute 'yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo' do
-    user 'root'
-    not_if 'test -e /etc/yum.repos.d/docker-ce.repo'
-  end
-  
-  package 'docker-ce' do
-    user 'root'
-  end
-
-  group 'docker' do
-    user 'root'
-  end
-  
-  execute "add user to docker group" do
-    command "sudo usermod -a -G docker #{ENV['USER']} && newgrp docker"
-    not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
-  end
-else
-  raise "unsupported operating system: #{os_version}"
-end
-
-service 'docker' do
-  action [:enable, :start]
-  user 'root'
-end

data/itamae/environments/nodejs.rb

@@ -1,2 +0,0 @@
-include_recipe 'base'
-include_recipe 'nodejs/install'

data/itamae/environments/nodejs/install.rb

@@ -1,11 +0,0 @@
-template '/etc/yum.repos.d/nodesource.repo' do
-  user 'root'
-end
-
-template '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL' do
-  user 'root'
-end
-
-package 'nodejs' do
-  user 'root'
-end

data/itamae/environments/ruby.rb

@@ -1,3 +0,0 @@
-include_recipe 'base'
-include_recipe 'nodejs/install'
-include_recipe 'ruby/install'

data/itamae/environments/ruby/install.rb

@@ -1,36 +0,0 @@
-version = ENV['RUBY_VERSION'] || '2.5.3'
-short_version = version.split('.')[0..1].join('.')
-
-execute 'download ruby' do
-  cwd '/var/daddy/tmp'
-  command <<-EOF
-    rm -f ruby-#{version}.tar.gz
-    wget https://cache.ruby-lang.org/pub/ruby/#{short_version}/ruby-#{version}.tar.gz
-  EOF
-  not_if "sha256sum -c #{::File.join(::File.dirname(__FILE__), "ruby-#{version}.tar.gz_sha256sum.txt")}"
-end
-
-execute 'install ruby' do
-  cwd '/var/daddy/tmp'
-  command <<-EOF
-     tar zxf ruby-#{version}.tar.gz
-     pushd ruby-#{version}
-       ./configure --disable-install-rdoc
-       make
-       sudo make install
-     popd
-   EOF
-   not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+) \""
-end
-
-gem_package 'rubygems-update' do
-  user 'root'
-end
-
-gem_package 'bundler' do
-  user 'root'
-end
-
-gem_package 'itamae' do
-  user 'root'
-end

data/lib/daddy/itamae/ext/resource/file.rb

@@ -1,43 +0,0 @@
-require 'itamae/resource/file'
-
-module Itamae
-  module Resource
-    class File < Base
-
-      private
-
-      def send_tempfile
-        if !attributes.content && !content_file
-          @temppath = nil
-          return
-        end
-
-        begin
-          src = if content_file
-                  content_file
-                else
-                  f = Tempfile.open('itamae')
-                  f.write(attributes.content)
-                  f.close
-                  f.path
-                end
-
-          @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
-
-          if backend.is_a?(Itamae::Backend::Docker)
-            run_command(["mkdir", @temppath])
-            backend.send_file(src, @temppath)
-            @temppath = ::File.join(@temppath, ::File.basename(src))
-          else
-            backend.send_file(src, @temppath)
-          end
-
-          run_specinfra(:change_file_mode, @temppath, '0600')
-        ensure
-          f.unlink if f
-        end
-      end
-
-    end
-  end
-end