[Xfce4-commits] <moka:nick/maintainer-improvements> Move some stuff around.
Nick Schermer
noreply at xfce.org
Thu Oct 6 22:22:02 CEST 2011
Updating branch refs/heads/nick/maintainer-improvements
to 67aa79f61e920953a0d77314c184b8ae979e68c0 (commit)
from d3e2e0e2c1206c69b2d94ae986a92f501151d00a (commit)
commit 67aa79f61e920953a0d77314c184b8ae979e68c0
Author: Nick Schermer <nick at xfce.org>
Date: Thu Oct 6 22:21:19 2011 +0200
Move some stuff around.
.gitignore | 2 +-
AUTHORS | 1 +
Rakefile | 14 ++--
VERSION.yml | 2 +-
examples/{one-man-one-project => xfce}/config.ru | 0
.../project_release_mail.erb | 0
.../templates/collection_feed_entry.erb | 0
.../templates/collection_release_mail.erb | 0
.../templates/login_password_canceled | 0
.../templates/login_password_request | 0
.../templates/project_feed_entry.erb | 0
.../templates/project_release_mail.erb | 0
lib/controllers/authentication.rb | 2 +-
lib/middleware/feeds.rb | 2 +-
lib/middleware/mailinglists.rb | 2 +-
lib/moka.rb | 4 +-
moka.gemspec | 94 --------------------
update-installation.sh | 2 +-
18 files changed, 16 insertions(+), 109 deletions(-)
diff --git a/.gitignore b/.gitignore
index b56f3dd..6c99cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
pkg/
-examples/one-man-one-project/example.db
+examples/xfce/example.db
diff --git a/AUTHORS b/AUTHORS
index c40ddc1..0d43729 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
Jannis Pohlmann <jannis at xfce.org>
+Nick Schermer <nick at xfce.org>
diff --git a/Rakefile b/Rakefile
index 1c11d4b..8e9d0e7 100755
--- a/Rakefile
+++ b/Rakefile
@@ -8,15 +8,15 @@ begin
gem.name = 'moka'
gem.summary = %Q{Release management web application}
gem.email = 'jannis at xfce.org'
- gem.homepage = 'http://git.xfce.org/jannis/moka'
- gem.authors = ['Jannis Pohlmann']
+ gem.homepage = 'http://git.xfce.org/admin/moka/'
+ gem.authors = ['Jannis Pohlmann', 'Nick Schermer']
gem.files = FileList['[A-Z]*', '{examples,lib}/**/*']
- gem.add_dependency('pony', '0.3')
- gem.add_dependency('sinatra', '0.9.2')
- gem.add_dependency('warden', '0.2.3')
- gem.add_dependency('haml', '2.2.1')
- gem.add_dependency('ratom', '0.6.2')
+ gem.add_dependency('pony')
+ gem.add_dependency('sinatra')
+ gem.add_dependency('warden')
+ gem.add_dependency('haml')
+ gem.add_dependency('ratom')
end
rescue LoadError
puts 'Jeweler not available. Install it with "gem install jeweler"'
diff --git a/VERSION.yml b/VERSION.yml
index 4cbce20..cbaf28e 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,4 +1,4 @@
---
:major: 0
-:minor: 1
+:minor: 3
:patch: 0
diff --git a/examples/one-man-one-project/config.ru b/examples/xfce/config.ru
similarity index 100%
rename from examples/one-man-one-project/config.ru
rename to examples/xfce/config.ru
diff --git a/examples/one-man-one-project/project_release_mail.erb b/examples/xfce/project_release_mail.erb
similarity index 100%
rename from examples/one-man-one-project/project_release_mail.erb
rename to examples/xfce/project_release_mail.erb
diff --git a/examples/one-man-one-project/templates/collection_feed_entry.erb b/examples/xfce/templates/collection_feed_entry.erb
similarity index 100%
rename from examples/one-man-one-project/templates/collection_feed_entry.erb
rename to examples/xfce/templates/collection_feed_entry.erb
diff --git a/examples/one-man-one-project/templates/collection_release_mail.erb b/examples/xfce/templates/collection_release_mail.erb
similarity index 100%
rename from examples/one-man-one-project/templates/collection_release_mail.erb
rename to examples/xfce/templates/collection_release_mail.erb
diff --git a/examples/one-man-one-project/templates/login_password_canceled b/examples/xfce/templates/login_password_canceled
similarity index 100%
rename from examples/one-man-one-project/templates/login_password_canceled
rename to examples/xfce/templates/login_password_canceled
diff --git a/examples/one-man-one-project/templates/login_password_request b/examples/xfce/templates/login_password_request
similarity index 100%
rename from examples/one-man-one-project/templates/login_password_request
rename to examples/xfce/templates/login_password_request
diff --git a/examples/one-man-one-project/templates/project_feed_entry.erb b/examples/xfce/templates/project_feed_entry.erb
similarity index 100%
rename from examples/one-man-one-project/templates/project_feed_entry.erb
rename to examples/xfce/templates/project_feed_entry.erb
diff --git a/examples/one-man-one-project/templates/project_release_mail.erb b/examples/xfce/templates/project_release_mail.erb
similarity index 100%
rename from examples/one-man-one-project/templates/project_release_mail.erb
rename to examples/xfce/templates/project_release_mail.erb
diff --git a/lib/controllers/authentication.rb b/lib/controllers/authentication.rb
index 18d8572..cdd5202 100755
--- a/lib/controllers/authentication.rb
+++ b/lib/controllers/authentication.rb
@@ -1,7 +1,7 @@
require 'rubygems'
require 'pp'
-gem 'warden', '0.2.3'
+#gem 'warden', '0.2.3'
require 'warden'
module Moka
diff --git a/lib/middleware/feeds.rb b/lib/middleware/feeds.rb
index bdcfed3..65d5bf0 100755
--- a/lib/middleware/feeds.rb
+++ b/lib/middleware/feeds.rb
@@ -1,6 +1,6 @@
require 'rubygems'
-gem 'ratom', '0.6.2'
+#gem 'ratom', '0.6.2'
require 'atom'
module Moka
diff --git a/lib/middleware/mailinglists.rb b/lib/middleware/mailinglists.rb
index b7ee69c..fa1b2ba 100755
--- a/lib/middleware/mailinglists.rb
+++ b/lib/middleware/mailinglists.rb
@@ -1,6 +1,6 @@
require 'rubygems'
-gem 'pony', '0.3'
+#gem 'pony', '0.3'
require 'pony'
module Moka
diff --git a/lib/moka.rb b/lib/moka.rb
index e1c4247..0291ce8 100755
--- a/lib/moka.rb
+++ b/lib/moka.rb
@@ -1,9 +1,9 @@
require 'rubygems'
-gem 'sinatra', '0.9.2'
+# gem 'sinatra', '0.9.2'
require 'sinatra'
-gem 'haml', '2.2.1'
+# gem 'haml', '2.2.1'
require 'sass'
directory = File.expand_path(File.dirname(__FILE__))
diff --git a/moka.gemspec b/moka.gemspec
deleted file mode 100644
index efae094..0000000
--- a/moka.gemspec
+++ /dev/null
@@ -1,94 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = %q{moka}
- s.version = "0.1.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Jannis Pohlmann"]
- s.date = %q{2011-01-17}
- s.email = %q{jannis at xfce.org}
- s.files = [
- "AUTHORS",
- "COPYING",
- "Rakefile",
- "VERSION.yml",
- "examples/one-man-one-project/config.ru",
- "examples/one-man-one-project/project_release_mail.erb",
- "lib/controllers/announcements.rb",
- "lib/controllers/authentication.rb",
- "lib/controllers/collections.rb",
- "lib/controllers/maintainers.rb",
- "lib/controllers/projects.rb",
- "lib/controllers/request.rb",
- "lib/helpers/general.rb",
- "lib/middleware/feeds.rb",
- "lib/middleware/identica.rb",
- "lib/middleware/mailinglists.rb",
- "lib/models/archive.rb",
- "lib/models/classification.rb",
- "lib/models/collection.rb",
- "lib/models/configuration.rb",
- "lib/models/maintainer.rb",
- "lib/models/project.rb",
- "lib/models/role.rb",
- "lib/moka.rb",
- "lib/views/announcements.erb",
- "lib/views/auth_login.erb",
- "lib/views/collection.erb",
- "lib/views/collection_delete.erb",
- "lib/views/collection_new_release.erb",
- "lib/views/collection_release.erb",
- "lib/views/foot.erb",
- "lib/views/head.erb",
- "lib/views/index.erb",
- "lib/views/maintainer.erb",
- "lib/views/maintainer_profile.erb",
- "lib/views/manage_releases.erb",
- "lib/views/permission_denied.erb",
- "lib/views/project.erb",
- "lib/views/project_branch_new_release_announcement.erb",
- "lib/views/project_branch_new_release_confirm.erb",
- "lib/views/project_new_release.erb",
- "lib/views/project_new_release_tarball.erb",
- "lib/views/project_release_delete.erb",
- "lib/views/project_release_update.erb",
- "lib/views/request.erb",
- "lib/views/request_finished.erb",
- "lib/views/request_sshinfo.erb",
- "lib/views/stylesheet.sass"
- ]
- s.homepage = %q{http://git.xfce.org/jannis/moka}
- s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.7}
- s.summary = %q{Release management web application}
-
- if s.respond_to? :specification_version then
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
- s.specification_version = 3
-
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<pony>, ["= 0.3"])
- s.add_runtime_dependency(%q<sinatra>, ["= 0.9.2"])
- s.add_runtime_dependency(%q<warden>, ["= 0.2.3"])
- s.add_runtime_dependency(%q<haml>, ["= 2.2.1"])
- s.add_runtime_dependency(%q<ratom>, ["= 0.6.2"])
- else
- s.add_dependency(%q<pony>, ["= 0.3"])
- s.add_dependency(%q<sinatra>, ["= 0.9.2"])
- s.add_dependency(%q<warden>, ["= 0.2.3"])
- s.add_dependency(%q<haml>, ["= 2.2.1"])
- s.add_dependency(%q<ratom>, ["= 0.6.2"])
- end
- else
- s.add_dependency(%q<pony>, ["= 0.3"])
- s.add_dependency(%q<sinatra>, ["= 0.9.2"])
- s.add_dependency(%q<warden>, ["= 0.2.3"])
- s.add_dependency(%q<haml>, ["= 2.2.1"])
- s.add_dependency(%q<ratom>, ["= 0.6.2"])
- end
-end
-
diff --git a/update-installation.sh b/update-installation.sh
index 8ad8a7a..609a2c4 100755
--- a/update-installation.sh
+++ b/update-installation.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-rake build && su -c 'gem install --local pkg/moka-0.1.0.gem --no-ri --no-rdoc'
+rake build && su -c 'gem install --local pkg/moka-0.1.0.gem --no-ri --no-rdoc'
More information about the Xfce4-commits
mailing list