caboodle 0.2.3 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

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

@@ -1,7 +1,7 @@
 has_footer: true
 has_caboodle_link: true
 kits:
-- Posterous
+- Standard
 - Skimmed
 - Susy
 - Jquery

data/lib/caboodle/app/views/layout.haml

@@ -25,7 +25,15 @@
         
   %body.caboodle
     = before_page
+    
     #page.hfeed
+      - if Caboodle::Errors.size > 0
+        %section#errors
+          - Caboodle::Errors.each do |err|
+            %h2
+              = err.title
+            %p.reason
+              = err.reason
       = before_header
       %header#site-header
         = above_header
@@ -77,13 +85,6 @@
           = below_social
         = after_social 
         = before_content
-        - if Caboodle::Errors.size > 0
-          %section#errors
-            - Caboodle::Errors.each do |err|
-              %h2
-                = err.title
-              %p.reason
-                = err.reason
         %section#content
           = above_content
           = yield

data/lib/caboodle/app/views/stylesheets/screen.scss

@@ -137,4 +137,8 @@ section.subsection {
 
 #testing {
   background-color: red;
+}
+
+section#errors {
+  background-color: #ffdddd;
 }

data/lib/caboodle/kit.rb

@@ -76,14 +76,23 @@ module Caboodle
           kit_name = kit_name.downcase
           puts "))) Loading Kit: #{kit_name}"
           orig = Caboodle.constants
-          require "caboodle/kits/#{kit_name}/#{kit_name}" #rescue puts "Problem loading Kit: #{kit_name}"
-          added = Caboodle.constants - orig
-          puts added
-          added.each do |d| 
-            c = Caboodle.const_get(d)
-            if c.respond_to?(:is_a_caboodle_kit)
-              puts "*** Register #{c}"
-              c.register_kit
+          begin
+            require "caboodle/kits/#{kit_name}/#{kit_name}" #rescue puts "Problem loading Kit: #{kit_name}"
+            added = Caboodle.constants - orig
+            puts added
+            added.each do |d| 
+              c = Caboodle.const_get(d)
+              if c.respond_to?(:is_a_caboodle_kit)
+                puts "*** Register #{c}"
+                c.register_kit
+              end
+            end
+          rescue Exception=>e
+            if ENV["RACK_ENV"] == "production"
+              puts e.inspect
+              Caboodle::Errors << Hashie::Mash.new({:title=>"Failed to load #{name} kit", :reason=>e.backtrace})
+            else
+              raise e
             end
           end
         end
@@ -117,10 +126,13 @@ module Caboodle
           puts "checking #{r}"
           puts "value: #{Caboodle::Site[r]}"
           if Caboodle::Site[r].blank?
-            puts "Please set a value for #{r}:"
-            v = STDIN.gets
-            Caboodle::Site[r] = v
-            Caboodle::Kit.dump_config
+            puts "Rack env #{ENV["RACK_ENV"]}"
+            unless ENV["RACK_ENV"] == "production"
+              puts "Please set a value for #{r}:"
+              v = STDIN.gets
+              Caboodle::Site[r] = v
+              Caboodle::Kit.dump_config
+            end
           end
         end
         Site.kits << name
@@ -235,12 +247,13 @@ module Caboodle
       end
     
       def required_settings
-        r = RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [:title, :description, :logo_url, :author] 
+        r = RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
         RequiredSettings[self.ancestors.first.to_s.split("::").last]
       end
     
       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/broken/broken.rb

@@ -0,0 +1,5 @@
+module Caboodle
+  class Broken
+    
+  #deliberately wrong
+end

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

@@ -0,0 +1,9 @@
+module Caboodle
+  class Standard < Caboodle::Kit
+    required [:title, :description, :logo_url, :author]
+    
+    get "/" do
+      "The default home page"
+    end
+  end
+end

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

@@ -245,4 +245,16 @@ section.subsection {
 
 #testing {
   background-color: red;
+}
+
+section#errors {
+  background-color: #ffdddd;
+  padding: 0.5em;
+  h2 {
+    @include adjust-font-size-to(16px);
+    color: #882222;
+  }
+  .reason {
+    display: none;
+  }
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - steflewandowski
@@ -274,6 +274,7 @@ files:
 - lib/caboodle/helpers.rb
 - lib/caboodle/kit.rb
 - lib/caboodle/kits/analytics/analytics.rb
+- lib/caboodle/kits/broken/broken.rb
 - lib/caboodle/kits/carbonmade/carbonmade.rb
 - lib/caboodle/kits/carbonmade/views/carbonmade.haml
 - lib/caboodle/kits/disqus/disqus.rb
@@ -285,6 +286,7 @@ files:
 - lib/caboodle/kits/github/github.rb
 - lib/caboodle/kits/github/views/_repo.haml
 - lib/caboodle/kits/github/views/github.haml
+- lib/caboodle/kits/gravatar/gravatar.rb
 - lib/caboodle/kits/history/config/history.yml
 - lib/caboodle/kits/history/history.rb
 - lib/caboodle/kits/history/views/history.haml
@@ -311,6 +313,7 @@ files:
 - lib/caboodle/kits/skimmed/skimmed.rb
 - lib/caboodle/kits/soundcloud/soundcloud.rb
 - lib/caboodle/kits/soundcloud/views/soundcloud.haml
+- lib/caboodle/kits/standard/standard.rb
 - lib/caboodle/kits/susy/susy.rb
 - lib/caboodle/kits/susy/views/susy/_base.scss
 - lib/caboodle/kits/susy/views/susy/_defaults.scss