itamae-plugin-recipe-redmine 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea09e9b4dcde84766fa7083c8bb1a86c8491af61c42e2e8347c870aadb751899
-  data.tar.gz: 77f7d6e095253daa31e11b7633735e0c707b16de3adbbadeb5291f70a9207c37
+  metadata.gz: c3f8d221692d8189ce0007c548af84a7ba43007f1f2f788747714d760d62fa83
+  data.tar.gz: 32225a7f6c901ed25a34b73050bad61c7d1f2a5bf63c85abe3f9e2b93f889062
 SHA512:
-  metadata.gz: 15e293bbfbc61dcb4b7bc4606c8f00e82bd754b2615b9a30532633e5a898ef12b8de85770254f233027c40c2fd72f4e489d592e2a8d3a4aceaee5f87e1b9b7bb
-  data.tar.gz: 851585204c32c83e9fa190ebb66e02eafdb350bbd173c52c1d00cf378a709f84e2665c8643792497340540cb7a744f74b000fd0e990a8eca9d0c1669c14b1d2e
+  metadata.gz: 0dde7bc05c81eeddaa1b27d4e253056e5f99e3f23abaf16cb5e4044de88d799edb29ece3b7ff2f8234da85c0ced90029a3ed528eb846b5bc9e5005d0edd83324
+  data.tar.gz: 9c5de3e05c3bd5920ae0c8ebc5b01fe27134e0993b7cd7c750b932097e2230e6aacc328eb26b924de6220905ab526e0a00fdc303ef327550d9275de0ab5fafb2

data/README.md

@@ -21,10 +21,12 @@ Or install it yourself as:
 ## Usage
 
 from command line:
+
     $ itamae local -n redmine::default    # dry-run
     $ itamae local    redmine::default    # real-run
 
 from recipe:
+
     include_recipe 'redmine'
 
 ## Development

data/itamae-plugin-recipe-redmine.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'itamae', '~> 1.10', '>= 1.10.2'
 
-  spec.add_development_dependency "bundler", "~> 2.2.33"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 12.3.3"
 end

data/lib/itamae/plugin/recipe/redmine/default.rb

@@ -61,6 +61,16 @@ template "/opt/redmine/redmine-#{version}/config/configuration.yml" do
   mode '644'
 end
 
+if ENV['GEMFILE_LOCAL'] || version == '4.1.7'
+  template "/opt/redmine/redmine-#{version}/Gemfile.local" do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '644'
+    source ENV['GEMFILE_LOCAL'] || 'Gemfile.local'
+  end
+end
+
 execute 'bundle install --without development test --path vendor/bundle' do
   cwd "/opt/redmine/redmine-#{version}"
   command <<-EOF
@@ -79,8 +89,12 @@ link 'current' do
 end
 
 patch_file = "#{File.dirname(__FILE__)}/files/application.rb.diff"
-execute 'apply patch to config.session_store :cookie_store ... secure:true' do
-  command "patch -p1                <#{patch_file}"
-  not_if  "patch -p1 -Rsf --dry-run <#{patch_file}"
-  cwd     '/opt/redmine/current'
+if version == '4.2.6'
+  execute 'apply patch to config.session_store :cookie_store ... secure:true' do
+    command "patch -p1                <#{patch_file}"
+    not_if  "patch -p1 -Rsf --dry-run <#{patch_file}"
+    cwd     '/opt/redmine/current'
+  end
+else
+  Itamae.logger.warn "patch(#{patch_file}) is just for redmine #{version}, skipped."
 end

data/lib/itamae/plugin/recipe/redmine/files/application.rb.diff

@@ -1,12 +1,12 @@
 diff --git a/config/application.rb b/config/application.rb
-index c40a580..e748028 100644
+index 1905b45..4316f1a 100644
 --- a/config/application.rb
 +++ b/config/application.rb
-@@ -80,6 +80,7 @@ module RedmineApp
-     config.session_store :cookie_store,
+@@ -81,6 +81,7 @@ module RedmineApp
+       :cookie_store,
        :key => '_redmine_session',
        :path => config.relative_url_root || '/',
 +      :secure => true,
        :same_site => :lax
+     )
  
-     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))

data/lib/itamae/plugin/recipe/redmine/redmine-4.2.6_sha256sum.txt

@@ -0,0 +1 @@
+022cb2eee0f8823fd27e2e93373086a29b4bb11215ee6dc7012b5ef2a3bada4c  redmine-4.2.6.tar.gz

data/lib/itamae/plugin/recipe/redmine/templates/Gemfile.local.erb

@@ -0,0 +1,2 @@
+# https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md#2212--2023-05-11
+gem 'loofah', '~> 2.19.1'

data/lib/itamae/plugin/recipe/redmine/version.rb

@@ -2,12 +2,12 @@ module Itamae
   module Plugin
     module Recipe
       module Redmine
-        VERSION = "0.1.7"
+        VERSION = "0.2.2"
 
         REDMINE_VERSION = [
           REDMINE_VERSION_MAJOR = '4',
-          REDMINE_VERSION_MINOR = '1',
-          REDMINE_VERSION_PATCH = '7'
+          REDMINE_VERSION_MINOR = '2',
+          REDMINE_VERSION_PATCH = '6'
         ].join('.')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-redmine
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - y-matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.33
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.33
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,8 @@ files:
 - lib/itamae/plugin/recipe/redmine/redmine-4.1.1_sha256sum.txt
 - lib/itamae/plugin/recipe/redmine/redmine-4.1.5_sha256sum.txt
 - lib/itamae/plugin/recipe/redmine/redmine-4.1.7_sha256sum.txt
+- lib/itamae/plugin/recipe/redmine/redmine-4.2.6_sha256sum.txt
+- lib/itamae/plugin/recipe/redmine/templates/Gemfile.local.erb
 - lib/itamae/plugin/recipe/redmine/templates/configuration.yml.erb
 - lib/itamae/plugin/recipe/redmine/version.rb
 homepage: https://github.com/maedadev/itamae-plugin-recipe-redmine
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.16
 signing_key: 
 specification_version: 4
 summary: itamae recipe to ease redmine installation