taskwarrior-web 1.0.3 → 1.0.4

data/lib/taskwarrior-web/runner.rb

@@ -7,9 +7,7 @@ module TaskwarriorWeb
 
     def run
       @built ||= build
-      to_run = "#{TASK_BIN} #{@built}"
-      puts "Command: #{to_run}"
-      `#{to_run}`
+      `#{TASK_BIN} #{@built}`
     end
 
   end

data/lib/taskwarrior-web/views/layout.erb

@@ -5,12 +5,15 @@
     <!-- Styles -->
     <link rel="stylesheet" href="/css/bootstrap.min.css">
     <link rel="stylesheet" href="/css/datepicker.css">
+    <link rel="stylesheet" href="/css/token-input.css">
+    <link rel="stylesheet" href="/css/token-input-facebook.css">
     <link rel="stylesheet" href="/css/styles.css">
 
     <!-- Scripts -->
     <script type="text/javascript" src="/js/jquery.min.js"></script>
     <script type="text/javascript" src="/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="/js/bootstrap-datepicker.js"></script>
+    <script type="text/javascript" src="/js/jquery.tokeninput.js"></script>
     <script type="text/javascript" src="/js/application.js"></script>
   </head>
 
@@ -23,7 +26,7 @@
         <div id="flash-messages">
           <% if @messages %>
             <% @messages.each do |message| %>
-              <div class="alert <%= message.severity %>"><%= message.message %></div>
+              <div class="alert <%= message[:severity] %>"><%= message[:message] %></div>
             <% end %>
           <% end %>
         </div>

data/lib/taskwarrior-web/views/task_form.erb

@@ -3,28 +3,28 @@
   <div class="control-group">
     <label for="task-description" class="control-label">Description</label>
     <div class="controls">
-      <input type="textfield" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
+      <input type="textfield" id="task-description" name="task[description]" value="<%= @task[:description] unless @task.nil? %>" />
     </div>
   </div>
 
   <div class="control-group">
     <label for="task-project" class="control-label">Project</label>
     <div class="controls">
-      <input type="textfield" id="task-project" name="task[project]" value="<%= @task.project unless @task.nil? %>" />
+      <input type="textfield" id="task-project" name="task[project]" value="<%= @task[:project] unless @task.nil? %>" />
     </div>
   </div>
 
   <div class="control-group">
     <label for="task-due" class="control-label">Due Date</label>
     <div class="controls">
-      <input class="date-picker" type="textfield" id="task-due" name="task[due]" value="<%= @task.due unless @task.nil? %>" data-date-format="<%= @date_format %>" />
+      <input class="date-picker" type="textfield" id="task-due" name="task[due]" value="<%= @task[:due] unless @task.nil? %>" data-date-format="<%= @date_format %>" />
     </div>
   </div>
 
   <div class="control-group">
     <label for="task-tags" class="control-label">Tags</label>
     <div class="controls">
-      <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task.tags unless @task.nil? %>" />
+      <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task[:tags] unless @task.nil? %>" />
       <div class="description">Enter tags separated by commas</div>
     </div>
   </div>

data/spec/app/helpers_spec.rb

@@ -46,11 +46,11 @@ describe TaskwarriorWeb::App::Helpers do
       end
 
       it 'should return "today" when a given date is today' do
-        helpers.colorize_date(Time.now.to_s).should eq('today') 
+        helpers.colorize_date(Time.now.to_s).should eq('success') 
       end
 
       it 'should return "overdue" when a date is before today' do
-        helpers.colorize_date(Time.at(0).to_s).should eq('overdue')
+        helpers.colorize_date(Time.at(0).to_s).should eq('error')
       end
     end
   end

data/spec/models/command_builder_spec.rb

