caboodle 0.2.8 → 0.2.9

data/Rakefile

@@ -6,11 +6,10 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "caboodle"
     gem.summary = "Web mashups the simple way"
-    gem.description = "Use Kits to create simple mashups."
+    gem.description = "Caboodle is a Rack and Sinatra-based framework for creating websites which combine information from various online services. There are Kits for many of the larger services, which provide a way to retrieve and display photos, videos, blog posts, status updates and so on. Caboodle normalises the display of all of these discrete Kits so that you can create a website which looks seamless but is made up of a variety of things from a variety of sources."
     gem.email = "stef@stef.io"
     gem.homepage = "http://github.com/steflewandowski/caboodle"
-    gem.authors = ["steflewandowski"]
-    gem.add_dependency "heroku", ">= 0"
+    gem.authors = ["Stef Lewandowski"]
     gem.add_dependency "sinatra", ">=1.0"
     gem.add_dependency "hashie", ">=0.2.0"
     gem.add_dependency "haml", ">=3.0.12"
@@ -18,11 +17,9 @@ begin
     gem.add_dependency "compass-susy-plugin", ">=0.7.0"
     gem.add_dependency "sinatra-compass", ">=0.5.0"
     gem.add_dependency "sinatra-advanced-routes", ">=0.5.1"
-    gem.add_dependency "sinatra-content-for",">=0.2.0"
-    gem.add_dependency "memcached",">=0.19.9"
     gem.add_dependency "nokogiri",">=1.4.0"
     gem.add_dependency "weary",">=0.7.2"
-    gem.add_dependency "sleepy",">=0.1.3"
+    gem.add_dependency "sleepy",">=0.1.4"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/bin/caboodle

@@ -11,4 +11,10 @@ args = ARGV.dup
 ARGV.clear
 command = args.shift.strip rescue 'help'
 
-Caboodle::Command.run(command, args)
+git_path = `which git`
+if git_path.blank?
+  puts "Sorry - you don't appear to have git installed or in your path"
+  puts "Please set up git and try again: http://github.com"
+else
+  Caboodle::Command.run(command, args)
+end

data/lib/caboodle/app/.gems

@@ -1 +1,2 @@
-caboodle
+caboodle
+memcached

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

@@ -1,5 +1,6 @@
 has_footer: true
 has_caboodle_link: true
+home_kit: Standard
 kits:
 - Standard
 - Skimmed

data/lib/caboodle/app.rb

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

data/lib/caboodle/command.rb

@@ -1,6 +1,3 @@
-gem 'heroku'
-require 'heroku'
-require 'heroku/command'
 
 module Caboodle
   module Command
@@ -8,20 +5,24 @@ module Caboodle
       def run(command, args, retries=0)
         case command
         when "create"
-          puts `mkdir #{args.first}`
-          puts `cd #{args.first} && cp -r #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/* .`
-          puts `cd #{args.first} && cp #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/.gems .`
-          puts `cd #{args.first} && git init`
-          Caboodle::Kit.configure
-          puts `cd #{args.first} && git add .`
-          puts `cd #{args.first} && git commit -m"initial setup"`
-          puts `cd #{args.first} && heroku create #{args.first}`
-          
+          puts "Welcome to Caboodle!"
+          site_name = args.first
+          puts `mkdir -p #{site_name}`
+          puts `cd #{site_name} && cp -ri #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/* .`
+          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
+          puts "Please set a few settings to get started"
+          Caboodle::Kit.ask_user_for_all_missing_settings
+          puts `cd #{site_name} && git add .`
+          puts `cd #{site_name} && git commit -m"initial setup"`
         when /kit:add/
           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`
@@ -29,7 +30,12 @@ module Caboodle
         when /kit:home/
           if Caboodle::Kit.available_kits.include?(args.first.capitalize)
             Caboodle::Site.home_kit = args.first.capitalize
+          else
+            puts "Sorry - that Kit isn't available. Try:"
+            Caboodle::Kit.available_kits.each {|kit| puts kit}
           end
+        when /kit:list/
+          Caboodle::Kit.available_kits.each {|kit| puts kit}
         when /kit:remove/
           Caboodle::Kit.unload_kit args.first.capitalize
           puts "Pushing to Heroku"
@@ -38,12 +44,16 @@ module Caboodle
           puts `git push heroku master`
           puts "Done!"
         when "deploy"
+          gem 'heroku'
+          require 'heroku'
+          require 'heroku/command'
+        
           puts `git commit -m"deploy" -a`
           puts `git push heroku master`
         else
-          Heroku::Command.run(command,args,retries)
+          puts "Sorry, that command is not recognized"
         end
       end
     end
   end
-end
+end

data/lib/caboodle/config.rb

@@ -8,6 +8,7 @@ module Caboodle
   Errors           = []
   Defaults         = Hashie::Mash.new(Hashie::Mash.new(YAML.load_file(File.join(File.dirname(__FILE__), 'config','defaults.yml'))))
   RequiredSettings = Hashie::Mash.new()
+  OptionalSettings = Hashie::Mash.new()
   Layout           = Hashie::Mash.new()
   Site             = Defaults.clone
   

data/lib/caboodle/kit.rb

@@ -22,11 +22,13 @@ module Caboodle
     class << self
       attr_accessor :credit_link
         
-      def configure
-        config_path = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+      def configure config_path
+        set :config, config_path
         if File.exists?(config_path)
           Caboodle::Kit.load_config(config_path)
           Caboodle::Kit.setup
+        else
+          puts "No such configuration file: #{config_path}"
         end
       end
       
@@ -54,14 +56,13 @@ module Caboodle
 
       def dump_config
         begin
-          puts "Dump config"
-          p = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
+          p = config
           d = Caboodle::Site.clone
           e = d.to_hash
           e.delete("required_settings")
           File.open(p, 'w') {|f| f.write(YAML::dump(e))}
         rescue
-          puts "Cannot write config file"
+          puts "Cannot write to config file: #{p}"
         end
       end
 
@@ -118,25 +119,43 @@ module Caboodle
       end
       
       def register_kit
-        required_settings.each do |r|
-          puts "checking #{r}"
-          puts "value: #{Caboodle::Site[r]}"
-          if Caboodle::Site[r].blank?
-            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
+        ask_user_for_missing_settings
         Site.kits << name
         Site.kits.uniq!
         Caboodle::Kits << self
         Caboodle::Kits
       end
       
+      def ask_user r, optional=false       
+        unless ENV["RACK_ENV"] == "production"
+          puts " "
+          opt = "Optional: " if optional
+          puts "#{opt}Please set a value for #{r}:"
+          v = STDIN.gets
+          Caboodle::Site[r] = v
+          Caboodle::Kit.dump_config
+        end
+      end
+      
+      def ask_user_for_missing_settings
+        required_settings.each do |r|
+          if Caboodle::Site[r].blank?
+            ask_user r
+          end
+        end
+        optional_settings.each do |r|
+          if Caboodle::Site[r].blank?
+            ask_user r, true
+          end
+        end
+      end
+      
+      def ask_user_for_all_missing_settings
+        Caboodle::Kits.each do |kit|
+          kit.ask_user_for_missing_settings
+        end
+      end
+      
       def unregister_kit
         Caboodle::Kits.delete(self)
         Caboodle::Site.kits.delete(self.to_s)
@@ -179,6 +198,16 @@ module Caboodle
         self.required_settings
       end
       
+      def optional keys
+        if keys.class == Array
+          keys.each do |k| 
+            self.optional_settings << k
+          end
+        else
+          self.optional_settings << keys
+        end
+        self.optional_settings      end
+      
       def stylesheets array_of_css_files
         if array_of_css_files.class == Array
           array_of_css_files.each { |a| Caboodle::Stylesheets << a.to_s }
@@ -245,9 +274,14 @@ module Caboodle
       end
     
       def required_settings
-        r = RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
+        RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
         RequiredSettings[self.ancestors.first.to_s.split("::").last]
       end
+      
+      def optional_settings
+        OptionalSettings[self.ancestors.first.to_s.split("::").last] ||= [] 
+        OptionalSettings[self.ancestors.first.to_s.split("::").last]
+      end
     
       def available_kits
         Dir.new(File.join(File.dirname(__FILE__),"kits")).entries.delete_if{|a| a[0,1]=="."}

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

@@ -1,9 +1,9 @@
 module Caboodle
   class Standard < Caboodle::Kit
-    required [:title, :description, :logo_url, :author]
-    puts "Test home 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))
-      puts "There is no home page kit"
+      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
       end

data/lib/caboodle/scrape.rb

@@ -1,9 +1,12 @@
+require 'nokogiri'
+require 'hashie'
+
 module Caboodle
   def self.scrape url
-    Nokogiri::HTML(Weary.get(url).perform_sleepily.body)
+    ::Nokogiri::HTML(Weary.get(url).perform_sleepily.body)
   end
   
   def self.mash req
-    Hashie::Mash.new(req.perform_sleepily.parse)
+    ::Hashie::Mash.new(req.perform_sleepily.parse)
   end
 end

data/lib/caboodle.rb

@@ -1,3 +1,3 @@
 $:<<File.dirname(__FILE__)
 $:<<File.join(File.dirname(__FILE__),"caboodle")
-%{sinatra/base sinatra/content_for yaml hashie haml find sinatra/base sinatra/compass sinatra/advanced_routes compass susy pp sleepy caboodle/helpers caboodle/config caboodle/kit caboodle/app caboodle/scrape}.split.each{|a| require a}
+%{sinatra/base yaml hashie haml find sinatra/base sinatra/compass sinatra/advanced_routes compass susy pp sleepy caboodle/helpers caboodle/config caboodle/kit caboodle/app caboodle/scrape}.split.each{|a| require a}

metadata

@@ -1,41 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
-- steflewandowski
+- Stef Lewandowski
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +01:00
+date: 2010-08-26 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: heroku
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +32,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +48,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +64,11 @@ dependencies:
         - 12
         version: 3.0.12
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +80,11 @@ dependencies:
         - 2
         version: 0.10.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: compass-susy-plugin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +96,11 @@ dependencies:
         - 0
         version: 0.7.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra-compass
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +112,11 @@ dependencies:
         - 0
         version: 0.5.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sinatra-advanced-routes
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,43 +128,11 @@ dependencies:
         - 1
         version: 0.5.1
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sinatra-content-for
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: memcached
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 65
-        segments: 
-        - 0
-        - 19
-        - 9
-        version: 0.19.9
-  type: :runtime
-  version_requirements: *id010
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,11 +144,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: weary
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,24 +160,24 @@ dependencies:
         - 2
         version: 0.7.2
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sleepy
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
-  version_requirements: *id013
-description: Use Kits to create simple mashups.
+  version_requirements: *id010
+description: Caboodle is a Rack and Sinatra-based framework for creating websites which combine information from various online services. There are Kits for many of the larger services, which provide a way to retrieve and display photos, videos, blog posts, status updates and so on. Caboodle normalises the display of all of these discrete Kits so that you can create a website which looks seamless but is made up of a variety of things from a variety of sources.
 email: stef@stef.io
 executables: 
 - caboodle