journald-native 1.0.6 → 1.0.12

data/lib/journald/native/version.rb

@@ -1,5 +1,5 @@
 module Journald
   module Native
-    VERSION = '1.0.6'
+    VERSION = '1.0.12'.freeze
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: journald-native
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.12
 platform: ruby
 authors:
 - Anton Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,35 +58,41 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: 
 email:
-- sandfox@sandfox.im
+- sandfox@sandfox.me
 executables: []
 extensions:
 - ext/journald_native/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- LICENSE.txt
+- CHANGELOG.md
+- COPYING.md
 - README.md
-- Rakefile
-- ext/journald_native/CMakeLists.txt
-- ext/journald_native/cpp14shiv.h
 - ext/journald_native/extconf.rb
-- ext/journald_native/extinit.cpp
-- ext/journald_native/journald_native.cpp
+- ext/journald_native/journald_dummy.c
+- ext/journald_native/journald_dummy.h
+- ext/journald_native/journald_native.c
 - ext/journald_native/journald_native.h
-- ext/journald_native/ruby_exception_wrapper.cpp
-- ext/journald_native/ruby_exception_wrapper.h
-- ext/journald_native/sd_journal.h
-- ext/journald_native/sd_journal_dummy.h
-- journald-native.gemspec
 - lib/journald/native.rb
 - lib/journald/native/version.rb
-homepage: https://github.com/sandfox-im/journald-native
+homepage: https://github.com/theforeman/journald-native
 licenses:
-- MIT
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,15 +102,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+requirements:
+- systemd-journal
+- systemd development package
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: systemd-journal logging native lib wrapper

data/.gitignore

@@ -1,29 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-Makefile
-*.iml
-*.ipr
-*.iws
-.rakeTasks
-.idea
-extconf.h

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in journald-logger.gemspec
-gemspec

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Anton Smirnov
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,9 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/extensiontask'
-
-spec = Gem::Specification.load('journald-native.gemspec')
-Rake::ExtensionTask.new('journald_native', spec)
-
-task :build => :compile do
-  # just add prerequisite
-end

data/ext/journald_native/CMakeLists.txt

@@ -1,9 +0,0 @@
-# dummy cmake file for CLion
-
-cmake_minimum_required(VERSION 2.8.4)
-project(journald_native)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-set(SOURCE_FILES extinit.cpp journald_native.cpp ruby_exception_wrapper.cpp)
-add_executable(journald_native ${SOURCE_FILES})

data/ext/journald_native/cpp14shiv.h

@@ -1,78 +0,0 @@
-/*
-    unique_ptr from http://isocpp.org/files/papers/N3656.txt
-    index sequence from gcc 4.9 sources
-*/
-
-#include <cstddef>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-namespace std {
-    template<class T> struct _Unique_if {
-        typedef unique_ptr<T> _Single_object;
-    };
-
-    template<class T> struct _Unique_if<T[]> {
-        typedef unique_ptr<T[]> _Unknown_bound;
-    };
-
-    template<class T, size_t N> struct _Unique_if<T[N]> {
-        typedef void _Known_bound;
-    };
-
-    template<class T, class... Args>
-        typename _Unique_if<T>::_Single_object
-        make_unique(Args&&... args) {
-            return unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-
-    template<class T>
-        typename _Unique_if<T>::_Unknown_bound
-        make_unique(size_t n) {
-            typedef typename remove_extent<T>::type U;
-            return unique_ptr<T>(new U[n]());
-        }
-
-    template<class T, class... Args>
-        typename _Unique_if<T>::_Known_bound
-        make_unique(Args&&...) = delete;
-
-    /// Class template integer_sequence
-    template<typename _Tp, _Tp... _Idx>
-    struct integer_sequence
-    {
-        typedef _Tp value_type;
-        static constexpr size_t size() { return sizeof...(_Idx); }
-    };
-
-    template<typename _Tp, _Tp _Num,
-            typename _ISeq = typename _Build_index_tuple<_Num>::__type>
-    struct _Make_integer_sequence;
-
-    template<typename _Tp, _Tp _Num,  size_t... _Idx>
-    struct _Make_integer_sequence<_Tp, _Num, _Index_tuple<_Idx...>>
-    {
-        static_assert( _Num >= 0,
-                "Cannot make integer sequence of negative length" );
-
-        typedef integer_sequence<_Tp, static_cast<_Tp>(_Idx)...> __type;
-    };
-
-    /// Alias template make_integer_sequence
-    template<typename _Tp, _Tp _Num>
-    using make_integer_sequence
-    = typename _Make_integer_sequence<_Tp, _Num>::__type;
-
-    /// Alias template index_sequence
-    template<size_t... _Idx>
-    using index_sequence = integer_sequence<size_t, _Idx...>;
-
-    /// Alias template make_index_sequence
-    template<size_t _Num>
-    using make_index_sequence = make_integer_sequence<size_t, _Num>;
-
-    /// Alias template index_sequence_for
-    template<typename... _Types>
-    using index_sequence_for = make_index_sequence<sizeof...(_Types)>;
-}

