runit-man 1.8.4 → 1.9.0

data/lib/runit-man/app.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'ftools'
 require 'json'
 require 'erubis'
@@ -160,10 +161,26 @@ class RunitMan < Sinatra::Base
       files_to_view << File.expand_path(file_location, '/')
     end
 
+    def add_user(name, password)
+      allowed_users[name] = password
+    end
+
     def files_to_view
       @files_to_view ||= []
     end
 
+    def allowed_users
+      @allowed_users ||= {}
+    end
+
+    def prepare_to_run
+      unless allowed_users.empty?
+        use Rack::Auth::Basic do |username, password|
+          allowed_users.include?(username) && allowed_users[username] == password
+        end
+      end
+    end
+
   private
     def create_run_script(dir)
       script_name   = File.join(dir, 'run')

data/lib/runit-man/runner.rb

@@ -14,6 +14,7 @@ OptionParser.new { |op|
   op.on('-f all_services_directory (/etc/sv by default)')         { |val| RunitMan.set :all_services_directory, val }
   op.separator 'View options:'
   op.on('-v file_location', 'Enables view of specified file through runit-man') { |val| RunitMan.enable_view_of(val) }
+  op.on('-u user:password', 'Requires user name with given password to auth') { |val| RunitMan.add_user(*(val.split(':', 2))) }
   op.separator 'Configuration options:'
   op.on_tail('-r', '--register', 'Register as runit service') do
     RunitMan.register_as_runit_service
@@ -21,5 +22,7 @@ OptionParser.new { |op|
   end
 }.parse!(ARGV.dup)
 
+RunitMan.prepare_to_run
+
 RunitMan.run!
 

data/lib/runit-man/service_info.rb

@@ -36,7 +36,7 @@ class ServiceInfo
   end
 
   def stat
-    @status.inactive? ? 'inactive' : @status.to_s
+    @status.to_s
   end
 
   def active?

data/lib/runit-man/service_status.rb

@@ -54,6 +54,7 @@ class ServiceStatus
   end
 
   def to_s
+    return 'inactive' if inactive?
     # try to mimics stat behaviour to minimize readings
     result = status_string
     result += ', got TERM' if got_term?

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 8
-  - 4
-  version: 1.8.4
+  - 9
+  - 0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +04:00
+date: 2010-07-19 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency