hazel 0.0.3 → 0.0.4

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1"
 end
 
 gem "thor", "~> 0.14.6"

data/Gemfile.lock

@@ -7,5 +7,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.1)
   thor (~> 0.14.6)

data/README.md

@@ -2,6 +2,8 @@
 
 A simple Sinatra app generator, heavily based on [snfn](https://github.com/zachpendleton/snfn).
 
+![Using Hazel](http://c7.github.com/hazel/images/using_hazel.gif)
+
 ## Installation
 
     gem install hazel

data/lib/extensions/string.rb

@@ -15,15 +15,16 @@ module Hazel
         self.replace camel_case
       end
 
-      def file_name
-        return self.gsub(/-/, "_") if !match(/[A-Z]/)
-        altered_self = self.strip
-
-        altered_self.scan(/[A-Z]/).each do |match|
-          altered_self.gsub!(match, "_#{match.downcase}")
-        end
+      def directory_name
+        self.downcase.gsub(/[^a-z|\-|\_]/, '')
+      end
 
-        altered_self.sub(/^_/, "").gsub(/_{2,}+/, "_").downcase
+      def file_name
+        self.gsub(/[\-| ]/, '_').
+             gsub(/([A-Z]+|[A-Z][a-z])/) { |x| "_#{x}" }.
+             sub(/^_/, "").
+             gsub(/_{2,}+/, "_").
+             downcase
       end
 
       def file_name!

data/lib/hazel/cli.rb

@@ -13,12 +13,15 @@ module Hazel
     class_option :database, :aliases => "-d", :default => "sqlite", :desc => "The type of database to use"
     class_option :no_database, :type => :boolean, :desc => "Exclude all database configuration files"
     class_option :redis, :type => :boolean, :desc => "Include Redis configuration"
+    class_option :rvm_gemset, :type => :boolean, :desc => "Create a new RVM Gemset under the current Ruby"
     class_option :no_bundle_install, :type => :boolean, :desc => "Don’t run bundle install after generating the app"
     class_option :no_git_repo, :type => :boolean, :desc => "Don’t initialize a Git repository"
 
     # Creates instance variables from options passed to hazel.
     def setup
-      @name = @app_path = name.file_name
+      @app_path = name.directory_name
+      @name     = name.file_name
+
       options.each do |key, value|
         instance_variable_set "@#{key.to_s}".to_sym, value
       end
@@ -95,14 +98,40 @@ module Hazel
       template("config/initializers/redis.rb", File.join(@app_path, "config/initializers/redis.rb")) if @redis
     end
 
+    def create_rvm_gemset
+      if @rvm_gemset
+        rvm_path = File.expand_path(ENV['rvm_path'] || '~/.rvm')
+        $LOAD_PATH.unshift File.join(rvm_path, 'lib')
+        require 'rvm'
+
+        rvm_ruby = "#{ENV['RUBY_VERSION']}@#{@app_path}"
+        data = "rvm --create use #{rvm_ruby}"
+
+        create_file(File.join(@app_path, '.rvmrc'), data)
+        run("rvm rvmrc trust #{@app_path}")
+
+        rvm_env = RVM::Environment.new(rvm_ruby)
+
+        unless @no_bundle_install
+          rvm_env.chdir(@app_path) do
+            puts "\n      Installing dependencies into #{rvm_ruby}\n\n"
+            rvm_env.system "gem install bundler"
+            rvm_env.system "bundle install"
+          end
+
+          @no_bundle_install = true
+        end
+      end
+    end
+
     def install_dependencies
-      inside(@name) do
+      inside(@app_path) do
         run('bundle install') unless @no_bundle_install
       end
     end
 
     def initialize_git_repo
-      inside(@name) do
+      inside(@app_path) do
         run('git init .') unless @no_git_repo
       end
     end

data/lib/hazel/version.rb

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

data/lib/templates/Gemfile

@@ -27,6 +27,7 @@ gem "redis", "~> 2.2", :require => ["redis/connection/hiredis", "redis"]
 <% end -%>
 
 group :development do
+  gem "rake", "~> 0.9.2"
   gem "minitest", "~> 2.10"
   gem "rack-test", "~> 0.6.1"
 end

data/spec/string_extension_spec.rb

@@ -45,4 +45,9 @@ describe String do
   it "should_underscore_a_string_with_a_hyphen_preceding_a_capital_letter" do
     "my_App".file_name.must_equal "my_app"
   end
+
+  it "should allow dashes in directory names, but not in filenames" do
+    "my-App".directory_name.must_equal "my-app"
+    "my-App".file_name.must_equal "my_app"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hazel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70323813142520 !ruby/object:Gem::Requirement
+  requirement: &70174817115060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,18 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70323813142520
+  version_requirements: *70174817115060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70323813142020 !ruby/object:Gem::Requirement
+  requirement: &70174817114020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70323813142020
+  version_requirements: *70174817114020
 description: Hazel is a generator for Sinatra apps, heavily based on snfn
 email: peter@c7.se
 executables:
@@ -51,10 +51,8 @@ files:
 - lib/templates/config.ru
 - lib/templates/Gemfile
 - lib/templates/public/favicon.ico
-- lib/templates/public/images/.gitkeep
 - lib/templates/public/images/hazel_icon.png
 - lib/templates/public/images/hazel_small.png
-- lib/templates/public/javascripts/.gitkeep
 - lib/templates/public/stylesheets/main.css
 - lib/templates/Rakefile
 - lib/templates/README.md
@@ -62,6 +60,8 @@ files:
 - lib/templates/spec/spec_helper.rb
 - lib/templates/views/layout.erb.tt
 - lib/templates/views/welcome.erb
+- lib/templates/public/images/.gitkeep
+- lib/templates/public/javascripts/.gitkeep
 - spec/spec_helper.rb
 - spec/string_extension_spec.rb
 - Gemfile
@@ -69,7 +69,8 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- bin/hazel
+- !binary |-
+  YmluL2hhemVs
 homepage: http://c7.github.com/hazel/
 licenses:
 - MIT-LICENSE
@@ -91,8 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A simple Sinatra app generator.
 test_files: []
+has_rdoc: