From 043395d2fdb32f9f0377812671f8ffac76b6116b Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Thu, 30 Oct 2014 23:42:16 +0300 Subject: [PATCH] separating native lib and logger - rename gem to journald-native --- Rakefile | 4 ++-- .../extconf.rb | 2 +- .../journald_native.c} | 4 ++-- journald-logger.gemspec => journald-native.gemspec | 14 +++++++------- lib/journald/logger.rb | 7 ------- lib/journald/native.rb | 7 +++++++ lib/journald/{logger => native}/version.rb | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) rename ext/{journald_logger => journald_native}/extconf.rb (93%) rename ext/{journald_logger/journald_logger.c => journald_native/journald_native.c} (98%) rename journald-logger.gemspec => journald-native.gemspec (59%) delete mode 100644 lib/journald/logger.rb create mode 100644 lib/journald/native.rb rename lib/journald/{logger => native}/version.rb (75%) diff --git a/Rakefile b/Rakefile index fc6e766..e457c64 100644 --- a/Rakefile +++ b/Rakefile @@ -1,8 +1,8 @@ require 'bundler/gem_tasks' require 'rake/extensiontask' -spec = Gem::Specification.load('journald-logger.gemspec') -Rake::ExtensionTask.new('journald_logger', spec) +spec = Gem::Specification.load('journald-native.gemspec') +Rake::ExtensionTask.new('journald_native', spec) task :build => :compile do # just add prerequisite diff --git a/ext/journald_logger/extconf.rb b/ext/journald_native/extconf.rb similarity index 93% rename from ext/journald_logger/extconf.rb rename to ext/journald_native/extconf.rb index facd81c..6719284 100644 --- a/ext/journald_logger/extconf.rb +++ b/ext/journald_native/extconf.rb @@ -17,4 +17,4 @@ abort 'systemd/sd-journal.h is missing. please install systemd-journal' unless f abort "#{func}() is missing. systemd-journal is not usable" unless find_library('systemd-journal', func) end -create_makefile('journald_logger') +create_makefile('journald_native') diff --git a/ext/journald_logger/journald_logger.c b/ext/journald_native/journald_native.c similarity index 98% rename from ext/journald_logger/journald_logger.c rename to ext/journald_native/journald_native.c index 538c0c5..635e435 100644 --- a/ext/journald_logger/journald_logger.c +++ b/ext/journald_native/journald_native.c @@ -4,7 +4,7 @@ #include #include -void Init_journald_logger(); +void Init_journald_native(); /* initializers */ static void jdl_init_modules(); @@ -23,7 +23,7 @@ static char * jdl_alloc_safe_string(VALUE string); static VALUE mJournald; static VALUE mNative; -void Init_journald_logger() +void Init_journald_native() { jdl_init_modules(); jdl_init_constants(); diff --git a/journald-logger.gemspec b/journald-native.gemspec similarity index 59% rename from journald-logger.gemspec rename to journald-native.gemspec index 7b2be32..31b944e 100644 --- a/journald-logger.gemspec +++ b/journald-native.gemspec @@ -1,23 +1,23 @@ # coding: utf-8 lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'journald/logger/version' +require 'journald/native/version' Gem::Specification.new do |spec| - spec.name = 'journald-logger' - spec.version = Journald::Logger::VERSION + spec.name = 'journald-native' + spec.version = Journald::Native::VERSION spec.authors = ['Anton Smirnov'] spec.email = ['sandfox@sandfox.im'] - spec.summary = %q{systemd-journal native logger} - # spec.description = %q{TODO: Write a longer description. Optional.} - spec.homepage = 'https://github.com/sandfox-im/journald-logger' + spec.summary = %q{systemd-journal logging native lib wrapper} + # spec.description = %q{Write a longer description. Optional.} + spec.homepage = 'https://github.com/sandfox-im/journald-native' spec.license = 'MIT' spec.files = `git ls-files -z`.split("\x0") spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.extensions << 'ext/journald_logger/extconf.rb' + spec.extensions << 'ext/journald_native/extconf.rb' spec.add_development_dependency 'bundler', '~> 1.6' spec.add_development_dependency 'rake' diff --git a/lib/journald/logger.rb b/lib/journald/logger.rb deleted file mode 100644 index 1b60eb8..0000000 --- a/lib/journald/logger.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'journald/logger/version' -require_relative '../journald_logger' - -module Journald - module Logger - end -end diff --git a/lib/journald/native.rb b/lib/journald/native.rb new file mode 100644 index 0000000..0d1dffe --- /dev/null +++ b/lib/journald/native.rb @@ -0,0 +1,7 @@ +require 'journald/native/version' +require_relative '../journald_native' + +module Journald + module Native + end +end diff --git a/lib/journald/logger/version.rb b/lib/journald/native/version.rb similarity index 75% rename from lib/journald/logger/version.rb rename to lib/journald/native/version.rb index 23c19ef..f68e3f4 100644 --- a/lib/journald/logger/version.rb +++ b/lib/journald/native/version.rb @@ -1,5 +1,5 @@ module Journald - module Logger + module Native VERSION = '0.0.1' end end