[Xfce4-commits] <cafe:master> Rename to cafe (this is where people meet, right?).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to d513424ef05113e7cbaabc40057030bab5e3a2ba (commit)
       from 361e21bb41e6215767d476044cd194467a7c983a (commit)

commit d513424ef05113e7cbaabc40057030bab5e3a2ba
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Mar 12 15:06:18 2011 +0100

    Rename to cafe (this is where people meet, right?).

 .gitignore                 |    2 ++
 Rakefile                   |   13 ++++++-------
 config.ru                  |   16 ++++++++++++++++
 lib/cafe.rb                |   19 +++++++++++++++++++
 lib/controllers/members.rb |   15 +++++++++++++++
 module.xml                 |    4 ++--
 update-installation.sh     |    8 +++++++-
 7 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c74ce46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.gemspec
+pkg
diff --git a/Rakefile b/Rakefile
index 5ecf440..b0d7a9a 100755
--- a/Rakefile
+++ b/Rakefile
@@ -5,18 +5,17 @@ begin
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
-    gem.name     = 'assembly'
+    gem.name     = 'cafe'
     gem.summary  = %Q{Web application used to managing the Xfce Foundation}
     gem.email    = 'jannis at xfce.org'
-    gem.homepage = 'http://git.xfce.org/jannis/assembly'
+    gem.homepage = 'http://git.xfce.org/jannis/cafe'
     gem.authors  = ['Jannis Pohlmann']
     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', '>= 0.3')
+    gem.add_dependency('sinatra', '>= 0.9.2')
+    gem.add_dependency('warden', '>= 0.2.3')
+    gem.add_dependency('haml', '>= 2.2.1')
   end
 rescue LoadError
   puts 'Jeweler not available. Install it with "gem install jeweler"'
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..5994d96
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'sinatra'
+require 'cafe'
+
+disable :run
+enable  :static
+enable  :session
+enable  :methodoverride
+enable  :reload
+set     :environment, :development
+
+use Rack::ShowExceptions
+
+run Cafe::Application
diff --git a/lib/cafe.rb b/lib/cafe.rb
new file mode 100644
index 0000000..aaae3aa
--- /dev/null
+++ b/lib/cafe.rb
@@ -0,0 +1,19 @@
+require 'rubygems'
+
+# determine the location of this very ruby script
+directory = File.expand_path(File.dirname(__FILE__))
+
+# load models
+require File.join(directory, 'models', 'member')
+
+# load helpers
+
+# load controllers
+require File.join(directory, 'controllers', 'members')
+
+# load middleware
+
+module Cafe
+  class Application < Sinatra::Base
+  end
+end
diff --git a/lib/controllers/members.rb b/lib/controllers/members.rb
new file mode 100644
index 0000000..869158d
--- /dev/null
+++ b/lib/controllers/members.rb
@@ -0,0 +1,15 @@
+module Cafe
+  module Controllers
+    module Members
+
+      def self.registered(app)
+
+        app.get '/members/:name' do
+          'Hello World'
+        end
+
+      end
+
+    end
+  end
+end
diff --git a/lib/models/member.rb b/lib/models/member.rb
new file mode 100644
index 0000000..e69de29
diff --git a/module.xml b/module.xml
index 3cc1e59..b1fdb6b 100644
--- a/module.xml
+++ b/module.xml
@@ -5,9 +5,9 @@
  xmlns:gnome="http://api.gnome.org/doap-extensions#"
  xmlns="http://usefulinc.com/ns/doap#">
 
- <name xml:lang="en">assembly</name>
+ <name xml:lang="en">cafe</name>
  <shortdesc xml:lang="en">Web application used to manage the Xfce Foundation</shortdesc>
- <homepage rdf:resource="http://git.xfce.org/foundation/assembly"/>
+ <homepage rdf:resource="http://git.xfce.org/foundation/cafe"/>
 
  <maintainer>
   <foaf:Person>
diff --git a/update-installation.sh b/update-installation.sh
index d053fb8..a11be9f 100755
--- a/update-installation.sh
+++ b/update-installation.sh
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-rake build &&  su -c 'gem install pkg/assembly-0.1.0.gem'
+HOSTNAME=`hostname`
+
+if [[ "$HOSTNAME" -eq "orion" ]]; then
+  rake gemspec && rake build && sudo gem install pkg/cafe-0.1.0.gem
+else
+  rake gemspec && rake build && su -c 'gem install pkg/cafe-0.1.0.gem'
+fi