Project

General

Profile

« Previous | Next » 

Revision b4d2e30f

Added by Dominic Cleal over 9 years ago

Import jgrep from Fedora for foreman_hooks helper

View differences:

comps/comps-foreman-plugins-fedora19.xml
<packagereq type="default">rubygem-dynflow</packagereq>
<packagereq type="default">rubygem-ftools</packagereq>
<packagereq type="default">rubygem-hammer_cli_foreman_ssh</packagereq>
<packagereq type="default">rubygem-jgrep</packagereq>
<packagereq type="default">rubygem-less</packagereq>
<packagereq type="default">rubygem-less-rails</packagereq>
<packagereq type="default">rubygem-logify</packagereq>
......
<packagereq type="default">rubygem-ftools-doc</packagereq>
<packagereq type="default">rubygem-hammer_cli_foreman_bootdisk-doc</packagereq>
<packagereq type="default">rubygem-hammer_cli_foreman_ssh-doc</packagereq>
<packagereq type="default">rubygem-jgrep-doc</packagereq>
<packagereq type="default">rubygem-less-doc</packagereq>
<packagereq type="default">rubygem-less-rails-doc</packagereq>
<packagereq type="default">rubygem-logify-doc</packagereq>
comps/comps-foreman-plugins-rhel6.xml
<packagereq type="default">ruby193-rubygem-docker-api</packagereq>
<packagereq type="default">ruby193-rubygem-dynflow</packagereq>
<packagereq type="default">ruby193-rubygem-ftools</packagereq>
<packagereq type="default">ruby193-rubygem-jgrep</packagereq>
<packagereq type="default">ruby193-rubygem-less</packagereq>
<packagereq type="default">ruby193-rubygem-less-rails</packagereq>
<packagereq type="default">ruby193-rubygem-little-plugger</packagereq>
......
<packagereq type="default">ruby193-rubygem-foreman_templates-doc</packagereq>
<packagereq type="default">ruby193-rubygem-foreman_xen-doc</packagereq>
<packagereq type="default">ruby193-rubygem-ftools-doc</packagereq>
<packagereq type="default">ruby193-rubygem-jgrep-doc</packagereq>
<packagereq type="default">ruby193-rubygem-less-doc</packagereq>
<packagereq type="default">ruby193-rubygem-less-rails-doc</packagereq>
<packagereq type="default">ruby193-rubygem-little-plugger-doc</packagereq>
comps/comps-foreman-plugins-rhel7.xml
<packagereq type="default">ruby193-rubygem-docker-api</packagereq>
<packagereq type="default">ruby193-rubygem-dynflow</packagereq>
<packagereq type="default">ruby193-rubygem-ftools</packagereq>
<packagereq type="default">ruby193-rubygem-jgrep</packagereq>
<packagereq type="default">ruby193-rubygem-less</packagereq>
<packagereq type="default">ruby193-rubygem-less-rails</packagereq>
<packagereq type="default">ruby193-rubygem-little-plugger</packagereq>
......
<packagereq type="default">ruby193-rubygem-foreman_templates-doc</packagereq>
<packagereq type="default">ruby193-rubygem-foreman_xen-doc</packagereq>
<packagereq type="default">ruby193-rubygem-ftools-doc</packagereq>
<packagereq type="default">ruby193-rubygem-jgrep-doc</packagereq>
<packagereq type="default">ruby193-rubygem-less-doc</packagereq>
<packagereq type="default">ruby193-rubygem-less-rails-doc</packagereq>
<packagereq type="default">ruby193-rubygem-little-plugger-doc</packagereq>
rel-eng/tito.props
rubygem-diffy
rubygem-docker-api
rubygem-dynflow
rubygem-jgrep
rubygem-open4
rubygem-opennebula
rubygem-foreman_abrt
......
rubygem-diffy
rubygem-docker-api
rubygem-dynflow
rubygem-jgrep
rubygem-open4
rubygem-opennebula
rubygem-foreman_abrt
......
rubygem-diffy
rubygem-docker-api
rubygem-dynflow
rubygem-jgrep
rubygem-open4
rubygem-opennebula
rubygem-foreman_abrt
rubygem-foreman_hooks/rubygem-foreman_hooks.spec
%package doc
BuildArch: noarch
Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
Requires: %{?scl_prefix}rubygem(jgrep)
Summary: Documentation for rubygem-%{gem_name}
%description doc
rubygem-jgrep/0001-Fix-test-run.patch
From c390416f30d2295a54693f36ec708ba1933dbe6d Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 29 Apr 2014 15:18:52 +0200
Subject: [PATCH] Fix test run
Failures:
1) JGrep#has_complex? should return true if complex statement is present in an array
Failure/Error: result = JGrep::has_complex?({"foo" => ["bar" => 1]}, [["statement","foo.bar=1"]])
NoMethodError:
undefined method `first' for "foo.bar=1":String
# ./lib/jgrep.rb:306:in `has_complex?'
# ./spec/unit/jgrep_spec.rb:124:in `block (3 levels) in <module:JGrep>'
2) JGrep#has_complex? should return false if complex statement is not present in an array
Failure/Error: result = JGrep::has_complex?({"foo" => ["bar" => 1]}, [["statement","foo.bar=0"]])
NoMethodError:
undefined method `first' for "foo.bar=0":String
# ./lib/jgrep.rb:306:in `has_complex?'
# ./spec/unit/jgrep_spec.rb:129:in `block (3 levels) in <module:JGrep>'
Finished in 0.04232 seconds
70 examples, 2 failures
Failed examples:
rspec ./spec/unit/jgrep_spec.rb:123 # JGrep#has_complex? should return true if complex statement is present in an array
rspec ./spec/unit/jgrep_spec.rb:128 # JGrep#has_complex? should return false if complex statement is not present in an array
---
lib/jgrep.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/jgrep.rb b/lib/jgrep.rb
index 9519758..c2d77f6 100644
--- a/lib/jgrep.rb
+++ b/lib/jgrep.rb
@@ -303,7 +303,7 @@ module JGrep
break
end
end
- field = field[1].first.split(/=|<|>/).first
+ field = [field[1]].flatten.first.split(/=|<|>/).first
field.split(".").each_with_index do |item, i|
tmp = tmp[item]
--
1.9.0
rubygem-jgrep/JSON-Grep-6a96698f42475975375b027b4d3bf5d8511b4a8f.tar.gz
../.git/annex/objects/Q0/kW/SHA256E-s13998--0f7c357d979dc1c7f22ad40df1adf549179a57bd583483ebe945ceb1a1fc975e.tar.gz/SHA256E-s13998--0f7c357d979dc1c7f22ad40df1adf549179a57bd583483ebe945ceb1a1fc975e.tar.gz
rubygem-jgrep/rubygem-jgrep.spec
%{?scl:%scl_package rubygem-%{gem_name}}
%{!?scl:%global pkg_name %{name}}
%global commit 6a96698f42475975375b027b4d3bf5d8511b4a8f
%global gem_name jgrep
Name: %{?scl_prefix}rubygem-%{gem_name}
Version: 1.3.3
Release: 4%{?dist}
Summary: Query JSON structure with a matching language
Group: Development/Tools
License: ASL 2.0
URL: http://jgrep.org/
Source0: https://github.com/ploubser/JSON-Grep/archive/%{commit}/JSON-Grep-%{commit}.tar.gz
Patch0: 0001-Fix-test-run.patch
BuildArch: noarch
BuildRequires: %{?scl_prefix}rubygems-devel
BuildRequires: %{?scl_prefix}rubygem(rspec)
BuildRequires: %{?scl_prefix}rubygem(mocha)
BuildRequires: %{?scl_prefix}rubygem(json)
%if 0%{?fedora} > 18
Requires: %{?scl_prefix}ruby(release) >= 1.8
%else
Requires: %{?scl_prefix}ruby(abi) >= 1.8
%endif
Requires: %{?scl_prefix}rubygems
Requires: %{?scl_prefix}rubygem(json)
Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}-%{release}
%description
JGrep is Ruby-based CLI tool and API for parsing and displaying JSON data
using a logical expression syntax. It allows you to search a list of JSON
documents and return specific documents or values based on logical truths.
%package doc
Summary: Documentation for %{pkg_name}
Group: Documentation
Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
%description doc
Documentation for %{pkg_name}
%prep
%setup -qn JSON-Grep-%{commit}
%patch0 -p1
%build
mkdir -p .%{gem_dir}
%{?scl:scl enable %{scl} "}
gem build %{gem_name}.gemspec
gem install --local --install-dir .%{gem_dir} \
--bindir .%{_bindir} \
--force %{gem_name}-%{version}.gem
%{?scl:"}
%install
mkdir -p %{buildroot}%{gem_dir}
mkdir -p %{buildroot}%{_bindir}
cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
cp -a ./%{_bindir}/* %{buildroot}%{_bindir}
%check
%{?scl:scl enable %{scl} "}
rspec -Ilib spec
%{?scl:"}
%files
%{_bindir}/*
%dir %{gem_instdir}
%{gem_instdir}/bin
%{gem_libdir}
%exclude %{gem_cache}
%exclude %{gem_instdir}/*.gemspec
%{gem_spec}
%doc COPYING README.markdown
%files doc
%{gem_docdir}
%changelog
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Apr 30 2014 Lubomir Rintel <lkundrak@v3.sk> - 1.3.3-3
- Disable tests on rhel
* Tue Apr 29 2014 Lubomir Rintel <lkundrak@v3.sk> - 1.3.3-2
- Run tests (Lukas Bezdicka, #1092000)
- Fix issue with tests. (Guess adding the run was a good idea...)
* Mon Apr 28 2014 Lubomir Rintel <lkundrak@v3.sk> - 1.3.3-1
- Initial packaging

Also available in: Unified diff