[noosfero/noosfero][master] 5 commits: New dependencies
Antonio Terceiro
gitlab at gitlab.com
Fri May 8 17:27:58 BRT 2015
Antonio Terceiro pushed to branch master at Noosfero / noosfero
Commits:
141e3e6f by Antonio Terceiro at 2015-05-08T17:25:45Z
New dependencies
- - - - -
ce362344 by Antonio Terceiro at 2015-05-08T17:25:45Z
Bump version numbers
- - - - -
4856846b by Antonio Terceiro at 2015-05-08T17:25:45Z
util/debian-install: revamp
- Always install with APT. When using local packages, create a local APT
repository so that we always properly test dependency resolution.
- Refresh local debs if the ones in pkg/ were updated
- Use backports (needed for new dependencies)
- - - - -
ca76abd7 by Antonio Terceiro at 2015-05-08T17:25:45Z
Gemfile: move asset pipeline dependencies to top level
This is needed to load the app in production mode.
I would guess that fresh new Rails apps come with the asset pipeline
dependencies on the top-level and not inside a group for a reason.
- - - - -
87905aaa by Antonio Terceiro at 2015-05-08T17:26:53Z
Merge branch 'asset-pipeline-on-debian'
With this Debian support is restaured. script/quick-start should just
work, and I went all the way to test production deployments with
packages and all that. Should be good enough.
- - - - -
7 changed files:
- Gemfile
- debian/changelog
- debian/control
- lib/noosfero/version.rb
- script/install-dependencies/debian-wheezy.sh
- util/debian-install/Vagrantfile
- util/debian-install/install
Changes:
=====================================
Gemfile
=====================================
--- a/Gemfile
+++ b/Gemfile
@@ -20,18 +20,17 @@ gem 'locale', '~> 2.0.5'
gem 'whenever', :require => false
gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
-group :assets do
- gem 'uglifier', '>= 1.0.3'
- gem 'sass-rails'
-end
+# asset pipeline
+gem 'uglifier', '>= 1.0.3'
+gem 'sass-rails'
group :production do
gem 'dalli', '~> 2.7.0'
end
group :test do
- gem 'rspec', '~> 2.10.0'
- gem 'rspec-rails', '~> 2.10.1'
+ gem 'rspec', '~> 2.14.0'
+ gem 'rspec-rails', '~> 2.14.1'
gem 'mocha', '~> 1.1.0', :require => false
end
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.2~0) UNRELEASED; urgency=medium
+
+ * Temporary version in heavy development
+
+ -- Antonio Terceiro <terceiro at debian.org> Fri, 08 May 2015 16:08:18 -0300
+
noosfero (1.1) wheezy; urgency=low
* Noosfero 1.1 final release
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: cucumber,
ruby-database-cleaner,
ruby-gettext,
ruby-mocha,
- ruby-rspec,
- ruby-rspec-rails,
+ ruby-rspec (>= 2.14),
+ ruby-rspec-rails (>= 2.14),
ruby-selenium-webdriver,
ruby-sqlite3,
ruby-tidy,
@@ -59,7 +59,9 @@ Depends: adduser,
ruby-redcloth,
ruby-rest-client,
ruby-rmagick,
+ ruby-sass-rails,
ruby-tzinfo (>= 1.1.0-2~),
+ ruby-uglifier,
ruby-whenever,
ruby-will-paginate (>= 2.3.12-1~),
tango-icon-theme,
=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
module Noosfero
PROJECT = 'noosfero'
- VERSION = '1.1'
+ VERSION = '1.2~0'
end
root = File.expand_path(File.dirname(__FILE__) + '/../..')
=====================================
script/install-dependencies/debian-wheezy.sh
=====================================
--- a/script/install-dependencies/debian-wheezy.sh
+++ b/script/install-dependencies/debian-wheezy.sh
@@ -1,4 +1,4 @@
-binary_packages='deb http://download.noosfero.org/debian/wheezy-1.1 ./'
+binary_packages='deb http://download.noosfero.org/debian/wheezy-1.2 ./'
source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/')
@@ -53,6 +53,13 @@ FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz
EOF
fi
+if grep -qrl wheezy /etc/apt/sources.list* && ! grep -qrl wheezy-backports /etc/apt/sources.list*; then
+ sudo tee /etc/apt/sources.list.d/backports.list <<EOF
+deb http://httpredir.debian.org/debian wheezy-backports main
+EOF
+fi
+
+
if test -f tmp/debian/Release.gpg; then
echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
sudo apt-key add tmp/debian/signing-key.asc
@@ -65,6 +72,9 @@ run sudo apt-get -qy dist-upgrade
run sudo apt-get -y install dctrl-tools
+# *sigh* need ruby-rspec from backports
+run sudo apt-get -y install -t wheezy-backports ruby-rspec
+
# needed to run noosfero
packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e '/^\s*#/d; s/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent')
run sudo apt-get -y install $packages
=====================================
util/debian-install/Vagrantfile
=====================================
--- a/util/debian-install/Vagrantfile
+++ b/util/debian-install/Vagrantfile
@@ -13,9 +13,11 @@ else
local_debs = Dir.glob('*.deb')
debs.each do |f|
fn = File.basename(f)
- if local_debs.include?(fn)
- local_debs.delete(fn)
- else
+
+ local_debs.delete(fn)
+
+ if File.stat(f) != File.stat(fn)
+ FileUtils::Verbose.rm_f(fn)
FileUtils::Verbose.ln f, '.'
end
end
=====================================
util/debian-install/install
=====================================
--- a/util/debian-install/install
+++ b/util/debian-install/install
@@ -61,19 +61,35 @@ deb http://download.noosfero.org/debian/wheezy-test ./
deb-src http://download.noosfero.org/debian/wheezy-test ./
EOF
+sed -e 's/wheezy/&-backports/' \
+ /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
+
export DEBIAN_FRONTEND=noninteractive
+# local debs
+if [ -n "$(find /vagrant -name '*.deb')" ]; then
+ apt-get install -qy apt-utils bzip2
+ (
+ rm -rf /opt/noosfero
+ mkdir /opt/noosfero
+ cp /vagrant/*.deb /opt/noosfero
+ cd /opt/noosfero
+ apt-ftparchive packages . > Packages
+ cat Packages | gzip - > Packages.gz
+ cat Packages | bzip2 - > Packages.bz2
+ apt-ftparchive release . > Release
+ echo 'deb [trusted=yes] file:///opt/noosfero ./' > /etc/apt/sources.list.d/local.list
+ )
+else
+ rm -f /etc/apt/sources.list.d/local.list
+fi
+
apt-get update
apt-get dist-upgrade -qy
-apt-get install -qy postgresql ruby1.8
+apt-get install -qy postgresql
-if dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb; then
- apt-cache policy noosfero
- apt-get install -qyf
-else
- apt-cache policy noosfero
- apt-get install -qy noosfero noosfero-apache
-fi
+apt-cache policy noosfero
+apt-get install -qy noosfero noosfero-apache
a2dissite 000-default
service apache2 reload
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/12d046950b8577db431ab112183cfe0ed51ffc6f...87905aaaa4b2da1c24cb0e98964c5f2f348f5ca5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150508/0ec6e912/attachment-0001.html>
More information about the Noosfero-dev
mailing list