hoboken 0.0.1.beta2 → 0.0.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93ed494dde1289a45fcfb75ffa80285d0995020
-  data.tar.gz: cd9319eef83037bf07083d0cc0740fc94fc0b415
+  metadata.gz: 92e42c10869f91d6dd97bc1f6445bfc441ba7c3f
+  data.tar.gz: 28fdbb0fd176c28fce090ab5c08694f579cbe3d6
 SHA512:
-  metadata.gz: 2b4f2c2ccccb2ac0fecd1e76236fe52669478facb48a61d0791ab574fac940001e0dfa7f3b9127d4436d3b323010968432a86e72cb4844df6bce31cb405bb2f0
-  data.tar.gz: 6019310cb5cdb8005948b4ed8a9b5fc275a2c927ba40a771a9c3a72fa13881db4891339964b67f2f87c3a95aef779d308e743161d8959cf4437d3155bd19c645
+  metadata.gz: e9084680cea5d0f1a2cb8c9bb56187bfc16a6f769269aa7d196635fe94e49ada236894b74e3e69f3b94b10f3a3ccde046e262c16fdffbd702c83384f4e61eb65
+  data.tar.gz: d4e6120ee3d411dff96b3c6cf8374571d79e2175591fc3b2f7ce8166dc9dfa60ae477758c73198f87371ad15a1439bc8060a4c64314c46fde9b5e0330b9ef724

data/README.md

@@ -1,12 +1,13 @@
 # Hoboken
 
+[![Gem Version](https://badge.fury.io/rb/hoboken.png)](http://badge.fury.io/rb/hoboken)
 [![Dependency Status](https://gemnasium.com/bnadlerjr/hoboken.png)](https://gemnasium.com/bnadlerjr/hoboken)
 
 Generate Sinatra project templates.
 
 ## Installation
 
-    $ gem install hoboken
+    $ gem install hoboken --pre
 
 ## Usage
 
@@ -42,6 +43,7 @@ Additional generators are available for existing projects generated using Hoboke
     $ hoboken add:i18n             # Internationalization support using sinatra-r18n
     $ hoboken add:metrics          # Add metrics (flog, flay, simplecov)
     $ hoboken add:omniauth         # OmniAuth authentication (allows you to select a provider)
+    $ hoboken add:sequel           # Database access via Sequel gem
     $ hoboken add:sprockets        # Rack-based asset packaging system
 
 ## Contributing

data/Rakefile

@@ -1,11 +1,18 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => "test:unit"
+task :default => "test:all"
 
 namespace :test do
-  Rake::TestTask.new(:unit) do |t|
-    t.libs << 'test/unit'
-    t.test_files = Dir["test/unit/**/*_test.rb"]
+  types = %w(unit integration)
+
+  types.each do |type|
+    Rake::TestTask.new(type.to_sym) do |t|
+      t.libs << "test/#{type}"
+      t.test_files = Dir["test/#{type}/**/*_test.rb"]
+    end
   end
+
+  desc "Run all tests"
+  task :all => types.map { |s| "test:#{s}" }
 end

data/lib/hoboken.rb

@@ -6,6 +6,99 @@ require_relative "hoboken/generate"
 require_relative "hoboken/actions"
 
 module Hoboken
+  class Group < Thor::Group
+    include Thor::Actions
+    include Hoboken::Actions
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+  end
+
+  class Sequel < Thor::Group
+    include Thor::Actions
+    include Hoboken::Actions
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def add_gems
+      gem "sequel", "4.6.0"
+      gem "sqlite3", "1.3.8", group: [:development, :test]
+    end
+
+    def setup_directories
+      empty_directory("db/migrate")
+      empty_directory("tasks")
+    end
+
+    def copy_rake_task
+      copy_file("hoboken/templates/sequel.rake", "tasks/sequel.rake")
+    end
+
+    def setup_database_connection_in_rackup_file
+      insert_into_file("config.ru", after: /require "bundler\/setup"/) do
+        "\nrequire \"logger\"\nrequire \"sequel\""
+      end
+
+      app_name = File.open("config.ru").grep(/run.+/).first.chomp.gsub("run ", "")
+
+      gsub_file("config.ru", /run #{app_name}/) do
+<<CODE
+
+db = Sequel.connect(ENV["DATABASE_URL"], loggers: [Logger.new($stdout)])
+Sequel.extension :migration
+Sequel::Migrator.check_current(db, "db/migrate") if Dir.glob("db/migrate/*.rb").size > 0
+
+app = #{app_name}
+app.set :database, db
+run app
+CODE
+      end
+    end
+
+    def add_database_test_helper_class
+      insert_into_file("test/test_helper.rb", after: /require "test\/unit"/) do
+        "\nrequire \"sequel\""
+      end
+
+      append_file("test/test_helper.rb") do
+<<CODE
+
+module Test::Database
+  class TestCase < Test::Unit::TestCase
+    def run(*args, &block)
+      result = nil
+      database.transaction(rollback: :always) { result = super }
+      result
+    end
+
+    private
+
+    def database
+      @database ||= Sequel.sqlite.tap do |db|
+        Sequel.extension :migration
+        Sequel::Migrator.run(db, 'db/migrate') if Dir.glob("db/migrate/*.rb").size > 0
+      end
+    end
+  end
+end
+CODE
+      end
+    end
+
+    def reminders
+      say "\nGemfile updated... don't forget to 'bundle install'"
+      say <<TEXT
+
+Notes:
+* The sqlite3 gem has been installed for dev and test environments only. You will need to specify a gem to use for production.
+* You will need to specify an environment variable 'DATABASE_URL' (either add it to .env or export it)
+TEXT
+    end
+  end
+
   class OmniAuth < Thor::Group
     include Thor::Actions
     include Hoboken::Actions
@@ -116,223 +209,10 @@ CODE
     end
   end
 
-  class Sprockets < Thor::Group
-    include Thor::Actions
-    include Hoboken::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def create_assets_folder
-      empty_directory("assets")
-      FileUtils.cp("public/css/styles.css", "assets/styles.css")
-      FileUtils.cp("public/js/app.js", "assets/app.js")
-    end
-
-    def add_gems
-      gem "sprockets", "2.10.0", group: :assets
-      gem "uglifier", "2.1.1", group: :assets
-      gem "yui-compressor", "0.9.6", group: :assets
-    end
-
-    def copy_sprockets_helpers
-      copy_file("hoboken/templates/sprockets.rake", "tasks/sprockets.rake")
-      copy_file("hoboken/templates/sprockets_chain.rb", "middleware/sprockets_chain.rb")
-      copy_file("hoboken/templates/sprockets_helper.rb", "helpers/sprockets.rb")
-    end
-
-    def update_app
-      insert_into_file("app.rb", after: /configure :development do\n/) do
-<<CODE
-      require File.expand_path('middleware/sprockets_chain', settings.root)
-      use Middleware::SprocketsChain, %r{/assets} do |env|
-        %w(assets vendor).each do |f|
-          env.append_path File.expand_path("../\#{f}", __FILE__)
-        end
-      end
-
-CODE
-      end
-
-      insert_into_file("app.rb", after: /set :root, File.dirname\(__FILE__\)\n/) do
-        "    helpers Helpers::Sprockets"
-      end
-
-      gsub_file("app.rb", /require "sinatra\/reloader" if development\?/) do
-<<CODE
-if development?
-  require "sinatra/reloader"
-
-  require File.expand_path('middleware/sprockets_chain', settings.root)
-  use Middleware::SprocketsChain, %r{/assets} do |env|
-    %w(assets vendor).each do |f|
-      env.append_path File.expand_path("../\#{f}", __FILE__)
-    end
-  end
-end
-
-helpers Helpers::Sprockets
-CODE
-      end
-    end
-
-    def adjust_link_tags
-      insert_into_file("views/layout.erb", before: /<\/head>/) do
-<<HTML
-  <%= stylesheet_tag :styles %>
-
-  <%= javascript_tag :app %>
-HTML
-      end
-
-      gsub_file("views/layout.erb", /<link rel="stylesheet" type="text\/css" href="css\/styles.css">/, "")
-      gsub_file("views/layout.erb", /<script type="text\/javascript" src="js\/app.js"><\/script>/, "")
-    end
-
-    def directions
-      text = <<TEXT
-
-Run `bundle install` to get the sprockets gem and its
-dependencies.
-
-Running the server in development mode will serve css
-and js files from /assets. In order to serve assets in
-production, you must run `rake assets:precompile`. Read
-the important note below before running this rake task.
-TEXT
-
-      important = <<TEXT
-
-Important Note:
-Any css or js files from the /public folder have been copied
-to /assets, the original files remain intact in /public, but
-will be replaced the first time you run `rake assets:precompile`.
-You may want to backup those files if they are not under source
-control before running the Rake command.
-TEXT
-
-      say text
-      say important, :red
-    end
-  end
-
-  class Heroku < Thor::Group
-    include Thor::Actions
-    include Hoboken::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def add_gem
-      gem "foreman", "0.63.0", group: :development
-    end
-
-    def procfile
-      create_file("Procfile") do
-        "web: bundle exec thin start -p $PORT -e $RACK_ENV"
-      end
-    end
-
-    def env_file
-      create_file(".env") do
-        "RACK_ENV=development\nPORT=9292"
-      end
-      append_to_file(".gitignore", ".env") if File.exist?(".gitignore")
-    end
-
-    def slugignore
-      create_file(".slugignore") do
-        "tags\n/test\n/tmp"
-      end
-    end
-
-    def fix_stdout_for_logging
-      prepend_file("config.ru", "$stdout.sync = true\n")
-    end
-
-    def replace_server_rake_task
-      gsub_file("Rakefile", /desc.*server.*{rack_env}"\)\nend$/m) do
-<<TASK
-desc "Start the development server with Foreman"
-task :server do
-  exec("foreman start")
-end
-TASK
-      end
-    end
-
-    def reminders
-      say "\nGemfile updated... don't forget to 'bundle install'"
-    end
-  end
-
-  class Internationalization < Thor::Group
-    include Thor::Actions
-    include Hoboken::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def add_gem
-      gem "sinatra-r18n", "1.1.5"
-      insert_into_file("app.rb", after: /require "sinatra("|\/base")/) do
-        "\nrequire \"sinatra/r18n\""
-      end
-      insert_into_file("app.rb", after: /Sinatra::Base/) do
-        "\n    register Sinatra::R18n"
-      end
-    end
-
-    def translations
-      empty_directory("i18n")
-      template("hoboken/templates/en.yml.tt", "i18n/en.yml")
-    end
-
-    def reminders
-      say "\nGemfile updated... don't forget to 'bundle install'"
-    end
-  end
-
-  class Metrics < Thor::Group
-    include Thor::Actions
-    include Hoboken::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def add_gems
-      gem "flog", "2.5.3", group: :test
-      gem "flay", "1.4.3", group: :test
-      gem "simplecov", "0.7.1", require: false, group: :test
-    end
-
-    def copy_task_templates
-      empty_directory("tasks")
-      template("hoboken/templates/metrics.rake.tt", "tasks/metrics.rake")
-    end
-
-    def simplecov_snippet
-      insert_into_file "test/unit/test_helper.rb", before: /require "test\/unit"/ do
-<<CODE
-
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/test/"
-  coverage_dir 'tmp/coverage'
-end
-
-CODE
-      end
-    end
-
-    def reminders
-      say "\nGemfile updated... don't forget to 'bundle install'"
-    end
-  end
+  require_relative "hoboken/add_ons/metrics"
+  require_relative "hoboken/add_ons/internationalization"
+  require_relative "hoboken/add_ons/heroku"
+  require_relative "hoboken/add_ons/sprockets"
 
   class CLI < Thor
     desc "version", "Print version and quit"
@@ -343,10 +223,11 @@ CODE
     register(Generate, "generate", "generate [APP_NAME]", "Generate a new Sinatra app")
     tasks["generate"].options = Hoboken::Generate.class_options
 
-    register(Metrics, "add:metrics", "add:metrics", "Add metrics (flog, flay, simplecov)")
-    register(Internationalization, "add:i18n", "add:i18n", "Internationalization support using sinatra-r18n")
-    register(Heroku, "add:heroku", "add:heroku", "Heroku deployment support")
+    register(AddOns::Metrics, "add:metrics", "add:metrics", "Add metrics (flog, flay, simplecov)")
+    register(AddOns::Internationalization, "add:i18n", "add:i18n", "Internationalization support using sinatra-r18n")
+    register(AddOns::Heroku, "add:heroku", "add:heroku", "Heroku deployment support")
     register(OmniAuth, "add:omniauth", "add:omniauth", "OmniAuth authentication (allows you to select a provider)")
-    register(Sprockets, "add:sprockets", "add:sprockets", "Rack-based asset packaging system")
+    register(AddOns::Sprockets, "add:sprockets", "add:sprockets", "Rack-based asset packaging system")
+    register(Sequel, "add:sequel", "add:sequel", "Database access via Sequel gem")
   end
 end

data/lib/hoboken/add_ons/heroku.rb

@@ -0,0 +1,40 @@
+module Hoboken
+  module AddOns
+    class Heroku < ::Hoboken::Group
+      def add_gem
+        gem "foreman", "0.63.0", group: :development
+      end
+
+      def procfile
+        create_file("Procfile") do
+          "web: bundle exec thin start -p $PORT -e $RACK_ENV"
+        end
+      end
+
+      def slugignore
+        create_file(".slugignore") do
+          "tags\n/test\n/tmp"
+        end
+      end
+
+      def fix_stdout_for_logging
+        prepend_file("config.ru", "$stdout.sync = true\n")
+      end
+
+      def replace_server_rake_task
+        gsub_file("Rakefile", /desc.*server.*{rack_env}"\)\nend$/m) do
+<<TASK
+desc "Start the development server with Foreman"
+task :server do
+  exec("foreman start")
+end
+TASK
+        end
+      end
+
+      def reminders
+        say "\nGemfile updated... don't forget to 'bundle install'"
+      end
+    end
+  end
+end

data/lib/hoboken/add_ons/internationalization.rb

@@ -0,0 +1,24 @@
+module Hoboken
+  module AddOns
+    class Internationalization < ::Hoboken::Group
+      def add_gem
+        gem "sinatra-r18n", "1.1.5"
+        insert_into_file("app.rb", after: /require "sinatra("|\/base")/) do
+          "\nrequire \"sinatra/r18n\""
+        end
+        insert_into_file("app.rb", after: /Sinatra::Base/) do
+          "\n    register Sinatra::R18n"
+        end
+      end
+
+      def translations
+        empty_directory("i18n")
+        template("hoboken/templates/en.yml.tt", "i18n/en.yml")
+      end
+
+      def reminders
+        say "\nGemfile updated... don't forget to 'bundle install'"
+      end
+    end
+  end
+end

data/lib/hoboken/add_ons/metrics.rb

@@ -0,0 +1,34 @@
+module Hoboken
+  module AddOns
+    class Metrics < ::Hoboken::Group
+      def add_gems
+        gem "flog", "2.5.3", group: :test
+        gem "flay", "1.4.3", group: :test
+        gem "simplecov", "0.7.1", require: false, group: :test
+      end
+
+      def copy_task_templates
+        empty_directory("tasks")
+        template("hoboken/templates/metrics.rake.tt", "tasks/metrics.rake")
+      end
+
+      def simplecov_snippet
+        insert_into_file "test/test_helper.rb", before: /require "test\/unit"/ do
+<<CODE
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/test/"
+  coverage_dir 'tmp/coverage'
+end
+
+CODE
+        end
+      end
+
+      def reminders
+        say "\nGemfile updated... don't forget to 'bundle install'"
+      end
+    end
+  end
+end

data/lib/hoboken/add_ons/sprockets.rb

@@ -0,0 +1,97 @@
+module Hoboken
+  module AddOns
+    class Sprockets < ::Hoboken::Group
+      def create_assets_folder
+        empty_directory("assets")
+        FileUtils.cp("public/css/styles.css", "assets/styles.css")
+        FileUtils.cp("public/js/app.js", "assets/app.js")
+      end
+
+      def add_gems
+        gem "sprockets", "2.10.0", group: :assets
+        gem "uglifier", "2.1.1", group: :assets
+        gem "yui-compressor", "0.9.6", group: :assets
+      end
+
+      def copy_sprockets_helpers
+        copy_file("hoboken/templates/sprockets.rake", "tasks/sprockets.rake")
+        copy_file("hoboken/templates/sprockets_chain.rb", "middleware/sprockets_chain.rb")
+        copy_file("hoboken/templates/sprockets_helper.rb", "helpers/sprockets.rb")
+      end
+
+      def update_app
+        insert_into_file("app.rb", after: /configure :development do\n/) do
+<<CODE
+      require File.expand_path('middleware/sprockets_chain', settings.root)
+      use Middleware::SprocketsChain, %r{/assets} do |env|
+        %w(assets vendor).each do |f|
+          env.append_path File.expand_path("../\#{f}", __FILE__)
+        end
+      end
+
+CODE
+        end
+
+        insert_into_file("app.rb", after: /set :root, File.dirname\(__FILE__\)\n/) do
+          "    helpers Helpers::Sprockets"
+        end
+
+        gsub_file("app.rb", /require "sinatra\/reloader" if development\?/) do
+<<CODE
+if development?
+  require "sinatra/reloader"
+
+  require File.expand_path('middleware/sprockets_chain', settings.root)
+  use Middleware::SprocketsChain, %r{/assets} do |env|
+    %w(assets vendor).each do |f|
+      env.append_path File.expand_path("../\#{f}", __FILE__)
+    end
+  end
+end
+
+helpers Helpers::Sprockets
+CODE
+        end
+      end
+
+      def adjust_link_tags
+        insert_into_file("views/layout.erb", before: /<\/head>/) do
+<<HTML
+  <%= stylesheet_tag :styles %>
+
+  <%= javascript_tag :app %>
+HTML
+        end
+
+        gsub_file("views/layout.erb", /<link rel="stylesheet" type="text\/css" href="css\/styles.css">/, "")
+        gsub_file("views/layout.erb", /<script type="text\/javascript" src="js\/app.js"><\/script>/, "")
+      end
+
+      def directions
+        text = <<TEXT
+
+Run `bundle install` to get the sprockets gem and its
+dependencies.
+
+Running the server in development mode will serve css
+and js files from /assets. In order to serve assets in
+production, you must run `rake assets:precompile`. Read
+the important note below before running this rake task.
+TEXT
+
+        important = <<TEXT
+
+Important Note:
+Any css or js files from the /public folder have been copied
+to /assets, the original files remain intact in /public, but
+will be replaced the first time you run `rake assets:precompile`.
+You may want to backup those files if they are not under source
+control before running the Rake command.
+TEXT
+
+        say text
+        say important, :red
+      end
+    end
+  end
+end

data/lib/hoboken/generate.rb

@@ -47,16 +47,6 @@ module Hoboken
       apply_template("views/index.erb.tt", "views/index.erb")
     end
 
-    def inline_views
-      return unless options[:tiny]
-      combined_views = %w(layout index).map do |f|
-        "@@#{f}\n" + File.read("#{snake_name}/views/#{f}.erb")
-      end.join("\n")
-
-      append_to_file("#{snake_name}/app.rb", "\n__END__\n\n#{combined_views}")
-      remove_dir("#{snake_name}/views")
-    end
-
     def public_folder
       return if options[:tiny]
       inside snake_name do
@@ -73,26 +63,45 @@ module Hoboken
 
     def test_folder
       empty_directory("#{snake_name}/test/unit")
+      empty_directory("#{snake_name}/test/integration")
       empty_directory("#{snake_name}/test/support")
-      apply_template("test/unit/test_helper.rb.tt", "test/unit/test_helper.rb")
+      apply_template("test/test_helper.rb.tt", "test/test_helper.rb")
       apply_template("test/unit/app_test.rb.tt", "test/unit/app_test.rb")
       apply_template("test/support/rack_test_assertions.rb.tt", "test/support/rack_test_assertions.rb")
     end
 
+    def env_file
+      inside snake_name do
+        create_file(".env") do
+          "RACK_ENV=development\nPORT=9292"
+        end
+      end
+    end
+
     def make_modular
       return unless "modular" == options[:type]
       empty_directory("#{snake_name}/helpers")
       remove_file("#{snake_name}/app.rb")
       apply_template("modular.rb.tt", "app.rb")
-      ["config.ru", "test/unit/test_helper.rb"].each do |f|
+      ["config.ru", "test/test_helper.rb"].each do |f|
         path = File.join(snake_name, f)
         gsub_file(path, /Sinatra::Application/, "#{camel_name}::App")
       end
     end
 
+    def inline_views
+      return unless options[:tiny]
+      combined_views = %w(layout index).map do |f|
+        "@@#{f}\n" + File.read("#{snake_name}/views/#{f}.erb")
+      end.join("\n")
+
+      append_to_file("#{snake_name}/app.rb", "\n__END__\n\n#{combined_views}")
+      remove_dir("#{snake_name}/views")
+    end
+
     def create_git_repository
       return unless options[:git]
-      if system("git --version >#{NULL} 2>&1")
+      if has_git?
         copy_file("templates/gitignore", "#{snake_name}/.gitignore")
         inside snake_name do
           run("git init .")
@@ -115,7 +124,7 @@ module Hoboken
     end
 
     def camel_name
-      Thor::Util.camel_case(name)
+      Thor::Util.camel_case(name.split("/").last)
     end
 
     def titleized_name
@@ -123,7 +132,16 @@ module Hoboken
     end
 
     def author
-      `git config user.name`.chomp
+      if has_git?
+        `git config user.name`.chomp
+      else
+        say "\nNo Git executable found. Using result of `whoami` as author name."
+        `whoami`.chomp
+      end
+    end
+
+    def has_git?
+      system("git --version >#{NULL} 2>&1")
     end
 
     def apply_template(src, dest)

data/lib/hoboken/templates/Gemfile.erb.tt

@@ -13,3 +13,5 @@ end
 group :test do
   gem "contest", "~> 0.1.3"
 end
+
+gem "dotenv", "~> 0.9.0", group: :development

data/lib/hoboken/templates/Rakefile.tt

@@ -18,6 +18,11 @@ namespace :test do
     t.test_files = Dir["test/unit/**/*_test.rb"]
   end
 
+  Rake::TestTask.new(:integration) do |t|
+    t.libs << 'test/unit'
+    t.test_files = Dir["test/integration/**/*_test.rb"]
+  end
+
   desc "Run all tests"
-  task :all => %w[test:unit]
+  task :all => %w[test:unit test:integration]
 end

data/lib/hoboken/templates/config.ru.tt

@@ -1,3 +1,5 @@
 require "bundler/setup"
+require "dotenv"
+Dotenv.load
 require File.expand_path("../app", __FILE__)
 run Sinatra::Application

data/lib/hoboken/templates/gitignore

@@ -2,3 +2,4 @@
 .bundle
 /tmp
 tags
+.env

data/lib/hoboken/templates/sequel.rake

@@ -0,0 +1,19 @@
+namespace :db do
+  require 'sequel'
+
+  Sequel.extension :migration
+  DB = Sequel.connect(ENV['DATABASE_URL'] || "sqlite://db/development.db")
+
+  desc 'Migrate the database to latest version'
+  task :migrate do
+    Sequel::Migrator.run(DB, 'db/migrate')
+    puts '<= db:migrate executed'
+  end
+
+  desc 'Perform migration reset (full erase and migration up)'
+  task :reset do
+    Sequel::Migrator.run(DB, 'db/migrate', :target => 0)
+    Sequel::Migrator.run(DB, 'db/migrate')
+    puts '<= db:reset executed'
+  end
+end

data/lib/hoboken/templates/test/support/rack_test_assertions.rb.tt

@@ -6,6 +6,11 @@ module Rack::Test::Assertions
     :redirect       => 302
   }
 
+  CONTENT_TYPES = {
+    :json => "application/json;charset=utf-8",
+    :html => "text/html;charset=utf-8"
+  }
+
   def assert_body_contains(expected, message=nil)
     msg = build_message(message, "expected body to contain <?>\n#{last_response.body}", expected)
     assert_block(msg) do
@@ -13,6 +18,14 @@ module Rack::Test::Assertions
     end
   end
 
+  def assert_content_type(content_type)
+    unless CONTENT_TYPES.keys.include?(content_type)
+      raise ArgumentError, "unrecognized content_type (#{content_type})"
+    end
+
+    assert_equal CONTENT_TYPES[content_type], last_response.content_type
+  end
+
   def assert_flash(type=:notice, message=nil)
     msg = build_message(message, "expected <?> flash to exist, but was nil", type.to_s)
     assert_block(msg) do
@@ -40,13 +53,13 @@ module Rack::Test::Assertions
     assert_has_session
     msg = build_message(message, "expected session to have key named <?>", key)
     assert_block(msg) do
-      last_request.env["rack.session"].keys.include?(key)
+      last_request.env["rack.session"].keys.include?(key.to_s)
     end
   end
 
   def assert_session(key, expected, message=nil)
     assert_session_has_key(key)
-    actual = last_request.env["rack.session"][key]
+    actual = last_request.env["rack.session"][key.to_s]
     msg = build_message(message, "expected session key <?> to be <?>, but was <?>", key, expected, actual)
     assert_block(msg) do
       expected == actual

data/lib/hoboken/templates/test/{unit/test_helper.rb.tt → test_helper.rb.tt}

@@ -4,8 +4,11 @@ require "bundler/setup"
 require "test/unit"
 require "contest"
 require "rack/test"
-require_relative "../support/rack_test_assertions"
-require_relative "../../app"
+require "dotenv"
+require_relative "support/rack_test_assertions"
+require_relative "../app"
+
+Dotenv.load
 
 class Test::Unit::TestCase
   # Syntactic sugar for defining a memoized helper method.

data/lib/hoboken/templates/test/unit/app_test.rb.tt

@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "../test_helper"
 
 class AppTest < Rack::Test::TestCase
   test "GET /" do

data/lib/hoboken/version.rb

@@ -1,3 +1,3 @@
 module Hoboken
-  VERSION = "0.0.1.beta2"
+  VERSION = "0.0.1.beta3"
 end

data/test/integration/add_on_test.rb

@@ -0,0 +1,118 @@
+require_relative "../test_helper"
+
+class AddOnTest < IntegrationTestCase
+  def test_metrics_add_on
+    run_hoboken(:generate) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:metrics")
+      assert_file("Gemfile", /flog/, /flay/, /simplecov/)
+      assert_file("tasks/metrics.rake")
+      assert_file("test/test_helper.rb",
+<<CODE
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/test/"
+  coverage_dir 'tmp/coverage'
+end
+
+CODE
+                 )
+    end
+  end
+
+  def test_internationalization_add_on_classic
+    run_hoboken(:generate) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:i18n")
+      assert_file("Gemfile", "sinatra-r18n")
+      assert_file("app.rb", 'require "sinatra/r18n"')
+      assert_file("i18n/en.yml")
+    end
+  end
+
+  def test_internationalization_add_on_modular
+    run_hoboken(:generate, type: :modular) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:i18n")
+      assert_file("Gemfile", "sinatra-r18n")
+      assert_file("app.rb", 'require "sinatra/r18n"', "register Sinatra::R18n")
+      assert_file("i18n/en.yml")
+    end
+  end
+
+  def test_heroku_add_on
+    run_hoboken(:generate) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:heroku")
+      assert_file("Gemfile", "foreman")
+      assert_file("Procfile")
+      assert_file(".slugignore")
+      assert_file("config.ru", /\$stdout.sync = true/)
+      assert_file("Rakefile", /exec\("foreman start"\)/)
+    end
+  end
+
+  def test_sprockets_add_on_classic
+    run_hoboken(:generate) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:sprockets")
+      assert_file("assets/styles.css")
+      assert_file("assets/app.js")
+      assert_file("Gemfile", "sprockets", "uglifier", "yui-compressor")
+      assert_file("tasks/sprockets.rake")
+      assert_file("middleware/sprockets_chain.rb")
+      assert_file("helpers/sprockets.rb")
+      assert_file("app.rb", <<CODE
+if development?
+  require "sinatra/reloader"
+
+  require File.expand_path('middleware/sprockets_chain', settings.root)
+  use Middleware::SprocketsChain, %r{/assets} do |env|
+    %w(assets vendor).each do |f|
+      env.append_path File.expand_path("../\#{f}", __FILE__)
+    end
+  end
+end
+
+helpers Helpers::Sprockets
+CODE
+                 )
+      assert_file("views/layout.erb", <<CODE
+  <%= stylesheet_tag :styles %>
+
+  <%= javascript_tag :app %>
+CODE
+                 )
+    end
+  end
+
+  def test_sprockets_add_on_modular
+    run_hoboken(:generate, type: :modular) do
+      bin_path = File.expand_path("../../../bin/hoboken", __FILE__)
+      execute("#{bin_path} add:sprockets")
+      assert_file("assets/styles.css")
+      assert_file("assets/app.js")
+      assert_file("Gemfile", "sprockets", "uglifier", "yui-compressor")
+      assert_file("tasks/sprockets.rake")
+      assert_file("middleware/sprockets_chain.rb")
+      assert_file("helpers/sprockets.rb")
+      assert_file("app.rb", <<CODE
+    configure :development do
+      require File.expand_path('middleware/sprockets_chain', settings.root)
+      use Middleware::SprocketsChain, %r{/assets} do |env|
+        %w(assets vendor).each do |f|
+          env.append_path File.expand_path("../\#{f}", __FILE__)
+        end
+      end
+CODE
+                 )
+      assert_file("views/layout.erb", <<CODE
+  <%= stylesheet_tag :styles %>
+
+  <%= javascript_tag :app %>
+CODE
+                 )
+    end
+  end
+end

data/test/integration/generate_test.rb

@@ -0,0 +1,71 @@
+require_relative "../test_helper"
+
+class GenerateTest < IntegrationTestCase
+  def test_generate_classic
+    run_hoboken(:generate) do
+      assert_file ".env"
+      assert_file "Gemfile"
+      assert_file "README.md"
+      assert_file "Rakefile"
+      assert_file "app.rb", /require "sinatra"/
+      assert_file "config.ru", /run Sinatra::Application/
+      assert_directory "public"
+      assert_directory "test"
+      assert_file "views/index.erb"
+      assert_file "views/layout.erb"
+    end
+  end
+
+  def test_generate_classic_tiny
+    run_hoboken(:generate, tiny: true) do
+      refute_directory("public")
+      assert_file "app.rb", /__END__/, /@@layout/, /@@index/
+    end
+  end
+
+  def test_generate_classic_can_run_tests
+    run_hoboken(:generate) do
+      assert_match /1 tests, 1 assertions, 0 failures, 0 errors, 0 skips/, execute("rake test:all")
+    end
+  end
+
+  def test_generate_modular
+    run_hoboken(:generate, type: :modular) do
+      assert_file ".env"
+      assert_file "Gemfile"
+      assert_file "README.md"
+      assert_file "Rakefile"
+      assert_file "app.rb", /require "sinatra\/base"/, /module Sample/, /class App < Sinatra::Base/
+      assert_file "config.ru", /run Sample::App/
+      assert_directory "public"
+      assert_file "test/test_helper.rb", /Sample::App/
+      assert_file "views/index.erb"
+      assert_file "views/layout.erb"
+    end
+  end
+
+  def test_generate_modular_tiny
+    run_hoboken(:generate, tiny: true, type: :modular) do
+      refute_directory("public")
+      assert_file "app.rb", /__END__/, /@@layout/, /@@index/
+    end
+  end
+
+  def test_generate_modular_can_run_tests
+    run_hoboken(:generate, type: :modular) do
+      assert_match /1 tests, 1 assertions, 0 failures, 0 errors, 0 skips/, execute("rake test:all")
+    end
+  end
+
+  def test_generate_with_ruby_version
+    run_hoboken(:generate, ruby_version: "2.1.0") do
+      assert_file "Gemfile", /ruby "2\.1\.0"/
+    end
+  end
+
+  def test_generate_with_git
+    run_hoboken(:generate, git: true) do
+      assert_directory ".git"
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,69 @@
+require "test/unit"
+require "fileutils"
+
+$hoboken_counter = 0
+DESTINATION = File.expand_path("../tmp", __FILE__)
+FileUtils.rm_rf(DESTINATION)
+
+class IntegrationTestCase < Test::Unit::TestCase
+  def teardown
+    if self.passed?
+      FileUtils.rm_rf("#{DESTINATION}/#{$hoboken_counter}")
+    else
+      puts "Left #{DESTINATION}/#{$hoboken_counter}/sample in place since test failed."
+    end
+  end
+
+  def run_hoboken(command, **opts)
+    options = Array.new.tap do |o|
+      o << "--git" if opts.fetch(:git) { false }
+      o << "--tiny" if opts.fetch(:tiny) { false }
+      o << "--type=#{opts[:type]}" if opts.has_key?(:type)
+      o << "--ruby-version=#{opts[:ruby_version]}" if opts.has_key?(:ruby_version)
+    end
+
+    $hoboken_counter += 1
+    bin_path = File.expand_path("../../bin/hoboken", __FILE__)
+
+    `#{bin_path} #{command} #{DESTINATION}/#{$hoboken_counter}/sample #{options.join(" ")}`
+    yield
+  end
+
+  def execute(command)
+    current_path = Dir.pwd
+    FileUtils.cd("#{DESTINATION}/#{$hoboken_counter}/sample")
+    `bundle install` unless File.exists?("Gemfile.lock")
+    `#{command}`
+  ensure
+    FileUtils.cd(current_path)
+  end
+
+  def assert_file(filename, *contents)
+    full_path = File.join(DESTINATION, $hoboken_counter.to_s, "sample", filename)
+    assert_block("expected #{filename.inspect} to exist") do
+      File.exists?(full_path)
+    end
+
+    unless contents.empty?
+      read = File.read(full_path)
+      contents.each do |content|
+        assert_block("expected #{filename.inspect} to contain #{content}:\n#{read}") do
+          pattern = content.is_a?(Regexp) ? content : /#{content}/
+          read =~ pattern
+        end
+      end
+    end
+  end
+
+  def assert_directory(name)
+    assert_block("expected #{name} directory to exist") do
+      File.directory?(File.join(DESTINATION, $hoboken_counter.to_s, "sample", name))
+    end
+  end
+
+  def refute_directory(name)
+    assert_block("did not expect directory #{name} to exist") do
+      !File.directory?(File.join(DESTINATION, $hoboken_counter.to_s, "sample", name))
+    end
+  end
+end

data/test/unit/hoboken_actions_test.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require_relative "../test_helper"
 require_relative "../../lib/hoboken/actions.rb"
 
 module Hoboken

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoboken
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta2
+  version: 0.0.1.beta3
 platform: ruby
 authors:
 - Bob Nadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,10 @@ files:
 - hoboken.gemspec
 - lib/hoboken.rb
 - lib/hoboken/actions.rb
+- lib/hoboken/add_ons/heroku.rb
+- lib/hoboken/add_ons/internationalization.rb
+- lib/hoboken/add_ons/metrics.rb
+- lib/hoboken/add_ons/sprockets.rb
 - lib/hoboken/generate.rb
 - lib/hoboken/templates/Gemfile.erb.tt
 - lib/hoboken/templates/README.md.tt
@@ -81,19 +85,23 @@ files:
 - lib/hoboken/templates/hoboken.png
 - lib/hoboken/templates/metrics.rake.tt
 - lib/hoboken/templates/modular.rb.tt
+- lib/hoboken/templates/sequel.rake
 - lib/hoboken/templates/sinatra.png
 - lib/hoboken/templates/sprockets.rake
 - lib/hoboken/templates/sprockets_chain.rb
 - lib/hoboken/templates/sprockets_helper.rb
 - lib/hoboken/templates/styles.css.tt
 - lib/hoboken/templates/test/support/rack_test_assertions.rb.tt
+- lib/hoboken/templates/test/test_helper.rb.tt
 - lib/hoboken/templates/test/unit/app_test.rb.tt
-- lib/hoboken/templates/test/unit/test_helper.rb.tt
 - lib/hoboken/templates/views/index.erb.tt
 - lib/hoboken/templates/views/layout.erb.tt
 - lib/hoboken/version.rb
 - test/fixtures/Gemfile
 - test/fixtures/Gemfile.pristine
+- test/integration/add_on_test.rb
+- test/integration/generate_test.rb
+- test/test_helper.rb
 - test/unit/hoboken_actions_test.rb
 homepage: https://github.com/bnadlerjr/hoboken
 licenses:
@@ -122,4 +130,7 @@ summary: Sinatra project generator.
 test_files:
 - test/fixtures/Gemfile
 - test/fixtures/Gemfile.pristine
+- test/integration/add_on_test.rb
+- test/integration/generate_test.rb
+- test/test_helper.rb
 - test/unit/hoboken_actions_test.rb