conversejs 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f66f123dd141b971701ec78ebd72e4175212f0bf426fc53662ea4d03668622
-  data.tar.gz: 1b5a8e6130635f5555fc3dfcfe9524baa6408c87d8bda70cbf1ff4c71bc79b75
+  metadata.gz: d92763234c3e4f058aab595d50dd71c3fb55e16cbe732e4be17271f3c3d96ec1
+  data.tar.gz: b09ab2615605ad75f606cfd4477191b369f046f62bdef909aac6340b812f84ad
 SHA512:
-  metadata.gz: 5cddc8fe1016473258596994f7f1d47d68b9bea0c7fb01cf9ae4d88e466430284c285cdcdf88957fae04fa209c9a68d72ea110db3736b47ef9c481f8c34325dc
-  data.tar.gz: eadb7f0bc585a8a39d5e3ef570066221cc1d629943b8a7099e3d559b264dd7c67878fb87f194d6f5359ef54d367d10c96eba7ab2cd80d4e6039fe8b7995a6963
+  metadata.gz: 9acc3ddd41129d4863ef7b731a74441aa3fb5761126e7bff2dc2369c820b85f446fd4c2f07ee0413b13831ad6d94593a36cd453bfb2f6c18eccc4f9a7cafee38
+  data.tar.gz: 524eb9ad3db5139976ead0abbf330b20200a4021b1d26b817e561441ba1c057cc64ed76bbbdc932aead80ec9afa8d47ee5cb62387c1e9946c85bd0e4b275cc4a

data/.github/workflows/release.yml

@@ -18,19 +18,20 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install Ruby 2.5
+      - name: Install Ruby 2.7
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 2.7
           bundler-cache: true
-          rubygems: '3.3.26'
+          rubygems: '3.4.22'
 
       - name: Prepare the virtual environment
         uses: hausgold/actions/ci@master
         with:
           clone_token: '${{ secrets.CLONE_TOKEN }}'
+          settings_secret_key: '${{ secrets.SETTINGS_SECRET_KEY }}'
           settings: '${{ github.repository }}'
           target: ci/gem-test
 
@@ -45,3 +46,9 @@ jobs:
 
       - name: Push the release Git commit/tag and package to the registry
         run: make release
+
+      - name: Build and upload application documentation
+        run: api-docs && coverage --docs-only
+        env:
+          WORKFLOW_DISPATCH_TOKEN: '${{ secrets.WORKFLOW_DISPATCH_TOKEN }}'
+          GITHUB_TAG: 'v${{ github.event.inputs.VERSION }}'

data/.github/workflows/test.yml

@@ -18,24 +18,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.7']
-        rails: ['5.2']
+        ruby: ['2.7']
+        rails: ['5.2', '6.1']
     env:
       BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install the correct Ruby version
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-          rubygems: '3.3.26'
+          rubygems: '3.4.22'
 
       - name: Prepare the virtual environment
         uses: hausgold/actions/ci@master
         with:
           clone_token: '${{ secrets.CLONE_TOKEN }}'
+          settings_secret_key: '${{ secrets.SETTINGS_SECRET_KEY }}'
           settings: '${{ github.repository }}'
           target: ci/gem-test
 
@@ -44,20 +45,3 @@ jobs:
 
       - name: Upload the code coverage report
         run: coverage
-
-  trigger-docs:
-    name: Trigger the documentation upload
-    runs-on: ubuntu-22.04
-    timeout-minutes: 2
-    needs: test
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - name: Prepare the virtual environment
-        uses: hausgold/actions/ci@master
-        with:
-          clone_token: '${{ secrets.CLONE_TOKEN }}'
-          settings: '${{ github.repository }}'
-          target: ci/noop
-
-      - name: Trigger the documentation upload
-        run: workflow documentation

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/
 /spec/dummy/tmp
 /spec/dummy/log
 /vendor/

data/.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   TargetRailsVersion: 5.2
   Exclude:
     - bin/**/*

data/Appraisals

@@ -3,3 +3,7 @@
 appraise 'rails-5.2' do
   gem 'railties', '~> 5.2.0'
 end
