grippy-doozer 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/doozer

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
-require 'date'
 require 'rubygems'
 require 'optparse'
-
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'doozer'
-
 Doozer::Generator.run(*ARGV)

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-11}
   s.default_executable = %q{doozer}
   s.description = %q{This GEM provides a small, barebones framework for creating MVC Rack applications.}
   s.email = %q{gmelton@whorde.com}
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "lib/doozer/redirect.rb",
      "lib/doozer/route.rb",
      "lib/doozer/scripts/cluster.rb",
+     "lib/doozer/scripts/console.rb",
      "lib/doozer/scripts/migrate.rb",
      "lib/doozer/scripts/task.rb",
      "lib/doozer/scripts/test.rb",
@@ -76,6 +77,7 @@ Gem::Specification.new do |s|
      "templates/skeleton/config/rack.rb",
      "templates/skeleton/config/routes.rb",
      "templates/skeleton/script/cluster",
+     "templates/skeleton/script/console",
      "templates/skeleton/script/migrate",
      "templates/skeleton/script/task",
      "templates/skeleton/script/test",

data/lib/doozer/app.rb

@@ -10,16 +10,13 @@ module Doozer
       # load routes
       load_routes
       
-      # load the application coontrollers, views, and helpers
+      # load the application models, coontrollers, views, and helpers
       load_files
-      
-      # load models
-      load_models
-      
+            
       # attach the file watcher for the mvc/lib/etc in development mode
-      require 'doozer/watcher'; load_watcher if Doozer::Configs.rack_env != :deployment
+      load_watcher if Doozer::Configs.rack_env != :deployment
       
-      p "Doozer racked up..."
+      printf "Doozer racked up...\n"
     end
     
     # This method is called along the rackup chain and maps the request path to the route, controller, and view for the format type.
@@ -112,14 +109,16 @@ module Doozer
     end
     
     def load_files
-      p "Caching files..."
+      # load models
+      load_models
+      printf "Caching files...\n"
       @@controllers = {}
       @@layouts={}
       @@views={}
       @@errors={}
       
       # require helper files and include into Doozer::Partial
-      helper_files = Dir.glob(File.join(APP_PATH,'/app/helpers/*_helper.rb'))      
+      helper_files = Dir.glob(File.join(APP_PATH,'app/helpers/*_helper.rb'))      
       helper_files.each {|f|
         require f
         key = f.split("helpers/")[1].gsub(/.rb/,'')
@@ -127,7 +126,7 @@ module Doozer
       }
       
       # cache contoller classes
-      controller_files = Dir.glob(File.join(APP_PATH,'/app/controllers/*_controller.rb'))
+      controller_files = Dir.glob(File.join(APP_PATH,'app/controllers/*_controller.rb'))
       # we need to load the application_controller first since this might not be the first in the list...
       if controller_files.length > 0
         i=0
@@ -161,7 +160,7 @@ module Doozer
       }
       
       # cache layout erb's
