pacct 0.8.1-universal-linux → 0.8.2-universal-linux

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+require "./lib/pacct/version.rb"
+
 task :default => :spec
 
 desc "Run specs"
@@ -10,6 +12,36 @@ RSpec::Core::RakeTask.new(:spec) do |task|
 end
 
 task :docs do
-  system("rdoc --exclude '(./)?spec/'")
+  system("rdoc ext lib")
+end
+
+desc "Build RPM"
+task :rpm do
+  Rake::Task['build'].invoke
+
+  package = "pkg/pacct-#{Pacct::VERSION}-universal-linux.gem"
+
+  FileUtils.cp(package, 'rpm/SOURCES')
+
+  home_dir = Etc.getpwuid.dir
+
+  rpmbuild_dir = File.join(home_dir, 'rpmbuild')
+  spec_dir = File.join(rpmbuild_dir, 'SPECS')
+  src_dir = File.join(rpmbuild_dir, 'SOURCES')
+
+  [rpmbuild_dir, spec_dir, src_dir].each do |dir|
+    FileUtils.mkdir_p(dir)
+  end
+
+  FileUtils.cp('rpm/pacct.spec', spec_dir)
+  FileUtils.cp(package, src_dir)
+
+  rake_dir = Dir.pwd
+
+  Dir.chdir(rpmbuild_dir)
+
+  system 'rpmbuild -ba SPECS/pacct.spec'
+
+  Dir.chdir(rake_dir)
 end
 

data/ext/pacct/extconf.rb

@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$CFLAGS << ' -Werror'
+
 =begin
 if ENV['COVERAGE']
   $CFLAGS << ' -fprofile-arcs -ftest-coverage'

data/ext/pacct/pacct_c.c

@@ -88,6 +88,7 @@ static comp_t ulong_to_comp_t(unsigned long l) {
 }
 
 //Checks the result of a call, raising an error if it fails
+//To do: handle non-integer values in the rb_raise format string?
 #define CHECK_CALL(expr, expected_result) \
   { \
     typeof(expr) expected = (expected_result); \
@@ -102,9 +103,7 @@ static comp_t ulong_to_comp_t(unsigned long l) {
         err = rb_funcall(cSystemCallError, id_new, 2, rb_str_new2(buf), INT2NUM(errno)); \
         rb_exc_raise(err); \
       } else { \
-        char buf[512]; \
-        snprintf(buf, sizeof(buf), #expr ": result %i expected, not %i - %s(%u)", expected, result, __FILE__, __LINE__); \
-        rb_raise(rb_eRuntimeError, buf); \
+        rb_raise(rb_eRuntimeError, #expr ": result %i expected, not %i - %s(%u)", expected, result, __FILE__, __LINE__); \
       } \
     } \
   } \
@@ -846,6 +845,10 @@ void Init_pacct_c() {
   if(mRSpec == Qtrue) {
     /*
      *Document-module: Pacct::Test
+     *
+     *Contains unit-testing methods
+     *
+     *Only defined when RSpec is loaded
      */
     VALUE mTest = rb_define_module_under(mPacct, "Test");
     rb_define_module_function(mTest, "check_call", test_check_call_macro, 1);
@@ -853,4 +856,4 @@ void Init_pacct_c() {
     rb_define_module_function(mTest, "read_failure", test_read_failure, 0);
     rb_define_module_function(mTest, "comp_t_to_ulong", test_comp_t_to_ulong, 1);
   }
-}
+}

data/lib/pacct/version.rb

@@ -1,4 +1,4 @@
 module Pacct
   #The library version
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/rpm/pacct.spec

@@ -0,0 +1,69 @@
+Name:		ruby-pacct
+Version:	0.8.1
+Release:	1%{?dist}
+Summary:	A Ruby C extension for reading Linux process accounting files in acct(5) format
+
+%define gem_name pacct
+%define gem %{gem_name}-%{version}-universal-linux
+
+Group:		Development/Libraries
+License:	MIT
+URL:		https://github.com/blm768/pacct
+Source0:	%{gem}.gem
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	ruby-devel
+Requires:	rubygems
+
+%description
+A Ruby C extension for reading Linux process accounting files in acct(5) format
+
+%prep
+#gem unpack %{SOURCE0}
+#%setup -q -D -T -n %{gem}
+%setup -q -D -T -n .
+cp %{SOURCE0} .
+
+#gem spec %{SOURCE0} -l --ruby > %{gem}.gemspec
+
+%define gem_dir /usr/lib/ruby/gems/1.8
+%define gem_instdir %{gem_dir}/gems/%{gem}
+
+%build
+mkdir -p ./%{gem_dir}
+
+#gem build %{gem_name}.gemspec
+
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+gem install -V \
+        --local \
+        --install-dir ./%{gem_dir} \
+        --bindir ./%{_bindir} \
+        --force \
+        --rdoc \
+        %{gem}.gem
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_instdir}
+
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
+
+#mkdir -p %{buildroot}%{gem_extdir_mri}/ext
+#mv %{buildroot}%{gem_instdir}/lib/pacct/pacct_c.so %{buildroot}%{gem_extdir_mri}/ext
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc %{gem_dir}/doc/%{gem}/*
+%{gem_instdir}/*
+%exclude %{gem_instdir}/.gitignore
+%{gem_dir}/specifications/%{gem}.gemspec
+%{gem_dir}/cache/%{gem}.gem
+%exclude %{gem_dir}/bin/ruby_noexec_wrapper
+
+%changelog
+

metadata

@@ -1,40 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pacct
-version: !ruby/object:Gem::Version
-  version: 0.8.1
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: universal-linux
-authors:
+authors: 
 - Ben Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: A C extension library for parsing accounting files in acct(5) format
-email:
+email: 
 - blm768@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/pacct/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -45,6 +51,8 @@ files:
 - lib/pacct.rb
 - lib/pacct/version.rb
 - pacct.gemspec
+- rpm/SOURCES
+- rpm/pacct.spec
 - snapshot/pacct
 - snapshot/pacct_invalid_ids
 - snapshot/pacct_invalid_length
@@ -54,29 +62,38 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/blm768/pacct
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A C extension library for parsing accounting files in acct(5) format
-test_files:
+test_files: 
 - spec/entry_spec.rb
 - spec/log_spec.rb
 - spec/pacct_spec.rb