data/ext/journald_native/extinit.cpp

@@ -1,7 +0,0 @@
-#include "journald_native.h"
-
-/* initialize ruby extension */
-extern "C" void Init_journald_native()
-{
-    journald_native::init_modules();
-}

data/ext/journald_native/journald_native.cpp

@@ -1,100 +0,0 @@
-#include "journald_native.h"
-#include "sd_journal.h"
-
-#include <memory>
-
-#include "ruby_exception_wrapper.h"
-
-namespace journald_native {
-
-namespace {
-
-/* aux */
-// just a short alias for ruby_raisable_call()
-template <typename Func, typename... Args>
-inline auto r(Func f, Args... args) -> decltype(f(args...))
-{
-    return ruby_exception_wrapper::ruby_raisable_call(f, args...);
-}
-
-/* methods */
-inline VALUE native_print(VALUE v_self, VALUE v_priority, VALUE v_message)
-{
-    int         priority = NUM2INT(v_priority);
-    std::string message  = r(rb_string_value_cstr, &v_message);
-
-    int         result   = sd_journal_print(priority, "%s", message.c_str());
-
-    return INT2NUM(result);
-}
-
-inline VALUE native_send(int argc, VALUE* argv, VALUE v_self)
-{
-    auto msgs = std::make_unique<iovec[]>((size_t)argc);
-
-    for (int i = 0; i < argc; i++) {
-        VALUE v = r(rb_string_value, &argv[i]);
-
-        msgs[i].iov_base = (char *)RSTRING_PTR(v);
-        msgs[i].iov_len  = (size_t)RSTRING_LEN(v);
-    }
-
-    int result = sd_journal_sendv(msgs.get(), argc);
-
-    return INT2NUM(result);
-}
-
-inline VALUE native_perror(VALUE v_self, VALUE v_message)
-{
-    std::string message = r(rb_string_value_cstr, &v_message);
-
-    int         result  = sd_journal_perror(message.c_str());
-
-    return INT2NUM(result);
-}
-
-VALUE is_dummy(VALUE v_self = Qnil)
-{
-    constexpr VALUE dummy = JOURNALD_NATIVE_SD_JOURNAL_DUMMY ? Qtrue : Qfalse;
-    return dummy;
-}
-
-/* initializers */
-inline void init_journald(VALUE module)
-{
-    rb_define_const(module, "LOG_EMERG",   INT2NUM(LOG_EMERG));    /* system is unusable */
-    rb_define_const(module, "LOG_ALERT",   INT2NUM(LOG_ALERT));    /* action must be taken immediately */
-    rb_define_const(module, "LOG_CRIT",    INT2NUM(LOG_CRIT));     /* critical conditions */
-    rb_define_const(module, "LOG_ERR",     INT2NUM(LOG_ERR));      /* error conditions */
-    rb_define_const(module, "LOG_WARNING", INT2NUM(LOG_WARNING));  /* warning conditions */
-    rb_define_const(module, "LOG_NOTICE",  INT2NUM(LOG_NOTICE));   /* normal but significant condition */
-    rb_define_const(module, "LOG_INFO",    INT2NUM(LOG_INFO));     /* informational */
-    rb_define_const(module, "LOG_DEBUG",   INT2NUM(LOG_DEBUG));    /* debug-level messages */
-}
-
-inline void init_native(VALUE module)
-{
-    // methods
-    rb_define_singleton_method(module, "print",  RXW_WRAPPED_METHOD_FUNC(native_print, VALUE, VALUE, VALUE),  2);
-    rb_define_singleton_method(module, "send",   RXW_WRAPPED_METHOD_FUNC(native_send, int, VALUE*, VALUE),   -1); /* -1 to pass as C array */
-    rb_define_singleton_method(module, "perror", RXW_WRAPPED_METHOD_FUNC(native_perror, VALUE, VALUE),        1);
-
-    // dummy detection
-    rb_define_const(module, "IS_DUMMY", is_dummy());
-    rb_define_singleton_method(module, "dummy?", RUBY_METHOD_FUNC(is_dummy), 0);
-}
-
-} // private namespace
-
-void init_modules()
-{
-    // no nontrivial destructors during initialization, no need for ruby catch
-
-    VALUE mJournald = rb_define_module("Journald");
-    VALUE mNative   = rb_define_module_under(mJournald, "Native");
-
-    init_journald(mJournald); // add constants to Journald
-    init_native(mNative);     // add methods to Journald::Native
-}
-
-}

data/ext/journald_native/ruby_exception_wrapper.cpp

