caboodle 0.2.22 → 0.2.23

data/README.textile

@@ -2,16 +2,18 @@
 
 h2. Caboodle is a quick and easy way to create a mashup website
 
-A quick demonstration if you are familiar with Ruby:
+What a Caboodle-based site looks like out of the box:
+
+"Stef.io":http://stef.io 
+
+How you set one up (assuming you are familiar with Ruby)
 
 <pre>sudo gem install caboodle
   
 caboodle create myproject
-
 (Respond to some questions, such as setting the site's title)
 
 cd myproject
-
 caboodle kit:add flickr
 
 Please set a value for flickr_username
@@ -21,16 +23,13 @@ Please set a value for flickr_apikey
 b1789c432a78990b44d39ff
 
 caboodle kit:add tumblr
-
 Please set a value for tumblr_username
 myproject
 
 caboodle kit:home tumblr
-
 (Sets the Tumblr kit as the home page)
 
 caboodle heroku:create myproject
-
 caboodle heroku:deploy</pre>
 
 h2. "WIKI":http://wiki.github.com/steflewandowski/Caboodle/

data/VERSION

@@ -1 +1 @@
-0.2.22
+0.2.23

data/lib/caboodle/app/scss/site.scss

@@ -0,0 +1,5 @@
+// Put your custom styles here.
+// This file expects SCSS, which is an extension of CSS, documented at: http://sass-lang.com
+// Depending on the kits you have installed you will be able to use any mixins defined within them.
+// Susy documentation: http://susy.oddbird.net
+// As default, the Susy kit is installed, so you have access to its mixins

data/lib/caboodle/app.rb

@@ -6,11 +6,12 @@ module Caboodle
     set :views, Proc.new { File.join(root, "views") }
     set :public, Proc.new { File.join(root, "public") }
     set :run, false
+    set :root_config, File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
     
     helpers Sinatra::CaboodleHelpers
     
     configure do
-      Caboodle::Kit.configure_site File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+      Caboodle::Kit.configure_site root_config if File.exists?(root_config)
     end
   
   end

data/lib/caboodle/command.rb

@@ -16,10 +16,12 @@ module Caboodle
           puts `cd #{site_name} && cp -i #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/config.ru .`
           puts `cd #{site_name} && cp -ri #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/config .`
           puts `cd #{site_name} && cp -i #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/.gems .`
-          puts `cd #{site_name} && cp -i #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/public .`
+          puts `cd #{site_name} && cp -ri #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/public .`
+          puts `cd #{site_name} && cp -ri #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/pages .`
+          puts `cd #{site_name} && cp -ri #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/scss .`
           puts `cd #{site_name} && git init`
           config = File.expand_path(File.join(".",site_name,"config","site.yml"))
-          Caboodle::Config.configure_site 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 .`

data/lib/caboodle/config.rb

@@ -55,7 +55,7 @@ module Caboodle
           kit_name = kit_name.downcase
           orig = Caboodle.constants
           begin
-            puts kit_name
+            puts "Loading #{kit_name}"
             require "caboodle/kits/#{kit_name}/#{kit_name}"
             added = Caboodle.constants - orig
             added.each do |d| 

data/lib/caboodle/kits/susy/susy.rb

@@ -16,6 +16,7 @@ module Caboodle
       content_type 'text/css', :charset => 'utf-8'
       sass_dir = File.expand_path(File.join(File.dirname(__FILE__),"views","susy"))
       load_paths = [App.root, File.join(App.root,"views"), File.join(App.root,"views","stylesheets"), sass_dir] + ::Compass.sass_engine_options[:load_paths]
+      
       Kits.each do |name|
         kit_name = name.to_s.split("::").last || name
         kit_name = kit_name.downcase
@@ -25,6 +26,11 @@ module Caboodle
       
       options = {:sass_dir => sass_dir, :syntax => :scss, :load_paths => load_paths}
       the_sass = open(File.join(File.dirname(__FILE__),"views","susy","screen.scss")).read
+      
+      Dir[File.join(Caboodle::App.root,"scss","*.scss")].map do |a| 
+        SASS << a
+      end
+      
       imported_files = []
       SASS.each do |s|
         the_sass << "\n"

data/lib/caboodle/kits/susy/views/susy/_base.scss

@@ -24,6 +24,7 @@ $side-gutter-width: $gutter-width;
 $base: #4c4c4c;
 $alt: #ff6600;
 
+
 // Fonts --------------------------------------------------------------
 
 @mixin sans-family {
@@ -47,3 +48,6 @@ $alt: #ff6600;
 // OTHER MIXINS --------------------------------------------------------------
 // Mixins set here will be available in defaults, screen, print and IE
 // Or anywhere you import either base.sass or defaults.sass
+
+// By default use the user's SCSS base file if it exists
+@import "scss/_base";

data/lib/caboodle/kits/twitter/twitter.rb

@@ -10,9 +10,13 @@ module Caboodle
     menu "Twitter"
   
     configure do
-      if Site.logo_url.to_s.blank? && !Site.twitter_username.to_s.blank?
-        xml = Nokogiri::XML(open("http://twitter.com/users/#{Site.twitter_username}.xml").read)
-        Site.logo_url = xml.css("profile_image_url").children.first.to_s 
+      begin
+        if Site.logo_url.to_s.blank? && !Site.twitter_username.to_s.blank?
+          xml = Nokogiri::XML(open("http://twitter.com/users/#{Site.twitter_username}.xml").read)
+          Site.logo_url = xml.css("profile_image_url").children.first.to_s 
+        end
+      rescue Exception=>e
+        Caboodle::Errors << Hashie::Mash.new({:title=>"Problem communicating with Twitter at startup", :reason=>e.backtrace})
       end
     end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 2
-  - 22
-  version: 0.2.22
+  - 23
+  version: 0.2.23
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -286,6 +286,7 @@ files:
 - lib/caboodle/app/public/images/favicon.ico
 - lib/caboodle/app/public/images/grid.png
 - lib/caboodle/app/public/js/application.js
+- lib/caboodle/app/scss/site.scss
 - lib/caboodle/app/views/error.haml
 - lib/caboodle/app/views/layout.haml
 - lib/caboodle/command.rb