[aeolus-conductor/f17] update to 0.10.1-1 release

slinabery slinabery at fedoraproject.org
Fri Jun 8 16:33:05 UTC 2012 

commit 17149c732f3649f9e56e8ac31900bab5d0830374
Author: Steve Linabery <slinaber at redhat.com>
Date:   Fri Jun 8 10:30:27 2012 -0500

    update to 0.10.1-1 release

 .gitignore            |    1 +
 aeolus-conductor.spec |  209 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources               |    2 +-
 3 files changed, 190 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 028997f..f4ec08a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /aeolus-conductor-0.4.0-gitb6e37f9738.tar.gz
 /aeolus-conductor-0.4.0.tar.gz
 /aeolus-conductor-0.9.0.tar.gz
+/aeolus-conductor-0.10.1.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index 8ae50a5..7fd6f2c 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:     aeolus-conductor
-Version:  0.9.0
+Version:  0.10.1
 Release:  1%{?dist}
 Summary:  The Aeolus Conductor
 
@@ -45,6 +45,10 @@ Requires: rubygem(pg)
 Requires: rubygem(ruby-net-ldap)
 Requires: rubygem(oauth)
 Requires: rubygem(rake)
+Requires: rubygem(delayed_job) >= 2.1.4
+Requires: rubygem(paranoia)
+Requires: rubygem(compass) >= 0.11.5
+Requires: rubygem(compass-960-plugin) >= 0.10.4
 Requires: postgresql
 Requires: postgresql-server
 Requires: system-logos
@@ -61,6 +65,8 @@ Requires: rubygem(ruby-net-ldap)
 Requires: curl
 
 BuildRequires: rubygem(sass)
+BuildRequires: rubygem(compass) >= 0.11.5
+BuildRequires: rubygem(compass-960-plugin) >= 0.10.4
 
 BuildArch: noarch
 
@@ -77,6 +83,10 @@ Requires: rubygem(thin) >= 1.2.5
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+BuildRequires: systemd-units
 
 %description daemons
 The configuration and daemons necessary to run and proxy the Aeolus Conductor.
@@ -151,6 +161,7 @@ getent passwd aeolus >/dev/null || \
 %{__mkdir} -p %{buildroot}%{app_root}
 %{__mkdir} -p %{buildroot}%{doc_root}
 %{__mkdir} -p %{buildroot}%{_initrddir}
+%{__mkdir} -p %{buildroot}%{_unitdir}/systemd/system
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d
@@ -169,10 +180,11 @@ getent passwd aeolus >/dev/null || \
 # extension may exist.  For instance cgi="public" means that src/public/*.cgi
 # will be copied from the source into the RPM.
 builder="app/views/errors"
-css="public/stylesheets public/stylesheets/jquery.ui-1.8.1 \
-     public/javascripts/jquery-svg"
+css="public/stylesheets public/stylesheets/jquery.ui-1.8.1"
 feature="features"
-gif="public/images public/stylesheets/images"
+gif="public/images \
+     public/stylesheets/images \
+     vendor/converge-ui/images"
 haml="app/views/hardware_profiles app/views/realm_mappings \
       app/views/users app/views/provider_accounts \
       app/views/roles app/views/providers app/views/settings \
@@ -183,37 +195,47 @@ haml="app/views/hardware_profiles app/views/realm_mappings \
       app/views/deployables app/views/catalogs \
       app/views/provider_types app/views/api/images \
       app/views/config_servers app/views/provider_realms \
+      app/views/logs \
       app/views/api/hooks \
       app/views/api \
       app/views/images \
       app/views/api/builds app/views/api/provider_images \
       app/views/api/target_images app/views/api/entrypoint \
-      app/views/api/environments"
-mustache="app/views/instances app/views/pools app/views/deployments"
+      app/views/api/environments \
+      vendor/converge-ui/rails/layouts"
+mustache="app/views/instances app/views/pools app/views/deployments \
+          app/views/deployables app/views/images"
 html="public"
 ico="public"
-jpg="public/images public/stylesheets/images"
-js="public/javascripts public/javascripts/jquery-svg \
+jpg="public/images \
+     public/stylesheets/images \
+     vendor/converge-ui/images"
+js="public/javascripts \
     public/javascripts/jquery.ui-1.8.1 \
     public/javascripts/jquery.ui-1.8.1/ui/minified \
-    public/javascripts/lib
+    public/javascripts/lib \
     public/javascripts/backbone"
 json="spec/fixtures"
 key="features/upload_files"
 opts="spec"
-png="public/images public/images/icons public/stylesheets/images \
-     public/stylesheets/jquery.ui-1.8.1/images"
+png="public/images \
+     public/images/icons \
+     public/stylesheets/images \
+     public/stylesheets/jquery.ui-1.8.1/images \
+     vendor/converge-ui/images \
+     vendor/converge-ui/images/icons"
 rake="lib/tasks"
 rb="app/models app/controllers app/controllers/api app/helpers app/services app/util \
     config config/initializers config/environments db db/migrate \
     features/support features/step_definitions lib spec spec/controllers \
-    spec/factories spec/helpers spec/models spec/services spec/controllers/api lib/aeolus \
-    lib/aeolus/event"
+    spec/factories spec/helpers spec/models spec/services spec/controllers/api \
+    spec/aeolus/event spec/aeolus/ext lib/aeolus lib/aeolus/event lib/aeolus/ext \
+    vendor/converge-ui/rails/helpers"
 rhtml="app/views/layouts"
-svg="public/images public/images/icons public/javascripts/jquery-svg public/fonts"
-ttf="public/fonts"
-eot="public/fonts"
-woff="public/fonts"
+svg="public/images public/images/icons public/fonts vendor/converge-ui/fonts"
+ttf="public/fonts vendor/converge-ui/fonts"
+eot="public/fonts vendor/converge-ui/fonts"
+woff="public/fonts vendor/converge-ui/fonts"
 txt="public"
 yml="config config/locales config/locales/defaults config/locales/overrides
      config/locales/role_definitions config/locales/classnames \
@@ -225,7 +247,7 @@ for filetype in builder css eot feature gif haml mustache html ico jpg js json k
 
     for dir in $dirs; do
         %{__mkdir} -p %{buildroot}%{app_root}/$dir
