daddy 0.11.3 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913cfbabdf728c1b6e0e1768b778d1d6972a86eb9d2bf1784c0ee4bd0532ee3d
-  data.tar.gz: be021799518b5758507721f1a8a3e6381bc490ec2b3e25d25bba8752965093e1
+  metadata.gz: 5546040134b767b9acea4ec78f71ece754c5fd2616c2dad158394af4ba9a85d3
+  data.tar.gz: eed047c392ed56ee97d48f0b02c454531f635ee6a2d35e8cd3d2f0566f14b17c
 SHA512:
-  metadata.gz: 46cbd69ae09c9f666692902d5e01c96e4a28be3bcf3967862645f435e24b036e7ede6d8c8dd66f252ff30b4bac36d64b799221ce252d953f904b4868bc69264a
-  data.tar.gz: 83dc2792ec9d7890f495f253642699ced8dd9c24423243b216ec79ffdb8fc910f214a0827f361602eb59f969ab4d5f866a29178698ebb002d6555ff441ede5af
+  metadata.gz: 8cc9bfeaf3842a481c93e8d68ad6117b93c9764964e302c541094e7eb0cdb6aa72b78bcc87993c3598ed283f8d1479f53dd23284216c5eee4cbcef6ff1573218
+  data.tar.gz: 6e6a104964911ee1941f02481a86072ccc1c83e380a1ec6d56e8bf9864609bbcd7298b465fc8186628b006b2149ca794a2db5a64885a9dfe4c22a2f968b77c0d

data/itamae/environments/base/default.rb

@@ -1,10 +1,10 @@
 %w{
   autoconf
   automake
-  curl
   gcc
   gcc-c++
   git
+  glibc-langpack-ja
   make
   libcurl-devel
   libffi-devel
@@ -12,11 +12,15 @@
   libxml2-devel
   libxslt-devel
   openssl-devel
+  patch
   readline-devel
   shared-mime-info
   sudo
+  tar
+  unzip
   wget
   which
+  zip
   zlib-devel
 }.each do |name|
   package name do
@@ -30,10 +34,16 @@ end
   package name do
     user 'root'
     options '--enablerepo=powertools'
+    only_if "grep -qE '^AlmaLinux release 8\.[0-9]+' /etc/almalinux-release"
   end
 end
 
-execute 'dnf clean all' do
-  user 'root'
-  options '--enablerepo=powertools'
+%w{
+  libyaml-devel
+}.each do |name|
+  package name do
+    user 'root'
+    options '--enablerepo=crb'
+    only_if "grep -qE '^AlmaLinux release 9\.[0-9]+' /etc/almalinux-release"
+  end
 end

data/itamae/environments/nodejs/default.rb

@@ -1,49 +1,2 @@
-file '/etc/yum.repos.d/nodesource-nodejs.repo' do
-  user 'root'
-  owner 'root'
-  group 'root'
-  mode '644'
-end
-
-execute 'place /etc/yum.repos.d/nodesource-nodejs.repo' do
-  user 'root'
-  command <<-EOF
-    set -eu
-    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs.repo')} /etc/yum.repos.d/nodesource-nodejs.repo
-    sudo chmod 644 /etc/yum.repos.d/nodesource-nodejs.repo
-  EOF
-  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs.repo')} /etc/yum.repos.d/nodesource-nodejs.repo"
-end
-
-execute 'yum clean all --enablerepo=nodesource-nodejs' do
-  user 'root'
-  action :nothing
-  subscribes :run, "execute[place /etc/yum.repos.d/nodesource-nodejs.repo]", :immediately
-end
-
-package 'nodejs' do
-  user 'root'
-  version '22.18.0-1nodesource'
-  options '--enablerepo=nodesource-nodejs'
-end
-
-execute 'place /etc/yum.repos.d/yarn.repo' do
-  user 'root'
-  command <<-EOF
-    set -eu
-    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo
-    sudo chmod 644 /etc/yum.repos.d/yarn.repo
-  EOF
-  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo"
-end
-
-execute 'yum clean all --enablerepo=yarn' do
-  user 'root'
-  action :nothing
-  subscribes :run, "execute[place /etc/yum.repos.d/yarn.repo]", :immediately
-end
-
-package 'yarn' do
-  user 'root'
-  options '--enablerepo=yarn'
-end
+include_recipe 'nodejs'
+include_recipe 'yarn'

data/itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs-v18.repo

@@ -0,0 +1,8 @@
+[nodesource-nodejs]
+name=Node.js Packages for Linux RPM based distros - x86_64
+baseurl=https://rpm.nodesource.com/pub_18.x/nodistro/nodejs/x86_64
+priority=9
+enabled=0
+gpgcheck=1
+gpgkey=https://rpm.nodesource.com/gpgkey/ns-operations-public.key
+module_hotfixes=1

data/itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs-v20.repo

@@ -0,0 +1,8 @@
+[nodesource-nodejs]
+name=Node.js Packages for Linux RPM based distros - x86_64
+baseurl=https://rpm.nodesource.com/pub_20.x/nodistro/nodejs/x86_64
+priority=9
+enabled=0
+gpgcheck=1
+gpgkey=https://rpm.nodesource.com/gpgkey/ns-operations-public.key
+module_hotfixes=1

data/itamae/environments/nodejs/nodejs.rb

@@ -0,0 +1,21 @@
+execute 'place /etc/yum.repos.d/nodesource-nodejs.repo' do
+  user 'root'
+  command <<-EOF
+    set -eu
+    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs-v22.repo')} /etc/yum.repos.d/nodesource-nodejs.repo
+    sudo chmod 644 /etc/yum.repos.d/nodesource-nodejs.repo
+  EOF
+  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs-v22.repo')} /etc/yum.repos.d/nodesource-nodejs.repo"
+end
+
+package 'nodejs' do
+  user 'root'
+  version '22.22.2-1nodesource'
+  options '--enablerepo=nodesource-nodejs'
+end
+
+execute 'dnf clean all --enablerepo=nodesource-nodejs' do
+  user 'root'
+  action :nothing
+  subscribes :run, "package[nodejs]", :immediately
+end

data/itamae/environments/nodejs/yarn.rb

@@ -0,0 +1,20 @@
+execute 'place /etc/yum.repos.d/yarn.repo' do
+  user 'root'
+  command <<-EOF
+    set -eu
+    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo
+    sudo chmod 644 /etc/yum.repos.d/yarn.repo
+  EOF
+  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo"
+end
+
+package 'yarn' do
+  user 'root'
+  options '--enablerepo=yarn'
+end
+
+execute 'dnf clean all --enablerepo=yarn' do
+  user 'root'
+  action :nothing
+  subscribes :run, "package[yarn]", :immediately
+end

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '3.4.7'
+version = ENV['RUBY_VERSION'] || '3.4.9'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -15,7 +15,7 @@ execute "install ruby-#{version}" do
   cwd '/var/daddy/tmp'
   command <<-EOF
     set -eu
-    rm -Rf ruby-#{version}/
+    sudo rm -Rf ruby-#{version}/
     tar zxf ruby-#{version}.tar.gz
 
     # avoid override confirmation when a different version of ruby was installed before
@@ -33,9 +33,23 @@ execute "install ruby-#{version}" do
   not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+)? \""
 end
 
+bundler_versions = case short_version
+  when '2.7'
+    ['2.3.26', '2.4.22']
+  else
+    '2.7.2'
+  end
+ohai_version = case short_version
+  when '2.7'
+    '19.0.3'
+  else
+    '19.1.24'
+  end
+
 {
-  'bundler' => ['2.7.2'],
-  'itamae' => '1.14.1'
+  'bundler' => bundler_versions,
+  'itamae' => '1.14.2',
+  'ohai' => ohai_version
 }.each do |name, versions|
   versions = Array(versions)
   versions.each do |version|
@@ -47,12 +61,6 @@ end
   end
 end
 
-execute 'gem update --system 3.7.2 -N' do
-  user 'root'
-  action :nothing
-  subscribes :run, "gem_package[bundler]", :immediately
-end
-
 execute "bundle config set --global path ~/.gem/ruby/#{short_version}.0" do
   user ENV['USER']
   not_if "bundle config get path | grep -qE '\\.gem/ruby/#{short_version}.0'"

data/itamae/environments/ruby/ruby-3.4.8.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b  ruby-3.4.8.tar.gz

data/itamae/environments/ruby/ruby-3.4.9.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c  ruby-3.4.9.tar.gz

data/lib/daddy/rails/railtie.rb

@@ -18,14 +18,12 @@ module Daddy
 
       initializer 'carrierwave' do
         if defined?(CarrierWave)
-          puts '[daddy] loading carrierwave configuration'
           require 'daddy/carrierwave'
         end
       end
 
       initializer 'sidekiq' do
         if defined?(Sidekiq)
-          puts '[daddy] loading sidekiq configuration'
           require 'daddy/sidekiq'
         end
       end

data/lib/daddy/version.rb

@@ -1,7 +1,7 @@
 module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
-    VERSION_MINOR = '11',
-    VERSION_REVISION = '3'
+    VERSION_MINOR = '12',
+    VERSION_REVISION = '1'
   ].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.1
 platform: ruby
 authors:
 - ichy
