getting specs up to 1.9 sclized

sclizing gems

also fix up remote user

removing rcov and updating specs for ruby193

updating Rails version

bugs

Removing thread-dump

getting openshift-cgroups to the right place

add init file to files section

ruby 19 changes

Author: danmcp

broker/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.0.13'
+gem 'rails', '~> 3.2.8'
 gem 'json'
 gem 'parseconfig', '0.5.2'
 gem 'mongo'
@@ -42,5 +42,4 @@ group :development, :test do
   gem 'mocha', '0.9.8', :require => nil
   gem 'rake', '>= 0.8.7', '<= 0.9.2.2'
   gem 'cucumber'
-  gem 'rcov'
 end

broker/lib/tasks/rcov.rake

@@ -27,12 +27,10 @@ Requires:  rubygem(rails)
 Requires:  rubygem(xml-simple)
 Requires:  rubygem(bson_ext)
 Requires:  rubygem(rest-client)
-Requires:  rubygem(thread-dump)
 Requires:  rubygem(parseconfig)
 Requires:  rubygem(json)
 Requires:  rubygem(openshift-origin-controller)
 Requires:  rubygem(passenger)
-Requires:  rubygem(rcov)
 Requires:  rubygem-passenger-native
 Requires:  rubygem-passenger-native-libs
 %if %{with_systemd}

broker/openshift-origin-broker.spec

@@ -18,16 +18,6 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/unit/**/*_test.rb'
 end
 
-desc "Coverage tests"
-Rcov::RcovTask.new do |t|
-  t.libs << File.expand_path('../lib', __FILE__)
-  t.libs << File.expand_path('../test', __FILE__)
-  t.libs << File.expand_path('../test/unit', __FILE__)
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.rcov_opts << "-x '/usr/lib/ruby'"
-  t.rcov_opts << "-i 'openshift,rhc'"
-end
-
 desc "Generate RDoc"
 task :doc do
   sh "rdoc ."

common/Rakefile

@@ -20,6 +20,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency("json")
   s.add_dependency("activemodel")
-
-  s.add_development_dependency('rcov')
 end

common/openshift-origin-common.gemspec

@@ -1,203 +1,99 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname openshift-origin-common
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%if 0%{?fedora}%{?rhel} <= 6
+    %global scl ruby193
+    %global scl_prefix ruby193-
+%endif
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package rubygem-%{gem_name}}
+%global gem_name openshift-origin-common
+%global rubyabi 1.9.1
 
 Summary:        Cloud Development Common
