pimon 0.1.3 → 0.1.4

data/README.md

@@ -20,11 +20,10 @@ Optionally you may install it as a gem and run it, please check "Installing as a
 ## Configuration
 Configuration is done through a YAML file, you may check some examples on the config directory.
 
-1. basic_auth - enable or disable, configure username and password
-2. redis - location of the redis socket
-3. chart - colors for each chart
-4. queues - redis list names for the series in the charts
-5. stats_collector - configure number of stats and time period between them
+1. redis - location of the redis socket
+2. chart - colors for each chart
+3. queues - redis list names for the series in the charts
+4. stats_collector - configure number of stats and time period between them
 
 ## Installing as a gem
 ```
@@ -38,6 +37,7 @@ Options:
     -c, --config CONFIG              YAML configuration file for pimon
     -d, --daemonize                  Run Pimon daemonized in the background
     -e, --environment ENVIRONMENT    Application environment (default: "development", options: "development", "production")
+    -i, --interface INTERFACE        Hostname or IP address of the interface to listen on (default: "localhost")
     -p, --port PORT                  Port to use (default: 3000)
     -P, --pid PIDFILE                File to store PID (default: /tmp/pimon.pid)
 ```
@@ -83,9 +83,8 @@ this feature will probably be discontinued in the future.
 
 ## TODO
 1. Improve disk stats, have a way of having custom mount points
-2. Capistrano task to reset production basic_auth username and password
-3. Show uptime
-4. Change configuration in realtime
+2. Show uptime
+3. Change configuration in realtime
 
 ## Copyright
 Licensed under the [WTFPL](http://en.wikipedia.org/wiki/WTFPL "Do What The Fuck You Want To Public License") license.

data/bin/pimon

@@ -26,6 +26,12 @@ Options:
     options[:environment] = environment
   end
   
+  opts.on('-i INTERFACE',
+          '--interface INTERFACE',
+          'Hostname or IP address of the interface to listen on (default: "localhost")') do |interface|
+    options[:interface] = interface
+  end
+
   opts.on('-p PORT',
           '--port PORT',
           'Port to use (default: 3000)') do |port|
@@ -53,10 +59,11 @@ begin
   when 'start'
     require 'thin'
     port = options[:port] || 3000
+    interface = options[:interface] || 'localhost'
     options[:environment] ? ENV['RACK_ENV'] = options[:environment] : ENV['RACK_ENV'] = 'development'
     config = "#{File.dirname(__FILE__)}/../config/config.ru"
     ENV['PIMON_CONFIG'] = options[:pimon_config] if options[:pimon_config]
-    puts "Pimon is starting at http://localhost:#{port}"
+    puts "Pimon is starting at http://#{interface}:#{port}"
     puts "Running in #{ENV['RACK_ENV']} mode."
     
     if ENV['PIMON_CONFIG']
@@ -65,7 +72,7 @@ begin
       puts "Using default configuration"
     end
     
-    server = Rack::Server.new(:config => config, :daemonize => options[:daemonize], :pid => pid_file, :Port => port, :server => 'thin')
+    server = Rack::Server.new(:config => config, :daemonize => options[:daemonize], :pid => pid_file, :Port => port, :server => 'thin', :Host => interface)
     server.start
   when 'stop'
     if File.file?(pid_file)

data/config/default.yml

@@ -1,5 +1,3 @@
-basic_auth:
-  enabled: false
 redis:
   socket: /tmp/redis.sock
 chart:

data/config/deploy.rb

@@ -19,7 +19,7 @@ after 'deploy:update_code', 'deploy:bundle_install'
 
 namespace :deploy do
   task :start, :roles => [:web, :app] do
-    run "cd #{deploy_to}/current && && PIMON_CONFIG=#{deploy_to}/current/config/production.yml nohup thin -C config/thin/config.yml -R config/config.ru start"
+    run "cd #{deploy_to}/current && PIMON_CONFIG=#{deploy_to}/shared/production.yml nohup thin -C config/thin/config.yml -R config/config.ru start"
   end
   
   task :stop, :roles => [:web, :app] do
@@ -28,36 +28,14 @@ namespace :deploy do
   
   task :restart, :roles => [:web, :app] do
     deploy.stop
-    deploy.check_basic_auth
     deploy.start
   end
   
   task :cold do
     deploy.update
-    deploy.check_basic_auth
     deploy.start
   end
   
-  desc "After deploying check if there's need for a new username/password for the basic_auth"
-  task :check_basic_auth, :roles => :app do
-    require "yaml"
-    set :username, proc { Capistrano::CLI.ui.ask("username : ") }
-    set :password, proc { Capistrano::CLI.password_prompt("password : ") }
-    set :shared_config, "#{deploy_to}/shared/production.yml"
-    
-    if 'true' ==  capture("if [ -e #{shared_config} ]; then echo 'true'; fi").strip
-      run "cp #{shared_config} #{deploy_to}/current/config/production.yml"
-    else
-      production_config = YAML::load_file('config/production.yml')
-      production_config['basic_auth']['username'] = username
-      production_config['basic_auth']['password'] = password
-      
-      put YAML::dump(production_config), shared_config, :mode => 0664
-      run "cp #{shared_config} #{deploy_to}/current/config/production.yml"
-      puts "DONE"
-    end
-  end
-  
   desc "run 'bundle install' to install Bundler's packaged gems for the current deploy"
   task :bundle_install, :roles => :app do
     run "cd #{deploy_to}/current && bundle install --without test development"

data/lib/pimon.rb

@@ -16,15 +16,7 @@ class Pimon < Sinatra::Base
   set :public_folder, "#{File.dirname(__FILE__)}/pimon/public"
   set :views,         "#{File.dirname(__FILE__)}/pimon/views"
   set :sockets, []
-  
-  def self.configure_basic_auth
-    if settings.config.is_basic_auth_enabled?
-      use Rack::Auth::Basic, "Restricted Area" do |username, password|
-        [username, password] == config.basic_auth
-      end
-    end
-  end
-  
+
   configure :development, :production do
     require 'redis'
     filename = "#{File.dirname(__FILE__)}/../config/default.yml"
@@ -43,7 +35,6 @@ class Pimon < Sinatra::Base
     set :stats_checker, StatsCollector.new(config, Redis.new(:path => config.redis[:socket]))
     set :timer, nil
     
-    self.configure_basic_auth
   end
   
   configure :test do
@@ -55,7 +46,6 @@ class Pimon < Sinatra::Base
     set :stats_checker, StatsCollector.new(config, MockRedis.new)
     set :timer, nil
     
-    self.configure_basic_auth
   end
   
   get '/' do

data/lib/pimon/version.rb

@@ -1,3 +1,3 @@
 module Pimon
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/pimon_spec.rb

@@ -15,21 +15,9 @@ RSpec.configure do |config|
 end
 
 describe "Pimon" do
-  context "when not authenticated" do
+  it "should be success" do
     
-    it "should be not authorized" do
-      get '/'
-      expect(last_response.status).to eq(401)
-    end
-  end
-  
-  context "when authenticated" do
-    before { authorize 'pimon', 'pimon' }
-    
-    it "should be success" do
-      
-      get '/'
-      expect(last_response).to be_ok
-    end
+    get '/'
+    expect(last_response).to be_ok
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pimon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -216,7 +216,6 @@ files:
 - config/config_dev.ru
 - config/default.yml
 - config/deploy.rb
-- config/production.yml
 - config/test.yml
 - config/test_broken.yml
 - config/thin/config.yml

data/config/production.yml

@@ -1,27 +0,0 @@
-basic_auth:
-  enabled: true
-  username: changed_on_deploy
-  password: changed_on_deploy
-redis:
-  socket: /tmp/redis.sock
-chart:
-  cpu:
-    color: '#D2691E'
-  disk:
-    color: '#CDC673'
-  mem:
-    color: '#87CEFA'
-  temp:
-    color: '#FF9B04'
-  swap:
-    color: '#3CB371'
-queues:
-  time: pimon_time
-  cpu:  pimon_cpu
-  disk: pimon_disk
-  mem:  pimon_mem
-  swap: pimon_swap
-  temp: pimon_temp
-stats_collector:
-  number_of_stats: 12
-  time_period_in_min: 5