hazel 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 476c2c8050f244f6be328c559ee19625c12795a1
-  data.tar.gz: fd4dcc8d2d27ea9ed0c9b467afc349f6fbb4a457
+  metadata.gz: 55a61a6e65125bc65a4d3f6e2c550fa1bfdcea0a
+  data.tar.gz: d83d2631b83a726ef444fb1d0df13a357975d268
 SHA512:
-  metadata.gz: fccc8651a3af90178da451378b0840d0a5a89055fb4079ad2f6a62c4dc6478013ce6f835ad2265af06515364512f7da84c2702f88e9490371b24167e7fc5c8de
-  data.tar.gz: 6dfd2038ecc138c85d8242656ea8c44371ba9257e39f750fdeae8661bdc11acf4fc47f7a0c981f3c735c4c1b9f7ddc13336e0e1f496413e55b4a18ada9d526f3
+  metadata.gz: d8758ab8dcf73792e56b551a5310c65151d42717027bcc946853ea9029f4f9ff18b9c917086f80c5045c35160098ad935632857c810cb75929c213b5c9b03941
+  data.tar.gz: 2a437308acb55c714ec8f0745809ea2dc73677cc0dc9654e11e13bfb06163e99b8537323de2205673d35603c128e0d078d12b657c5a1b2bd0a1b0270e17509d5

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    hazel (0.0.7)
-      thor (~> 0.17)
+    hazel (0.0.8)
+      thor (~> 0.18)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    fakefs (0.4.2)
-    minitest (4.6.2)
-    rake (10.0.3)
-    thor (0.17.0)
+    fakefs (0.4.3)
+    minitest (5.2.0)
+    rake (10.1.1)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (~> 1.5.1)
   fakefs (~> 0.4)
   hazel!
-  minitest (~> 4.6)
+  minitest (~> 5.2)
   rake (~> 10.0)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Peter Hellberg
+Copyright (c) 2014 Peter Hellberg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,14 +10,13 @@ A simple Sinatra app generator, heavily based on [snfn](https://github.com/zachp
 
 ## Configuration
 
-* `--capistrano` Include Capistrano configuration
-*  `-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
+* `--capistrano` Include Capistrano
+* `-d` Database. Options are "postgres," "mysql," "sqlite", and "mongo."
+   Default is ""
+* `--redis` Include Redis configuration options.
+* `--rvm` Create .ruby-version (ruby-2.1.0) and .ruby-gemset
+* `--bundle` Run bundle after generating the app
+* `--git` Initialize a Git repository
 
 ## Example
 
@@ -29,13 +28,13 @@ App using MySQL and Redis.
 
     hazel my_app -d mysql --redis
 
-App using MongoDB and Redis, but don’t run bundle install.
+App using MongoDB and Redis, then run bundle install.
 
-    hazel my_app -d mongo --redis --no-bundle-install
+    hazel my_app -d mongo --redis --bundle
 
-App using Redis, a RVM Gemset, but no database or Git repo
+App using Redis, RVM, and Git repo
 
-    hazel my_app --redis --rvm-gemset --no-database --no-git-repo
+    hazel my_app --redis --rvm --git-repo
 
 ## Architecture
 
@@ -61,8 +60,8 @@ and `config/initializers/database.rb`).
 
 ## License
 
-    Copyright (c) 2013 Peter Hellberg
-    
+    Copyright (c) 2014 Peter Hellberg
+
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
@@ -70,10 +69,10 @@ and `config/initializers/database.rb`).
     distribute, sublicense, and/or sell copies of the Software, and to
     permit persons to whom the Software is furnished to do so, subject to
     the following conditions:
-    
+
     The above copyright notice and this permission notice shall be
     included in all copies or substantial portions of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/Rakefile

@@ -1,5 +1,7 @@
 # encoding: utf-8
-require 'rake/testtask'
+
+require "rake/testtask"
+require "bundler/gem_tasks"
 
 Rake::TestTask.new(:spec) do |test|
   test.libs << 'lib' << 'spec'

data/lib/hazel/cli.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 
-require "rubygems"
 require "extensions/string"
 require "thor/group"
 
@@ -11,12 +10,11 @@ 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 :database, :aliases => "-d", :default => "", :desc => "The type of database to use"
     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"
+    class_option :rvm, :type => :boolean, :desc => "Create .ruby-version (ruby-2.1.0) and .ruby-gemset"
+    class_option :bundle, :type => :boolean, :desc => "Run bundle after generating the app"
+    class_option :git, :type => :boolean, :desc => "Initialize a Git repository"
 
     # Creates instance variables from options passed to hazel.
     def setup
@@ -34,11 +32,11 @@ module Hazel
 
     # Create empty directories
     def create_empty_directories
-      %w{config/initializers lib log tmp spec}.each do |dir|
+      %w{config/initializers lib spec}.each do |dir|
         empty_directory File.join(@app_path, dir)
       end
 
-      empty_directory File.join(@app_path, 'db/migrate') unless @no_database
+      empty_directory File.join(@app_path, 'db/migrate') unless @database.empty?
 
       create_file File.join(@app_path, "lib", ".gitkeep")
     end
@@ -83,21 +81,12 @@ 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
+      template("config/db.yml", File.join(@app_path, "config/db.yml")) unless @database.empty?
     end
 
     def create_database_initializer
-      template("config/initializers/database.rb", File.join(@app_path, "config/initializers/database.rb")) unless @no_database
+      template("config/initializers/database.rb", File.join(@app_path, "config/initializers/database.rb")) unless @database.empty?
     end
 
     def create_redis_config
@@ -108,42 +97,33 @@ 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')
-        require 'rvm'
-
-        rvm_env = RVM::Environment.new(ENV['RUBY_VERSION'])
-
-        rvm_env.gemset_create(@app_path)
-        rvm_env.gemset_use(@app_path)
-
-        gemset = "#{ENV['RUBY_VERSION']}@#{@app_path}"
-
-        create_file(File.join(@app_path, '.rvmrc'), "rvm use #{gemset}")
-        run("rvm rvmrc trust #{@app_path}")
+    def create_capistrano_config
+      if @capistrano
+        inside(@app_path) do
+          run('cap install')
+        end
+      end
+    end
 
-        unless @no_bundle_install
-          rvm_env.chdir(@app_path) do
-            say_status :installing, "All dependencies into #{gemset}"
-            rvm_env.system "gem install bundler"
-            rvm_env.run_command 'bundle install'
-          end
+    def create_rvm_gemset
+      if @rvm
+        create_file(File.join(@app_path, '.ruby-version'), 'ruby-2.1.0')
+        create_file(File.join(@app_path, '.ruby-gemset'), @app_path)
 
-          @no_bundle_install = true
-        end
+        @bundle = false
+        puts "You need to run 'bundle install' manually."
       end
     end
 
-    def install_dependencies
+    def initialize_git_repo
       inside(@app_path) do
-        run('bundle install') unless @no_bundle_install
+        run('git init .') if @git
       end
     end
 
-    def initialize_git_repo
+    def install_dependencies
       inside(@app_path) do
-        run('git init .') unless @no_git_repo
+        run('bundle') if @bundle
       end
     end
   end

data/lib/hazel/version.rb

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

data/lib/templates/Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org/"
 
 # App Stack
-gem "sinatra", "~> 1.3"
+gem "sinatra", "~> 1.4"
 
-<% unless @no_database -%>
+<% unless @database.empty? -%>
 # Database Stack
 <% unless @database == 'mongo' -%>
 gem "sequel"
@@ -29,13 +29,12 @@ gem "fakeredis", "~> 0.4"
 <% end -%>
 group :development do
   gem "rake", "~> 10.0"
-  gem "minitest", "~> 4.6"
+  gem "minitest", "~> 5.2"
   gem "rack-test", "~> 0.6"
 <% if @capistrano -%>
-  gem "capistrano", "~> 2.14"
-  gem "capistrano-ext", "~> 1.2"
+  gem "capistrano", "~> 3.0"
 <% if @rvm_gemset -%>
-  gem "rvm-capistrano", "~> 1.2"
+  gem "capistrano-rvm"
 <% end -%>
 <% end -%>
 end

data/lib/templates/Rakefile

@@ -1,13 +1,12 @@
-%w{ rubygems bundler find rake/testtask}.each { |lib| require lib }
+%w{ bundler find rake/testtask}.each { |lib| require lib }
 
 task :default => :spec
 
 Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList['spec/*_spec.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-<% unless @no_database -%>
+<% unless @database.empty? -%>
 namespace :db do
   desc "Run all migrations in db/migrate"
   task :migrate => :connect do

data/lib/templates/config.ru

@@ -1,13 +1,16 @@
 # Load path and gems/bundler
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-require "rubygems"
+
 require "bundler"
 Bundler.require
 
 # Local config
 require "find"
+
 %w{config/initializers lib}.each do |load_path|
-  Find.find(load_path) { |f| require f unless f.match(/\/\..+$/) || File.directory?(f) }
+  Find.find(load_path) { |f|
+    require f unless f.match(/\/\..+$/) || File.directory?(f)
+  }
 end
 
 # Load app

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

@@ -1,4 +1,4 @@
-<% unless @no_database -%>
+<% unless @database.empty? -%>
 require "yaml"
 settings = YAML::load_file("config/db.yml")
 <% if @database != 'mongo' -%>

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
 # encoding: UTF-8
 
-require 'minitest/pride'
-require 'minitest/spec'
 require 'minitest/autorun'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hazel
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter Hellberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.2'
 description: Hazel is a generator for Sinatra apps, heavily based on snfn
 email: peter@c7.se
 executables:
@@ -59,41 +59,38 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
+- MIT-LICENSE
+- README.md
+- Rakefile
+- bin/hazel
 - lib/extensions/string.rb
 - lib/hazel/cli.rb
 - lib/hazel/version.rb
+- lib/templates/Gemfile
+- lib/templates/README.md
+- lib/templates/Rakefile
 - lib/templates/app.rb
-- lib/templates/Capfile
+- lib/templates/config.ru
 - 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
-- 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
 - lib/templates/spec/app_spec.rb
 - 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/hazel/cli_spec.rb
 - spec/hazel/version_spec.rb
 - spec/spec_helper.rb
 - spec/string_extension_spec.rb
-- Gemfile
-- Gemfile.lock
-- MIT-LICENSE
-- README.md
-- Rakefile
-- bin/hazel
 homepage: http://c7.github.com/hazel/
 licenses:
 - MIT-LICENSE
@@ -104,19 +101,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A simple Sinatra app generator.
 test_files: []
-has_rdoc: 

data/lib/templates/Capfile

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

data/lib/templates/config/deploy.rb

@@ -1,87 +0,0 @@
-<% 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

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