smart_proxy_abrt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b818423fa22af257c309b076b1f7617ba4554af
-  data.tar.gz: 80c9913d7368d68a6fb7997d96c3f11893257fb8
+  metadata.gz: c4dc83a2f1040df307420e2e75ee192c56901628
+  data.tar.gz: 13e7f426850a904b6cdf1b5156a215995bf3171f
 SHA512:
-  metadata.gz: ff9a396e73063d03b71244a3afa62cb9778240e4b11f74ed06eeef0beb38f2f292718f8658fa799f35de8c851722c8ce059057a394e94eefee5d1db5768e5746
-  data.tar.gz: 89c5e9d13cbacfe0c9af58698273f8e10fe8f499e7987bcd0030400f0ab9b6fbafa54d262ea5f583184a693f11162e9c67e5ec17438bd503bf142e61833c283c
+  metadata.gz: 84210dcc4ca882d2f42c1142fd6673a2411f1c5a71e306ae6435f24fed311d8f6d94c8ed11658f45fd4b969179e7f72723de79788757d1c9f7c2e2a288b52b6d
+  data.tar.gz: 939ebb9cf9d2b801da774a04132091b2afd70cfa3a556f252755d2e4552903723eaa5537d508c5c67918d70163414e31460b66f8c6e1379217245875b12f09a4

data/Rakefile

@@ -1,11 +1,6 @@
 require 'rake'
 require 'rake/testtask'
 
-# Test for 1.9
-if (RUBY_VERSION.split('.').map{|s|s.to_i} <=> [1,9,0]) > 0 then
-  PLATFORM = RUBY_PLATFORM
-end
-
 desc 'Default: run unit tests.'
 task :default => :test
 
@@ -14,12 +9,6 @@ Rake::TestTask.new(:test) do |t|
   t.libs << '.'
   t.libs << 'lib'
   t.libs << 'test'
-  files = FileList['test/**/*_test.rb']
-  if PLATFORM =~ /mingw/
-    files = FileList['test/**/server_ms_test*']
-  else
-    files = FileList['test/**/*_test.rb'].delete_if{|f| f =~ /_ms_/}
-  end
-  t.test_files = files
+  t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end

data/bin/smart-proxy-abrt-send

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift '/usr/share/foreman-proxy/lib' #XXX!
-$LOAD_PATH.unshift '/usr/share/foreman-proxy/modules' #XXX!
+# XXX I can't think of a sane way to not hardcode the paths: the RPM package of
+# smart-proxy does not contain a gem so the gem machinery cannot be used. And
+# we can't have it in the config because we need smart_proxy to read it ...
+$LOAD_PATH.unshift '/usr/share/foreman-proxy/lib'
+$LOAD_PATH.unshift '/usr/share/foreman-proxy/modules'
 
 # We rely on the main smart_proxy module to initialize the plugins so that we
 # can access our module's settings. Also used from smart-proxy code: global

data/extra/foreman-proxy-abrt-send.cron

@@ -1,2 +1,2 @@
-# Send collected ABRT reports once every 10 minutes
+# Send collected ABRT reports once every 30 minutes
 */30 * * * * foreman-proxy smart-proxy-abrt-send

data/lib/smart_proxy_abrt/abrt_lib.rb

@@ -4,21 +4,21 @@ require 'uri'
 require 'time'
 require 'fileutils'
 
+require 'openssl'
+
 require 'proxy/log'
 require 'proxy/request'
 
 module Proxy::Abrt
-  def self.random_alpha_string(length)
-    base = ('a'..'z').to_a
-    result = ""
-    length.times { result << base[rand(base.size)] }
-    result
+  # Returns hex representation of random bytes-long number
+  def self.random_hex_string(nbytes)
+    OpenSSL::Random.random_bytes(nbytes).unpack('H*').join
   end
 
   # Generate multipart boundary separator
   def self.suggest_separator
       separator = "-"*28
-      separator + self.random_alpha_string(16)
+      separator + self.random_hex_string(16)
   end
 
   # It seems that Net::HTTP does not support multipart/form-data - this function
@@ -220,7 +220,7 @@ module Proxy::Abrt
     end
 
     def self.unique_filename(prefix)
-      File.join(HostReport.spooldir, prefix + Proxy::Abrt::random_alpha_string(8))
+      File.join(HostReport.spooldir, prefix + Proxy::Abrt::random_hex_string(8))
     end
 
     def self.with_unique_filename(prefix)

data/lib/smart_proxy_abrt/abrt_version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Abrt
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/test/test_helper.rb

@@ -1,10 +1,8 @@
-path_to_smart_proxy_repo = '../smart-proxy'
-$LOAD_PATH.unshift File.join(path_to_smart_proxy_repo, 'test')
+require 'test/unit'
+require 'mocha/setup'
+require 'rack/test'
 