@@ -1,16 +0,0 @@
-#include "ruby_exception_wrapper.h"
-
-namespace ruby_exception_wrapper {
-
-// callback for rb_rescue2 to catch ruby exception and wrap it by RbWrappedException
-VALUE rethrow_as_cpp(VALUE put_exception_here_ptr, VALUE exception)
-{
-    // cannot actually throw here, just pass the exception
-    VALUE* excptr = reinterpret_cast<VALUE*>(put_exception_here_ptr);
-
-    *excptr = exception;
-
-    return exception;
-}
-
-}

data/ext/journald_native/ruby_exception_wrapper.h

@@ -1,105 +0,0 @@
-#ifndef RUBY_EXCEPTION_WRAPPER_H
-#define RUBY_EXCEPTION_WRAPPER_H
-
-#include <ruby.h>
-
-#include <functional>
-#include <type_traits>
-#include <utility>
-
-#include "cpp14shiv.h" // make this c++14 code c++11 compatible; remove for c++14
-
-// wrap functions, prototype required, i.e. RXW_WRAPPED_METHOD_FUNC(native_send, int, VALUE*, VALUE)
-// functions can be inline
-#define RXW_WRAPPED_METHOD_FUNC(method, ...) ((VALUE (*)(ANYARGS))::ruby_exception_wrapper::method_wrapper_call<decltype(&method), method, __VA_ARGS__>)
-
-namespace ruby_exception_wrapper {
-
-    class RbWrappedException: public std::exception {
-        VALUE ruby_exception;
-    public:
-        RbWrappedException(VALUE e): ruby_exception(e) {};
-        VALUE getRubyException() { return ruby_exception; }
-    };
-
-    // callback for rb_rescue2 to catch ruby exception and wrap it by RbWrappedException
-    VALUE rethrow_as_cpp(VALUE put_exception_here_ptr, VALUE exception);
-
-    namespace {
-        // do real call of function from template
-        template <typename FuncPointer, typename... Args>
-        inline VALUE call_wrapper_tuple_impl(FuncPointer& fp, Args... args)
-        {
-            // only pointers and VALUE permitted
-            // VALUE guaranteed to be able to contain pointer
-            return reinterpret_cast<VALUE>(fp(args...));
-        }
-
-        // unpack params to do real call
-        template <typename CallTuple, std::size_t... Is>
-        inline VALUE call_wrapper_tuple_unpack(CallTuple& call_tuple, std::index_sequence<Is...>)
-        {
-            return call_wrapper_tuple_impl(std::get<Is>(call_tuple)...);
-        }
-
-        // callback for rb_rescue2 for no exceptions
-        template <typename CallTuple>
-        VALUE call_wrapper_tuple(VALUE v_ct) {
-            CallTuple call_tuple = std::move(*reinterpret_cast<CallTuple*>(v_ct));
-
-            return call_wrapper_tuple_unpack(call_tuple, std::make_index_sequence<std::tuple_size<CallTuple>::value> {});
-        };
-
-        // safely call function
-        template <typename Func, typename... Args>
-        inline auto do_raisable_call(Func f, Args... args) -> decltype(f(args...))
-        {
-            typedef std::function<typename std::remove_pointer<Func>::type> FuncPointer;
-            typedef std::tuple<FuncPointer, Args...> CallTuple;
-
-            FuncPointer fp = f;
-
-            CallTuple call_tuple = std::make_tuple(fp, args...);
-
-            VALUE exception = 0; // get raised exception if any
-
-            VALUE result = rb_rescue2(
-                    RUBY_METHOD_FUNC(call_wrapper_tuple<CallTuple>), reinterpret_cast<VALUE>(&call_tuple),
-                    RUBY_METHOD_FUNC(rethrow_as_cpp), reinterpret_cast<VALUE>(&exception),
-                    rb_eException, Qfalse
-            );
-
-            if (exception) { // nonzero here if rescue called unless some pervert throws Qfalse
-                throw RbWrappedException(exception);
-            }
-
-            return reinterpret_cast<decltype(f(args...))>(result);
-        }
-    }
-
-    template <typename Func, typename... Args>
-    inline auto ruby_raisable_call(Func f, Args... args) -> decltype(f(args...))
-    {
-        static_assert(
-                std::is_same<decltype(f(args...)), VALUE>::value || std::is_pointer<decltype(f(args...))>::value,
-                "Only for funcs returning VALUE or pointer"
-        );
-
-        auto result = do_raisable_call(f, args...);
-
-        return result;
-    }
-
-    template <typename Func, Func func, typename... Args>
-    VALUE method_wrapper_call(Args... args)
-    {
-        try {
-            return func(args...);
-        } catch(RbWrappedException &e) {
-            rb_exc_raise(e.getRubyException());
-        }
-    }
-
-}
-
-#endif