-Name:           rubygem-%{gemname}
+Name:           rubygem-%{gem_name}
 Version: 1.1.1
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
-Source0:        rubygem-%{gemname}-%{version}.tar.gz
+Source0:        rubygem-%{gem_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ruby(abi) = 1.8
-Requires:       rubygems
-Requires:       rubygem(activemodel)
-Requires:       rubygem(json)
-Requires:       rubygem(rcov)
-
-BuildRequires:  ruby
-BuildRequires:  rubygems
+Requires:       %{?scl:%scl_prefix}ruby
+Requires:       %{?scl:%scl_prefix}rubygems
+Requires:       %{?scl:%scl_prefix}rubygem(activemodel)
+Requires:       %{?scl:%scl_prefix}rubygem(json)
+%if 0%{?fedora}%{?rhel} <= 6
+BuildRequires:  ruby193-build
+BuildRequires:  scl-utils-build
+%endif
+BuildRequires:  %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+BuildRequires:  %{?scl:%scl_prefix}ruby 
+BuildRequires:  %{?scl:%scl_prefix}rubygems
+BuildRequires:  %{?scl:%scl_prefix}rubygems-devel
+BuildRequires:  %{?scl:%scl_prefix}rubygem-yard
 BuildArch:      noarch
-Provides:       rubygem(%{gemname}) = %version
-
-%package -n ruby-%{gemname}
-Summary:        Cloud Development Common Library
-Requires:       rubygem(%{gemname}) = %version
-Provides:       ruby(%{gemname}) = %version
+Provides:       rubygem(%{gem_name}) = %version
 Obsoletes: 	rubygem-stickshift-common
 
+%package doc
+Summary:        Cloud Development Common Library Documentation
+
 %description
 This contains the Cloud Development Common packaged as a rubygem.
 
-%description -n ruby-%{gemname}
-This contains the Cloud Development Common packaged as a ruby site library.
+%description doc
+This contains the Cloud Development Common packaged as a ruby site library
+documentation files.
 
 %prep
-%setup -q
+%{?scl:scl enable %scl "}
+#gem unpack %{SOURCE0}
+#%setup -q -D -T -n  %{gem_name}-%{version}
+%setup -q -D -n  %{gem_name}-%{version}
+#gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%{?scl:"}
 
 %build
+mkdir -p ./%{gem_dir}
+
+%{?scl:scl enable %scl - << \EOF}
+gem build %{gem_name}.gemspec
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+gem install -V \
+        --local \
+        --install-dir ./%{gem_dir} \
+        --bindir ./%{_bindir} \
+        --force \
+        --rdoc \
+        %{gem_name}-%{version}.gem
+%{?scl:EOF}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-mkdir -p %{buildroot}%{ruby_sitelib}
-
-# Build and install into the rubygem structure
-gem build %{gemname}.gemspec
-gem install --local --install-dir %{buildroot}%{gemdir} --force %{gemname}-%{version}.gem
-
-# Symlink into the ruby site library directories
-ln -s %{geminstdir}/lib/%{gemname} %{buildroot}%{ruby_sitelib}
-ln -s %{geminstdir}/lib/%{gemname}.rb %{buildroot}%{ruby_sitelib}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 %clean
 rm -rf %{buildroot}                                
 
 %files
-%defattr(-,root,root,-)
-%dir %{geminstdir}
-%doc %{geminstdir}/Gemfile
-%{gemdir}/doc/%{gemname}-%{version}
-%{gemdir}/gems/%{gemname}-%{version}
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files -n ruby-%{gemname}
-%{ruby_sitelib}/%{gemname}
-%{ruby_sitelib}/%{gemname}.rb
+%dir %{gem_instdir}
+%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/COPYRIGHT
+%doc %{gem_instdir}/.yardoc
+%doc %{gem_instdir}/Gemfile
+%doc %{gem_instdir}/Rakefile
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/%{gem_name}.gemspec
+%{gem_spec}
+%{gem_libdir}
+
+%exclude %{gem_cache}
+%exclude %{gem_instdir}/rubygem-%{gem_name}.spec
+
+%files doc 
+%doc %{gem_docdir}
 
 %changelog
 * Thu Nov 08 2012 Adam Miller <[email protected]> 1.1.1-1
 - Bumping specs to at least 1.1 ([email protected])
 
 * Tue Oct 30 2012 Adam Miller <[email protected]> 1.0.1-1
 - bumping specs to at least 1.0.0 ([email protected])
-
-* Mon Oct 29 2012 Adam Miller <[email protected]> 0.16.8-1
-- Moving broker config to /etc/openshift/broker.conf Rails app and all oo-*
-  scripts will load production environment unless the
-  /etc/openshift/development marker is present Added param to specify default
-  when looking up a config value in OpenShift::Config Moved all defaults into
-  plugin initializers instead of separate defaults file No longer require
-  loading 'openshift-origin-common/config' if 'openshift-origin-common' is
-  loaded openshift-origin-common selinux module is merged into F16 selinux
-  policy. Removing from broker %%postrun ([email protected])
-
-* Thu Oct 18 2012 Adam Miller <[email protected]> 0.16.7-1
-- Move SELinux to Origin and use new policy definition. ([email protected])
-
-* Tue Oct 16 2012 Adam Miller <[email protected]> 0.16.6-1
-- Merge pull request #676 from pravisankar/dev/ravi/bug/852324
-  ([email protected])
-- Fix for bug# 852324 ([email protected])
-
-* Mon Oct 15 2012 Adam Miller <[email protected]> 0.16.5-1
-- Centralize plug-in configuration ([email protected])
-- Fixing a few missed references to ss-* Added command to load openshift-origin
-  selinux module ([email protected])
-
-* Mon Oct 08 2012 Dan McPherson <[email protected]> 0.16.4-1
-- fix obsoletes ([email protected])
-
-* Fri Oct 05 2012 Krishna Raman <[email protected]> 0.16.3-1
-- new package built with tito
-
-* Wed Oct 03 2012 Adam Miller <[email protected]> 0.16.2-1
-- removing Gemfile.locks ([email protected])
-
-* Wed Sep 12 2012 Adam Miller <[email protected]> 0.16.1-1
-- bump_minor_versions for sprint 18 ([email protected])
-
-* Thu Aug 23 2012 Adam Miller <[email protected]> 0.15.2-1
-- 
-
-* Wed Aug 22 2012 Adam Miller <[email protected]> 0.15.1-1
-- bump_minor_versions for sprint 17 ([email protected])
-
-* Wed Aug 15 2012 Adam Miller <[email protected]> 0.14.3-1
-- Merge pull request #377 from brenton/misc1 ([email protected])
-- Removing duplicate require ([email protected])
-
-* Tue Aug 14 2012 Adam Miller <[email protected]> 0.14.2-1
-- Removing unneeded mongo dep ([email protected])
-- gemspec refactorings based on Fedora packaging feedback ([email protected])
-
-* Thu Aug 02 2012 Adam Miller <[email protected]> 0.14.1-1
-- bump_minor_versions for sprint 16 ([email protected])
-- setup broker/nod script fixes for static IP and custom ethernet devices add
-  support for configuring different domain suffix (other than example.com)
-  Fixing dependency to qpid library (causes fedora package conflict) Make
-  livecd start faster by doing static configuration during cd build rather than
-  startup Fixes some selinux policy errors which prevented scaled apps from
-  starting ([email protected])
-
-* Tue Jul 24 2012 Adam Miller <[email protected]> 0.13.3-1
-- Generate fields in the descriptor only if they are not empty or default value
-  ([email protected])
-
-* Fri Jul 20 2012 Adam Miller <[email protected]> 0.13.2-1
-- Bug 841073 ([email protected])
-
-* Wed Jul 11 2012 Adam Miller <[email protected]> 0.13.1-1
-- bump_minor_versions for sprint 15 ([email protected])
-
-* Thu Jul 05 2012 Adam Miller <[email protected]> 0.12.4-1
-- cart metadata work merged; depends service added; cartridges enhanced; unit
-  tests updated ([email protected])
-
-* Tue Jul 03 2012 Adam Miller <[email protected]> 0.12.3-1
-- Misc selinux fixes for RHEL6.3 ([email protected])
-- MCollective updates - Added mcollective-qpid plugin - Added mcollective-
-  msg-broker plugin - Added mcollective agent and facter plugins - Added
-  option to support ignoring node profile - Added systemu dependency for
-  mcollective-client ([email protected])
-
-* Mon Jul 02 2012 Adam Miller <[email protected]> 0.12.2-1
-- BugFixes: 824973, 805983, 796458 ([email protected])
-
-* Wed Jun 20 2012 Adam Miller <[email protected]> 0.12.1-1
-- bump_minor_versions for sprint 14 ([email protected])
-
-* Tue Jun 12 2012 Adam Miller <[email protected]> 0.11.3-1
-- Strip out the unnecessary gems from rcov reports and focus it on just the
-  OpenShift code. ([email protected])
-
-* Fri Jun 08 2012 Adam Miller <[email protected]> 0.11.2-1
-- Updated gem info for rails 3.0.13 ([email protected])
-
-* Fri Jun 01 2012 Adam Miller <[email protected]> 0.11.1-1
-- bumping spec versions ([email protected])
-
-* Fri May 25 2012 Adam Miller <[email protected]> 0.10.3-1
-- code for min_gear setting ([email protected])
-
-* Thu May 17 2012 Adam Miller <[email protected]> 0.10.2-1
-- nit ([email protected])
-- proper usage of OpenShift::Model and beginnings of usage tracking
-  ([email protected])
-- Add rcov testing to the Stickshift broker, common and controller.
-  ([email protected])
-
-* Thu May 10 2012 Adam Miller <[email protected]> 0.10.1-1
-- bump spec version ([email protected])
-- bumping spec versions ([email protected])
-
-* Thu Apr 26 2012 Adam Miller <[email protected]> 0.9.1-1
-- bumping spec versions ([email protected])
-
-* Tue Apr 24 2012 Adam Miller <[email protected]> 0.8.7-1
-- CloudUser.find() not creating scaling object for user.scaling as it expectes
-  'Hash' instead of 'BSON::OrderedHash'. Fix is to create scaling object if the
-  record has any 'Hash type'. ([email protected])
-
-* Mon Apr 23 2012 Adam Miller <[email protected]> 0.8.6-1
-- cleaning up spec files ([email protected])
-
-* Sat Apr 21 2012 Dan McPherson <[email protected]> 0.8.5-1
-- forcing builds ([email protected])
-
-* Sat Apr 21 2012 Dan McPherson <[email protected]> 0.8.3-1
-- new package built with tito

common/rubygem-openshift-origin-common.spec

@@ -1,19 +1,9 @@
 #require "bundler/gem_tasks"
 require 'rake'
 require 'rake/testtask'
-require 'rcov/rcovtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end
-
-desc "Coverage tests"
-Rcov::RcovTask.new  do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-  t.rcov_opts << "-x '/usr/lib/ruby'"
-  t.rcov_opts << "-i 'openshift,rhc'"
-end