enigmamachine 0.2.0 → 0.2.1

data/README.rdoc

@@ -109,8 +109,8 @@ eats your mother.
 == Installation
 
 Enigmamachine is written in Ruby and uses the Sinatra web framework, the
-Datamapper ORM library, and the Eventmachine event-processing library.  If
-you're not a Ruby person, you don't need to care about any of this.
+Datamapper ORM library, the Eventmachine event-processing library, and the Thin
+webserver.  If you're not a Ruby person, you don't need to care about any of this.
 Enigmamachine can be triggered by any language that can send a POST request -
 so all you PHPistas, python-lovers, droopy-moustachists, or blue-suited
 java types can all use it just as easy as us fashionable-haircut-language
@@ -131,7 +131,7 @@ You'll need to add the following line to your ~/.bashrc file, as well:
 
  export PATH=/var/lib/gems/1.8/bin:$PATH
 
-Then _gem install enigmamachine_ should theoretically work.  You'll also need a copy of
+Then <i>gem install enigmamachine</i> should theoretically work.  You'll also need a copy of
 ffmpeg installed and available in your path. On Mac OS X, rubygems should
 already be installed, although you'll need to have a C compiler available
 (make sure you install the developer tools that came with your operating

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/enigmamachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{enigmamachine}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-07-09}
   s.default_executable = %q{enigmamachine}
   s.description = %q{A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.}
   s.email = %q{dave@caprica}
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "lib/enigmamachine/views/videos/video.erb",
      "lib/ext/array_ext.rb",
      "lib/ext/partials.rb",
+     "lib/generators/config.yml",
      "test/helper.rb",
      "test/support/afile.mpg",
      "test/support/blueprints.rb",

data/lib/enigmamachine.rb

@@ -43,6 +43,8 @@ class EnigmaMachine < Sinatra::Base
   configure :test do
     db = "sqlite3::memory:"
     DataMapper.setup(:default, db)
+    @@username = 'admin'
+    @@password = 'admin'
   end
 
   configure :production, :test, :development do
@@ -53,6 +55,12 @@ class EnigmaMachine < Sinatra::Base
 
   configure :production, :development do
     DataMapper.auto_upgrade!
+    unless File.exist? File.join(Dir.getwd, 'config.yml')
+      FileUtils.cp(File.dirname(__FILE__) +  '/generators/config.yml', Dir.getwd)
+    end
+    raw_config = File.read(Dir.getwd + "/config.yml")
+    @@username = YAML.load(raw_config)['username']
+    @@password = YAML.load(raw_config)['password']
   end
 
   # Set the views to the proper path inside the gem
@@ -72,15 +80,6 @@ class EnigmaMachine < Sinatra::Base
     alias_method :h, :escape_html
   end
 
-  # Set up Rack authentication
-  #
-  # I'm going to disable this for now, although later this might be a good way
-  # of providing security for shared hosts. TODO: figure out how to secure the
-  # app for use on shared hosts.
-  #
-#  use Rack::Auth::Basic do |username, password|
-#    [username, password] == ['admin', 'admin']
-#  end
 
   # Include flash notices
   #
@@ -91,6 +90,7 @@ class EnigmaMachine < Sinatra::Base
   # main Sinatra/thin thread once the periodic timer is added.
   #
   configure do
+
     Video.reset_encoding_videos
     Thread.new do
       until EM.reactor_running?
@@ -100,6 +100,17 @@ class EnigmaMachine < Sinatra::Base
     end
   end
 
+  # Set up Rack authentication
+  #
+  # I'm going to disable this for now, although later this might be a good way
+  # of providing security for shared hosts. TODO: figure out how to secure the
+  # app for use on shared hosts.
+  #
+  use Rack::Auth::Basic do |username, password|
+    [username, password] == [@@username, @@password]
+  end
+
+
   # Shows the enigma status page.
   #
   get '/' do

data/lib/generators/config.yml

@@ -0,0 +1,3 @@
+username: admin
+password: admin
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enigmamachine
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - dave
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +01:00
+date: 2010-07-09 00:00:00 +01:00
 default_executable: enigmamachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/enigmamachine/views/videos/video.erb
 - lib/ext/array_ext.rb
 - lib/ext/partials.rb
+- lib/generators/config.yml
 - test/helper.rb
 - test/support/afile.mpg
 - test/support/blueprints.rb