grippy-doozer 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-09-04}
   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}
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
      "templates/skeleton/app/views/index/index.html.erb",
      "templates/skeleton/app/views/layouts/default.html.erb",
      "templates/skeleton/config/app.yml",
+     "templates/skeleton/config/boot.rb",
      "templates/skeleton/config/database.yml",
      "templates/skeleton/config/environment.rb",
      "templates/skeleton/config/rack.rb",
@@ -100,6 +101,7 @@ Gem::Specification.new do |s|
      "test/project/app/views/index/index.html.erb",
      "test/project/app/views/layouts/default.html.erb",
      "test/project/config/app.yml",
+     "test/project/config/boot.rb",
      "test/project/config/database.yml",
      "test/project/config/environment.rb",
      "test/project/config/rack.rb",
@@ -132,6 +134,7 @@ Gem::Specification.new do |s|
      "test/project/app/controllers/application_controller.rb",
      "test/project/app/controllers/index_controller.rb",
      "test/project/app/helpers/application_helper.rb",
+     "test/project/config/boot.rb",
      "test/project/config/environment.rb",
      "test/project/config/rack.rb",
      "test/project/config/routes.rb",

data/lib/doozer/orm/active_record.rb

@@ -3,7 +3,7 @@ module Doozer
   module ORM
     def self.load
       db_config = Doozer::Configs.db()
-      # ActiveRecord::Base.allow_concurrency = true
+      #ActiveRecord::Base.allow_concurrency = true
       ActiveRecord::Base.establish_connection(
         :adapter  => db_config["adapter"],
         :host     => db_config["host"],
@@ -13,7 +13,7 @@ module Doozer
       )
       printf "ORM: #{Doozer::Configs.orm()} initialized...\n"
       # printf "ORM: logging initialized"
-      ActiveRecord::Base.logger = Doozer::Configs.logger 
+      ActiveRecord::Base.logger = Doozer::Configs.logger
     end
   end
 end

data/lib/doozer/rackup/server.ru

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'doozer'
+
+APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 
 #--boot it up
 Doozer::Initializer.boot(env)
@@ -15,7 +16,7 @@ map "/" do
 	  use Rack::Reloader, secs=1
 	end
 	
-	use Rack::Static, {:urls => Doozer::Configs.app["static_urls"], :root => "#{Dir.pwd}/#{Doozer::Configs.app["static_root"]}"} if Doozer::Configs.app
+	use Rack::Static, {:urls => Doozer::Configs.app["static_urls"], :root => "#{APP_PATH}/#{Doozer::Configs.app["static_root"]}"} if Doozer::Configs.app
 
 	use Rack::Session::Cookie, :key => 'rack.session',
 	                           :domain => '',
@@ -27,7 +28,7 @@ end
 
 #--stack additional rack apps
 begin
-	require "#{Dir.pwd}/config/rack"
+	require "#{APP_PATH}/config/rack"
 	stack()
 rescue => e
 	Doozer::Configs.logger.error(e)

data/lib/doozer/scripts/cluster.rb

