caboodle 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/caboodle/app/config/site.yml

@@ -5,4 +5,5 @@ kits:
 - Standard
 - Skimmed
 - Susy
-- Jquery
+- Jquery
+- Gravatar

data/lib/caboodle/app.rb

@@ -10,7 +10,7 @@ module Caboodle
     helpers Sinatra::CaboodleHelpers
     
     configure do
-      Caboodle::Kit.configure File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+      Caboodle::Kit.configure_site File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
     end
   
   end

data/lib/caboodle/command.rb

@@ -2,6 +2,11 @@
 module Caboodle
   module Command
     class << self
+      def configure
+        config = File.expand_path(File.join(".","config","site.yml"))
+        Caboodle::Kit.configure_site config
+      end
+      
       def run(command, args, retries=0)
         case command
         when "create"
@@ -12,7 +17,7 @@ module Caboodle
           puts `cd #{site_name} && cp -i #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/.gems .`
           puts `cd #{site_name} && git init`
           config = File.expand_path(File.join(".",site_name,"config","site.yml"))
-          Caboodle::Kit.configure config
+          Caboodle::Kit.configure_site config
           puts "Please set a few settings to get started"
           Caboodle::Kit.ask_user_for_all_missing_settings
           puts `cd #{site_name} && git add .`
@@ -21,12 +26,7 @@ module Caboodle
           Caboodle::Kit.load_kit args.first.capitalize
           puts "Dump config"
           Caboodle::Kit.dump_config
-          puts "Pushing to Heroku"
-          puts "Please be patient - this could take some time the first time you do this"
-          puts `git add .`
           puts `git commit -m"kit:add #{args}" -a`
-          puts `git push heroku master`
-          puts "Done!"
         when /kit:home/
           if Caboodle::Kit.available_kits.include?(args.first.capitalize)
             Caboodle::Site.home_kit = args.first.capitalize
@@ -38,11 +38,21 @@ module Caboodle
           Caboodle::Kit.available_kits.each {|kit| puts kit}
         when /kit:remove/
           Caboodle::Kit.unload_kit args.first.capitalize
-          puts "Pushing to Heroku"
-          puts `git add .`
           puts `git commit -m"kit:remove #{args}" -a`
-          puts `git push heroku master`
-          puts "Done!"
+        when /config:list/
+          configure
+          Caboodle::Site.each{|k,v| puts "#{k}: #{v}"}
+        when /config:set/
+          configure
+          Caboodle::Site[args[0]] = args[1]
+          Caboodle::Kit.dump_config
+        when /config:get/
+          configure
+          puts Caboodle::Site[args[0]]
+        when /config:kits/
+          puts "The following kits are loaded"
+          configure
+          puts Caboodle::Site.kits.join("\n")
         when "deploy"
           gem 'heroku'
           require 'heroku'
@@ -51,7 +61,18 @@ module Caboodle
           puts `git commit -m"deploy" -a`
           puts `git push heroku master`
         else
-          puts "Sorry, that command is not recognized"
+          puts "Sorry, that command is not recognized" unless command == "help"
+          puts "Caboodle accepts the following commands:"
+          puts " "
+          puts "caboodle create <sitename> - sets up a new caboodle"
+          puts "caboodle kit:add <kit name> - adds a specificed kit to the caboodle"
+          puts "caboodle kit:home <kit name> - sets the kit as the one that runs the home page"
+          puts "caboodle kit:remove <kit name> - removes the kit"
+          puts "caboodle kit:list - lists all of the available kits"
+          puts "caboodle config:list - shows the configuration variables"
+          puts "caboodle config:set <variable name> <value> - sets a value for the configuration variable"
+          puts "caboodle config:get <variable name> - shows the value of the configuration variable"
+          puts "caboodle deploy - pushes the caboodle to Heroku"
         end
       end
     end

data/lib/caboodle/kit.rb

@@ -22,7 +22,7 @@ module Caboodle
     class << self
       attr_accessor :credit_link
         
-      def configure config_path
+      def configure_site config_path
         set :config, config_path
         if File.exists?(config_path)
           Caboodle::Kit.load_config(config_path)
@@ -257,7 +257,6 @@ module Caboodle
             Caboodle::Layout[k.to_sym] = v
           end
         end
-        puts Caboodle::Layout.inspect
       end
       
       def defaults hash
@@ -289,7 +288,6 @@ module Caboodle
       
       def start
         errors = []
-        puts self.required_settings.inspect
         self.required_settings.each do |s|
           if Site[s].blank?
             errors << "    :#{s} has not been set"

data/lib/caboodle/kits/gravatar/gravatar.rb

@@ -0,0 +1,14 @@
+require 'digest/md5'
+
+module Caboodle
+  class Standard < Caboodle::Kit
+    optional [:email]
+    
+    configure do
+      if Caboodle::Site.logo_url.to_s.blank? && !Caboodle::Site.email.to_s.blank?
+        hash = Digest::MD5.hexdigest(Caboodle::Site.email)
+        Caboodle::Site.logo_url = "http://www.gravatar.com/avatar/#{hash}"
+      end
+    end
+  end
+end

data/lib/caboodle/kits/standard/standard.rb

@@ -2,7 +2,7 @@ module Caboodle
   class Standard < Caboodle::Kit
     required [:title, :description, :author]
     optional [:logo_url]
-    if Caboodle::Site.home_kit.blank? || !(Caboodle::Kit.available_kits.include?(Caboodle::Site.home_kit)) || !(Caboodle::Kits.include?(Caboodle::Site.home_kit))
+    if Caboodle::Site.home_kit.blank?
       puts "Using the default home kit - you will want to run 'caboodle kit:home <kit name>' to specify your own kit"
       get "/" do
         haml :standard

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +01:00
+date: 2010-08-27 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency