izanami 0.17.0 → 0.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFiMDJhNDIzZGM5ZjNhNGIwYzMyMjZiZjgxYWNjZmU1MzUzMDNiMg==
+    NmFiZWJjZDIxNDNkMzI2ZmUwNjg3NDRhYzA4ZWE2MjE3YWQ3NzM4MQ==
   data.tar.gz: !binary |-
-    NzM2N2FjODYzMmI4NzhmMTJkYWMwMzEyZTY3ZWQzMTYyYThkNmQ5Ng==
+    NWE3NjI5Nzc0NGJiMTU1NDA2M2I5OTE3YzA1MDAzMDNhMTQzZmIwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTIyM2NhOTUyMDQzZTY0YjcwOGRkZWVmY2NlOWZkN2Q0YzIzOWU2YmY1MWI2
-    MWJmODcxZWU4Mjg3ZTZjZjcyN2U1NjJlM2VkZDM3Y2ViY2E0N2E2ZTkxMTBj
-    NDA0NGFmYWUzNzkyODU3MDU2NjA1NDQ2OWM5ZDgyYzBhZTE1ZDc=
+    Njc2OWJhMmNlNGVmM2QzNGE0MGQ2M2YyZTA3OGY4ZTE5M2EwOThkMzM4ZGEy
+    NzA3NDZmNjAxMWFlZTc2YTc3MmY4YzVjNjRlOTJhOTIxNzI4Mzc4ZjYwZTgy
+    YmExOTM1ODA0NzQ1MjYwZWFhMWRjZWM0ZGU4ZTcyODBhM2M0Mzc=
   data.tar.gz: !binary |-
-    OTNjZjFjOGM4YmY3YmQ2OWYzMjUwNGE2MjFlMmEzODdiZTVkNzg2YThiZGNk
-    MzUxOWQxMzJkOTA0YzhiYzc5ZjRjZGNmZDJlMjg2MzVhNjI3Y2U0Mzk2Mzcx
-    YzBhNDc1NWQ2NjZmMjg1OGZiMmFhN2FlMDYzOGQxNjE5N2ZiOWI=
+    ZDZjYmU3NTAyMTcxZjk1OGM3YTNhOGFmMjA0YTYyMWRlOTA2NGM4MzVkMjdh
+    ZWZkNGQ2ZTdjMzdmZGE4N2QwOTg1NzRhNjBhZTIwODJhM2MzYmViZTQwNDE2
+    ZDc2M2RiZDgyZjRlMTAwM2ZlYTdlNWE2MWEyZGU5MWY1YzEzMGI=

data/README.md

@@ -52,8 +52,9 @@ Izanami configuration is handled via environment variables:
 
 * `RACK_ENV`: App environment (e.g: `development`, `production`, `test`. Defaults to `development`).
 * `IZANAMI_PORT`: Web app port (defaults to `4567`).
-* `IZANAMI_USER`: User for the HTTP Basic Authentication (e.g: `izanami`).
-* `IZANAMI_PASSWORD`: Password for the HTTP Basic Authentication (e.g: `$3cr3t`).
+* `IZANAMI_AUTH`: Check if the app should use the built in basic auth module. Pass `disable` or `disabled` to skip it (is `enabled` by default).
+* `IZANAMI_USER`: User for the HTTP Basic Authentication, if `IZANAMI_AUTH` is enabled (e.g: `izanami`).
+* `IZANAMI_PASSWORD`: Password for the HTTP Basic Authentication, if `IZANAMI_AUTH` is enabled (e.g: `$3cr3t`).
 * `IZANAMI_REDIS_URL`: Redis configuration in URL format (defaults to `redis://127.0.0.1:6379/0`).
 * `IZANAMI_SANDBOX`: Path to the directory with the capistrano recipes.
 * `IZANAMI_WATCHDOG_SLEEP_TIME`: The time the watchdog sleeps before update the sandbox git repository (default to 300 seconds).
@@ -62,8 +63,12 @@ Izanami configuration is handled via environment variables:
 
 Izanami runs with `thin` by default. You can start the app with:
 
+    # With HTTP Basic Authentication
     $ IZANAMI_USER=izanami IZANAMI_PASSWORD=izanami IZANAMI_SANDBOX=/path/to/recipes izanami app
 
