Merge pull request #1523 from fatfreecrm/fix-packaging

Swap from our fork of acts_as_commentable via github, to our fork of acts_as_commentable via rubygems

Author: CloCkWeRX

Gemfile

@@ -93,8 +93,8 @@ group :heroku do
   gem 'puma'
 end
 
-gem 'responds_to_parent', git: 'https://github.com/RedPatchTechnologies/responds_to_parent.git', branch: 'master' # Temporarily pointed at git until https://github.com/zendesk/responds_to_parent/pull/7 is released
-gem 'acts_as_commentable', git: 'https://github.com/fatfreecrm/acts_as_commentable.git', branch: 'main' # Our fork
+gem 'responds_to_parent2'
+gem 'acts_as_commentable2'
 gem 'sassc-rails'
 gem 'coffee-rails'
 gem 'uglifier'

Gemfile.lock

@@ -1,19 +1,3 @@
-GIT
-  remote: https://github.com/RedPatchTechnologies/responds_to_parent.git
-  revision: 36337ac1cb69245bdf551bc852abb9bd77c3826f
-  branch: master
-  specs:
-    responds_to_parent (2.0.0)
-      actionpack (>= 3.2.22, < 8.0)
-
-GIT
-  remote: https://github.com/fatfreecrm/acts_as_commentable.git
-  revision: 28df5959f8c17168be7c5d4ed3ea2f3d06275773
-  branch: main
-  specs:
-    acts_as_commentable (7.1.0)
-      activerecord (~> 7.1.0)
-
 GIT
   remote: https://github.com/jquery-ui-rails/jquery-ui-rails.git
   revision: 413265e81f790f795239e07e7e25e01429b2f18d
@@ -109,6 +93,8 @@ GEM
     acts-as-taggable-on (11.0.0)
       activerecord (>= 7.0, < 8.0)
       zeitwerk (>= 2.4, < 3.0)
+    acts_as_commentable2 (7.1.0.1)
+      activerecord (~> 7.1.0)
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
@@ -430,6 +416,8 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
+    responds_to_parent2 (2.1.0)
+      actionpack (>= 3.2.22, < 8.0)
     rexml (3.3.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -575,7 +563,7 @@ DEPENDENCIES
   activejob
   activemodel-serializers-xml
   acts-as-taggable-on (>= 3.4.3)
-  acts_as_commentable!
+  acts_as_commentable2
   acts_as_list
   base64
   bigdecimal
@@ -637,7 +625,7 @@ DEPENDENCIES
   rb-fsevent
   rb-inotify
   responders (~> 3.0)
-  responds_to_parent!
+  responds_to_parent2
   rspec-activemodel-mocks
   rspec-rails
   rubocop

fat_free_crm.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'paper_trail',         '~> 15.1.0'
   gem.add_dependency 'devise',              '~> 4.6'
   gem.add_dependency 'devise-encryptable',  '~> 0.2.0'
-  gem.add_dependency 'acts_as_commentable', '>= 6.1'
+  gem.add_dependency 'acts_as_commentable2', '~> 7.1.0'
   gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
   gem.add_dependency 'dynamic_form'
   gem.add_dependency 'haml'
@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'font-awesome-rails'
   gem.add_dependency 'premailer'
   gem.add_dependency 'nokogiri'
-  gem.add_dependency 'responds_to_parent'
+  gem.add_dependency 'responds_to_parent2'
   gem.add_dependency 'rails3-jquery-autocomplete'
   gem.add_dependency 'thor'
   gem.add_dependency 'rails_autolink'

lib/fat_free_crm/version.rb

@@ -9,7 +9,7 @@ module FatFreeCRM
   module VERSION # :nodoc:
     MAJOR = 0
     MINOR = 24
-    TINY  = 0
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

sample_hooks/README.md

@@ -0,0 +1,11 @@
+# Sample Git Hooks
+
+This directory contains sample git hooks. To use them, copy them to the `.git/hooks` directory in your local repository.
+
+## Pre-commit
+
+This hook runs `rubocop` on all staged `.rb` files and `erblint` on all staged `.js` files. If either of these linters fail, the commit will be aborted.
+
+## Pre-push
+
+This hook runs `rspec`. If the test suite fails, the push will be aborted.

sample_hooks/pre-commit

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Stash unstaged changes
+git stash -q --keep-index
+
+# Run rubocop on staged .rb files
+git diff --name-only --cached --diff-filter=AM | grep '\.rb$' | xargs bundle exec rubocop
+rubocop_exit_code=$?
+
+# Run erblint on staged .js files
+git diff --name-only --cached --diff-filter=AM | grep '\.js$' | xargs bundle exec erblint
+erblint_exit_code=$?
+
+# Unstash unstaged changes
+git stash pop -q
+
+# Exit with a non-zero exit code if either linter failed
+if [ $rubocop_exit_code -ne 0 ] || [ $erblint_exit_code -ne 0 ]; then
+  exit 1
+fi
+
+exit 0

sample_hooks/pre-push

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bundle exec rspec
+exit $?