egon 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDgwYjE4MDY2Y2VjNzVkZmY1YjA1NWQ4YWU2MDBkOGE1YTViY2Y0Zg==
+    OTEwNTZmMzE3ZmVhOThhNmMwMWUyMDIxZTAwMzc5NjE1ZjBiOGZlNA==
   data.tar.gz: !binary |-
-    MWU2MjlmYWU4Nzc5NDUwYTdhOGZlYWNkYTgxZTJlNTRmNjFiYzJhZg==
+    ZjAyY2MxN2ZjYTEyMDBmNTlkZTBhN2FiOWY0ODM0MGQ3YjdiZDA4Mg==
 SHA512:
   metadata.gz: !binary |-
-    MTQ4NmFjZTlhMmM0YTJkNmNiMzJlMDgyZDA1NDAxYTRmODIzZWE0YmFkN2Mx
-    NTQ4MGQwMWQ2ZGQyMTczODA2ODFkZDZhMDU5YjFhZGI0NjZhN2ZmY2VhMjFk
-    N2VmYmJlODY5NWVjMjkzNWJmNDU5NzFmYzdhMzdhZWU3NGM2N2U=
+    NzdlZTZmMTM2YjY0ZjY2MzkyOTg1NjU2OWQzZDRmZWUzNGQyYTdiZWMwNTI0
+    YmRkOWM4YWY4N2E5OGMyMWNiYWFkMjY0NTkyNDgyNGQxODkzMDVmNThlNDMx
+    Y2JlNmFiMTI3ODkxMjkyOGI0NzYwOGRkN2JjZGVjNTEyNzVhYWY=
   data.tar.gz: !binary |-
-    ODU2M2UxZTIxYzJhMDMxMjU2NGM0N2Y0ZDMwOWNjMzU2NTlkNWJkMmU2MjIy
-    ZDgyY2U2MjdlOTVmNTQ1MjQ5ZmUwYTA0OWYxOGQzYWJhYzU2NTEyZjE4M2I1
-    YTVkODAwZTZiZDUwODUzYjVlYWI0ZTdiMGZhNmM0MDBjY2VlMDY=
+    YjRmZDM4MTA5MjE2ODJmYmQ0Y2Q4ZmM0ODYwODg0MjI3NjU0MDA2YTI4OGMw
+    NzI2NWU1MjYyNWZhM2YzYTkwODI2NmYzMWU2ZjhmNzQ0NDNjY2NmYTEyZTBj
+    MjVjYTI5ZjRjZmI5NzVjNDgyMjVhY2FlMzVhOTViYTUyMDE0YzM=

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/rubygem-egon.spec

@@ -1,58 +1,64 @@
+%{?scl:%scl_package rubygem-%{gem_name}}
+%{!?scl:%global pkg_name %{name}}
+
 %global gem_name egon
 
-Name: rubygem-%{gem_name}
-Version: 0.4.1
-Release: 1%{?dist}
+Name: %{?scl_prefix}rubygem-%{gem_name}
+Version: 0.4.2
+Release: 7%{?dist}
 Summary: A library on top of Fog that encapsulates TripleO deployment operations
 Group: Development/Languages
 License: GPL-3.0+
 URL: https://github.com/fusor/egon
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-BuildRequires: rubygem(fog) => 1.31.0
-BuildRequires: rubygem(fog) < 1.32
-BuildRequires: rubygem(net-ssh) => 2.9.2
-BuildRequires: rubygem(net-ssh) < 2.10
-BuildRequires: rubygem(rspec) => 3.2.0
-BuildRequires: rubygem(rspec) < 3.3
+BuildRequires: %{?scl_prefix}rubygems-devel
+BuildRequires: %{?scl_prefix}ruby
+BuildRequires: %{?scl_prefix}rubygem(fog) => 1.31.0
+BuildRequires: %{?scl_prefix}rubygem(net-ssh) => 2.9.2
+BuildRequires: %{?scl_prefix}rubygem(net-ssh) < 2.10
 BuildArch: noarch
 
 %description
 A library on top of Fog that encapsulates TripleO deployment operations.
 
-
 %package doc
-Summary: Documentation for %{name}
+Summary: Documentation for %{pkg_name}
 Group: Documentation
-Requires: %{name} = %{version}-%{release}
+Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}.
+Documentation for %{pkg_name}.
 
 %prep
+%{?scl:scl enable %{scl} - << \EOF}
 gem unpack %{SOURCE0}
+%{?scl:EOF}
 
 %setup -q -D -T -n  %{gem_name}-%{version}
 
+%{?scl:scl enable %{scl} - << \EOF}
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%{?scl:EOF}
 
 %build
 # Create the gem as gem install only works on a gem file
+%{?scl:scl enable %{scl} - << \EOF}
 gem build %{gem_name}.gemspec
+%{?scl:EOF}
 
-# %%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
+%{?scl:scl enable %{scl} - << \EOF}
+gem install %{gem_name}-%{version}.gem --local --install-dir .%{gem_dir}
+%{?scl:EOF}
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
+mkdir .%{_bindir}
+mv .%{gem_dir}/bin/* \
+        .%{_bindir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-
 mkdir -p %{buildroot}%{_bindir}
 cp -pa .%{_bindir}/* \
         %{buildroot}%{_bindir}/
@@ -60,6 +66,7 @@ cp -pa .%{_bindir}/* \
 find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 # Run the test suite
+
 %check
 pushd .%{gem_instdir}
 
@@ -70,8 +77,6 @@ popd
 %{_bindir}/undercloud-install-local.rb
 %{_bindir}/undercloud-install-satellite.rb
 %{_bindir}/undercloud-install-vanilla-rhel.rb
-%exclude %{gem_instdir}/.gitignore
-%{gem_instdir}/.ruby-version
 %license %{gem_instdir}/LICENSE
 %{gem_instdir}/bin
 %{gem_libdir}
@@ -88,5 +93,21 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-7
+- gempsec and rpm spec cleanup (jmontleo@redhat.com)
+
+* Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-6
+- remove dev require (jmontleo@redhat.com)
+
+* Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-5
+- Allow newer version of fog 
+
+* Wed Sep 09 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-4
+- remove bad require (jmontleo@redhat.com)
+
+* Wed Sep 09 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-3
+- Egon RPM compatible with SCL and Foreman (jrist@redhat.com)
+- Egon RPM compatible with SCL (jrist@redhat.com)
+
 * Mon Aug 31 2015 jrist <jrist@redhat.com> - 0.4.1-1
 - Initial package

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,14 +91,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/undercloud-install-local.rb
 - bin/undercloud-install-satellite.rb
 - bin/undercloud-install-vanilla-rhel.rb
-- egon-0.4.2.gem
 - egon.gemspec
 - lib/egon.rb
 - lib/egon/overcloud/undercloud_handle.rb
@@ -112,11 +110,18 @@ files:
 - lib/egon/undercloud/port-check-mixin.rb
 - lib/egon/undercloud/ssh-connection.rb
 - lib/egon/version.rb
-- pkg/egon-0.0.1.gem
-- pkg/egon-0.0.2.gem
 - pkg/egon-0.1.0.gem
+- pkg/egon-0.2.0.gem
+- pkg/egon-0.3.1.gem
+- pkg/egon-0.3.2.gem
+- pkg/egon-0.3.3.gem
+- pkg/egon-0.3.4.gem
+- pkg/egon-0.3.5.gem
+- pkg/egon-0.3.6.gem
+- pkg/egon-0.4.0.gem
+- pkg/egon-0.4.1.gem
+- pkg/egon-0.4.2.gem
 - rubygem-egon.spec
-- rubygem-foreman_abrt.spec
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb
 - test/test_undercloud_handle.rb

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    egon (0.4.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.1)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    excon (0.45.3)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.31.0)
-      fog-atmos
-      fog-aws (~> 0.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.30)
-      fog-ecloud
-      fog-google (>= 0.0.2)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.4.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.7.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.30.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.2)
-      fog-core
-      fog-xml
-    fog-google (0.0.5)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.3)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.4)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.0.1)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (0.4.6)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    multi_json (1.11.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  egon!
-  fog (~> 1.31.0)
-  net-ssh (~> 2.9.2)
-  rake (~> 10.0)
-  rspec (~> 3.2.0)

data/rubygem-foreman_abrt.spec

@@ -1,134 +0,0 @@
-# This package contains macros that provide functionality relating to
-# Software Collections. These macros are not used in default
-# Fedora builds, and should not be blindly copied or enabled.
-# Specifically, the "scl" macro must not be defined in official Fedora
-# builds. For more information, see:
-# http://docs.fedoraproject.org/en-US/Fedora_Contributor_Documentation
-# /1/html/Software_Collections_Guide/index.html
-
-%{?scl:%scl_package rubygem-%{gem_name}}
-%{!?scl:%global pkg_name %{name}}
-
-%global gem_name foreman_abrt
-
-%define rubyabi 1.9.1
-%global foreman_dir /usr/share/foreman
-%global foreman_bundlerd_dir %{foreman_dir}/bundler.d
-%global foreman_pluginconf_dir %{foreman_dir}/config/settings.plugins.d
-
-Summary:    Display reports from Automatic Bug Reporting Tool in Foreman
-Name:       %{?scl_prefix}rubygem-%{gem_name}
-Version:    0.0.6
-Release:    3%{?dist}
-Group:      Applications/System
-License:    GPLv3
-URL:        http://github.com/theforeman/foreman_abrt
-Source0:    http://rubygems.org/downloads/%{gem_name}-%{version}.gem
-
-Requires:   foreman >= 1.8.0
-
-%if 0%{?fedora} > 18
-Requires: %{?scl_prefix_ruby}ruby(release)
-%else
-Requires: %{?scl_prefix_ruby}ruby(abi) >= %{rubyabi}
-%endif
-Requires: %{?scl_prefix_ruby}rubygems
-
-%if 0%{?fedora} > 18
-BuildRequires: %{?scl_prefix_ruby}ruby(release)
-%else
-BuildRequires: %{?scl_prefix_ruby}ruby(abi) >= %{rubyabi}
-%endif
-BuildRequires: %{?scl_prefix_ruby}rubygems-devel
-BuildRequires: %{?scl_prefix_ruby}rubygems
-
-BuildArch: noarch
-
-Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
-Provides: foreman-plugin-abrt
-%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}}
-
-%description
-This plugin allows you to see bug reports submitted by Automatic Bug Reporting
-Tool.
-
-%package doc
-BuildArch:  noarch
-Requires:   %{?scl_prefix}%{pkg_name} = %{version}-%{release}
-%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}-doc}
-Summary:    Documentation for rubygem-%{gem_name}
-
-%description doc
-This package contains documentation for rubygem-%{gem_name}.
-
-%prep
-%setup -n %{pkg_name}-%{version} -q -c -T
-mkdir -p .%{gem_dir}
-%{?scl:scl enable %{scl} "}
-gem install --local --install-dir .%{gem_dir} \
-            --force %{SOURCE0} --no-rdoc --no-ri
-%{?scl:"}
-
-%build
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
-
-mkdir -p %{buildroot}%{foreman_bundlerd_dir}
-cat <<GEMFILE > %{buildroot}%{foreman_bundlerd_dir}/%{gem_name}.rb
-gem '%{gem_name}'
-GEMFILE
-
-%files
-%dir %{gem_instdir}
-%{gem_instdir}/app
-%{gem_instdir}/config
-%{gem_instdir}/db
-%{gem_instdir}/lib
-%exclude %{gem_cache}
-%exclude %{gem_instdir}/.*
-%exclude %{gem_instdir}/Rakefile
-%exclude %{gem_instdir}/test
-%{gem_spec}
-%{foreman_bundlerd_dir}/%{gem_name}.rb
-%doc %{gem_instdir}/LICENSE
-
-%exclude %{gem_dir}/cache/%{gem_name}-%{version}.gem
-
-%files doc
-%doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/README.md
-
-%posttrans
-# We need to run the db:migrate after the install transaction
-/usr/sbin/foreman-rake db:migrate  >/dev/null 2>&1 || :
-/usr/sbin/foreman-rake db:seed  >/dev/null 2>&1 || :
-(/sbin/service foreman status && /sbin/service foreman restart) >/dev/null 2>&1
-exit 0
-
-%changelog
-* Wed Aug 26 2015 Dominic Cleal <dcleal@redhat.com> 0.0.6-3
-- Converted to tfm SCL (dcleal@redhat.com)
-
-* Mon Mar 23 2015 Dominic Cleal <dcleal@redhat.com> 0.0.6-2
-- Remove unused apipie:cache call (dcleal@redhat.com)
-
-* Thu Jan 15 2015 Martin Milata <mmilata@redhat.com> 0.0.6-1
-- Update to foreman_abrt-0.0.6
-
-* Fri Jan 09 2015 Martin Milata <mmilata@redhat.com> 0.0.5-1
-- Update to foreman_abrt-0.0.5
-
-* Fri Nov 14 2014 Martin Milata <mmilata@redhat.com> 0.0.4-1
-- Update to foreman_abrt-0.0.4
-
-* Tue Sep 30 2014 Martin Milata <mmilata@redhat.com> 0.0.3-1
-- Update to foreman_abrt-0.0.3
-
-* Tue Aug 26 2014 Martin Milata <mmilata@redhat.com> 0.0.2-1
-- Update to foreman_abrt-0.0.2
-
-* Mon Aug 11 2014 Martin Milata <mmilata@redhat.com> 0.0.1-1
-- new package