classiccms 0.3.7 → 0.3.8

data/lib/classiccms/application.rb

@@ -70,8 +70,9 @@ module Classiccms
 
     #from gem
     #require resque
-    Resque.redis = YAML.load_file(File.join(ROOT, 'resque.yml'))[ENV['RACK_ENV']]
-    Resque.redis.namespace = CONFIG[:database]
+    redis_conf = YAML.load_file(File.join(Dir.pwd, 'config/redis.yml'))[ENV['RACK_ENV']]
+    Resque.redis = redis_conf['host']
+    Resque.redis.namespace = redis_conf['database']
 
     #require helpers
     require File.join(File.dirname(__FILE__), 'helpers.rb')

data/lib/classiccms/cli.rb

@@ -29,6 +29,12 @@ module Classiccms
           f.puts mongoid
         end
 
+        #replace database name
+        redis = File.read(File.join(Dir.pwd, app_name, 'config/redis.yml')).gsub('$', app_name)
+        File.open(File.join(Dir.pwd, app_name, 'config/redis.yml'), 'w') do |f|
+          f.puts redis
+        end
+
         puts "#{app_name} created!"
       end
     end

data/lib/classiccms/scaffold/config/redis.yml

@@ -0,0 +1,9 @@
+development:
+  host: localhost:6379
+  database: $_development
+test:
+  host: localhost:6379
+  database: $_test
+production:
+  host: localhost:6379
+  database: $

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -362,7 +362,6 @@ files:
 - lib/classiccms/models/slug.rb
 - lib/classiccms/models/uploader.rb
 - lib/classiccms/models/user.rb
-- lib/classiccms/mongoid.rb
 - lib/classiccms/public/css/fonts.sass
 - lib/classiccms/public/css/icons.sass
 - lib/classiccms/public/css/images.sass
@@ -1144,7 +1143,6 @@ files:
 - lib/classiccms/public/js/uploadify/uploadify.css
 - lib/classiccms/public/js/uploadify/uploadify.swf
 - lib/classiccms/public/js/uploadifyLang_en.js
-- lib/classiccms/resque.yml
 - lib/classiccms/scaffold/.gitignore
 - lib/classiccms/scaffold/Gemfile
 - lib/classiccms/scaffold/Rakefile
@@ -1156,6 +1154,7 @@ files:
 - lib/classiccms/scaffold/config/application.rb
 - lib/classiccms/scaffold/config/config.yml
 - lib/classiccms/scaffold/config/mongoid.yml
+- lib/classiccms/scaffold/config/redis.yml
 - lib/classiccms/scaffold/public/favicon.ico
 - lib/classiccms/scaffold/public/javascripts/index.coffee
 - lib/classiccms/scaffold/public/stylesheets/reset.sass

data/lib/classiccms/mongoid.rb

@@ -1 +0,0 @@
-

data/lib/classiccms/resque.yml

@@ -1,3 +0,0 @@
-development: localhost:6379
-test: localhost:6379
-development: localhost:6379