+    # Without HTTP Basic Authentication
+    $ IZANAMI_AUTH=disable IZANAMI_SANDBOX=/path/to/recipes izanami app
+
 But Izanami is a simple Sinatra app, so you can run it with any ruby server that handles a `config.ru` file:
 
 ```ruby

data/lib/izanami/app.rb

@@ -13,10 +13,6 @@ module Izanami
     # handle PUT and DELETE actions
     use Rack::MethodOverride
 
-    use Rack::Auth::Basic do |user, password|
-      user == ENV['IZANAMI_USER'] && password == ENV['IZANAMI_PASSWORD']
-    end
-
     configure :development, :test do
       set :stylesheets, ['/css/bootstrap.css', '/css/app.css']
     end
@@ -162,5 +158,22 @@ module Izanami
         out.close
       end
     end
+
+    # Sinatra overrides
+    # =====================
+
+    def self.new(*)
+      protect(super)
+    end
+
+    def self.protect(app)
+      if ENV['IZANAMI_AUTH'].to_s.match(/disabled?/i)
+        app
+      else
+        Rack::Auth::Basic.new(app) do |user, password|
+          user == ENV['IZANAMI_USER'] && password == ENV['IZANAMI_PASSWORD']
+        end
+      end
+    end
   end
 end

data/lib/izanami/version.rb

@@ -1,3 +1,3 @@
 module Izanami
-  VERSION = "0.17.0"
+  VERSION = "0.18.0"
 end

data/spec/helper.rb

@@ -1,8 +1,9 @@
-ENV['RACK_ENV'] ||= 'test'
-ENV['IZANAMI_USER'] = 'spec'
-ENV['IZANAMI_PASSWORD'] = 'spec'
-ENV['IZANAMI_SANDBOX'] = File.expand_path('..', __FILE__) + '/sandbox'
-ENV['IZANAMI_REDIS_URL'] ||= 'redis://127.0.0.1:6379/0'
+# Set configuration for specs.
+ENV['RACK_ENV']           ||= 'test'
+ENV['IZANAMI_USER']         = 'spec'
+ENV['IZANAMI_PASSWORD']     = 'spec'
+ENV['IZANAMI_SANDBOX']      = File.expand_path('..', __FILE__) + '/sandbox'
+ENV['IZANAMI_REDIS_URL']  ||= 'redis://127.0.0.1:6379/0'
 
 require 'bundler'
 Bundler.setup(:default, :test)

data/spec/izanami/app_spec.rb

@@ -1,48 +1,7 @@
 require_relative '../helper'
 require 'izanami/app'
 
-describe Izanami::App do
-  include Rack::Test::Methods
-
-  def app
-    Izanami::App
-  end
-
-  def worker
-    fork { yield }
-  end
-
-  # Simulate Worker::Command
-  def publish(redis_url, id)
-    redis = Redis.new(url: redis_url)
-
-    # wait for a subscriber to connect to a channel
-    loop do
-      subscribers = redis.info['pubsub_channels']
-      break if subscribers != '0'
-    end
-
-    key     = "izanami:commands:#{id}"
-    channel = "izanami:commands:#{id}:channel"
-    output  = 'PONG'
-    status  = 'success'
-
-    redis.publish channel, output
-    redis.multi do
-      redis.publish channel, '--EOC--'
-      redis.hset key, 'status', status
-      redis.hset key, 'output', output
-    end
-  end
-
-  def save_commands(redis, commands)
-    commands.each do |command|
-      # set all the values in redis in one step
-      redis.hmset "izanami:commands:#{command['id']}", *command.to_a.flatten
-      redis.sadd "izanami:commands:ids", command['id']
-    end
-  end
-
+shared_examples 'web app' do
   let!(:redis_url) { ENV['IZANAMI_REDIS_URL'] }
   let(:redis) { Redis.new(url: redis_url) }
 
@@ -64,10 +23,6 @@ describe Izanami::App do
   end
 
   let(:commands) { [command_a, command_b] }
-  let(:user)     { ENV['IZANAMI_USER'] }
-  let(:password) { ENV['IZANAMI_PASSWORD'] }
-
-  before { authorize(user, password) }
 
   after { redis.flushdb }
 
@@ -193,3 +148,61 @@ describe Izanami::App do
     end
   end
 end
+
+describe Izanami::App do
+  include Rack::Test::Methods
+
+  def app
+    Izanami::App.new
+  end
+
+  def worker
+    fork { yield }
+  end
+
+  # Simulate Worker::Command
+  def publish(redis_url, id)
+    redis = Redis.new(url: redis_url)
+
+    # wait for a subscriber to connect to a channel
+    loop do
+      subscribers = redis.info['pubsub_channels']
+      break if subscribers != '0'
+    end
+
+    key     = "izanami:commands:#{id}"
+    channel = "izanami:commands:#{id}:channel"
+    output  = 'PONG'
+    status  = 'success'
+
+    redis.publish channel, output
+    redis.multi do
+      redis.publish channel, '--EOC--'
+      redis.hset key, 'status', status
+      redis.hset key, 'output', output
+    end
+  end
+
+  def save_commands(redis, commands)
+    commands.each do |command|
+      # set all the values in redis in one step
+      redis.hmset "izanami:commands:#{command['id']}", *command.to_a.flatten
+      redis.sadd "izanami:commands:ids", command['id']
+    end
+  end
+
+  context 'with authorization enabled' do
+    let(:user)     { ENV['IZANAMI_USER'] }
+    let(:password) { ENV['IZANAMI_PASSWORD'] }
+
+    before { authorize(user, password) }
+
+    it_should_behave_like 'web app'
+  end
+
+  context 'with authorization disabled' do
+    before { ENV['IZANAMI_AUTH'] = 'disabled' }
+
+    it_should_behave_like 'web app'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izanami
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Juan Hernández
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler