daddy 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd77f32d1f89b47fc19d5c35efb4711c1e72fcce4e2dfa2984332278f86f6636
-  data.tar.gz: cecd83ad21bb9f8847b6e98f0aca8ffb6f333bad65d60ad9dbc1b13da174a991
+  metadata.gz: 5546040134b767b9acea4ec78f71ece754c5fd2616c2dad158394af4ba9a85d3
+  data.tar.gz: eed047c392ed56ee97d48f0b02c454531f635ee6a2d35e8cd3d2f0566f14b17c
 SHA512:
-  metadata.gz: c14ae8d1ad86dc4a2c3bbaec528bd81b5d18183db95a155cf67dc699b5a7f1b64d12f00b963d659eab24085db7743a3a8bc3bbdcdb313b0860871b03dc9c82ce
-  data.tar.gz: 34c1733777d3560ae565002a31afa4af551b0ab733b183372e09bfc1171f16e33efddb9f2d7b28e1b99f75808c45de7e87d2adf91162137c141310985fcdb07d
+  metadata.gz: 8cc9bfeaf3842a481c93e8d68ad6117b93c9764964e302c541094e7eb0cdb6aa72b78bcc87993c3598ed283f8d1479f53dd23284216c5eee4cbcef6ff1573218
+  data.tar.gz: 6e6a104964911ee1941f02481a86072ccc1c83e380a1ec6d56e8bf9864609bbcd7298b465fc8186628b006b2149ca794a2db5a64885a9dfe4c22a2f968b77c0d

data/itamae/environments/base/default.rb

@@ -1,7 +1,6 @@
 %w{
   autoconf
   automake
-  curl
   gcc
   gcc-c++
   git
@@ -35,9 +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 --enablerepo=powertools' do
-  user 'root'
+%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
-
-package 'nodejs' do
-  user 'root'
-  version '22.21.1-1nodesource'
-  options '--enablerepo=nodesource-nodejs'
-end
-
-execute 'dnf clean all --enablerepo=nodesource-nodejs' do
-  user 'root'
-  action :nothing
-  subscribes :run, "package[nodejs]", :immediately
-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
-
-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
+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.8'
+version = ENV['RUBY_VERSION'] || '3.4.9'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -43,7 +43,7 @@ ohai_version = case short_version
   when '2.7'
     '19.0.3'
   else
-    '19.1.16'
+    '19.1.24'
   end
 
 {

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  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.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

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