@@ -26,7 +26,7 @@ describe TaskwarriorWeb::CommandBuilder do
         TaskwarriorWeb::Config.should_receive(:task_version).and_return('95.583.3')
         expect { 
           TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
-        }.should raise_exception(TaskwarriorWeb::UnrecognizedTaskVersion)
+        }.to raise_exception(TaskwarriorWeb::UnrecognizedTaskVersion)
       end
     end
   end

data/spec/models/command_builders/base_spec.rb

@@ -37,7 +37,7 @@ describe TaskwarriorWeb::CommandBuilder::Base do
     it 'should pull out the description parameter' do
       command = TaskwarriorWeb::Command.new(:add, nil, :description => 'Hello', :status => :pending)
       command.parse_params
-      command.params.should eq(" 'Hello' status:pending")
+      command.params.should eq(" Hello status:pending")
     end
   end  
 end

data/spec/models/command_builders/v1_spec.rb

@@ -14,7 +14,8 @@ describe TaskwarriorWeb::CommandBuilder::V1 do
 
     it 'should replace the :id string with the given task ID' do
       TaskwarriorWeb::Task.should_receive(:query).and_return([OpenStruct.new(:uuid => 34588)])
-      @command.task_command.substitute_parts
+      @command.task_command
+      @command.substitute_parts
       @command.command_string.should eq('1 done')
     end
   end

data/spec/models/config_spec.rb

@@ -4,10 +4,10 @@ require 'ostruct'
 
 describe TaskwarriorWeb::Config do
   describe '.property' do
-    it 'should call #get_value on the config file object' do
-      file = OpenStruct.new
+    it 'should call #[] on the config file object' do
+      file = {}
       TaskwarriorWeb::Config.should_receive(:file).and_return(file)
-      file.should_receive(:get_value).with('testing')
+      file.should_receive(:[]).with('testing')
       TaskwarriorWeb::Config.property('testing')
     end
   end

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     = '1.0.3'
+  s.version     = '1.0.4'
   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: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70275761273200 !ruby/object:Gem::Requirement
+  requirement: &70202272434500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275761273200
+  version_requirements: *70202272434500
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70275761272740 !ruby/object:Gem::Requirement
+  requirement: &70202272433920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275761272740
+  version_requirements: *70202272433920
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70275761272320 !ruby/object:Gem::Requirement
+  requirement: &70202272433500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275761272320
+  version_requirements: *70202272433500
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70275761288220 !ruby/object:Gem::Requirement
+  requirement: &70202272433060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275761288220
+  version_requirements: *70202272433060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70275761287660 !ruby/object:Gem::Requirement
+  requirement: &70202272432500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275761287660
+  version_requirements: *70202272432500
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70275761287240 !ruby/object:Gem::Requirement
+  requirement: &70202272432080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275761287240
+  version_requirements: *70202272432080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70275761286640 !ruby/object:Gem::Requirement
+  requirement: &70202272431560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275761286640
+  version_requirements: *70202272431560
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -121,6 +121,8 @@ files:
 - lib/taskwarrior-web/public/css/datepicker.css
 - lib/taskwarrior-web/public/css/jquery.tagsinput.css
 - lib/taskwarrior-web/public/css/styles.css
+- lib/taskwarrior-web/public/css/token-input-facebook.css
+- lib/taskwarrior-web/public/css/token-input.css
 - lib/taskwarrior-web/public/favicon.ico
 - lib/taskwarrior-web/public/img/ajax-loader.gif
 - lib/taskwarrior-web/public/img/glyphicons-halflings-white.png
@@ -129,6 +131,7 @@ files:
 - lib/taskwarrior-web/public/js/bootstrap-datepicker.js
 - lib/taskwarrior-web/public/js/bootstrap.min.js
 - lib/taskwarrior-web/public/js/jquery.min.js
+- lib/taskwarrior-web/public/js/jquery.tokeninput.js
 - lib/taskwarrior-web/runner.rb
 - lib/taskwarrior-web/task.rb
 - lib/taskwarrior-web/views/404.erb
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2906027418191232852
+      hash: -1446522944856929929
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11