[DRE-commits] [schleuder] 01/02: New upstream version 3.0.0~beta17
Georg Faerber
georg-alioth-guest at moszumanska.debian.org
Thu Jan 12 17:36:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
georg-alioth-guest pushed a commit to branch master
in repository schleuder.
commit 75e0f68e3a5616ff82a35506fc648964ed269bdc
Author: Georg Faerber <georg at riseup.net>
Date: Thu Jan 12 18:36:01 2017 +0100
New upstream version 3.0.0~beta17
---
.travis.yml | 1 +
CHANGELOG.md | 11 +++++++++++
CODE_OF_CONDUCT.md | 30 ++++++++++++++++++++++++++++++
Gemfile.lock | 14 +++++++-------
README.md | 16 +++++++++++-----
bin/schleuder-smtpd.rb | 5 +++++
lib/schleuder/version.rb | 2 +-
spec/factories/lists.rb | 2 +-
spec/smtp-daemon.rb | 5 +++++
spec/spec_helper.rb | 6 +++++-
10 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e7dd7fa..86690b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
- 2.1
- 2.2
- 2.3
+ - 2.4
before_install:
- gem install bundler
- sudo apt-get -qq update
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a8d427..1d44de8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/).
+## [3.0.0.beta17] / 2017-01-12
+
+### Changed
+
+* Stopped using SCHLEUDER_ROOT in specs. Those make life difficult for packaging for debian.
+* While running specs, ensure smtp-daemon.rb has been stopped before starting it anew.
+
+###
+
+* A Code of Conduct.
+
## [3.0.0.beta16] / 2017-01-11
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..ae4911b
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,30 @@
+# Schleuder's Code of Conduct
+
+The Schleuder project strongly values contributors from anywhere, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, age, religion, or nationality. As a result, the Schleuder development team has agreed to and enforces this code of conduct in order to provide a harassment-free experience for everyone who participates in the development of Schleuder.
+
+### Summary
+
+Harassment in code and discussion or violation of physical boundaries is completely unacceptable anywhere in the Schleuder project’s codebases, issue trackers, chat rooms, mailing lists, meetups, and any other events. Violators will be warned and then blocked or banned by the development team at or before the 3rd violation.
+
+### In detail
+
+Harassment includes offensive verbal comments related to level of experience, gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, age, religion, nationality, the use of sexualized language or imagery, deliberate intimidation, stalking, sustained disruption, and unwelcome sexual attention.
+
+Individuals asked to stop any harassing behavior are expected to comply immediately.
+
+Maintainers, including the development team, are also subject to the anti-harassment policy.
+
+If anyone engages in abusive, harassing, or otherwise unacceptable behavior, including maintainers, we may take appropriate action, up to and including warning the offender, deletion of comments, removal from the project’s codebase and communication systems, and escalation to Github support.
+
+If you are being harassed, notice that someone else is being harassed, or have any other concerns, please [contact the development team](mailto:schleuder at nadir.org) immediately.
+
+We expect everyone to follow these rules anywhere in the Schleuder project’s codebases, issue trackers, IRC channel, group chat, and mailing lists.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Finally, don't forget that it is human to make mistakes! We all do. Let’s work together to help each other, resolve issues, and learn from the mistakes that we will all inevitably make from time to time.
+
+
+### Thanks
+
+Thanks to the [Bundler Code of Conduct](https://bundler.io/conduct.html), which we adopted for ourselves.
diff --git a/Gemfile.lock b/Gemfile.lock
index c355ec7..dc92336 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- schleuder (3.0.0.beta16)
+ schleuder (3.0.0.beta17)
activerecord (~> 4.1)
mail-gpg (~> 0.3.0)
rake (~> 10)
@@ -27,20 +27,20 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- arel (6.0.3)
+ arel (6.0.4)
backports (3.6.8)
builder (3.2.2)
daemons (1.2.4)
database_cleaner (1.5.3)
diff-lcs (1.2.5)
eventmachine (1.2.1)
- factory_girl (4.7.0)
+ factory_girl (4.8.0)
activesupport (>= 3.0.0)
gpgme (2.0.12)
mini_portile2 (~> 2.1.0)
hirb (0.7.3)
i18n (0.7.0)
- json (1.8.3)
+ json (1.8.5)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail-gpg (0.3.0)
@@ -50,7 +50,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
- minitest (5.9.1)
+ minitest (5.10.1)
multi_json (1.12.1)
rack (1.6.5)
rack-protection (1.5.3)
@@ -82,7 +82,7 @@ GEM
rack-test
sinatra (~> 1.4.0)
tilt (>= 1.3, < 3)
- sqlite3 (1.3.12)
+ sqlite3 (1.3.13)
thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
@@ -104,4 +104,4 @@ DEPENDENCIES
schleuder!
BUNDLED WITH
- 1.13.6
+ 1.13.7
diff --git a/README.md b/README.md
index dbd4151..6dec597 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ For more details see <https://schleuder.nadir.org/docs/>.
Requirements
------------
* ruby >=2.1
-* gnupg >=2.0 (if possible use >= 2.1.14)
+* gnupg >=2.0
* gpgme
* sqlite3
@@ -42,15 +42,15 @@ Additionally these **rubygems** are required (will be installed automatically un
Installing Schleuder
------------
-1. Download [the gem](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta16.gem) and [the OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta16.gem.sig) and verify:
+1. Download [the gem](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta17.gem) and [the OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta17.gem.sig) and verify:
```
gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
- gpg --verify schleuder-3.0.0.beta16.gem.sig
+ gpg --verify schleuder-3.0.0.beta17.gem.sig
```
2. If all went well install the gem:
```
- gem install schleuder-3.0.0.beta16.gem
+ gem install schleuder-3.0.0.beta17.gem
```
3. Set up schleuder:
@@ -115,6 +115,12 @@ Contributing
Please see [CONTRIBUTING.md](CONTRIBUTING.md).
+Code of Conduct
+---------------
+
+We adopted a code of conduct. Please read [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
+
+
License
-------
@@ -124,4 +130,4 @@ GNU GPL 3.0. Please see [LICENSE.txt](LICENSE.txt).
Alternative Download
--------------------
-Alternatively to the gem-files you can download the latest release as [a tarball](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta16.tar.gz) and [its OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta16.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta17.tar.gz) and [its OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder3/raw/master/gems/schleuder-3.0.0.beta17.tar.gz.sig).
diff --git a/bin/schleuder-smtpd.rb b/bin/schleuder-smtpd.rb
index 98edbd1..7055276 100755
--- a/bin/schleuder-smtpd.rb
+++ b/bin/schleuder-smtpd.rb
@@ -1,4 +1,9 @@
#!/usr/bin/env ruby
+#
+# This script is a very simple SMTP-daemon, that delivers every incoming email
+# to a given schleuder-list. It's meant to help developing without a real,
+# local MTA.
+
require 'socket'
require 'open3'
diff --git a/lib/schleuder/version.rb b/lib/schleuder/version.rb
index 23a6cba..8286dee 100644
--- a/lib/schleuder/version.rb
+++ b/lib/schleuder/version.rb
@@ -1,3 +1,3 @@
module Schleuder
- VERSION = '3.0.0.beta16'
+ VERSION = '3.0.0.beta17'
end
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 2555ddc..4c8d38a 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -29,7 +29,7 @@ FactoryGirl.define do
logfiles_to_keep 2
after(:build) do |list|
FileUtils.mkdir_p(list.listdir)
- gpghome_upstream = File.join ENV["SCHLEUDER_ROOT"], "spec", "gnupg"
+ gpghome_upstream = File.join "spec", "gnupg"
FileUtils.cp_r Dir["#{gpghome_upstream}/{private*,*.gpg,.*migrated}"], list.listdir
end
diff --git a/spec/smtp-daemon.rb b/spec/smtp-daemon.rb
index 54f1a82..5fd7387 100755
--- a/spec/smtp-daemon.rb
+++ b/spec/smtp-daemon.rb
@@ -1,4 +1,9 @@
#!/usr/bin/env ruby
+#
+# This script is a very simple SMTP-daemon, that dumps every incoming email
+# into the given directory. It's meant to capture messages from schleuder-lists
+# during test-runs.
+
require 'socket'
require 'open3'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9635a62..2024bcd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -57,8 +57,12 @@ RSpec.configure do |config|
def start_smtp_daemon
if ! File.directory?(smtp_daemon_outputdir)
FileUtils.mkdir_p(smtp_daemon_outputdir)
+ else
+ # Try to kill it, in case it's still around (this occurred on some
+ # systems).
+ stop_smtp_daemon
end
- daemon = File.join(ENV['SCHLEUDER_ROOT'], 'spec', 'smtp-daemon.rb')
+ daemon = File.join('spec', 'smtp-daemon.rb')
pid = Process.spawn(daemon, '2523', smtp_daemon_outputdir)
pidfile = File.join(smtp_daemon_outputdir, 'pid')
IO.write(pidfile, pid)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git
More information about the Pkg-ruby-extras-commits
mailing list