hazel 0.0.4 → 0.0.5

data/Gemfile

@@ -4,4 +4,4 @@ group :development do
   gem "bundler", "~> 1.1"
 end
 
-gem "thor", "~> 0.14.6"
+gem "thor", "~> 0.15.3"

data/Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    thor (0.14.6)
+    thor (0.15.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.1)
-  thor (~> 0.14.6)
+  thor (~> 0.15.3)

data/README.md

@@ -13,6 +13,7 @@ A simple Sinatra app generator, heavily based on [snfn](https://github.com/zachp
 *  `-d` Database. Options are "postgres," "mysql," "sqlite", and "mongo."
    Default is "sqlite."
 *  `--redis` Include Redis configuration options.
+* `--rvm-gemset` Create a new RVM Gemset under the current Ruby
 * `--no-database` Don't include any database config options.
 * `--no-bundle-install` Don’t run bundle install after generating the app
 * `--no-git-repo` Don’t initialize a Git repository
@@ -31,6 +32,10 @@ App using MongoDB and Redis, but don’t run bundle install.
 
     hazel my_app -d mongo --redis --no-bundle-install
 
+App using Redis, a RVM Gemset, but no database or Git repo
+
+    hazel my_app --redis --rvm-gemset --no-database --no-git-repo
+
 ## Architecture
 
 The template autoloads files in config/initializers and
@@ -41,7 +46,7 @@ and are loaded via `config/initializers/database.rb`.
 
 [Sequel](http://sequel.rubyforge.org) is used as an ORM for
 relational databases, and migrations are stored in db/migrate.
-Migrations can be run using the rake command `rake rb:migrate`.
+Migrations can be run using the rake command `rake db:migrate`.
 
 [mongodb_model](https://github.com/alexeypetrushin/mongodb_model)
 is used for Mongo apps, with the config options

data/lib/hazel/cli.rb

@@ -75,7 +75,7 @@ module Hazel
     end
 
     def create_rakefile
-      copy_file "Rakefile", File.join(@app_path, "Rakefile")
+      template "Rakefile", File.join(@app_path, "Rakefile")
     end
 
     def create_readme
@@ -114,7 +114,7 @@ module Hazel
 
         unless @no_bundle_install
           rvm_env.chdir(@app_path) do
-            puts "\n      Installing dependencies into #{rvm_ruby}\n\n"
+            say_status :installing, "All dependencies into #{rvm_ruby}"
             rvm_env.system "gem install bundler"
             rvm_env.system "bundle install"
           end

data/lib/hazel/version.rb

@@ -2,7 +2,7 @@ module Hazel
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/templates/Gemfile

@@ -15,7 +15,7 @@ gem "pg"
 <% elsif @database == "mysql" -%>
 gem "mysql2"
 <% elsif @database == "mongo" -%>
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.6"
 gem "mongodb_model", "~> 2.1"
 <% end -%>
 <% end -%>
@@ -23,11 +23,12 @@ gem "mongodb_model", "~> 2.1"
 <% if @redis -%>
 # Redis
 gem "hiredis", "~> 0.4"
-gem "redis", "~> 2.2", :require => ["redis/connection/hiredis", "redis"]
+gem "redis", "~> 3.0", :require => ["redis/connection/hiredis", "redis"]
+gem "fakeredis", "~> 0.4"
 <% end -%>
 
 group :development do
-  gem "rake", "~> 0.9.2"
-  gem "minitest", "~> 2.10"
-  gem "rack-test", "~> 0.6.1"
+  gem "rake", "~> 0.9"
+  gem "minitest", "~> 3.2"
+  gem "rack-test", "~> 0.6"
 end

data/lib/templates/Rakefile

@@ -5,9 +5,17 @@ task :default => :spec
 Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList['spec/*_spec.rb']
   t.ruby_opts = ['-rubygems'] if defined? Gem
-  t.ruby_opts << '-I.'
 end
 
+task :kicker do
+  exec 'kicker -r ruby -e "clear && bundle exec rake" spec lib'
+end
+
+task :sass do
+  exec 'sass --watch --scss --style compressed sass/main.scss:public/stylesheets/main.css'
+end
+
+<% unless @no_database -%>
 namespace :db do
   desc "Run all migrations in db/migrate"
   task :migrate => :connect do
@@ -19,13 +27,4 @@ namespace :db do
     require "./config/initializers/database"
   end
 end
-
-task :environment, [:env] do |cmd, args|
-  Bundler.require
-  ENV['RACK_ENV'] = args[:env] || "development"
-  %w{ ./config/initializers ./lib }.each do
-    Find.find(lib) { |f| require f unless f.match(/\/\..+$/) || File.directory?(f) }
-  end
-end
-
-
+<%end%>

data/lib/templates/config/initializers/redis.rb

@@ -1,3 +1,5 @@
 # Redis Configuration
-redis_settings = YAML::load_file("config/redis.yml")
-REDIS = Redis.new(redis_settings[ENV['RACK_ENV']])
+unless ENV['RACK_ENV'] == 'test'
+  redis_settings = YAML::load_file("config/redis.yml")
+  REDIS = Redis.new(redis_settings[ENV['RACK_ENV']])
+end

data/lib/templates/spec/spec_helper.rb

@@ -5,10 +5,21 @@ require 'bundler'
 Bundler.setup
 Bundler.require
 
+ENV["RACK_ENV"] = "test"
+
 require 'minitest/pride'
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'rack/test'
+<% if @redis %>
+require 'fakeredis'
+REDIS = Redis.new
+<% end %>
+
+require "find"
+%w{./config/initializers ./lib}.each do |load_path|
+  Find.find(load_path) { |f| require f if f.match(/\.rb$/) }
+end
 
 class MiniTest::Spec
   include Rack::Test::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hazel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70174817115060 !ruby/object:Gem::Requirement
+  requirement: &70344124506980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70174817115060
+  version_requirements: *70344124506980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174817114020 !ruby/object:Gem::Requirement
+  requirement: &70344124505380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70174817114020
+  version_requirements: *70344124505380
 description: Hazel is a generator for Sinatra apps, heavily based on snfn
 email: peter@c7.se
 executables: