yodel 0.0.2 → 0.0.3

data/lib/yodel/application/yodel.rb

@@ -15,8 +15,17 @@ module Yodel
         extension.load!
       end
     else
+      # find the latest version of each yodel extension
+      latest_gem_version = {}
       Gem::Specification.find_all do |gem|
         next unless gem.name.start_with?('yodel_')
+        if !latest_gem_version.key?(gem.name) || gem.version > latest_gem_version[gem.name].version
+          latest_gem_version[gem.name] = gem
+        end
+      end
+      
+      # only load the latest versions
+      latest_gem_version.each_value do |gem|
         extension = GemExtension.new(gem)
         extension.load!
       end

data/lib/yodel/models/core/site/site.rb

@@ -40,6 +40,19 @@ class Site < MongoRecord
     @log ||= Log.new(self)
   end
   
+  def root_directory
+    # TODO: find a better way to distinguish between dev/prod and normal sites
+    @root_directory ||= begin
+      if name != 'yodel'
+        get('root_directory')
+      elsif Yodel.env.production?
+        Yodel.extensions['yodel_production_environment'].lib_dir
+      else
+        Yodel.extensions['yodel_development_environment'].lib_dir
+      end
+    end
+  end
+  
   def public_directory
     @public_dir ||= File.join(root_directory, Yodel::PUBLIC_DIRECTORY_NAME)
   end

data/lib/yodel/version.rb

@@ -1,3 +1,3 @@
 module Yodel
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yodel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70168508652460 !ruby/object:Gem::Requirement
+  requirement: &70164834814320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.21
   type: :runtime
   prerelease: false
-  version_requirements: *70168508652460
+  version_requirements: *70164834814320
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70168508651520 !ruby/object:Gem::Requirement
+  requirement: &70164834813080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70168508651520
+  version_requirements: *70164834813080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70168508650680 !ruby/object:Gem::Requirement
+  requirement: &70164834812520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508650680
+  version_requirements: *70164834812520
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70168508649740 !ruby/object:Gem::Requirement
+  requirement: &70164834811880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508649740
+  version_requirements: *70164834811880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70168508648780 !ruby/object:Gem::Requirement
+  requirement: &70164834811120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508648780
+  version_requirements: *70164834811120
 - !ruby/object:Gem::Dependency
   name: plucky
-  requirement: &70168508647460 !ruby/object:Gem::Requirement
+  requirement: &70164834810420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508647460
+  version_requirements: *70164834810420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70168508646540 !ruby/object:Gem::Requirement
+  requirement: &70164834800440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70168508646540
+  version_requirements: *70164834800440
 - !ruby/object:Gem::Dependency
   name: ember
-  requirement: &70168508645640 !ruby/object:Gem::Requirement
+  requirement: &70164834798560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508645640
+  version_requirements: *70164834798560
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70168508645080 !ruby/object:Gem::Requirement
+  requirement: &70164834797360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70168508645080
+  version_requirements: *70164834797360
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70168508644040 !ruby/object:Gem::Requirement
+  requirement: &70164834796140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70168508644040
+  version_requirements: *70164834796140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70168508643160 !ruby/object:Gem::Requirement
+  requirement: &70164834794680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70168508643160
+  version_requirements: *70164834794680
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &70168508641600 !ruby/object:Gem::Requirement
+  requirement: &70164834794120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70168508641600
+  version_requirements: *70164834794120
 - !ruby/object:Gem::Dependency
   name: rubydns
-  requirement: &70168508640940 !ruby/object:Gem::Requirement
+  requirement: &70164834793220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70168508640940
+  version_requirements: *70164834793220
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70168508640040 !ruby/object:Gem::Requirement
+  requirement: &70164834791920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70168508640040
+  version_requirements: *70164834791920
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70168508638960 !ruby/object:Gem::Requirement
+  requirement: &70164834791420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70168508638960
+  version_requirements: *70164834791420
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70168508638200 !ruby/object:Gem::Requirement
+  requirement: &70164834790920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508638200
+  version_requirements: *70164834790920
 - !ruby/object:Gem::Dependency
   name: linguistics
-  requirement: &70168508625780 !ruby/object:Gem::Requirement
+  requirement: &70164834790100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70168508625780
+  version_requirements: *70164834790100
 - !ruby/object:Gem::Dependency
   name: yodel_admin
-  requirement: &70168508625160 !ruby/object:Gem::Requirement
+  requirement: &70164834789500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508625160
+  version_requirements: *70164834789500
 - !ruby/object:Gem::Dependency
   name: yodel_queue
-  requirement: &70168508624200 !ruby/object:Gem::Requirement
+  requirement: &70164834788840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508624200
+  version_requirements: *70164834788840
 - !ruby/object:Gem::Dependency
   name: yodel_blog
-  requirement: &70168508623420 !ruby/object:Gem::Requirement
+  requirement: &70164834788160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508623420
+  version_requirements: *70164834788160
 - !ruby/object:Gem::Dependency
   name: yodel_shop
-  requirement: &70168508623000 !ruby/object:Gem::Requirement
+  requirement: &70164834787640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508623000
+  version_requirements: *70164834787640
 - !ruby/object:Gem::Dependency
   name: yodel_development_environment
-  requirement: &70168508622560 !ruby/object:Gem::Requirement
+  requirement: &70164834787180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508622560
+  version_requirements: *70164834787180
 - !ruby/object:Gem::Dependency
   name: yodel_production_environment
-  requirement: &70168508621920 !ruby/object:Gem::Requirement
+  requirement: &70164834786720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168508621920
+  version_requirements: *70164834786720
 description: Yodel CMS
 email:
 - me@willcannings.com