@@ -92,18 +92,15 @@ def stop
 end
 
 opts = OptionParser.new("", 24, '  ') { |opts|
-  opts.banner = "Usage: script/clusters -C [command] -E [environment] -h"
-
+  opts.banner = "Usage: script/cluster -C [command] -E [environment] -h"
   opts.separator ""
   opts.separator "Command options:"
   opts.on("-C", "--command COMMAND", "start, stop, restart, or test") { | c |
     @command = c.downcase.to_sym
   }
-  
   opts.on("-E", "--env ENVIRONMENT", "default: development || deployment") { | e |
     @env = e.downcase.to_sym
   }
-  
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/lib/doozer/version.rb

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

data/lib/generator/generator.rb

@@ -433,6 +433,9 @@ Task - Create a task file in project/tasks with the class name of TaskName.
         system("mkdir #{name}/config")
         system("cp #{skeleton_path 'config/*.yml'} #{name}/config")
         system("cp #{skeleton_path 'config/*.rb'} #{name}/config")
+        
+        ## load boot.erb replace version number and save as boot.rb
+        
       else
         p "Skipping #{name}/config directory (already exists)"
       end

data/templates/skeleton/config/boot.rb

@@ -0,0 +1,11 @@
+DOOZER_GEM_VERSION='0.1.5'
+
+begin
+  require 'date'
+  require 'rubygems'
+  gem 'doozer', "= #{DOOZER_GEM_VERSION}"
+  require 'doozer'
+rescue Gem::LoadError
+  raise "Doozer #{DOOZER_GEM_VERSION} gem not installed"
+end
+

data/templates/skeleton/script/cluster

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/cluster')

data/templates/skeleton/script/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-require 'date'
 require 'irb'
-require 'rubygems'
-require 'doozer'
+APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
+
 @env = (ARGV.length > 0) ? ARGV[0] : 'development'
 ARGV.delete(@env) if ARGV.include?(@env)
 @env = @env.to_sym

data/templates/skeleton/script/migrate

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/migrate')

data/templates/skeleton/script/task

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/task')

data/templates/skeleton/script/test

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
-require DOOZER_PATH + '/doozer/scripts/test'
+require File.join(APP_PATH, 'config/boot')
+require File.join(DOOZER_PATH, 'doozer/scripts/test') 

data/test/project/config/boot.rb

@@ -0,0 +1,10 @@
+DOOZER_GEM_VERSION='0.1.5'
+
+begin
+  require 'date'
+  require 'rubygems'
+  gem 'doozer', "= #{DOOZER_GEM_VERSION}"
+  require 'doozer'
+rescue Gem::LoadError
+  raise "Doozer #{DOOZER_GEM_VERSION} gem not installed"
+end

data/test/project/script/cluster

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/cluster')

data/test/project/script/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-require 'date'
 require 'irb'
-require 'rubygems'
-require 'doozer'
+APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
+
 @env = (ARGV.length > 0) ? ARGV[0] : 'development'
 ARGV.delete(@env) if ARGV.include?(@env)
 @env = @env.to_sym

data/test/project/script/migrate

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/migrate')

data/test/project/script/task

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
+require File.join(APP_PATH, 'config/boot')
 require File.join(DOOZER_PATH, 'doozer/scripts/task')

data/test/project/script/test

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'date'
-require 'rubygems'
-require 'doozer'
 APP_PATH = Dir.pwd
-require DOOZER_PATH + '/doozer/scripts/test'
+require File.join(APP_PATH, 'config/boot')
+require File.join(DOOZER_PATH, 'doozer/scripts/test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grippy-doozer
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-09-04 00:00:00 -07:00
 default_executable: doozer
 dependencies: []
 
@@ -76,6 +76,7 @@ files:
 - templates/skeleton/app/views/index/index.html.erb
 - templates/skeleton/app/views/layouts/default.html.erb
 - templates/skeleton/config/app.yml
+- templates/skeleton/config/boot.rb
 - templates/skeleton/config/database.yml
 - templates/skeleton/config/environment.rb
 - templates/skeleton/config/rack.rb
@@ -104,6 +105,7 @@ files:
 - test/project/app/views/index/index.html.erb
 - test/project/app/views/layouts/default.html.erb
 - test/project/config/app.yml
+- test/project/config/boot.rb
 - test/project/config/database.yml
 - test/project/config/environment.rb
 - test/project/config/rack.rb
@@ -126,7 +128,6 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/grippy/doozer
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A little MVC framework for Rack applications.
@@ -156,6 +157,7 @@ test_files:
 - test/project/app/controllers/application_controller.rb
 - test/project/app/controllers/index_controller.rb
 - test/project/app/helpers/application_helper.rb
+- test/project/config/boot.rb
 - test/project/config/environment.rb
 - test/project/config/rack.rb
 - test/project/config/routes.rb