-# create log directory in our (not smart-proxy) repo
-logdir = File.join(File.dirname(__FILE__), '..', 'logs')
-FileUtils.mkdir_p(logdir) unless File.exists?(logdir)
+require 'smart_proxy_for_testing'
 
-require 'test_helper'
-
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
+# create log directory in our (not smart-proxy) directory
+FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_abrt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Martin Milata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
-dependencies: []
+date: 2014-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: satyr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: This smart proxy plugin, together with a Foreman plugin, add the capability
   to send ABRT micro-reports from your managed hosts to Foreman.
 email: mmilata@redhat.com
@@ -36,7 +50,6 @@ files:
 - test/abrt_test.rb
 - test/abrt_api_test.rb
 - extra/foreman-proxy-abrt-send.cron
-- extra/rubygem-smart_proxy_abrt.spec
 - README
 - LICENSE
 - Rakefile

data/extra/rubygem-smart_proxy_abrt.spec

@@ -1,110 +0,0 @@
-%global gem_name smart_proxy_abrt
-
-%global foreman_proxy_bundlerd_dir /usr/share/foreman-proxy/bundler.d
-%global foreman_proxy_pluginconf_dir /etc/foreman-proxy/settings.d
-%global spool_dir /var/spool/foreman-proxy-abrt
-
-Name: rubygem-%{gem_name}
-Version: 0.0.1
-Release: 1%{?dist}
-Summary: Automatic Bug Reporting Tool plugin for Foreman's smart proxy
-Group: Applications/Internet
-License: GPLv3
-URL: http://github.com/abrt/smart-proxy-abrt
-Source0: https://fedorahosted.org/released/abrt/%{gem_name}-%{version}.gem
-Requires: ruby(release)
-Requires: ruby(rubygems)
-Requires: rubygem(ffi)
-Requires: foreman-proxy >= 1.6.0
-Requires: crontabs
-## does not exist in repository yet
-#Requires: rubygem-satyr
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-BuildRequires: rubygem(ffi)
-BuildRequires: rubygem(minitest)
-BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
-
-%description
-This smart proxy plugin, together with a Foreman plugin, add the capability to
-send ABRT micro-reports from your managed hosts to Foreman.
-
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation
-Requires:%{name} = %{version}-%{release}
-
-%description doc
-Documentation for %{name}
-
-%prep
-gem unpack %{SOURCE0}
-%setup -q -D -T -n  %{gem_name}-%{version}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-%build
-# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir
-# by default, so that we can move it into the buildroot in %%install
-%gem_install
-
-%install
-# Packaging guidelines say: Do not ship tests
-rm -r .%{gem_instdir}/test .%{gem_instdir}/Rakefile
-rm .%{gem_instdir}/extra/*.spec
-
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-       %{buildroot}%{gem_dir}/
-
-# executables
-mkdir -p %{buildroot}%{_bindir}
-cp -a .%{_bindir}/* \
-       %{buildroot}%{_bindir}
-
-# bundler file
-mkdir -p %{buildroot}%{foreman_proxy_bundlerd_dir}
-mv %{buildroot}%{gem_instdir}/bundler.d/abrt.rb \
-   %{buildroot}%{foreman_proxy_bundlerd_dir}
-
-# sample config
-mkdir -p %{buildroot}%{foreman_proxy_pluginconf_dir}
-mv %{buildroot}%{gem_instdir}/settings.d/abrt.yml.example \
-   %{buildroot}%{foreman_proxy_pluginconf_dir}/
-
-# crontab
-mkdir -p %{buildroot}%{_sysconfdir}/cron.d/
-mv %{buildroot}%{gem_instdir}/extra/foreman-proxy-abrt-send.cron \
-   %{buildroot}%{_sysconfdir}/cron.d/%{name}
-
-# create spool directory
-mkdir -p %{buildroot}%{spool_dir}
-
-#%check
-#testrb -Ilib test
-
-%files
-%dir %{gem_instdir}
-%{gem_libdir}
-%exclude %{gem_cache}
-%{gem_spec}
-%{gem_instdir}/bin
-
-%dir %attr(0755, foreman-proxy, foreman-proxy) %{spool_dir}
-%{foreman_proxy_bundlerd_dir}/abrt.rb
-%{_bindir}/smart-proxy-abrt-send
-%doc %{foreman_proxy_pluginconf_dir}/abrt.yml.example
-%config(noreplace) %{_sysconfdir}/cron.d/%{name}
-
-%files doc
-%{gem_docdir}
-%{gem_instdir}/README
-%{gem_instdir}/LICENSE
-
-%changelog
-* Tue Jul 15 2014 Martin Milata <mmilata@redhat.com> - 0.0.1-1
-- Initial package