-      layout_files = Dir.glob(File.join(APP_PATH,'/app/views/layouts/*.erb'))
+      layout_files = Dir.glob(File.join(APP_PATH,'app/views/layouts/*.erb'))
       layout_files.each {|f|
         key = f.split("layouts/")[1].split(".html.erb")[0].gsub(/.xml.erb/, '_xml').gsub(/.json.erb/, '_json')
         results = []
@@ -172,7 +171,7 @@ module Doozer
       #lood 404 and 500 pages if they exist
       pnf = Doozer::Configs.page_not_found_url
       if pnf
-        file = File.join(APP_PATH,"/#{pnf}")
+        file = File.join(APP_PATH,"#{pnf}")
         results = []
         File.new(file, "r").each { |line| results << line }
         @@errors[404] = results.join("")
@@ -181,7 +180,7 @@ module Doozer
       end
       ise = Doozer::Configs.internal_server_error_url
       if ise
-        file = File.join(APP_PATH,"/#{ise}")
+        file = File.join(APP_PATH,"#{ise}")
         results = []
         File.new(file, "r").each { |line| results << line }
         @@errors[500] = results.join("")
@@ -191,7 +190,7 @@ module Doozer
       
       @@controllers.each_key { | key |
         # p key.inspect
-        files = Dir.glob(File.join(APP_PATH,"/app/views/#{key.to_s}/*.erb"))
+        files = Dir.glob(File.join(APP_PATH,"app/views/#{key.to_s}/*.erb"))
         files.each { | f |
           #!!!don't cache partials here!!!
           view = f.split("#{key.to_s}/")[1].split(".erb")[0].gsub(/\./,'_')
@@ -212,22 +211,29 @@ module Doozer
     end
 
     def load_models
-      Dir.glob(File.join(APP_PATH,'/app/models/*.rb')).each { | model | require model }
+      printf "Loading models...\n"
+      Dir.glob(File.join(APP_PATH,'app/models/*.rb')).each { | model | 
+        require model 
+      }
     end
   
     def load_watcher
-      p "All along the watchtower..."
+      require 'doozer/watcher'
+      
+      printf "All along the watchtower...\n"
       watcher = FileSystemWatcher.new()
+      
       # watcher.addDirectory(File.join(File.dirname(__FILE__),'../doozer/'), "*.rb")
-      watcher.addDirectory(File.join(APP_PATH,'/app/'), "**/*")
-      watcher.addDirectory(File.join(APP_PATH,'/app/'), "**/**/*")
-      watcher.addDirectory(File.join(APP_PATH,'/config/'), "*.*")
-      watcher.addDirectory(File.join(APP_PATH,'/lib/'), "*.*")
-      watcher.addDirectory(File.join(APP_PATH,'/static/'), "*.*")
-      watcher.addDirectory(File.join(APP_PATH,'/static/'), "**/**/*")
+      watcher.addDirectory( APP_PATH + '/app/', "**/*")
+      watcher.addDirectory( APP_PATH + '/app', "**/**/*")
+      watcher.addDirectory( APP_PATH + '/config/', "*.*")
+      watcher.addDirectory( APP_PATH + '/lib/', "*.*")
+      watcher.addDirectory( APP_PATH + '/static/', "*.*")
+      watcher.addDirectory( APP_PATH + '/static/', "**/**/*")
+
 
       watcher.sleepTime = 1
-      watcher.start { |status,file|
+      watcher.start { |status, file|
         if(status == FileSystemWatcher::CREATED) then
             puts "created: #{file}"
             load_files
@@ -242,7 +248,10 @@ module Doozer
             Doozer::Partial.clear_loaded_partials
         end
       }
-      #don't join the thread it messes up rackup threading watcher.join() 
+      #don't join the thread it messes up rackup threading watcher.join()
+      # p watcher.isStarted?
+      # p watcher.isStopped?
+      # p watcher.foundFiles.inspect
     end
   
     def handler(key)

data/lib/doozer/configs.rb

@@ -13,8 +13,8 @@ module Doozer
    
    # Rack refers to production as deployment.
    def self.load(rack_env)
-      p "APP_ROOT: #{APP_PATH}" 
-      p "Loading configs for #{rack_env}"
+      printf "APP_ROOT: #{APP_PATH}\n" 
+      printf "Loading configs for #{rack_env}\n"
       
       # TODO: remove this and replace with APP_PATH
       @@env_path = Dir.pwd 
@@ -42,13 +42,13 @@ module Doozer
       begin
        @@config[:database] = Configs.symbolize_keys( YAML.load(File.read(File.join(APP_PATH,'config/database.yml'))) )
       rescue
-       p "Failed to load config/database.yml"
+       printf "--Failed to load config/database.yml \n"
       end
 
       begin
        @@config[:app] = Configs.symbolize_keys( YAML.load(File.read(File.join(APP_PATH,'config/app.yml'))) )
       rescue
-       p "Failed to load config/app.yml"
+       printf "--Failed to load config/app.yml\n"
       end
    end
 

data/lib/doozer/initializer.rb

@@ -70,6 +70,12 @@ module Doozer
       end
     end
 
+    
+    def self.console(env)
+      self.boot(env)
+      app = Doozer::App.new(env)
+    end
+    
     # Primary hook for extending/overriding ORM. Code block is pushed onto an array which allows for multiple hooks throughtout different files.
     # 
     # &block - code to execute after ORM is intialized

data/lib/doozer/orm/active_record.rb

@@ -11,8 +11,8 @@ module Doozer
         :password => db_config["password"],
         :database => db_config["database"]
       )
-      p "ORM: #{Doozer::Configs.orm()} initialized..."
-      p "ORM: logging initialized"
+      printf "ORM: #{Doozer::Configs.orm()} initialized...\n"
+      # printf "ORM: logging initialized"
       ActiveRecord::Base.logger = Doozer::Configs.logger 
     end
   end

data/lib/doozer/orm/data_mapper.rb

@@ -12,7 +12,7 @@ module Doozer
         :password => db_config["password"],
         :host     => db_config["host"]
       })
-      p "ORM: #{Doozer::Configs.orm()} initialized..."
+      printf "ORM: #{Doozer::Configs.orm()} initialized...\n"
       DataMapper::Logger.new(STDOUT, :debug)
     end
   end

data/lib/doozer/orm/sequel.rb

@@ -12,7 +12,7 @@ module Doozer
         :password => db_config["password"],
         :host     => db_config["host"]
       }) 
-      p "ORM: #{Doozer::Configs.orm} initialized..."
+      printf "ORM: #{Doozer::Configs.orm} initialized...\n"
     end
   end
 end

data/lib/doozer/partial.rb

@@ -56,7 +56,7 @@ module Doozer
           partial = Doozer::Partial.new(erb, locals, route)
           partial.bind()
       else
-        p "no partial exists for #{file}"
+        printf "--no partial exists for #{file}\n"
       end
     end
     

data/lib/doozer/rackup/server.ru

@@ -2,9 +2,6 @@
 require 'rubygems'
 require 'doozer'
 
-#--load initializers
-# require 'doozer/initializer'
-
 #--boot it up
 Doozer::Initializer.boot(env)
 

data/lib/doozer/route.rb

@@ -19,7 +19,7 @@ module Doozer
         # sort routes here
         @@parts.sort! do |a, b| a[1].length <=> b[1].length end
         @@parts.reverse!
-        p "Routes drawn and sorted..."
+        printf "Routes drawn and sorted...\n"
         # @@parts.each { | i | p i[1] }
       end
       def self.add(name=nil, path=nil, args=nil)

data/lib/doozer/scripts/cluster.rb

@@ -8,8 +8,6 @@
 # -E environment (default: development || deployment)
 # -D (daemonize) - This is automatically initialized in deployment mode. There should be no need to pass this unless you want to test it out in development mode.
 # -h Hellllpppp!!!
-
-require 'date' # needs to be included before rubygems. otherwise
 require 'optparse'
 
 APP_PATH = Dir.pwd if APP_PATH.nil?

data/lib/doozer/scripts/console.rb

@@ -0,0 +1,2 @@
+require 'doozer'
+Doozer::Initializer.console(@env)

data/lib/doozer/version.rb

@@ -2,7 +2,7 @@ module Doozer
   module Version
     MAJOR=0
     MINOR=1
-    PATCH=2
+    PATCH=3
     STRING=[MAJOR, MINOR, PATCH].join('.')
   end
 end

data/lib/doozer/watcher.rb

@@ -36,17 +36,16 @@ module ServiceState
   def setState(newState)
     @stateMutex.synchronize {
       if newState == CONFIGURED then
-	@configured = true
+	      @configured = true
       else
-	@state = newState
-	if isStarted? then
-	  @startTime = Time.now()
-	elsif isStopped?
-	  @stopTime = Time.now()
-	end
+	      @state = newState
+      	if isStarted? then
+      	  @startTime = Time.now()
+      	elsif isStopped?
+      	  @stopTime = Time.now()
+      	end
       end
     }
-    
     if defined?(@stateCallback) then
       @stateCallback.call(newState)
     end
@@ -94,6 +93,8 @@ class FileSystemWatcher
   # you can optionally use the file contents md5 to detect if a file has changed
   attr_accessor :useMD5
 
+  attr_accessor :foundFiles, :files, :directories
+
   def initialize(dir=nil, expression="**/*")
     @sleepTime = 5
     @useMD5 = false
@@ -158,46 +159,46 @@ class FileSystemWatcher
     @watchThread = Thread.new {
       # we will be stopped if someone calls stop or if someone set a stopWhen that becomes true
       while !isStopped? do
-	if (!@directories.empty?) or (!@files.empty?) then	
-	  # this will hold the list of the files we looked at this iteration
-	  # allows us to not look at the same file again and also to compare
-	  # with the foundFile list to see if something was deleted
-	  alreadyExamined = Hash.new()
+	      if (!@directories.empty?) or (!@files.empty?) then	
+      	  # this will hold the list of the files we looked at this iteration
+      	  # allows us to not look at the same file again and also to compare
+      	  # with the foundFile list to see if something was deleted
+      	  alreadyExamined = Hash.new()
 	  
-	  # check the files in each watched directory
-	  if not @directories.empty? then
-	    @directories.each { |dirObj|
-	      examineFileList(dirObj.getFiles(), alreadyExamined, &block)
-	    }
-	  end
+      	  # check the files in each watched directory
+      	  if not @directories.empty? then
+      	    @directories.each { | dirObj |
+      	      examineFileList(dirObj.getFiles(), alreadyExamined, &block)
+      	    }
+      	  end
 	  
-	  # now examine any files the user wants to specifically watch
-	  examineFileList(@files, alreadyExamined, &block) if not @files.empty?
+      	  # now examine any files the user wants to specifically watch
+      	  examineFileList(@files, alreadyExamined, &block) if not @files.empty?
 	  
-	  # see if we have to delete files from our found list
-	  if not @firstLoad then
-	    if not @foundFiles.empty? then
-	      # now diff the found files and the examined files to see if
-	      # something has been deleted
-	      allFoundFiles = @foundFiles.keys()
-	      allExaminedFiles = alreadyExamined.keys()
-	      intersection = allFoundFiles - allExaminedFiles
-	      intersection.each { |fileName|
-        # callback
-        block.call(DELETED, fileName)
-        # remove deleted file from the foundFiles list
-        @foundFiles.delete(fileName)
-            }	  
+      	  # see if we have to delete files from our found list
+      	  if not @firstLoad then
+      	    if not @foundFiles.empty? then
+      	      # now diff the found files and the examined files to see if
+      	      # something has been deleted
+      	      allFoundFiles = @foundFiles.keys()
+      	      allExaminedFiles = alreadyExamined.keys()
+      	      intersection = allFoundFiles - allExaminedFiles
+      	      intersection.each { |fileName|
+                  # callback
+                  block.call(DELETED, fileName)
+                  # remove deleted file from the foundFiles list
+                  @foundFiles.delete(fileName)
+                }	  
+              end
+            else
+              @firstLoad = false
+            end
           end
-        else
-          @firstLoad = false
-        end
-      end
 
-        # go to sleep
-        sleep(@sleepTime)
-          end
-        }
+          # go to sleep
+          sleep(@sleepTime)
+        end
+      }
     
     # set the watch thread priority
     @watchThread.priority = @priority
@@ -226,79 +227,72 @@ class FileSystemWatcher
 
       # dont examine the same file 2 times
       if not alreadyExamined.has_key?(fullFileName) then
-	# we cant do much if the file isnt readable anyway
-	if File.readable?(fullFileName) then
-	  # set that we have seen this file
-	  alreadyExamined[fullFileName] = true
+    	# we cant do much if the file isnt readable anyway
+    	  if File.readable?(fullFileName) then
+      	  # set that we have seen this file
+      	  alreadyExamined[fullFileName] = true
 	  
-	  # get the file info
-	  modTime, size = File.mtime(fullFileName), File.size(fullFileName)
+      	  # get the file info
+      	  modTime, size = File.mtime(fullFileName), File.size(fullFileName)
 	  
-	  # on the first iteration just load all of the files into the foundList
-	  if @firstLoad then
-	    @foundFiles[fullFileName] = FSWatcher::FoundFile.new(fullFileName, modTime, size, false, @useMD5)
-	  else
-	    # see if we have found this file already
-	    foundFile = @foundFiles[fullFileName]
-
-	    if foundFile then
-	      
-	      # if a file is marked as new, we still need to make sure it isnt still
-	      # being written to. we do this by checking the file sizes.
-	      if foundFile.isNew? then
-		
-		# if the file size is the same then it is probably done being written to
-		# unless the writer is really slow
-		if size == foundFile.size then		  
-
-		  # callback
-		  block.call(CREATED, fullFileName)
+      	  # on the first iteration just load all of the files into the foundList
+      	  if @firstLoad then
+      	    @foundFiles[fullFileName] = FSWatcher::FoundFile.new(fullFileName, modTime, size, false, @useMD5)
+      	  else
+      	    # see if we have found this file already
+      	    foundFile = @foundFiles[fullFileName]
+
+      	    if foundFile then
+        	    # if a file is marked as new, we still need to make sure it isnt still
+        	    # being written to. we do this by checking the file sizes.
+      	    
+        	    if foundFile.isNew? then
+              		# if the file size is the same then it is probably done being written to
+              		# unless the writer is really slow
+              		if size == foundFile.size then		  
+              		  # callback
+              		  block.call(CREATED, fullFileName)
 		  
