BF add github auth helper and server start helper

Author: bf4

.gitignore

@@ -0,0 +1 @@
+config/application.yml

README.md

@@ -34,24 +34,35 @@ Install the gems:
 bundle
 ```
 
-Then set the application settings as environment variables:
+Then set up your the application config and database settings
 
 ```bash
-export GITHUB_CLIENT_ID="<from GH>"
-export GITHUB_CLIENT_SECRET="<from GH>"
+./serve.sh setup`
 ```
 
+Update the GITHUB keys in your `config/application.yml`
+
+
 Finally start the web server using thin:
 
 ```bash
-bundle exec thin start  # start the server on 0.0.0.0:3000
+./serve.sh start
+```
+
+If you want to daemonize your dev server
+
+```bash
+./serve.sh start -d
+./serve.sh stop
 ```
 
-### Deploying to heroku
+### Deploying to heroku (production)
 
   ```bash
   heroku addons:add heroku-postgresql:dev
   heroku config:set GITHUB_CLIENT_ID="<from GH>" GITHUB_CLIENT_SECRET="<from GH>"
+  git push heroku master
+  heroku run rake db:migrate
   ```
 
 ## License

app.rb

@@ -4,16 +4,13 @@
 require 'sinatra/activerecord'
 require './models/code'
 require './models/user'
+require './models/github_auth'
 
 module PpwmMatcher
   class App < Sinatra::Base
     enable :sessions
 
-    set :github_options, {
-      :scopes    => "user:email",
-      :secret    => ENV['GITHUB_CLIENT_SECRET'],
-      :client_id => ENV['GITHUB_CLIENT_ID'],
-    }
+    set :github_options, PpwmMatcher::GithubAuth.options
     LOGGER = Logger.new(STDOUT)
 
     register Sinatra::Auth::Github

config/application.example.yml

@@ -0,0 +1,6 @@
+development:
+  GITHUB_CLIENT_ID: ""
+  GITHUB_CLIENT_SECRET: ""
+production:
+  GITHUB_CLIENT_ID: ""
+  GITHUB_CLIENT_SECRET: ""

init.rb

@@ -0,0 +1,5 @@
+require 'yaml'
+db_config_filename = 'config/database.yml'
+db_name = YAML.load(File.read("./#{db_config_filename}"))['development']['database']
+puts "Initializing and migrating postgresql db #{db_name}"
+`createdb #{db_name} && rake db:migrate`

models/github_auth.rb

@@ -0,0 +1,44 @@
+module PpwmMatcher
+  module GithubAuth
+
+    module_function
+
+    def options
+      {
+      :scopes    => "user:email",
+      :secret    => secret,
+      :client_id => client_id,
+    }
+    end
+
+
+    def secret
+      dev_config[secret_key] || ENV[secret_key]
+    end
+    def secret_key
+     'GITHUB_CLIENT_SECRET'
+     end
+    def client_id
+      dev_config[client_id_key] || ENV[client_id_key]
+    end
+    def client_id_key
+     'GITHUB_CLIENT_ID'
+    end
+    def dev_config
+      config.fetch('development', {})
+    end
+    def prod_config
+      config.fetch('production', {})
+    end
+    def config
+      @config ||= if File.exists?(app_config_filename)
+                    YAML.load(File.read(app_config_filename))
+                  else
+                    {}
+                  end
+    end
+    def app_config_filename
+      'config/application.yml'
+    end
+  end
+end

serve.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# ./serve.sh setup
+# ./serve.sh start
+if [ ! -n "$1" ]
+then
+    echo "Usage: ./serve.sh [start|stop|restart|setup]"
+else
+    case "$1" in
+
+    setup)
+      test -s 'config/application.yml'
+      if [ $? -eq 1 ]
+      then
+        echo -e 'copying over example application.yml'
+        cp config/application.example.yml config/application.yml
+      fi
+      ruby init.rb
+      ;;
+
+    start)
+      bundle exec thin start -p 9393 $2
+      ;;
+
+    stop)
+      bundle exec thin stop
+      ;;
+
+    esac
+fi