[DRE-commits] [schleuder-cli] 01/01: New upstream version 0.0.1
Georg Faerber
georg-alioth-guest at moszumanska.debian.org
Wed Jan 25 16:06:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
georg-alioth-guest pushed a commit to annotated tag upstream/0.0.1
in repository schleuder-cli.
commit 5fdcae213a33aefb1e331d80008bf9ddaf067706
Author: Georg Faerber <georg at riseup.net>
Date: Wed Jan 25 17:06:05 2017 +0100
New upstream version 0.0.1
---
CHANGELOG.md | 16 +++++++++++++
Gemfile.lock | 6 ++---
README.md | 16 ++++++-------
lib/schleuder-cli.rb | 1 +
lib/schleuder-cli/helper.rb | 2 +-
lib/schleuder-cli/lists.rb | 30 ++++++++++++------------
lib/schleuder-cli/subscriptions.rb | 3 ++-
lib/schleuder-cli/version.rb | 2 +-
man/{schleuder-cli.8 => schleuder-cli.1} | 8 +++----
man/{schleuder-cli.8.ron => schleuder-cli.1.ron} | 6 ++---
schleuder-cli.gemspec | 5 ++--
11 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dfa81d..ab1e22a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/).
+## [0.0.1] / 2017-01-25
+
+### Changed
+
+ * Use section 1 instead of 8 for manpage.
+ * Providing a key for the admin is now optional when creating new lists.
+
+### Fixed
+
+ * Fixed importing binary OpenPGP-keys.
+
+### Added
+
+ * Show a hint if delivery is disabled for a subscription when listing them.
+
+
## 0.0.1.beta13
### Changed
diff --git a/Gemfile.lock b/Gemfile.lock
index 48ab418..258cbc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- schleuder-cli (0.0.1.beta13)
+ schleuder-cli (0.0.1)
thor (~> 0)
GEM
@@ -21,7 +21,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
- thor (0.19.1)
+ thor (0.19.4)
PLATFORMS
ruby
@@ -31,4 +31,4 @@ DEPENDENCIES
schleuder-cli!
BUNDLED WITH
- 1.11.2
+ 1.13.7
diff --git a/README.md b/README.md
index c9c3f4a..4cd46aa 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,18 @@ Requirements
Installation
------------
-1. Download [the gem](https://git.codecoop.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.beta13.gem) and [the OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.beta13.gem.sig) and verify:
+1. Download [the gem](https://0xacab.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.gem) and [the OpenPGP-signature](https://0xacab.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.gem.sig) and verify:
```
gpg --recv-key 0xB3D190D5235C74E1907EACFE898F2C91E2E6E1F3
- gpg --verify schleuder-cli-0.0.1.beta13.gem.sig
+ gpg --verify schleuder-cli-0.0.1.gem.sig
```
2. If all went well install the gem:
```
- gem install schleuder-cli-0.0.1.beta13.gem
+ gem install schleuder-cli-0.0.1.gem
```
-You probably want to install [schleuder](https://git.codecoop.org/schleuder/schleuder3), too. Without schleuder, this software is very useless.
+You probably want to install [schleuder](https://0xacab.org/schleuder/schleuder3), too. Without schleuder, this software is very useless.
Configuration
-------------
@@ -46,9 +46,9 @@ The default settings will work out of the box with the default settings of Schle
These are the configuration file options and their default values:
- * `host`: The hostname (or IP-address) to connect to. Default: <localhost>.
- * `post`: The port to connect to. Default: <4443>.
- * `use_tls`: Use TLS when connect to Schleuder API? Default: <false>.
+ * `host`: The hostname (or IP-address) to connect to. Default: `localhost`.
+ * `post`: The port to connect to. Default: `4443`.
+ * `use_tls`: Use TLS when connect to Schleuder API? Default: `false`.
* `tls_fingerprint`: TLS-fingerprint of the Schleuder API. To be fetched from the API operators. Default: empty.
* `api_key`: Key to authenticate with against the Schleuder API. To be fetched from the API operators. Default: empty.
@@ -83,4 +83,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/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.beta13.tar.gz) and [its OpenPGP-signature](https://git.codecoop.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.beta13.tar.gz.sig).
+Alternatively to the gem-files you can download the latest release as [a tarball](https://0xacab.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.tar.gz) and [its OpenPGP-signature](https://0xacab.org/schleuder/schleuder-cli/raw/master/gems/schleuder-cli-0.0.1.tar.gz.sig).
diff --git a/lib/schleuder-cli.rb b/lib/schleuder-cli.rb
index 6ddff3d..6335669 100644
--- a/lib/schleuder-cli.rb
+++ b/lib/schleuder-cli.rb
@@ -5,6 +5,7 @@ require 'net/https'
require 'uri'
require 'singleton'
require 'yaml'
+require 'base64'
rootdir = Pathname.new(__FILE__).dirname.dirname.realpath
$:.unshift File.join(rootdir, 'lib')
diff --git a/lib/schleuder-cli/helper.rb b/lib/schleuder-cli/helper.rb
index b25b9dd..7ff25f0 100644
--- a/lib/schleuder-cli/helper.rb
+++ b/lib/schleuder-cli/helper.rb
@@ -170,7 +170,7 @@ module SchleuderCli
def import_key(listname, keyfile)
test_file(keyfile)
- keydata = File.read(keyfile)
+ keydata = File.binread(keyfile)
if ! keydata.match('BEGIN PGP')
keydata = Base64.encode64(keydata)
end
diff --git a/lib/schleuder-cli/lists.rb b/lib/schleuder-cli/lists.rb
index cd6ae2d..b757c9c 100644
--- a/lib/schleuder-cli/lists.rb
+++ b/lib/schleuder-cli/lists.rb
@@ -10,10 +10,8 @@ module SchleuderCli
end
end
- desc 'new <list at hostname> <adminaddress> </path/to/publickeys.asc>', 'Create a new schleuder list.'
- def new(listname, adminaddress, keyfile)
- test_file(keyfile)
-
+ desc 'new <list at hostname> <adminaddress> [</path/to/publickeys.asc>]', 'Create a new schleuder list.'
+ def new(listname, adminaddress, keyfile=nil)
res = post(url(:lists), {email: listname}) do |http, request|
http.read_timeout = 120
begin
@@ -29,17 +27,19 @@ module SchleuderCli
say "List #{listname} successfully created! Don't forget to hook it into your MTA."
end
- import_result = import_key(listname, keyfile)
- case import_result['considered']
- when 1
- fingerprint = import_result['imports'].first['fpr']
- say "Key #{fingerprint} imported."
- when 0
- fingerprint = nil
- say "#{keyfile} did not contain any keys!"
- else
- fingerprint = nil
- say "#{keyfile} contains more than one key, cannot derive fingerprint for #{adminaddress}. Please set it manually!"
+ if ! keyfile.to_s.empty?
+ import_result = import_key(listname, keyfile)
+ case import_result['considered']
+ when 1
+ fingerprint = import_result['imports'].first['fpr']
+ say "Key #{fingerprint} imported."
+ when 0
+ fingerprint = nil
+ say "#{keyfile} did not contain any keys!"
+ else
+ fingerprint = nil
+ say "#{keyfile} contains more than one key, cannot derive fingerprint for #{adminaddress}. Please set it manually!"
+ end
end
subscribe(listname, adminaddress, fingerprint, true)
diff --git a/lib/schleuder-cli/subscriptions.rb b/lib/schleuder-cli/subscriptions.rb
index 5ac1aba..5b3b2ac 100644
--- a/lib/schleuder-cli/subscriptions.rb
+++ b/lib/schleuder-cli/subscriptions.rb
@@ -10,7 +10,8 @@ module SchleuderCli
email = subscription['email']
fingerprint = subscription['fingerprint'].empty? ? 'N/A' : subscription['fingerprint']
admin = subscription['admin'] ? 'admin' : ''
- say "#{email}\t#{fingerprint}\t#{admin}\n"
+ delivery_enabled = subscription['delivery_enabled'] ? '' : 'Delivery disabled!'
+ say "#{email}\t#{fingerprint}\t#{admin}\t#{delivery_enabled}\n"
end
say "\n"
end
diff --git a/lib/schleuder-cli/version.rb b/lib/schleuder-cli/version.rb
index 4699111..2360253 100644
--- a/lib/schleuder-cli/version.rb
+++ b/lib/schleuder-cli/version.rb
@@ -1,3 +1,3 @@
module SchleuderCli
- VERSION = '0.0.1.beta13'
+ VERSION = '0.0.1'
end
diff --git a/man/schleuder-cli.8 b/man/schleuder-cli.1
similarity index 93%
rename from man/schleuder-cli.8
rename to man/schleuder-cli.1
index 5565149..acc0397 100644
--- a/man/schleuder-cli.8
+++ b/man/schleuder-cli.1
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "SCHLEUDER\-CLI" "8" "November 2016" "" ""
+.TH "SCHLEUDER\-CLI" "1" "January 2017" "" ""
.
.SH "NAME"
schleuder\-cli \- manage \fBschleuder\fR(8)\-lists, subscriptions, and keys\.
@@ -78,14 +78,14 @@ default path of schleuder\-cli configuration file\.
The configuration file is formatted as YAML\. See \fIhttp://www\.yaml\.org/\fR for more details\.
.
.SH "BUGS"
-Known bugs are listed on the schleuder\-cli bugtracker at \fIhttps://codecoop\.org/schleuder/schleuder\-cli/issues\fR
+Known bugs are listed on the schleuder\-cli bugtracker at \fIhttps://0xacab\.org/schleuder/schleuder\-cli/issues\fR
.
.SH "SEE ALSO"
\fBschleuder\fR(8), \fBschleuder\-api\-daemon\fR(8)\.
.
.TP
Website of \fBschleuder\-cli\fR
-\fIhttps://codecoop\.org/schleuder/schleuder\-cli/\fR
+\fIhttps://0xacab\.org/schleuder/schleuder\-cli/\fR
.
.TP
Website of \fBschleuder\fR
@@ -97,5 +97,5 @@ More extensive documentation for \fBschleuder\fR
.
.TP
\fBschleuder\-web\fR, the web interface for list\-management
-\fIhttps://codecoop\.org/schleuder/schleuder\-web/\fR
+\fIhttps://0xacab\.org/schleuder/schleuder\-web/\fR
diff --git a/man/schleuder-cli.8.ron b/man/schleuder-cli.1.ron
similarity index 94%
rename from man/schleuder-cli.8.ron
rename to man/schleuder-cli.1.ron
index 8b22eeb..06caee2 100644
--- a/man/schleuder-cli.8.ron
+++ b/man/schleuder-cli.1.ron
@@ -62,7 +62,7 @@ The configuration file is formatted as YAML. See
## BUGS
Known bugs are listed on the schleuder-cli bugtracker at
-<https://codecoop.org/schleuder/schleuder-cli/issues>
+<https://0xacab.org/schleuder/schleuder-cli/issues>
## SEE ALSO
@@ -70,7 +70,7 @@ Known bugs are listed on the schleuder-cli bugtracker at
`schleuder-api-daemon`(8).
* Website of `schleuder-cli`:
- <https://codecoop.org/schleuder/schleuder-cli/>
+ <https://0xacab.org/schleuder/schleuder-cli/>
* Website of `schleuder`:
<https://schleuder.nadir.org/>
@@ -79,4 +79,4 @@ Known bugs are listed on the schleuder-cli bugtracker at
<https://schleuder.nadir.org/docs/>
* `schleuder-web`, the web interface for list-management:
- <https://codecoop.org/schleuder/schleuder-web/>
+ <https://0xacab.org/schleuder/schleuder-web/>
diff --git a/schleuder-cli.gemspec b/schleuder-cli.gemspec
index bdc32f9..075c1ba 100644
--- a/schleuder-cli.gemspec
+++ b/schleuder-cli.gemspec
@@ -6,13 +6,14 @@ require 'schleuder-cli/version'
Gem::Specification.new do |s|
s.name = "schleuder-cli"
s.version = SchleuderCli::VERSION
- s.authors = %w(paz)
+ s.authors = 'schleuder dev team'
s.email = "schleuder at nadir.org"
s.homepage = "https://schleuder.nadir.org/"
s.summary = "A command line tool to configure schleuder-lists."
s.description = "Schleuder-cli enables creating, configuring, and deleting schleuder-lists, subscriptions, keys, etc."
s.files = `git ls-files man lib README.md`.split
- s.executables = `git ls-files bin`.split.map {|file| File.basename(file) }
+ s.executables = `git ls-files bin`.split.map {|file| File.basename(file) }
+ s.test_files = `git ls-files spec/`.split
s.platform = Gem::Platform::RUBY
s.require_path = 'lib'
s.rubyforge_project = '[none]'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder-cli.git
More information about the Pkg-ruby-extras-commits
mailing list