-		  # mark this file as a changed file now
-		  foundFile.updateModTime(modTime)
+              		  # mark this file as a changed file now
+              		  foundFile.updateModTime(modTime)
 		  
-		  # generate the md5 for the file since we know it is done
-		  # being written to
-		  foundFile.genMD5() if @useMD5
-		  
-		else
-		  
-		  # just update the size so we can check again at the next iteration
-		  foundFile.updateSize(size)
-		  
-		end
+              		  # generate the md5 for the file since we know it is done
+              		  # being written to
+              		  foundFile.genMD5() if @useMD5
+              		else
+              		  # just update the size so we can check again at the next iteration
+              		  foundFile.updateSize(size)
+              		end
 		
-	      elsif modTime > foundFile.modTime then
-
-  	      # if the mod times are different on files we already have
-          # found this is an update		
-          willYield = true
-
-          # if we are using md5's then compare them
-          if @useMD5 then
-            filesMD5 = FSWatcher.genFileMD5(fullFileName)
-            if filesMD5 && foundFile.md5 then
-              if filesMD5.to_s == foundFile.md5.to_s then
-                willYield = false
-              end
-            end
-
-            # if we are yielding then the md5s are dif so
-            # update the cached md5 value
-            foundFile.setMD5(filesMD5) if willYield
-
-          end
-
-          block.call(MODIFIED, fullFileName) if willYield		
-          foundFile.updateModTime(modTime)
-	      end
-	    else
-	      # this is a new file for our list. dont update the md5 here since
-	      # the file might not yet be done being written to
-	      @foundFiles[fullFileName] = FSWatcher::FoundFile.new(fullFileName, modTime, size)
-	    end
-	  end
-	end
+        	    elsif modTime > foundFile.modTime then
+
+          	      # if the mod times are different on files we already have
+                  # found this is an update		
+                  willYield = true
+
+                  # if we are using md5's then compare them
+                  if @useMD5 then
+                    filesMD5 = FSWatcher.genFileMD5(fullFileName)
+                    if filesMD5 && foundFile.md5 then
+                      if filesMD5.to_s == foundFile.md5.to_s then
+                        willYield = false
+                      end
+                    end
+                    # if we are yielding then the md5s are dif so
+                    # update the cached md5 value
+                    foundFile.setMD5(filesMD5) if willYield
+                  end
+                  block.call(MODIFIED, fullFileName) if willYield		
+                  foundFile.updateModTime(modTime)
+      	      end
+
+      	    else
+      	      # this is a new file for our list. dont update the md5 here since
+      	      # the file might not yet be done being written to
+      	      @foundFiles[fullFileName] = FSWatcher::FoundFile.new(fullFileName, modTime, size)
+      	    end
+      	  end
+      	end
       end
     }
   end

data/templates/skeleton/config/environment.rb

@@ -1,8 +1,6 @@
 # This file is loaded right after orm is initialized and right before app, controllers and models
 # place code here which is used throughout the application
-
-
-
+printf "Loading Environment..."
 
 Doozer::Initializer.after_orm do | config |
   # require 'doozer/plugins/paginate/init'

data/templates/skeleton/script/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'date'
+require 'irb'
+require 'rubygems'
+require 'doozer'
+@env = (ARGV.length > 0) ? ARGV[0] : 'development'
+ARGV.delete(@env) if ARGV.include?(@env)
+@env = @env.to_sym
+printf "[Doozer #{Doozer::Version::STRING}]\n"
+# see http://ruby-doc.org/core/ for more options
+IRB.conf[:LOAD_MODULES] = ["irb/completion", "#{DOOZER_PATH}/doozer/scripts/console"]
+IRB.conf[:USE_READLINE] = true
+IRB.load_modules()
+IRB.parse_opts()
+IRB.start()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grippy-doozer
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: doozer
 dependencies: []
 
@@ -59,6 +59,7 @@ files:
 - lib/doozer/redirect.rb
 - lib/doozer/route.rb
 - lib/doozer/scripts/cluster.rb
+- lib/doozer/scripts/console.rb
 - lib/doozer/scripts/migrate.rb
 - lib/doozer/scripts/task.rb
 - lib/doozer/scripts/test.rb
@@ -80,6 +81,7 @@ files:
 - templates/skeleton/config/rack.rb
 - templates/skeleton/config/routes.rb
 - templates/skeleton/script/cluster
+- templates/skeleton/script/console
 - templates/skeleton/script/migrate
 - templates/skeleton/script/task
 - templates/skeleton/script/test