geminabox-secure 0.3.6 → 0.3.7

data/README.markdown

@@ -1,10 +1,10 @@
 # Gem in a Box Secure
 
-![screen shot](http://i50.tinypic.com/2yknxnr.png)
+![screen shot](http://i.imgur.com/FS9lw.png)
 
 ## Really simple secure rubygem hosting
 
-Gem in a Box secure is a very basic branch of the awesome [Gem in a box][geminabox] - a simple [sinatra][sinatra] app to allow you to host your own in-house gems. The main difference here is the secure flavor provides forced SSL and HTTP basic auth.
+Gem in a Box Secure is a very basic branch of the awesome [Gem in a box][geminabox] - a simple [sinatra][sinatra] app to allow you to host your own in-house gems. The main difference here is the secure flavor provides configurable forced SSL and HTTP basic auth.
 
 ## Server Setup
 
@@ -16,11 +16,12 @@ Create a config.ru as follows:
     require "geminabox-secure"
 
     GeminaboxSecure.data = "/var/geminabox-data" # …or wherever
+	GeminaboxSecure.force_ssl = true #if you want SSL redirects enabled
     run GeminaboxSecure
 
-Set environment variables for your username and password: GEMBOX_USER and GEMBOX_PASSWORD, respectively. 
+Set environment variables for your username and password: GEMBOX_USER and GEMBOX_PASSWORD, respectively. Gem in a Box Secure defaults to "admin" and "s3cret" respectively if these are not set.
 
-Set up your SSL certificates.
+Set up your SSL certificates for your server of choice. 
 
 And finally, hook up the config.ru as you normally would ([passenger][passenger], [thin][thin], [unicorn][unicorn], whatever floats your boat).
 

data/lib/geminabox-secure.rb

@@ -17,10 +17,20 @@ class GeminaboxSecure < Sinatra::Base
   set :data, File.join(File.dirname(__FILE__), *%w[.. data])
   set :views, File.join(File.dirname(__FILE__), *%w[.. views])
   set :allow_replace, false
+  set :force_ssl, false
+  
   use Hostess
-  use Rack::SslEnforcer
+  
+  #defaults for SSL and basic HTTP Auth
+  if settings.force_ssl
+    use Rack::SslEnforcer
+  end
+  sec_user = ENV['GEMBOX_USER'].nil? ? 'admin' : ENV['GEMBOX_USER']
+  sec_pw = ENV['GEMBOX_PASSWORD'].nil? ? 's3cret' : ENV['GEMBOX_PASSWORD']
+  
+  #setup HTTP Auth
   use Rack::Auth::Basic, "Restricted Area" do |username, password|
-    [username, password] == [ENV['GEMBOX_USER'],ENV['GEMBOX_PASSWORD']]
+    [username, password] == [sec_user,sec_pw]
   end
 
   class << self
@@ -61,9 +71,9 @@ class GeminaboxSecure < Sinatra::Base
 
     tmpfile.binmode
 
-    Dir.mkdir(File.join(options.data, "gems")) unless File.directory? File.join(options.data, "gems")
+    Dir.mkdir(File.join(settings.data, "gems")) unless File.directory? File.join(settings.data, "gems")
 
-    dest_filename = File.join(options.data, "gems", File.basename(name))
+    dest_filename = File.join(settings.data, "gems", File.basename(name))
 
 
     if GeminaboxSecure.disallow_replace? and File.exist?(dest_filename)
@@ -102,16 +112,16 @@ HTML
   end
 
   def reindex
-    Gem::Indexer.new(options.data).generate_index
+    Gem::Indexer.new(settings.data).generate_index
   end
 
   def file_path
-    File.expand_path(File.join(options.data, *request.path_info))
+    File.expand_path(File.join(settings.data, *request.path_info))
   end
 
   def load_gems
     %w(specs prerelease_specs).inject(GemVersionCollection.new){|gems, specs_file_type|
-      specs_file_path = File.join(options.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
+      specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
       if File.exists?(specs_file_path)
         gems + Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path)))
       else
@@ -126,7 +136,7 @@ HTML
 
   helpers do
     def spec_for(gem_name, version)
-      spec_file = File.join(options.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
+      spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
       Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file
     end
 

data/lib/hostess.rb

@@ -2,7 +2,7 @@ require 'sinatra/base'
 
 class Hostess < Sinatra::Base
   def serve
-    send_file(File.expand_path(File.join(Geminabox.data, *request.path_info)), :type => response['Content-Type'])
+    send_file(File.expand_path(File.join(GeminaboxSecure.data, *request.path_info)), :type => response['Content-Type'])
   end
 
   %w[/specs.4.8.gz

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox-secure
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153239700 !ruby/object:Gem::Requirement
+  requirement: &2164731940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153239700
+  version_requirements: *2164731940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2153238920 !ruby/object:Gem::Requirement
+  requirement: &2164729960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153238920
+  version_requirements: *2164729960
 - !ruby/object:Gem::Dependency
   name: rack-ssl-enforcer
-  requirement: &2153237920 !ruby/object:Gem::Requirement
+  requirement: &2164728620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153237920
+  version_requirements: *2164728620
 description: Gem in a box with basic HTTP authentication and forced SSL, designed
   for use on Heroku or other cloud-based hosting services
 email: judd+contrib@euclidelements.com