Merge branch 'master' of ssh://git.fedorahosted.org/git/katello

daviddavis · Aug 9, 2011 · 7c1dffe · 7c1dffe
2 parents 7f461b8 + 4606051
commit 7c1dffe
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 23 deletions.
diff --git a/rel-eng/packages/katello b/rel-eng/packages/katello
@@ -1 +1 @@
-0.1.57-1 src/
+0.1.58-1 src/
diff --git a/src/Gemfile b/src/Gemfile
@@ -37,7 +37,7 @@ gem 'i18n_data', '>= 0.2.6', :require => 'i18n_data'
 gem 'capistrano'
 
 # @@@DEV_ONLY@@@
-# Everything bellow the line above will NOT be used for production freeze.
+# Everything bellow the line above will NOT be used in production.
 # Do not change the line contents, it's searched by sed during the build phase.
 
 # Bundle the extra gems:

diff --git a/src/extras/bundle-config b/src/extras/bundle-config
@@ -0,0 +1,2 @@
+--- 
+BUNDLE_WITHOUT: development:test
diff --git a/src/extras/fedora/katello.init b/src/extras/fedora/katello.init
@@ -67,6 +67,8 @@ start() {
         echo_success
     else
         cd ${KATELLO_HOME} #rails expects you to run from the root of the app
+        # delete Gemfile.lock (it will be regenerated)
+        rm -f /var/lib/katello/Gemfile.lock
         #workaround for the bug 726030 - Webrick wont start with the -d (daemon) option
         #daemon --user ${KATELLO_USER} bundle exec /usr/bin/ruby ${KATELLO_HOME}/script/rails s -p ${KATELLO_PORT} -e ${KATELLO_ENV} -d >/var/log/katello/startup.log 2>&1
         daemon --user ${KATELLO_USER} nohup bundle exec /usr/bin/ruby ${KATELLO_HOME}/script/rails s -p ${KATELLO_PORT} -e ${KATELLO_ENV} >/var/log/katello/startup.log 2>&1 &
@@ -155,7 +157,8 @@ case "$1" in
         # stop if it is running
         condstop
         pushd $KATELLO_HOME >/dev/null
-        su $KATELLO_USER -s /bin/bash -c "RAILS_ENV=$KATELLO_ENV rake setup --trace"
+        su $KATELLO_USER -s /bin/bash -c "RAILS_ENV=$KATELLO_ENV rake setup --trace" \
+          >/var/log/katello/initdb.log
         popd >/dev/null
         touch /var/lib/katello/initdb_done
         ;;

diff --git a/src/katello.spec b/src/katello.spec
@@ -5,10 +5,8 @@
 %global datadir %{_sharedstatedir}/%{name}
 %global confdir extras/fedora
 
-%global rubygems rubygem(rails) >= 3.0.5 rubygem(multimap) rubygem(haml) >= 3.1.2 rubygem(haml-rails) rubygem(json) rubygem(rest-client) rubygem(jammit) rubygem(rails_warden) rubygem(net-ldap) rubygem(compass) >= 0.11.5 rubygem(compass-960-plugin) >= 0.10.4 rubygem(capistrano) rubygem(oauth) rubygem(i18n_data) >= 0.2.6 rubygem(gettext_i18n_rails) rubygem(simple-navigation) >= 3.3.4 rubygem(sqlite3) rubygem(pg) rubygem(scoped_search) >= 2.3.1 rubygem(delayed_job) >= 2.1.4 rubygem(daemons) >= 1.1.4 rubygem(uuidtools)
-
 Name:           katello
-Version:	      0.1.57
+Version:	      0.1.58
 Release:	      1%{?dist}
 Summary:	      A package for managing application life-cycle for Linux systems
 
@@ -22,8 +20,28 @@ Requires:       pulp
 Requires:       openssl
 Requires:       candlepin-tomcat6
 Requires:       rubygems
-Requires:       rubygem(bundler)
-Requires:       %{rubygems}
+Requires:       rubygem(rails) >= 3.0.5
+Requires:       rubygem(multimap)
+Requires:       rubygem(haml) >= 3.1.2
+Requires:       rubygem(haml-rails)
+Requires:       rubygem(json)
+Requires:       rubygem(rest-client)
+Requires:       rubygem(jammit)
+Requires:       rubygem(rails_warden)
+Requires:       rubygem(net-ldap)
+Requires:       rubygem(compass) >= 0.11.5
+Requires:       rubygem(compass-960-plugin) >= 0.10.4
+Requires:       rubygem(capistrano)
+Requires:       rubygem(oauth)
+Requires:       rubygem(i18n_data) >= 0.2.6
+Requires:       rubygem(gettext_i18n_rails)
+Requires:       rubygem(simple-navigation) >= 3.3.4
+Requires:       rubygem(sqlite3) 
+Requires:       rubygem(pg)
+Requires:       rubygem(scoped_search) >= 2.3.1
+Requires:       rubygem(delayed_job) >= 2.1.4
+Requires:       rubygem(daemons) >= 1.1.4
+Requires:       rubygem(uuidtools)
 
 Requires(pre):  shadow-utils
 Requires(preun): chkconfig
@@ -35,31 +53,22 @@ BuildRequires: 	coreutils findutils sed
 BuildRequires: 	rubygems
 BuildRequires:  rubygem-rake
 BuildRequires:  rubygem(gettext)
-BuildRequires:  %{rubygems}
+BuildRequires:  rubygem(jammit)
+BuildRequires:  rubygem(compass) >= 0.11.5
+BuildRequires:  rubygem(compass-960-plugin) >= 0.10.4
 
 BuildArch: noarch
 
-# workaround for BZ 714167
-%if 0%{?fedora} && 0%{?fedora} < 16
-Requires:       rubygem(regin)
-BuildRequires:  rubygem(regin)
-%endif
-
-
 %description
 Provides a package for managing application life-cycle for Linux systems
 
 %prep
 %setup -q
 
 %build
-#generate Gemfile.lock from system-wide rubygems
-echo Generating Gemfile.lock
-echo If this step fails check Gemfile and rubygems SPEC macro
+#configure Bundler
 rm -f Gemfile.lock
-sed -i '/DEV_ONLY/,$d' Gemfile
-bundle install --local --without=test,development
-
+sed -i '/@@@DEV_ONLY@@@/,$d' Gemfile
 #compile SASS files
 echo Compiling SASS files...
 compass compile
@@ -84,6 +93,8 @@ install -d -m0755 %{buildroot}%{_localstatedir}/log/%{name}
 [ -d tmp ] && rm -rf tmp
 
 #copy the application to the target directory
+mkdir .bundle
+mv ./extras/bundle-config .bundle/config
 cp -R .bundle * %{buildroot}%{homedir}
 
 #copy configs and other var files (will be all overwriten with symlinks)
@@ -109,6 +120,9 @@ ln -svf %{datadir}/schema.rb %{buildroot}%{homedir}/db/schema.rb
 ln -sv %{_localstatedir}/log/%{name} %{buildroot}%{homedir}/log
 ln -sv %{_tmppath} %{buildroot}%{homedir}/tmp
 
+#create symlink for Gemfile.lock (it's being regenerated each start)
+ln -svf %{datadir}/Gemfile.lock %{buildroot}%{homedir}/Gemfile.lock
+
 #re-configure database to the /var/lib/katello directory
 sed -Ei 's/\s*database:\s+db\/(.*)$/  database: \/var\/lib\/katello\/\1/g' %{buildroot}%{_sysconfdir}/%{name}/database.yml
 
@@ -176,6 +190,44 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Tue Aug 09 2011 Lukas Zapletal <lzap+git@redhat.com> 0.1.58-1
+- solution to bundle install issues
+- initial commit of reset-dbs script
+- fixing repo sync
+- improving REST exception messages
+- fixing more katello-cli tests
+- custom partial for tupane system show calls
+- 720442: fixing system refresh on name update
+- 726402: fix for nil object on sys env page
+- 729110: fix for product sync status visual updates
+- Upgrading check to Candlepin 0.4.10-1
+- removing commented code from api systems controller spec
+- changing to different url validation. can now be used outside of model layer.
+- spec tests for repositories controller
+- 728295: check for valid urls for yum repos
+- adding spec tests for api systems_controller (upload packages, view packages,
+  update a system)
+- added functionality to api systems controller in :index, :update, and
+  :package_profile
+- support for checking missing url protocols
+- changing pulp consumer update messages to show old name
+- improve protocol match on reg ex url validation
+- removing a debugger statement
+- fixing broken orchestration in pulp consumer
+- spec test for katello url helper
+- fix url helper to match correct length port numbers
+- url helper validator (http, https, ftp, ipv4)
+- Revert "fix routing problem for POST /organizations/:organzation_id/systems"
+- fix routing problem for POST /organizations/:organzation_id/systems (=)
+- pretty_routes now prints some message to the stdout
+- added systems packages routes and update to systems
+- fixed pulp consumer package profile upload and added consumer update to pulp
+  resource
+- adding to systems_controller spec tests and other small changes.
+- fixing find_organization in api/systems_controller.
+- added action in api systems controller to get full package list for a
+  specific system.
+
 * Thu Aug 04 2011 Lukas Zapletal <lzap+git@redhat.com> 0.1.57-1
 - spec - adding regin dep as workaround for BZ 714167 (F14/15)
 

diff --git a/src/lib/http_resource.rb b/src/lib/http_resource.rb
@@ -124,7 +124,9 @@ def delete(a_path=nil, headers={})
 
     def raise_rest_client_exception e, a_path, http_method
       msg = "#{name}: #{e.message} (#{http_method} #{a_path})"
-      raise RestClientException,{:message => msg, :code => e.http_code}, caller
+      Rails.logger.error msg
+      # TODO: re-raise the same exception with msg as message
+      raise
     end
 
     def join_path(*args)

diff --git a/src/script/katello-reset-dbs b/src/script/katello-reset-dbs
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+echo "THIS SCRIPT WILL ERASE KATELLO / CANDLEPIN / PULP DATABASES"
+echo -e "\n\n"
+echo "It is strongly recommended to back up databases:"
+echo " # mongodump --db pulp_database --out - > pulp_database.json"
+echo " # pg_dump -c candlepin > candlepin_db.sql"
+echo " # pg_dump -c katello > katello_db.sql"
+
+read -p "Are you sure you want to proceed (yes/no)? "
+[ "$REPLY" != "yes" ] && exit 1
+
+echo "ERASING!"
+exit 0 # WIP
+
+echo "Stopping Katello instance"
+service katello stop
+
+echo "Stopping Pulp instance"
+service pulp-server stop
+
+echo "Stopping Candlepin instance"
+service tomcat6 stop
+
+echo "Dropping Pulp database"
+# mongo sometimes hang in F14/F15 (725601)
+#echo 'db.dropDatabase();' | mongo pulp_database
+service mongod stop
+rm -rf /var/lib/mongodb/pulp_database
+service mongod start
+
+echo "Initializing Pulp database"
+/usr/bin/pulp-migrate
+
+echo "Initializing Candlepin database"
+/usr/share/candlepin/cpsetup -s
+
+echo "Starting Pulp instance"
+service pulp-server start
+
+echo "Starting Candlepin instance"
+service tomcat6 start
+
+echo "Initializing Katello database"
+rm -f /var/lib/katello/initdb_done
+service katello initdb
+
+echo "Starting Katello instance"
+service katello start
+