deep_thought 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0dfbb4db4fd08ad8def952e00cf106b02862d25
-  data.tar.gz: dd56ee449838d5ba4bd0c01f5041f32d3105fdc8
+  metadata.gz: f19cef213ef16227a7bc898ac65270247f7b1e67
+  data.tar.gz: 301d7f61c392fd8c92790dcc1d3df457f7c76d1b
 SHA512:
-  metadata.gz: 937786d6394d8d5ca34fcaf3cda570cdff45b394c8bb94c4a7f674c9b859c499f53e3b27858e639f2c794adcc230af02274fbeb0dd059b6dbe06784ff2d0b854
-  data.tar.gz: f49fc78d7cf859cf928435ab78bdbaddb56b1d67bad870c9405a1f8e0751e95111d1122754925f71fc90fa7b638375e8a7193b9b4e77832a3f344eeac7464777
+  metadata.gz: 8132f413fc46c326fb189c9deefdc1334bfadcebbfdef68580591b6e1764ddbaf1602e05d1892c7f01bd786beede6552d7e03ae994ee3dacd9d8a7313de27972
+  data.tar.gz: c37efee45ec3c1bc287b7a6f930bfcf202b272b072432c2de6578808e70a8c934f590eefb95ff2928e1953cc431c907c741a8911e5962f0dabc2396166cf4e22

data/README.md

@@ -6,7 +6,7 @@ Deploy smart, not hard.
 
 Deep Thought takes all of the thought out of deploying.
 
-Want to prevent deployment conflicts? Deep Thought does that. Want to deploy with Hubot? Deep Thought has you covered. Looking to ensure a build is green before it is deployed? Deep Thought yawns at your puny requests. Want a web interface? Got it. An API? Yep. Security? Totally locked down. Deep Thought is master of your deployments.
+Want to prevent deployment conflicts? Deep Thought does that. Want to deploy with Hubot? Deep Thought has you covered. Looking to ensure a build is green before it is deployed? Deep Thought yawns at your puny requests. How about deployment locking? Of course! Want a web interface? Got it. An API? Yep. Security? Totally locked down. Deep Thought is master of your deployments.
 
 Deep Thought was inspired by GitHub's own Hubot+Heaven workflow. Check out [Zach Holman's talk](http://zachholman.com/talk/unsucking-your-teams-development-environment/) to see the original inspiration.
 
@@ -20,7 +20,9 @@ Use [this Gist](https://gist.github.com/redhotvengeance/5746731) to get started:
 
 ### Setup
 
-Deep Thought needs an environment with Ruby and Git installed, and also access to a PostgreSQL database. Deep Thought will work fine on any server or VM matching those requirements, though it is largely designed to be deployed to Heroku:
+Deep Thought needs an environment with Ruby and Git installed, and also access to a database. Deep Thought by default expects a PostgreSQL database, but should work with any ActiveRecord-compatible database.
+
+Deep Thought will work fine on any server or VM matching those requirements, though it is largely designed to be deployed to Heroku:
 
     heroku apps:create [NAME]
     heroku config:set RACK_ENV=production
@@ -52,6 +54,14 @@ Deep Thought requires the use of a background worker for deployments. Normally,
     HEROKU_APP=<app-name>
     HEROKU_API_KEY=<your-heroku-api-key>
 
+If you'd like to use a database other than PostgreSQL, you'll need to add appropriate gem to your Gemfile and set the `DATABASE_ADAPTER` environment variable. For instance, if you'd like to use MySQL, add the gem to the Gemfile:
+
+    gem "mysql2"
+
+Then set the adapter environment variable:
+
+    DATABASE_ADAPTER=mysql2
+
 ### Add a project
 
 Once logged in, click the `+ add project` button on the `projects` page. Enter a unique project name and the remote Git repository url for the project. Click `create project`, and your project will be set up and ready to deploy.
@@ -154,7 +164,7 @@ Your custom deployer should live in the `DeepThought::Deployer` namespace. Deep
 
 The `setup?` method is called before deploys to ensure the project is setup as needed for the deploy to execute properly. For instance, if your deployer deploys by pushing to a Git remote, you can ensure that the Git remotes exist within `setup?`. Your deployer may have no need of `setup?`, in which case just don't bother overwriting the method.
 
-A reference to the project is passed to the `setup?` method, as is the project config (which is the hash generated from the project's `.deepthought.yml` file). You can use access to the config to take advantage of any deployer-specfic data that may have been put into the `.deepthought.yml` file.
+A reference to the project is passed to the `setup?` method, as is the project config (which is the hash generated from the project's `.deepthought.yml` file). You can use access to the config to take advantage of any deployer-specific data that may have been put into the `.deepthought.yml` file.
 
 The `setup?` method should return `true` when successful and `false` when not.
 
@@ -228,10 +238,16 @@ Set it up:
 
     script/bootstrap
 
+The bootstrap script will create an `.env`, install all required gems, set up the databases, and make a user. Of course, you can always do it manually.
+
 Create an `.env`:
 
     echo RACK_ENV=development > .env
 
+Install required gems:
+
+    bundle install --binstubs
+
 Set up the databases (PostgreSQL):
 
     createuser deep_thought
@@ -239,6 +255,9 @@ Set up the databases (PostgreSQL):
     createdb -O deep_thought -E utf8 deep_thought_test
     rake db:migrate
 
+Make a user:
+    bundle exec rake create_user[test@test.com,secret]
+
 Start the server:
 
     script/server

data/Rakefile

@@ -3,8 +3,9 @@ $LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 require "bundler/gem_tasks"
 require "active_record"
 require "fileutils"
+require 'dotenv'
 
-ENV["RACK_ENV"] ||= "development"
+Dotenv.load
 
 require "deep_thought"
 

data/deep_thought.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "shotgun", "~>0.9"
   gem.add_development_dependency "thin", "~>1.6"
   gem.add_development_dependency "racksh", "~>1.0.0"
+  gem.add_development_dependency "dotenv", "~>0.9"
 
   # # testing
   gem.add_development_dependency "minitest", "~>4.7"

data/lib/deep_thought.rb

@@ -17,17 +17,18 @@ require 'deep_thought/version'
 
 module DeepThought
   def self.setup(settings)
-    env = settings['RACK_ENV']
+    env = settings['RACK_ENV'] ||= 'development'
 
     if env != "production"
       settings["DATABASE_URL"] ||= "postgres://deep_thought@localhost/deep_thought_#{env}"
     end
 
     database = URI(settings["DATABASE_URL"])
+    settings["DATABASE_ADAPTER"] ||= "postgresql"
 
     connection = {
-      :adapter   => "postgresql",
-      :encoding  => "unicode",
+      :adapter   => settings["DATABASE_ADAPTER"],
+      :encoding  => "utf8",
       :database  => database.path[1..-1],
       :pool      => 5,
       :username  => database.user,

data/lib/deep_thought/version.rb

@@ -1,3 +1,3 @@
 module DeepThought
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/script/bootstrap

@@ -1,3 +1,67 @@
 #!/bin/sh
 
+echo ''
+echo 'Boostraping Deep Thought...'
+
+ruby --version >/dev/null 2>&1 || { echo >&2 "\nIt looks like the Ruby isn't installed. You're going to need it: https://www.ruby-lang.org/en/\n"; exit 1; }
+git --version >/dev/null 2>&1 || { echo >&2 "\nIt looks like the Heroku Toolbelt isn't installed. You're going to need it: http://git-scm.com/\n"; exit 1; }
+psql --version >/dev/null 2>&1 || { echo >&2 "\nIt looks like PostgreSQL isn't installed. You're going to need it: http://www.postgresql.org/\n"; exit 1; }
+
+create_env() {
+  echo "RACK_ENV=development" > "${PWD}/.env"
+  echo "SESSION_SECRET=secret" >> "${PWD}/.env"
+}
+
+echo ''
+echo 'Creating .env file...'
+
+if [ -f "${PWD}/.env" ]; then
+  echo ''
+  read -p "File already exists - what would you like to do? [s]kip or [o]verwrite? " action
+
+  case "$action" in
+    o )
+      create_env
+  esac
+else
+  create_env
+fi
+
+echo ''
+echo 'Installing required gems...'
+
 bundle install --binstubs
+
+create_db() {
+  psql -l >/dev/null 2>&1 || { echo >&2 "\nIt looks like PostgreSQL isn't running. Depending on how you installed it, there are any number of ways it could be started. Go get it running and then bootstrap again.\n"; exit 1; }
+
+  echo ''
+  echo 'Creating deep_thought user...'
+
+  createuser deep_thought >/dev/null 2>&1
+
+  echo 'Creating deep_thought_development database...'
+  createdb -O deep_thought -E utf8 deep_thought_development >/dev/null 2>&1
+
+  echo 'Creating deep_thought_test database...'
+  createdb -O deep_thought -E utf8 deep_thought_test >/dev/null 2>&1
+
+  echo 'Running migrations...'
+  bundle exec rake db:migrate
+  bundle exec rake db:migrate RACK_ENV=test
+
+  echo 'Creating user test@test.com with password "secret"'
+  bundle exec rake create_user[test@test.com,secret] >/dev/null 2>&1
+}
+
+echo ''
+read -p "Would you like me to create and configure the PostgreSQL database for this project? [y]es or [n]o? " action
+
+case "$action" in
+  y )
+    create_db
+esac
+
+echo ''
+echo 'Done!'
+echo ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_thought
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Ian Lollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,6 +234,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement