taskwarrior-web 0.0.14 → 0.0.15

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.15 (3/12/12)
+
+* Fixed error in http auth
+* Moved views and public folders into lib
+
 ## v0.0.14 (2/9/12)
 
 * Merged in major refactoring to allow for easier support of task 2 and

data/lib/taskwarrior-web/app.rb

@@ -14,6 +14,8 @@ module TaskwarriorWeb
     @@root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
     set :root,  @@root    
     set :app_file, __FILE__
+    set :public_folder, File.dirname(__FILE__) + '/public'
+    set :views, File.dirname(__FILE__) + '/views'
     
     def protected!
       response['WWW-Authenticate'] = %(Basic realm="Taskworrior Web") and throw(:halt, [401, "Not authorized\n"]) and return unless authorized?
@@ -21,9 +23,8 @@ module TaskwarriorWeb
 
     def authorized?
       @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-      @auth.provided? && @auth.basic? && @auth.credentials &&
-        @auth.credentials[0] == TaskwarriorWeb::Config.property('task-web.user') &&
-        Digest::MD5.hexdigest(@auth.credentials[1]) == TaskwarriorWeb::Config.property('task-web.passwd')
+      values = [TaskwarriorWeb::Config.property('task-web.user'), TaskwarriorWeb::Config.property('task-web.passwd')]
+      @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == values
     end
 
     # Before filter

data/lib/taskwarrior-web/config.rb

@@ -4,8 +4,12 @@ module TaskwarriorWeb
   class Config
 
     def self.task_version
-      # TODO: Parse the actual task version
-      1
+      unless @task_version
+        version_line = `task version | grep '^task '`
+        @task_version = version_line.split.at(1)
+      end
+
+      @task_version
     end
 
     def self.file

data/taskwarrior-web.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "taskwarrior-web"
-  s.version     = '0.0.14'
+  s.version     = '0.0.15'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jake Bell"]
   s.email       = ["jake@theunraveler.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152168480 !ruby/object:Gem::Requirement
+  requirement: &70154504021780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152168480
+  version_requirements: *70154504021780
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &2152167760 !ruby/object:Gem::Requirement
+  requirement: &70154504020500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152167760
+  version_requirements: *70154504020500
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2152167020 !ruby/object:Gem::Requirement
+  requirement: &70154504040200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152167020
+  version_requirements: *70154504040200
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &2152166160 !ruby/object:Gem::Requirement
+  requirement: &70154504039160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152166160
+  version_requirements: *70154504039160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152165600 !ruby/object:Gem::Requirement
+  requirement: &70154504036820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152165600
+  version_requirements: *70154504036820
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152165000 !ruby/object:Gem::Requirement
+  requirement: &70154504034640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152165000
+  version_requirements: *70154504034640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152164380 !ruby/object:Gem::Requirement
+  requirement: &70154504033940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152164380
+  version_requirements: *70154504033940
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152023060 !ruby/object:Gem::Requirement
+  requirement: &70154504049400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152023060
+  version_requirements: *70154504049400
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152021400 !ruby/object:Gem::Requirement
+  requirement: &70154504048520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152021400
+  version_requirements: *70154504048520
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152020560 !ruby/object:Gem::Requirement
+  requirement: &70154504047860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152020560
+  version_requirements: *70154504047860
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -145,38 +145,45 @@ files:
 - lib/taskwarrior-web/command.rb
 - lib/taskwarrior-web/config.rb
 - lib/taskwarrior-web/helpers.rb
+- lib/taskwarrior-web/public/css/gh-buttons.css
+- lib/taskwarrior-web/public/css/jquery-ui.css
+- lib/taskwarrior-web/public/css/jquery.tagsinput.css
+- lib/taskwarrior-web/public/css/styles.css
+- lib/taskwarrior-web/public/css/tipsy.css
+- lib/taskwarrior-web/public/favicon.ico
+- lib/taskwarrior-web/public/images/ajax-loader.gif
+- lib/taskwarrior-web/public/images/arrow_right_black.png
+- lib/taskwarrior-web/public/images/arrow_right_grey.png
+- lib/taskwarrior-web/public/images/bg_fallback.png
+- lib/taskwarrior-web/public/images/gh-icons.png
+- lib/taskwarrior-web/public/images/grid-view.png
+- lib/taskwarrior-web/public/images/icon_sprite.png
+- lib/taskwarrior-web/public/images/list-view.png
+- lib/taskwarrior-web/public/images/logo.png
+- lib/taskwarrior-web/public/images/progress_bar.gif
+- lib/taskwarrior-web/public/images/slider_handles.png
+- lib/taskwarrior-web/public/images/subnav_background.gif
+- lib/taskwarrior-web/public/images/tab_background.gif
+- lib/taskwarrior-web/public/images/tipsy.gif
+- lib/taskwarrior-web/public/images/ui-icons_222222_256x240.png
+- lib/taskwarrior-web/public/images/ui-icons_454545_256x240.png
+- lib/taskwarrior-web/public/js/application.js
+- lib/taskwarrior-web/public/js/jquery-ui.min.js
+- lib/taskwarrior-web/public/js/jquery.cookie.js
+- lib/taskwarrior-web/public/js/jquery.min.js
+- lib/taskwarrior-web/public/js/jquery.tagsinput.js
+- lib/taskwarrior-web/public/js/jquery.tipsy.js
 - lib/taskwarrior-web/runner.rb
 - lib/taskwarrior-web/runners/v1.rb
 - lib/taskwarrior-web/runners/v2.rb
 - lib/taskwarrior-web/task.rb
-- public/css/gh-buttons.css
-- public/css/jquery-ui.css
-- public/css/jquery.tagsinput.css
-- public/css/styles.css
-- public/css/tipsy.css
-- public/favicon.ico
-- public/images/ajax-loader.gif
-- public/images/arrow_right_black.png
-- public/images/arrow_right_grey.png
-- public/images/bg_fallback.png
-- public/images/gh-icons.png
-- public/images/grid-view.png
-- public/images/icon_sprite.png
-- public/images/list-view.png
-- public/images/logo.png
-- public/images/progress_bar.gif
-- public/images/slider_handles.png
-- public/images/subnav_background.gif
-- public/images/tab_background.gif
-- public/images/tipsy.gif
-- public/images/ui-icons_222222_256x240.png
-- public/images/ui-icons_454545_256x240.png
-- public/js/application.js
-- public/js/jquery-ui.min.js
-- public/js/jquery.cookie.js
-- public/js/jquery.min.js
-- public/js/jquery.tagsinput.js
-- public/js/jquery.tipsy.js
+- lib/taskwarrior-web/views/404.erb
+- lib/taskwarrior-web/views/_navigation.erb
+- lib/taskwarrior-web/views/layout.erb
+- lib/taskwarrior-web/views/listing.erb
+- lib/taskwarrior-web/views/project.erb
+- lib/taskwarrior-web/views/projects.erb
+- lib/taskwarrior-web/views/task_form.erb
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
 - spec/models/command_spec.rb
@@ -184,13 +191,6 @@ files:
 - spec/models/task_spec.rb
 - spec/spec_helper.rb
 - taskwarrior-web.gemspec
-- views/404.erb
-- views/_navigation.erb
-- views/layout.erb
-- views/listing.erb
-- views/project.erb
-- views/projects.erb
-- views/task_form.erb
 homepage: http://github.com/theunraveler/taskwarrior-web
 licenses: []
 post_install_message: 
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1565305535582289311
+      hash: -2283855477715549866
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11