octopusci 0.0.2 → 0.0.3

data/bin/octopusci-skel

@@ -20,6 +20,10 @@ if !File.exists?(CONFIG_PATH)
     f << "general:
   jobs_path: \"/etc/octopusci/jobs\"
 
+http_basic:
+  username: admin
+  password: admin
+
 smtp:
   notification_from_email: somefrom@example.com
   address: smtp.gmail.com

data/config.ru

@@ -2,4 +2,9 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
 require 'resque/server'
 require 'octopusci/server'
 
+# Set the AUTH env variable to your basic auth password to protect Resque.
+Resque::Server.use Rack::Auth::Basic do |username, password|
+  (username == Octopusci::CONFIG['http_basic']['username']) && (password == Octopusci::CONFIG['http_basic']['password'])
+end
+
 run Rack::URLMap.new("/" => Octopusci::Server.new, "/resque" => Resque::Server.new)

data/lib/octopusci/server.rb

@@ -19,27 +19,33 @@ module Octopusci
       super
     end
     
+    helpers do
+      def protected!
+        unless authorized?
+          response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+          throw(:halt, [401, "Not authorized\n"])
+        end
+      end
+
+      def authorized?
+        @auth ||=  Rack::Auth::Basic::Request.new(request.env)        
+        @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [ Octopusci::CONFIG['http_basic']['username'], Octopusci::CONFIG['http_basic']['password'] ]
+      end
+    end
+    
     get '/' do
+      protected!
       @jobs = ::Job.order('jobs.created_at DESC').limit(20)
       erb :index
     end
     
     get '/:repo_name/:branch_name' do
+      protected!
       @page_logo = "#{params[:repo_name]} / #{params[:branch_name]}"
       @jobs = ::Job.where(:repo_name => params[:repo_name], :ref => "refs/heads/#{params[:branch_name]}").order('jobs.created_at DESC').limit(20)
       erb :index
     end
     
-    get '/:project_name/:branch_name/manbuild' do
-      github_payload = {}
-      # q_name = params[:project_name] + '-' + params[:branch_name]
-      # puts "#{q_name} - Queue Size: #{Resque.size(q_name)}"
-      # Resque.push(q_name, :class => 'Octopusci::Job', :args => ['/tmp/pusci_cmds.sh', github_payload])
-      # Use redis to store 'payload:foo' as the git
-
-      Octopusci::Queue.enqueue('MyTestJob', params[:project_name], params[:branch_name], github_payload)
-    end
-
     post '/github-build' do
       if params['payload'].nil?
         raise "No payload paramater found, it is a required parameter."

data/lib/octopusci/version.rb

@@ -1,3 +1,3 @@
 module Octopusci
-  Version = VERSION = '0.0.2'
+  Version = VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopusci
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70336835158680 !ruby/object:Gem::Requirement
+  requirement: &70282212736200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835158680
+  version_requirements: *70282212736200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70336835152260 !ruby/object:Gem::Requirement
+  requirement: &70282212731320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835152260
+  version_requirements: *70282212731320
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70336835138220 !ruby/object:Gem::Requirement
+  requirement: &70282212729460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835138220
+  version_requirements: *70282212729460
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70336835137420 !ruby/object:Gem::Requirement
+  requirement: &70282212728420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835137420
+  version_requirements: *70282212728420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70336835136400 !ruby/object:Gem::Requirement
+  requirement: &70282212727440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835136400
+  version_requirements: *70282212727440
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70336835135080 !ruby/object:Gem::Requirement
+  requirement: &70282212726300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835135080
+  version_requirements: *70282212726300
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70336835134300 !ruby/object:Gem::Requirement
+  requirement: &70282212725020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835134300
+  version_requirements: *70282212725020
 - !ruby/object:Gem::Dependency
   name: time-ago-in-words
-  requirement: &70336835133020 !ruby/object:Gem::Requirement
+  requirement: &70282212723340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336835133020
+  version_requirements: *70282212723340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70336835131820 !ruby/object:Gem::Requirement
+  requirement: &70282212710440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835131820
+  version_requirements: *70282212710440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336835130620 !ruby/object:Gem::Requirement
+  requirement: &70282212709320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835130620
+  version_requirements: *70282212709320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70336835127980 !ruby/object:Gem::Requirement
+  requirement: &70282212706940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835127980
+  version_requirements: *70282212706940
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70336835126760 !ruby/object:Gem::Requirement
+  requirement: &70282212705040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835126760
+  version_requirements: *70282212705040
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70336835124780 !ruby/object:Gem::Requirement
+  requirement: &70282212702720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835124780
+  version_requirements: *70282212702720
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70336835121580 !ruby/object:Gem::Requirement
+  requirement: &70282212701100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835121580
+  version_requirements: *70282212701100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70336835120460 !ruby/object:Gem::Requirement
+  requirement: &70282212699740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336835120460
+  version_requirements: *70282212699740
 description: A multi-branch Continous Integration server that integrates with GitHub
 email:
 - cyphactor@gmail.com