nofxx-god_web 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/god_web.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god_web}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Newland", "Marcos Piccinini"]
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "lib/app.rb",
      "lib/environment.rb",
      "lib/god_web.rb",
-     "lib/sinatra_http_auth.rb",
      "public/.DS_Store",
      "public/app.css",
      "public/icons/databases.png",

data/lib/app.rb

@@ -1,8 +1,7 @@
-
 before do
   unless (GODWEB_CONFIG['username'].nil? && GODWEB_CONFIG['password'].nil?) || self.request.path_info == '/heartbeat'
-    authenticate_or_request_with_http_basic "GodWeb" do
-      |user, pass| user == GODWEB_CONFIG['username'] && pass == GODWEB_CONFIG['password']
+    use Rack::Auth::Basic do |user, pass|
+      [user, pass] == [GODWEB_CONFIG['username'], GODWEB_CONFIG['password']]
     end
   end
   GODWEB.ping

data/lib/environment.rb

@@ -5,9 +5,6 @@ require 'stringio'
 require 'yaml'
 require 'erb'
 require 'optparse'
-#included until http://sinatra.lighthouseapp.com/projects/9779/tickets/16-patch-http-authentication is in a released version
-require File.dirname(__FILE__) + '/app'
-require File.dirname(__FILE__) + '/sinatra_http_auth'
 require File.dirname(__FILE__) + '/god_web'
 
 config = {
@@ -15,14 +12,17 @@ config = {
   'username' =>  nil,
   'password' =>  nil
 }
+
 begin
   config.merge!(YAML.load(File.read(ARGV[0])))
   GODWEB_CONFIG = config
 rescue
   GODWEB_CONFIG = config
 end
-
 GODWEB = GodWeb.new(config)
 
+# Require app
+require File.dirname(__FILE__) + '/app'
+
 Sinatra::Application.public = File.dirname(__FILE__) + "/../public"
 Sinatra::Application.views = File.dirname(__FILE__) + "/../views"

data/lib/god_web.rb

@@ -128,7 +128,7 @@ private
         l.gsub(/\[\S*\s(\S*)\]\W+INFO: \w*\s(\w*)/, "<span class='gray'>\\1</span> | <span class='act'>act</span> | \\2")
       end
 
-    end.join("</br>")
+    end.reverse.join("</br>")
   end
 
   #TODO

data/views/command.erb

@@ -1,4 +1,6 @@
 <div id="<%= @command %>ing_<%= @watch %>" class="panel" title="<%= @title %>">
-    <h2><%= @success ? 'Success' : 'Failed' %></h2>
-<%= @log %>
+  <h2><%= @success ? 'Success' : 'Failed' %></h2>
+  <fieldset>
+    <div align='left'><%= @log %></div>
+  </fieldset>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-god_web
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jesse Newland
@@ -67,7 +67,6 @@ files:
 - lib/app.rb
 - lib/environment.rb
 - lib/god_web.rb
-- lib/sinatra_http_auth.rb
 - public/.DS_Store
 - public/app.css
 - public/icons/databases.png
@@ -116,7 +115,6 @@ files:
 - views/watch.erb
 has_rdoc: false
 homepage: http://github.com/nofxx/god_web
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -137,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: iPhone friendly web UI for God

data/lib/sinatra_http_auth.rb

@@ -1,53 +0,0 @@
-module HttpAuthentication
-  module Basic
-
-    def authenticate_or_request_with_http_basic(realm = "Application", &login_procedure)
-      authenticate_with_http_basic(&login_procedure) || request_http_basic_authentication(realm)
-    end
-
-    def authenticate_with_http_basic(&login_procedure)
-      authenticate(&login_procedure)
-    end
-
-    def request_http_basic_authentication(realm = "Application")
-      authentication_request(realm)
-    end
-
-    private
-
-      def authenticate(&login_procedure)
-        if authorization
-          login_procedure.call(*user_name_and_password)
-        end
-      end
-
-      def user_name_and_password
-        decode_credentials.split(/:/, 2)
-      end
-
-      def authorization
-        request.env['HTTP_AUTHORIZATION']   ||
-        request.env['X-HTTP_AUTHORIZATION'] ||
-        request.env['X_HTTP_AUTHORIZATION'] ||
-        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
-      end
-
-      # Base64
-      def decode_credentials
-        (authorization.split.last || '').unpack("m").first
-      end
-
-      def authentication_request(realm)
-        status(401)
-        header("WWW-Authenticate" => %(Basic realm="#{realm.gsub(/"/, "")}"))
-        throw :halt, "HTTP Basic: Access denied.\n"
-      end
-
-  end
-end
-
-module Sinatra
-  class EventContext
-    include HttpAuthentication::Basic
-  end
-end