lib/tutter.rb in tutter-0.0.1 vs lib/tutter.rb in tutter-0.0.2

@@ -1,64 +1,95 @@
+require 'rubygems'
 require 'octokit'
 require 'yaml'
 require 'sinatra'
 require 'tutter/action'
 require 'json'
 
 class Tutter < Sinatra::Base
+
+  configure do
+    set :config_path, ENV['TUTTER_CONFIG_PATH'] || "conf/tutter.yaml"
+    set :config, YAML.load_file(settings.config_path)
+  end
+
   configure :development do
     require 'sinatra/reloader'
     register Sinatra::Reloader
-    set :config, YAML.load_file('conf/tutter.yaml')
     set :bind, '0.0.0.0'
   end
 
-  configure :production do
-    set :config, YAML.load_file('/etc/tutter.yaml')
+  configure :test do
+    set :bind, '0.0.0.0'
   end
 
   # Return project settings from config
   def get_project_settings project
     settings.config['projects'].each do |p|
       return p if p['name'] == project
     end
     false
   end
 
-  post '/' do
-    # Github send data in JSON format, parse it!
-    data = JSON.parse request.body.read
-    project = data['repository']['full_name']
+  def try_action event, data
+    project = data['repository']['full_name'] || error(400, 'Bad request')
 
-    conf = get_project_settings(project)
-    return 'Project does not exist in tutter.conf' unless conf
+    conf = get_project_settings(project) || error(404, 'Project does not exist in tutter.conf')
 
     # Setup octokit endpoints
     Octokit.configure do |c|
       c.api_endpoint = conf['github_api_endpoint']
       c.web_endpoint = conf['github_site']
     end
 
-    # Authenticate to Github
-    begin
-      client = Octokit::Client.new :access_token => conf['access_token']
-    rescue Octokit::Unauthorized
-      return "Authorization to #{project} failed, please verify your access token"
-    rescue Octokit::TooManyLoginAttempts
-      return "Account for #{project} has been temporary locked down due to to many failed login attempts"
+    if conf['access_token_env_var']
+      access_token = ENV[conf['access_token_env_var']] || ''
+    else
+      access_token = conf['access_token'] || ''
     end
 
+    client = Octokit::Client.new :access_token => access_token
+
     # Load action
     action = Action.create(conf['action'],
                                  conf['action_settings'],
                                  client,
                                  project,
+                                 event,
                                  data)
 
-    action.run
-    # Github does not care about status codes or return values.
-    # Output url to source if someone is interested
-    'Source code and documentation at https://github.com/jhaals/tutter'
+    status_code, message = action.run
+
+    return status_code, message
+  end
+
+  post '/' do
+    event = env['HTTP_X_GITHUB_EVENT']
+
+    unless event
+      error(500, "Invalid request")
+    end
+
+    # Get a 200 OK message in the Github webhook history
+    # Previously this showed an error.
+    if event == "ping"
+      return 200, "Tutter likes this hook!"
+    end
+
+    # Github send data in JSON format, parse it!
+    begin
+      data = JSON.parse request.body.read
+    rescue JSON::ParserError
+      error(400, 'POST data is not JSON')
+    end
+
+    # Check actions with repo
+
+    if data['repository']
+      return try_action(event, data)
+    end
+
+    error(400, "Unsupported request: #{event}")
   end
 
   get '/' do
     'Source code and documentation at https://github.com/jhaals/tutter'
   end