hazel 0.0.5 → 0.0.6

data/Gemfile

@@ -1,7 +1,8 @@
 source :rubygems
 
+gemspec
+
 group :development do
-  gem "bundler", "~> 1.1"
+  gem "rake", "~> 0.9"
+  gem "fakefs", "~> 0.4"
 end
-
-gem "thor", "~> 0.15.3"

data/Gemfile.lock

@@ -1,11 +1,21 @@
+PATH
+  remote: .
+  specs:
+    hazel (0.0.6)
+      thor (~> 0.16)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    thor (0.15.3)
+    minitest (4.2.0)
+    rake (0.9.2.2)
+    thor (0.16.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1)
-  thor (~> 0.15.3)
+  bundler (~> 1.2)
+  hazel!
+  minitest (~> 4.2)
+  rake (~> 0.9)

data/lib/hazel/cli.rb

@@ -10,6 +10,7 @@ module Hazel
 
     desc "Creates a new Sinatra application"
     argument :name, :type => :string, :desc => "The name of the new application"
+    class_option :capistrano, :type => :boolean, :desc => "Include Capistrano configuration"
     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"
@@ -82,6 +83,15 @@ module Hazel
       copy_file "README.md", File.join(@app_path, "README.md")
     end
 
+    def create_capistrano_config
+      if @capistrano
+        copy_file "Capfile", File.join(@app_path, "Capfile")
+        empty_directory File.join(@app_path, 'config/deploy')
+        template "config/deploy.rb", File.join(@app_path, "config/deploy.rb")
+        template "config/deploy/production.rb", File.join(@app_path, "config/deploy/production.rb")
+      end
+    end
+
     def create_db_config
       template("config/db.yml", File.join(@app_path, "config/db.yml")) unless @no_database
     end
@@ -101,22 +111,23 @@ module Hazel
     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}"
+        rvm_env = RVM::Environment.new(ENV['RUBY_VERSION'])
 
-        create_file(File.join(@app_path, '.rvmrc'), data)
-        run("rvm rvmrc trust #{@app_path}")
+        rvm_env.gemset_create(@app_path)
+        rvm_env.gemset_use(@app_path)
+
+        gemset = "#{ENV['RUBY_VERSION']}@#{@app_path}"
 
-        rvm_env = RVM::Environment.new(rvm_ruby)
+        create_file(File.join(@app_path, '.rvmrc'), "rvm use #{gemset}")
+        run("rvm rvmrc trust #{@app_path}")
 
         unless @no_bundle_install
           rvm_env.chdir(@app_path) do
-            say_status :installing, "All dependencies into #{rvm_ruby}"
+            say_status :installing, "All dependencies into #{gemset}"
             rvm_env.system "gem install bundler"
-            rvm_env.system "bundle install"
+            rvm_env.run_command 'bundle install'
           end
 
           @no_bundle_install = true

data/lib/hazel/version.rb

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

data/lib/templates/Capfile

@@ -0,0 +1,3 @@
+load 'deploy'
+Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'config/deploy'

data/lib/templates/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 # App Stack
-gem "sinatra", "~> 1.3.2"
+gem "sinatra", "~> 1.3"
 
 <% unless @no_database -%>
 # Database Stack
@@ -25,10 +25,17 @@ gem "mongodb_model", "~> 2.1"
 gem "hiredis", "~> 0.4"
 gem "redis", "~> 3.0", :require => ["redis/connection/hiredis", "redis"]
 gem "fakeredis", "~> 0.4"
-<% end -%>
 
+<% end -%>
 group :development do
   gem "rake", "~> 0.9"
-  gem "minitest", "~> 3.2"
+  gem "minitest", "~> 4.2"
   gem "rack-test", "~> 0.6"
+<% if @capistrano -%>
+  gem "capistrano", "~> 2.13"
+  gem "capistrano-ext", "~> 1.2"
+<% if @rvm_gemset -%>
+  gem "rvm-capistrano", "~> 1.2"
+<% end -%>
+<% end -%>
 end

data/lib/templates/Rakefile

@@ -7,14 +7,6 @@ Rake::TestTask.new(:spec) do |t|
   t.ruby_opts = ['-rubygems'] if defined? Gem
 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"

data/lib/templates/app.rb

@@ -3,9 +3,6 @@ class <%= @name.camel_case %> < Sinatra::Base
   set :public_folder => "public", :static => true
 
   get "/" do
-    @version     = RUBY_VERSION
-    @environment = ENV['RACK_ENV']
-
     erb :welcome
   end
 end

data/lib/templates/config/deploy.rb

@@ -0,0 +1,87 @@
+<% if @rvm_gemset -%>
+require "rvm/capistrano"
+
+set :rvm_ruby_string, "ruby-1.9.3"
+set :rvm_type, :system
+
+<% end -%>
+require "bundler/capistrano"
+require "capistrano/ext/multistage"
+
+#############################################################
+# Stages
+#############################################################
+
+set :default_stage, "production"
+set :stages, %w(production)
+
+#############################################################
+# Application
+#############################################################
+
+set :application, "<%= @name %>"
+set :deploy_to, "/var/www/apps/#{application}"
+set :keep_releases, 2
+
+after "deploy:update", "deploy:cleanup"
+
+#############################################################
+# Settings
+#############################################################
+
+set :user, "deploy"
+set :use_sudo, false
+
+ssh_options[:forward_agent] = true
+
+#############################################################
+# Git
+#############################################################
+
+set :scm, :git
+set :deploy_via, :remote_cache
+
+set :repository, "git@github.com:/GITHUB_USER/#{application}.git"
+
+namespace :deploy do
+  task :set_branch do
+    set(:branch) { Capistrano::CLI.ui.ask("Branch to deploy (or press ENTER to deploy from master): ") }
+
+    if branch.empty?
+      set :branch, "master"
+    end
+  end
+
+  before "deploy:update" , "deploy:set_branch"
+end
+
+<% if @rvm_gemset -%>
+#############################################################
+# RVM
+#############################################################
+
+after "deploy", "rvm:trust_rvmrc"
+
+namespace :rvm do
+  task :trust_rvmrc do
+    run "rvm rvmrc trust #{current_release}"
+    run "rvm rvmrc trust /var/www/apps/#{application}/current"
+  end
+end
+
+<% end -%>
+#############################################################
+# Passenger
+#############################################################
+
+namespace :deploy do
+  task :start do
+  end
+
+  task :stop do
+  end
+
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    run "touch #{File.join(current_path,'tmp','restart.txt')}"
+  end
+end

data/lib/templates/config/deploy/production.rb

@@ -0,0 +1,3 @@
+role :web, "<%= @name %>.tld"
+role :app, "<%= @name %>.tld"
+role :db,  "<%= @name %>.tld", :primary => true

data/lib/templates/views/welcome.erb

@@ -9,8 +9,8 @@
 <div class="sidebar">
   <h3>Environment</h3>
   <ul>
-    <li><b>Ruby:</b> <%= @version %></li>
-    <li><b>Environment:</b> <%= @environment %></li>
+    <li><b>Ruby:</b> <%= RUBY_VERSION %></li>
+    <li><b>Environment:</b> <%= ENV["RACK_ENV"] %></li>
     <li><b>Server:</b> <%= @env["SERVER_SOFTWARE"] %></li>
     <li><b>Port:</b> <%= @env["SERVER_PORT"] %></li>
   </ul>

data/spec/hazel/cli_spec.rb

@@ -0,0 +1,15 @@
+require 'fakefs'
+require_relative "../spec_helper"
+require_relative "../../lib/hazel/cli"
+
+describe Hazel::VERSION do
+  subject { Hazel::CLI }
+
+  describe "source_root" do
+    it "should return with a full path" do
+      pwd           = File.dirname(__FILE__)
+      template_path = pwd.sub 'spec/hazel', 'lib/templates'
+      subject.source_root.must_equal template_path
+    end
+  end
+end

data/spec/hazel/version_spec.rb

@@ -0,0 +1,27 @@
+require_relative "../spec_helper"
+require_relative "../../lib/hazel/version"
+
+describe Hazel::VERSION do
+  subject { Hazel::VERSION }
+
+  let(:major)  { subject::MAJOR  }
+  let(:minor)  { subject::MINOR  }
+  let(:tiny)   { subject::TINY   }
+  let(:string) { subject::STRING }
+
+  it "should have a major version" do
+    major.must_be_kind_of Fixnum
+  end
+
+  it "should have a minor version" do
+    minor.must_be_kind_of Fixnum
+  end
+
+  it "should have a tiny version" do
+    tiny.must_be_kind_of Fixnum
+  end
+
+  it "should have a string representation of the version number" do
+    string.must_equal "#{major}.#{minor}.#{tiny}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hazel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70344124506980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: '0.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70344124506980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70344124505380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70344124505380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: Hazel is a generator for Sinatra apps, heavily based on snfn
 email: peter@c7.se
 executables:
@@ -44,7 +70,10 @@ files:
 - lib/hazel/cli.rb
 - lib/hazel/version.rb
 - lib/templates/app.rb
+- lib/templates/Capfile
 - lib/templates/config/db.yml
+- lib/templates/config/deploy/production.rb
+- lib/templates/config/deploy.rb
 - lib/templates/config/initializers/database.rb
 - lib/templates/config/initializers/redis.rb
 - lib/templates/config/redis.yml
@@ -62,6 +91,8 @@ files:
 - lib/templates/views/welcome.erb
 - lib/templates/public/images/.gitkeep
 - lib/templates/public/javascripts/.gitkeep
+- spec/hazel/cli_spec.rb
+- spec/hazel/version_spec.rb
 - spec/spec_helper.rb
 - spec/string_extension_spec.rb
 - Gemfile
@@ -69,8 +100,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- !binary |-
-  YmluL2hhemVs
+- bin/hazel
 homepage: http://c7.github.com/hazel/
 licenses:
 - MIT-LICENSE
@@ -92,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple Sinatra app generator.