+
+appraise 'rails-6.1' do
+  gem 'railties', '~> 6.1.0'
+end

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 3.6.1
+
+* Added API docs building to continuous integration (#7)
+
+### 3.6.0
+
+* Moved the development dependencies from the gemspec to the Gemfile (#5)
+* Dropped support for Ruby <2.7 (#6)
+
 ### 3.5.0
 
 * Added support for Gem release automation

data/Dockerfile

@@ -1,8 +1,8 @@
-FROM hausgold/ruby:2.5
+FROM hausgold/ruby:2.7
 MAINTAINER Hermann Mayer <hermann.mayer@hausgold.de>
 
 # Update system gem
-RUN gem update --system '3.3.26'
+RUN gem update --system '3.4.22'
 
 # Install system packages and the latest bundler
 RUN apt-get update -yqqq && \
@@ -11,7 +11,7 @@ RUN apt-get update -yqqq && \
     ca-certificates \
     bash-completion inotify-tools && \
   echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && /usr/sbin/locale-gen && \
-  gem install bundler -v '~> 2.3.0' --no-document --no-prerelease
+  gem install bundler -v '~> 2.4.22' --no-document --no-prerelease
 
 # Add new web user
 RUN mkdir /app && \

data/Gemfile

@@ -6,3 +6,19 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in conversejs.gemspec
 gemspec
+
+# Development dependencies
+gem 'appraisal', '~> 2.4'
+gem 'bundler', '~> 2.3'
+gem 'countless', '~> 1.1'
+gem 'guard-rspec', '~> 4.7'
+gem 'rails', '>= 5.2'
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.12'
+gem 'rspec-rails', '~> 5.1'
+gem 'rubocop', '~> 1.28'
+gem 'rubocop-rails', '~> 2.14'
+gem 'rubocop-rspec', '~> 2.10'
+gem 'simplecov', '>= 0.22'
+gem 'yard', '>= 0.9.28'
+gem 'yard-activesupport-concern', '>= 0.0.1'

data/Makefile

@@ -24,6 +24,7 @@ GREP ?= grep
 ID ?= id
 MKDIR ?= mkdir
 RM ?= rm
+TEST ?= test
 XARGS ?= xargs
 
 # Container binaries
@@ -35,6 +36,7 @@ RAKE ?= rake
 RSPEC ?= rspec
 RUBOCOP ?= rubocop
 YARD ?= yard
+RUBY_VERSION := ruby-version
 
 # Files
 GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\
@@ -113,7 +115,8 @@ test-style: \
 
 test-style-ruby:
 	# Run the static code analyzer (rubocop)
-	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a)
+	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a \
+		|| ($(TEST) $$($(RUBY_VERSION)) != '2.7' && true))
 
 clean:
 	# Clean the dependencies

data/config/docker/.bashrc

@@ -16,7 +16,9 @@ sudo sed -i 's/autostart=.*/autostart=false/g' /etc/supervisor/conf.d/*
 sudo supervisord >/dev/null 2>&1 &
 
 # Wait for supervisord
-while ! supervisorctl status >/dev/null 2>&1; do sleep 1; done
+while ! (sudo supervisorctl status | grep avahi) >/dev/null 2>&1; do
+  sleep 1
+done
 
 # Boot the mDNS stack
 echo '# Start the mDNS stack'

data/conversejs.gemspec

@@ -31,22 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
-
-  spec.add_dependency 'railties', '>= 5.2'
-
-  spec.add_development_dependency 'appraisal', '~> 2.4'
-  spec.add_development_dependency 'bundler', '~> 2.3'
-  spec.add_development_dependency 'countless', '~> 1.1'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7'
-  spec.add_development_dependency 'rails', '>= 5.2'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.12'
-  spec.add_development_dependency 'rspec-rails', '~> 5.1'
-  spec.add_development_dependency 'rubocop', '~> 1.28'
-  spec.add_development_dependency 'rubocop-rails', '~> 2.14'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.10'
-  spec.add_development_dependency 'simplecov', '>= 0.22'
-  spec.add_development_dependency 'yard', '>= 0.9.28'
-  spec.add_development_dependency 'yard-activesupport-concern', '>= 0.0.1'
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_runtime_dependency 'railties', '>= 5.2', '< 7.0'
 end

data/gemfiles/rails_5.2.gemfile

@@ -2,6 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", "~> 2.4"
+gem "bundler", "~> 2.3"
+gem "countless", "~> 1.1"
+gem "guard-rspec", "~> 4.7"
+gem "rails", ">= 5.2"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.12"
+gem "rspec-rails", "~> 5.1"
+gem "rubocop", "~> 1.28"
+gem "rubocop-rails", "~> 2.14"
+gem "rubocop-rspec", "~> 2.10"
+gem "simplecov", ">= 0.22"
+gem "yard", ">= 0.9.28"
+gem "yard-activesupport-concern", ">= 0.0.1"
 gem "railties", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.4"
+gem "bundler", "~> 2.3"
+gem "countless", "~> 1.1"
+gem "guard-rspec", "~> 4.7"
+gem "rails", ">= 5.2"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.12"
+gem "rspec-rails", "~> 5.1"
+gem "rubocop", "~> 1.28"
+gem "rubocop-rails", "~> 2.14"
+gem "rubocop-rspec", "~> 2.10"
+gem "simplecov", ">= 0.22"
+gem "yard", ">= 0.9.28"
+gem "yard-activesupport-concern", ">= 0.0.1"
+gem "railties", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/conversejs/rails/version.rb

@@ -4,7 +4,7 @@ module Conversejs
   # The gem version details.
   module Rails
     # The version of the +conversejs+ gem
-    VERSION = '3.5.0'
+    VERSION = '3.6.1'
 
     class << self
       # Returns the version of gem as a string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conversejs
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Hermann Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -18,209 +18,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: countless
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
+        version: '7.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.28
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.28
-- !ruby/object:Gem::Dependency
-  name: yard-activesupport-concern
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '7.0'
 description: 
 email:
 - hermann.mayer92@gmail.com
@@ -230,7 +40,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/documentation.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -258,6 +67,7 @@ files:
 - doc/assets/project.svg
 - docker-compose.yml
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/conversejs.rb
 - lib/conversejs/rails.rb
 - lib/conversejs/rails/engine.rb
@@ -281,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/workflows/documentation.yml

@@ -1,39 +0,0 @@
-name: Build Documentation
-on:
-  repository_dispatch:
-    types: [documentation]
-
-concurrency:
-  group: 'docs'
-
-jobs:
-  docs:
-    name: Build gem documentation
-    runs-on: ubuntu-22.04
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install the correct Ruby version
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.5
-          bundler-cache: true
-          rubygems: '3.3.26'
-
-      - name: Prepare the virtual environment
-        uses: hausgold/actions/ci@master
-        with:
-          clone_token: '${{ secrets.CLONE_TOKEN }}'
-          settings: '${{ github.repository }}'
-          target: ci/gem-test
-
-      - name: Build gem documentation
-        run: make docs
-
-      - name: Upload the code coverage report
-        run: coverage
-
-      - name: Add this job to the commit status
-        run: commit-status '${{ job.status }}'
-        if: always()