@@ -288,12 +288,17 @@ files:
 - itamae/environments/docker/default.rb
 - itamae/environments/local.rb
 - itamae/environments/nodejs/default.rb
-- itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs.repo
+- itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs-v18.repo
+- itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs-v20.repo
+- itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs-v22.repo
 - itamae/environments/nodejs/files/etc/yum.repos.d/yarn.repo
+- itamae/environments/nodejs/nodejs.rb
+- itamae/environments/nodejs/yarn.rb
 - itamae/environments/ruby/default.rb
 - itamae/environments/ruby/ruby-2.7.8.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-3.2.9.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-3.4.7.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-3.4.8.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-3.4.9.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
@@ -380,7 +385,6 @@ files:
 - lib/tasks/nginx.rake
 - lib/tasks/obs_studio.rake
 - lib/tasks/phantomjs.rake
-- lib/tasks/publish.rake
 - lib/tasks/rails_erd.rake
 - lib/tasks/resque.rake
 - lib/tasks/resque/app.god.erb
@@ -416,7 +420,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '3.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/itamae/environments/ruby/ruby-3.4.7.tar.gz_sha256sum.txt

@@ -1 +0,0 @@
-23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36  ruby-3.4.7.tar.gz

data/lib/tasks/publish.rake

@@ -1,104 +0,0 @@
-require 'daddy/git'
-require 'nokogiri'
-
-namespace :dad do
-  task :publish do
-    fail('設定「cucumber.title」がありません。') unless Daddy.config.cucumber.title?
-
-    if File.exist?("db/schema.rb")
-      fail unless system('rake db:schema:load RAILS_ENV=test')
-    end
-
-    system("mkdir -p features/reports")
-    system("rm -Rf features/reports/*")
-
-    fail unless system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false COVERAGE=false features/開発日記")
-    system("mkdir -p features/reports/diary")
-    system("mv features/reports/index.html features/reports/diary")
-    system("mv features/reports/images features/reports/diary")
-
-    unless ENV['SKIP_SPEC']
-      fail unless system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/仕様書")
-      system("mkdir -p features/reports/spec")
-      system("mv features/reports/index.html features/reports/spec")
-      system("mv features/reports/images features/reports/spec")
-    end
-
-    git = Daddy::Git.new
-    branch = git.current_branch
-
-    # 公開
-    base_dir = dad_publish_base_dir
-    system("sudo mkdir -p #{base_dir}")
-    system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} #{base_dir}") 
-    system("mkdir -p #{base_dir}/#{branch}")
-    system("rm -Rf #{base_dir}/#{branch}/*")
-    system("cp -Rf features/reports/* #{base_dir}/#{branch}/")
-    if File.exist? 'coverage'
-      system("cp -Rf coverage #{base_dir}/#{branch}/")
-    end
-
-    # 開発日記を統合
-    if branch == 'master'
-      features = {}
-      dad_publish_sprint_dirs(base_dir).each do |dir|
-        dad_publish_extract_features(dir).each do |div|
-          feature = features[div['id']]
-          if feature
-            div.css('div.narrative').each do |narrative|
-              feature.add_child(narrative)
-            end
-            div.css('div.scenario').each do |scenario|
-              feature.add_child(scenario)
-            end
-          else
-            features[div['id']] = div
-          end
-        end
-      end
-
-      # 空HTMLを生成
-      system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false COVERAGE=false features/support")
-
-      doc = Nokogiri::HTML(File.read('features/reports/index.html'))
-      contents_div = doc.css('div.contents').first
-      features.keys.sort.each do |key|
-        contents_div.add_child(features[key])
-      end
-      File.write("#{base_dir}/index.html", doc)
-    end
-  end
-  
-end
-
-def self.dad_publish_sprint_dirs(base_dir)
-  ret = Dir[base_dir + '/p*'].sort{|a, b| File.basename(a)[1..-1].to_f <=> File.basename(b)[1..-1].to_f}
-  ret << base_dir + '/master'
-  ret
-end
-
-def self.dad_publish_extract_features(dir)
-  ret = []
-  return [] unless File.exist?(dir) and File.directory?(dir)
-
-  html = dir + '/diary/index.html'
-  return [] unless File.exist?(html)
-
-  doc = Nokogiri::HTML(File.read(html))
-  doc.css('div.feature').each do |div|
-    div.css('img.screenshot').each do |img|
-      img['src'] = File.basename(dir) + '/diary/' + img['src']
-    end
-    ret << div
-  end
-  
-  ret
-end
-
-def self.dad_publish_base_dir
-  '/var/lib/daddy/' + dad_publish_title_to_dirname 
-end
-
-def self.dad_publish_title_to_dirname
-  Daddy.config.cucumber.title.sub(' ', '_').downcase
-end