-	for i in $(echo src/$dir/*.$filetype); do
+        for i in $(echo src/$dir/*.$filetype); do
             test -e "$i" && %{__cp} "$i" %{buildroot}%{app_root}/$dir
         done
     done
@@ -234,13 +256,13 @@ done
 
 # precompile stylesheets
 %{__mkdir} %{buildroot}%{app_root}/public/stylesheets/compiled
-for stylesheet in layout login; do
-  sass --style compact ./src/app/stylesheets/$stylesheet.scss %{buildroot}%{app_root}/public/stylesheets/compiled/$stylesheet.css
-done
+compass compile --sass-dir ./src/app/stylesheets --css-dir %{buildroot}%{app_root}/public/stylesheets/compiled
 
 # misc files
 %{__cp} src/Rakefile %{buildroot}%{app_root}
 %{__cp} src/config.ru %{buildroot}%{app_root}
+%{__cp} src/Gemfile.in %{buildroot}%{app_root}
+%{__cp} src/spec/fixtures/Gemfile.in %{buildroot}%{app_root}/spec/fixtures
 %{__cp} src/lib/aeolus/debug/aeolus-debug %{buildroot}%{_bindir}
 
 %{__mkdir} -p %{buildroot}%{app_root}/config
@@ -261,6 +283,7 @@ done
 # copy over init scripts and various config
 %{__cp} conf/aeolus-conductor %{buildroot}%{_initrddir}
 %{__cp} conf/conductor-dbomatic %{buildroot}%{_initrddir}
+%{__cp} conf/conductor-delayed_job.systemd %{buildroot}%{_unitdir}/conductor-delayed_job.service
 %{__cp} conf/aeolus-conductor-httpd.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/aeolus-conductor.conf
 %{__cp} conf/aeolus-conductor.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/aeolus-conductor
 %{__cp} conf/aeolus-conductor.sysconf %{buildroot}%{_sysconfdir}/sysconfig/aeolus-conductor
@@ -279,6 +302,10 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log
 touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
 
 %{__mkdir} -p %{buildroot}%{app_root}/log
+# delayed_job version 2.1.4 forces the log to be in this location
+# we should be able to change this to /var/log/aeolus-conductor/delayed_job.log
+# with version 3.0
+touch %{buildroot}%{app_root}/log/delayed_job.log
 
 # copy script files over
 %{__cp} -r src/script %{buildroot}%{app_root}
@@ -302,6 +329,11 @@ popd 2>&1 > /dev/null
 %{__ln_s} -f %{app_root}/config/settings.yml %{_sysconfdir}/%{name}
 %{__ln_s} -f %{app_root}/config/oauth.json %{_sysconfdir}/%{name}
 
+#create converge-ui symlinks
+%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/layouts %{app_root}/app/views/layouts/converge-ui
+%{__ln_s} -f %{app_root}/vendor/converge-ui/fonts %{app_root}/public/fonts/converge-ui
+%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/helpers/layout_helper.rb %{app_root}/app/helpers/layout_helper.rb
+
 %postun
 # kind of a weird construct.  There are two cases where postun gets called;
 # during the removal of a package and during the cleanup after an upgrade.
@@ -318,18 +350,33 @@ if [ ! -d %{app_root}/app ]; then
 fi
 
 %post daemons
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    /bin/systemctl daemon-reload >/dev/null 2>&1
+fi
 # Register the services
 /sbin/chkconfig --add aeolus-conductor
 /sbin/chkconfig --add conductor-dbomatic
 
 %preun daemons
 if [ $1 = 0 ]; then
+   # Package removal, not upgrade
+   /bin/systemctl --no-reload disable conductor-delayed_job.service > /dev/null 2>&1
+   /bin/systemctl stop conductor-delayed_job.service > /dev/null 2>&1
    /sbin/service aeolus-conductor stop > /dev/null 2>&1
    /sbin/chkconfig --del aeolus-conductor
    /sbin/service conductor-dbomatic stop > /dev/null 2>&1
    /sbin/chkconfig --del conductor-dbomatic
 fi
 
+%postun daemons
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart conductor-delayed_job.service >/dev/null 2>&1
+fi
+
+
 %files
 %dir %{app_root}
 %{app_root}/app
@@ -352,12 +399,18 @@ fi
 %{app_root}/log
 %{app_root}/public
 %{app_root}/Rakefile
+%{app_root}/Gemfile.in
+%{app_root}/spec/fixtures/Gemfile.in
+%dir %{app_root}/vendor
+%{app_root}/vendor/converge-ui
 %config %{_sysconfdir}/%{name}
 %doc AUTHORS COPYING
+%{app_root}/script/upgrade
 
 %files daemons
 %{_initrddir}/aeolus-conductor
 %{_initrddir}/conductor-dbomatic
+%{_unitdir}/conductor-delayed_job.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/aeolus-conductor
 %config(noreplace) %{_sysconfdir}/sysconfig/conductor-rails
@@ -365,8 +418,10 @@ fi
 %attr(-, aeolus, aeolus) %{_localstatedir}/lib/%{name}
 %attr(-, aeolus, aeolus) %{_localstatedir}/run/%{name}
 %attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
+%attr(-, aeolus, aeolus) %{app_root}/log/delayed_job.log
 %doc AUTHORS COPYING
 %{_libdir}/../lib/tmpfiles.d/aeolus.conf
+%{app_root}/script/delayed_job
 
 %files doc
 %{doc_root}
@@ -380,6 +435,118 @@ fi
 %files -n aeolus-all
 
 %changelog
+* Thu Jun 07 2012 Steve Linabery <slinaber at redhat.com> - 0.10.1-1
+- 81f10a6 Refactor SessionEntity model to work properly with API
+- 1945d37 Fixed deployment rollback
+- 187756e Fix the new Provider Account form error
+
+* Wed Jun 06 2012 Steve Linabery <slinaber at redhat.com> - 0.10.0-1
+- 274fb0b rm3343: credential: make attributes accessible/protected
+- a66fd19 RM 3246: fix smaller issues in instance model
+- b3dc87c RM3244: fix minor issues
+- 04450b5 sanitize the use of details_tab param
+- f1cbeea Add BuildRequires for rubygem-compass and rubygem-compass-960-plugin
+- b388935 rpmbuild changes: added converge-ui files, compass Require dependency, converge-ui symlinks creation and scss compilation using compass into spec file
+- 2836e75 Removed old favicon and added new into public/images to be compatible with converge-ui layout
+- 9f019b6 Removed Sass::Plugin scss compilation from development enviromnent config because Compass watcher takes care of scss compilation
+- 1cc41e8 Moved compass config file to proper place, removed unnecessary compass.scss file
+- dfdfb0d Finishing touches in converge-ui integration
+- 86c6978 Added symlink for fonts, removed fonts conductor stylesheet, removed conductor fonts folder content
+- 36a7d9d updated converge-ui to latest version
+- d49ce9f converge-ui meeting updates
+- 7500a18 Adding compass gem dependancy and symbolic link for converge-ui template.
+- bd736c7 Unified UI (converge-ui) changes to header, footer using the converge-ui git submodule.
+- 5674223 Revert "Revert "Merge branch 'gelato'""
+- e3cd48d RM3311 fix for date range to be inclusive of times
+- 3a4be6f RM3311 added date select, ordering options, and csv export to log history
+- bf0595d Redmine #3345: Initial user groups implementation
+- 5b34b65 BZ 827562 - Upgrade from CloudForms 1.0 to CloudForms 1.0.1 requires additional data definition not provided by rails migration
+- 537b86f Moving the service parameter type attr off the parameter tag onto the value tag because the type only applys when we collect a value.
+- e8f5b1e If an assambly doesn't define any configserver params, config for this assembly is not sent to configserver.
+- 65c7767 Bug 807745 add 'use provider accounts' to global image admin role
+- c8e2f50 bug 808031: allow Global Provider user to view Provider Accounts
+- 18ae85c Fix files declaration for daemons subpkg
+- 05a2632 Fix images#show when there's no existing build
+- 3a146ec BZ815784 added Pool Family Quota Used column to Pool Families table
+- 8ebf737 Fix spec
+- 049958c Unifiy the way we store error messages for model attributes
+- 333a884 BZ808393: Fix invalid name error message
+- 759dbbe BZ808338: fix ajax caching for IE
+- dec27f2 BZ 806846 Disabled submit_tag in images#new views when no provider are enabled
+- 144afb2 BZ 806846 ImageController: removed duplicate code, fixed flash displaying
+- bdc6f3e Fix mustache template handler to work with Rails 3.1 and above
+- 799bd3a RM #3269: Figure out what is wrong with deps (ruby/bundler mode)
+- 4b03851 BZ#801971 - Scalability: Catalog Images tab, /conductor/pools/1?details_tab=images&only_tab=true, is slow
+- ccfd67e Styling for pool catalog images tab
+- bf85e5f BZ815357: api: tests for template xml in CDATA
+- b3c4ecd BZ815357: api: handle template xml in CDATA in images controller
+- 290dde4 BZ804543: template relaxng: make rootpw mandatory
+- fe8d4ed Corrected removed obsolette load_tab_captions_and_details_tab method from pool_families controller, replaced provider_account header with helper method
+- 445665b Revert "removed obsolette load_tab_captions_and_details_tab method from pool_families controller, replaced provider_account header with helper method"
+- 5c54d1d BZ810919 mustach-ify pretty-view pool header so that instance/deployment counts are automatically updated
+- f454171 removed obsolette load_tab_captions_and_details_tab method from pool_families controller, replaced provider_account header with helper method
+- b602b93 pool_families partials cleanup
+- 4cfd406 Fixed typo - renamed 'stopable' to 'stoppable'
+- eb0dc37 3322 - Added deployment's history tab
+- 1df022a Added basic events for deployment state changes
+- f96aa8f 3321 - Added partial launch support
+- 7bfb7e2 3320 - Added deployment rollback
+- 1a46ebb BZ806001 - aeolus-configure will always create an admin user, need to key of a uuid not name
+- dbdc389 Fix line limit violations in images_controller for mustache patchset
+- 2f3471e Fix line limit violations in some views for mustache patchset
+- dbb9bcf Fix line limit violations in deployables_controller for mustache patchset
+- e374dd1 Delete jquery-template js lib
+- 1c2932b Mustachifying images/show
+- 0138aae Mustachifying pools/_deployments
+- aaf99e9 Mustachifying deployables/show
+- 8c8be91 Redmine #3319: Set up conductor to use new Bundler extension point.
+- 57bdcf7 Redmine #3318: Add small extension library to bundler to load system gems
+- 1b77242 Add BuildRequires: systemd-units for daemons subpackage
+- da4472b Remove jquery-svg entries from rpm spec
+- 89dcc58 Delete jquery-svg
+- f7c7dfa application.js: Removed unused code
+- 42af2a1 Removed unused JS libraries - yetii, trimpath-template
+- 1332d3d RM 3144 specify default order for associated events
+- 65a472e RM 3144 don't set unscoped as default, as this messes up uptime calculations
+- 40100c2 Fix migration after paranoid gem changed the default scope
+- 0c8f597 RM 3144 added soft_delete tests
+- 1f1ac5b RM 3144 updated models to include acts_as_paranoid
+- 01be2df RM 3144 add deleted_at column for soft delete
+- 3486b97 RM 3144 added paranoia gem
+- 5905bb8 adding service dependancy support for audrey
+- a1fde11 Temporary Bugfix for adding providers.
+- 708a82d added app/views/logs
+- c406ca3 Revert "Merge branch 'gelato'"
+- da432dd Removed useless @deployment_properties variable
+- 65d9d8d Cleanup of deployments create action
+- e6fcb93 Merge branch 'gelato'
+- e142db5 RM 3145 touched up code to obey 80-character line limit
+- 570795c RM 3145 updates reflecting new state attribute for deployments
+- c64fe05 RM 3145 added css section for hover links
+- 7f6c191 RM 3145 added cucumber tests
+- e119c68 RM 3145 added logs section
+- 3b50091 RM 3145 added logs page
+- cc0e066 RM 3145 added logs controller
+- 54e749d RM 3145 added logs route
+- 8d778df Fix typo in UpdateStateForExistingDeployments migration
+- 8e7559c Redmine3153 partials cleanup and fixes part1
+- e3616e8 BZ 809722 - missing template for json response
+- 482437a performance fixes for Redmine feature #3149
+- f5010a6 Redmine #3158: Use denormalized model for permission checks
+- 30473d7 redmine task #3157: UI to show inherited permissions
+- f6b80e3 permissions denormalization: redmine #3155 and #3156
+- 0cd0270 RM 3181 - delayed_job support - revised
+- 03b6b45 Redmine #3233: Consolidate duplicated steps
+- 4a49749 Redmine #3211: Switch step defs for login to use DMA
+- 273833b Fixed setting of deployment state for existing deployments
+- 73ccace bump version to 0.10.0
+- 4594b35 import converge-ui stylesheet as partial to layout.scss
+- 1e601d3 removed converge-ui files from lib
+- e40e4eb changed simlinks, layout_helper is now unmodified, disabled most of the converge-ui stylesheets for now, reverted to conductor layout to prepare for incremental converge
+- be1ebc7 added converge-ui repo as git submodule co vendor/converge-ui
+- 622f629 Basic implementation of converge-ui code
+- 003582a Copies converge-ui into lib/
+
 * Thu May 03 2012 Martyn Taylor <mtaylor at redhat.com> - 0.9.0-1
 - Updated compilation of new sass files
 
diff --git a/sources b/sources
index 6d4b36b..37f335c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b27b88f3a8999f439d637d9e84e912f5  aeolus-conductor-0.9.0.tar.gz
+d01b1bc7096b654e4e014533ceccb3d1  aeolus-conductor-0.10.1.tar.gz

More information about the scm-commits mailing list