Merge branch 'sinatra' of github.com:winton/gem_template

Conflicts:
	Rakefile
	config/gemsets.yml
	config/gemspec.yml
	lib/application/haml.rb
	lib/application/lilypad.rb
	lib/application/session.rb
	lib/application/sinatra.rb
	lib/gem_template.rb
	lib/gem_template/boot/haml.rb
	lib/gem_template/boot/lilypad.rb
	lib/gem_template/boot/session.rb
	lib/gem_template/boot/sinatra.rb
	lib/maitre_d/boot/application.rb
	lib/maitre_d/boot/haml.rb
	lib/maitre_d/boot/lilypad.rb
	lib/maitre_d/boot/redis.rb
	lib/maitre_d/boot/session.rb
	lib/maitre_d/boot/sinatra.rb
	lib/maitre_d/gems.rb
	maitre_d.gemspec
	script/console
	spec/gem_template_spec.rb
	spec/maitre_d/gems_spec.rb
	spec/spec_helper.rb

.gitignore

@@ -1,10 +1,9 @@
+.bundle
 .DS_Store
 *.gem
 *.log
 config/database.yml
 config/deploy.rb
-config/mail.yml
-coverage
 log
 pkg
 tmp

Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+group :development do
+  gem "rack-test", "= 0.6.1"
+  gem "rspec", "~> 1.0"
+end
+
+gem "haml",      "= 3.1.2"
+gem "lilypad",   "= 0.3.1"
+gem "redis",     "= 2.2.2"
+gem "sinatra",   "= 1.2.6"
+gem "yajl-ruby", "= 1.0.0"

Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    haml (3.1.2)
+    lilypad (0.3.1)
+      builder (>= 2.1.2)
+      require (= 0.2.6)
+    rack (1.3.4)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    redis (2.2.2)
+    require (0.2.6)
+    rspec (1.3.2)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3.3)
+    yajl-ruby (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml (= 3.1.2)
+  lilypad (= 0.3.1)
+  rack-test (= 0.6.1)
+  redis (= 2.2.2)
+  rspec (~> 1.0)
+  sinatra (= 1.2.6)
+  yajl-ruby (= 1.0.0)

Rakefile

@@ -1,101 +1 @@
-require File.dirname(__FILE__) + '/lib/maitre_d/gems'
-
-MaitreD::Gems.activate %w(rake rspec)
-
-require 'rake'
-
-begin
-  require 'spec/rake/spectask'
-rescue Exception => e
-end
-
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../maitre_d.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
-
-if defined?(ActiveWrapper::Tasks)
-  ActiveWrapper::Tasks.new(
-    :base => File.dirname(__FILE__),
-    :env => ENV['ENV']
-  )
-end
-
-if defined?(Spec::Rake::SpecTask)
-  desc "Run specs"
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = %w(-fs --color)
-    t.warning = true
-  end
-  task :spec
-  task :default => :spec
-end
-
-desc "Build gem(s)"
-task :gem do
-  old_gemset = ENV['GEMSET']
-  root = File.expand_path('../', __FILE__)
-  pkg = "#{root}/pkg"
-  system "rm -Rf #{pkg}"
-  MaitreD::Gems.gemset_names.each do |gemset|
-    ENV['GEMSET'] = gemset.to_s
-    system "cd #{root} && gem build maitre_d.gemspec"
-    system "mkdir -p #{pkg} && mv *.gem pkg"
-  end
-  ENV['GEMSET'] = old_gemset
-end
-
-namespace :gem do
-  desc "Install gem(s)"
-  task :install do
-    Rake::Task['gem'].invoke
-    Dir["#{File.dirname(__FILE__)}/pkg/*.gem"].each do |pkg|
-      system "gem install #{pkg} --no-ri --no-rdoc"
-    end
-  end
-
-  desc "Push gem(s)"
-  task :push do
-    Rake::Task['gem'].invoke
-    Dir["#{File.dirname(__FILE__)}/pkg/*.gem"].each do |pkg|
-      system "gem push #{pkg}"
-    end
-  end
-end
-
-namespace :gems do
-  desc "Install gem dependencies (DEV=0 DOCS=0 GEMSPEC=default SUDO=0)"
-  task :install do
-    dev = ENV['DEV'] == '1'
-    docs = ENV['DOCS'] == '1' ? '' : '--no-ri --no-rdoc'
-    gemset = ENV['GEMSET']
-    sudo = ENV['SUDO'] == '1' ? 'sudo' : ''
-
-    MaitreD::Gems.gemset = gemset if gemset
-
-    if dev
-      gems = MaitreD::Gems.gemspec.development_dependencies
-    else
-      gems = MaitreD::Gems.gemspec.dependencies
-    end
-
-    gems.each do |name|
-      name = name.to_s
-      version = MaitreD::Gems.versions[name.to_sym]
-      if Gem.source_index.find_name(name, version).empty?
-        version = version ? "-v #{version}" : ''
-        system "#{sudo} gem install #{name} #{version} #{docs}"
-      else
-        puts "already installed: #{name} #{version}"
-      end
-    end
-  end
-end
-
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
+require 'bundler/gem_tasks'

bin/gem_template

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require File.expand_path("../../lib/gem_template", __FILE__)

lib/application/controller.rb

@@ -0,0 +1,6 @@
+Application.class_eval do
+
+  Dir["#{root}/lib/#{app_name}/controller/*.rb"].sort.each do |path|
+    require path
+  end
+end

lib/application/helper.rb

@@ -0,0 +1,6 @@
+Application.class_eval do
+
+  Dir["#{root}/lib/#{app_name}/helper/*.rb"].sort.each do |path|
+    require path
+  end
+end

lib/maitre_d/boot/log.rb → lib/application/log.rb

@@ -1,5 +1,5 @@
 Application.class_eval do
-  
+
   unless File.basename($0) == 'spec'
     log = File.new("#{root}/log/#{environment}.log", "a")
     STDOUT.reopen(log)

lib/application/redis.rb

@@ -0,0 +1,26 @@
+require 'redis'
+
+def redis
+  $redis ||= (
+
+    env = ENV['RACK_ENV'] || 'development'
+
+    if File.exists?('config/redis.yml')
+      yaml = YAML.load(File.read('config/redis.yml'))[env]
+
+      db = yaml.keys.first
+      config = yaml[db]
+      config['db'] = db
+
+      $redis_url = "#{config['host']}:#{config['port']}/#{config['db']}"
+
+      ::Redis.new(
+        :host => config['host'],
+        :port => config['port'],
+        :db => config['db']
+      )
+    end
+  )
+end
+
+redis

lib/maitre_d/boot/sinatra.rb → lib/application/sinatra.rb

@@ -1,9 +1,9 @@
 Application.class_eval do
 
   set :environment, $testing ? :test : environment
-  set :root, File.expand_path("#{File.dirname(__FILE__)}/../../../")
+  set :root, File.expand_path("#{File.dirname(__FILE__)}/../../")
   set :public, "#{root}/public"
   set :logging, true
   set :static, true
-  set :views, "#{root}/lib/maitre_d/view"
+  set :views, "#{root}/lib/#{app_name}/view"
 end

lib/maitre_d.rb

@@ -1,17 +1,19 @@
-require File.dirname(__FILE__) + '/maitre_d/gems'
+require "rubygems"
+require "bundler"
 
-MaitreD::Gems.activate %w(haml lilypad sinatra yajl-ruby)
+Bundler.setup(:default)
 
 $:.unshift File.dirname(__FILE__)
 
-require 'maitre_d/boot/core_ext'
-require 'maitre_d/boot/application'
-require 'maitre_d/boot/sinatra'
-require 'maitre_d/boot/log'
-require 'maitre_d/boot/session'
-require 'maitre_d/boot/haml'
-require 'maitre_d/boot/lilypad'
-require 'maitre_d/boot/redis'
-require 'maitre_d/boot/model'
-require 'maitre_d/boot/controller'
-require 'maitre_d/boot/helper'
+require 'maitre_d/application'
+require 'maitre_d/core_ext'
+
+require 'application/sinatra'
+require 'application/log'
+require 'application/session'
+require 'application/haml'
+require 'application/lilypad'
+require 'application/redis'
+require 'application/model'
+require 'application/controller'
+require 'application/helper'

lib/maitre_d/boot/application.rb → lib/maitre_d/application.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
 
 class Application < Sinatra::Base
+  set :app_name, 'maitre_d'
 end

lib/maitre_d/console.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
+
+require File.dirname(__FILE__) + '/application'
+require File.expand_path('../../application/sinatra', __FILE__)

lib/maitre_d/controller/reservations.rb

@@ -1,8 +1,6 @@
 Application.class_eval do
 
   get '/reservations/create' do
-    puts '@@@'
-    puts params.inspect
     reservation = Reservation.find(params)
 
     create = 
@@ -15,7 +13,6 @@
   end
 
   get '/reservations/show' do
-    puts '!!!'
     Reservation.find(params).to_response
   end