taskwarrior-web 0.0.15 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.0 (3/19/12)
+
+* Refactored for taskwarrior 2.0 compatibility.
+* Re-added task completion for both v1 and v2.
+
 ## v0.0.15 (3/12/12)
 
 * Fixed error in http auth

data/README.md

@@ -3,6 +3,8 @@
 A lightweight, Sinatra-based web interface for the
 wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
+**Now compatible with ALL versions of Taskwarrior, including the new 2.0.0**
+
 [![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
 
 ## Installation
@@ -32,20 +34,10 @@ The current featureset includes:
 * If you are on a Mac and use Fluid.app, you get a dock badge showing the
   number of pending tasks.
 
-I'm looking to include more features once `task` supports issuing commands via
-UUID, like:
-
-* Marking a pending task as done.
-* Deleting tasks
-
 ## Known Issues
 
-* Currently, taskwarrior-web does not work with task 2. It will by the time
-  task 2 is out of beta.
 * taskwarrior-web requires Ruby >= 1.9. It will not work with 1.8 and lower.
   Support for 1.8 will happen at some point.
-* The "View as list"/"View as Grid" links do nothing right now. (They will
-  soon).
 
 ## Marginalia
 

data/lib/taskwarrior-web/app.rb

@@ -119,6 +119,12 @@ module TaskwarriorWeb
       TaskwarriorWeb::Task.count(:status => :pending).to_s
     end
 
+    post '/ajax/task-complete/:id/?' do
+      # Bummer that we have to directly use Command here, but apparently tasks
+      # cannot be filtered by UUID.
+      TaskwarriorWeb::Command.new(:complete, params[:id]).run
+    end
+
     # Error handling
     not_found do
       @title = 'Page Not Found'

data/lib/taskwarrior-web/command.rb

@@ -1,25 +1,20 @@
+require 'taskwarrior-web/command_builder'
 require 'taskwarrior-web/runner'
 
 module TaskwarriorWeb
   class Command
 
-    attr_accessor :command, :id, :params
+    include TaskwarriorWeb::CommandBuilder
+    include TaskwarriorWeb::Runner
+
+    attr_accessor :command, :id, :params, :built, :command_string
 
     def initialize(command, id = nil, *args)
       @command = command if command
       @id = id if id
+      puts "@id in command.rb: #{@id}"
       @params = args.last.is_a?(::Hash) ? args.pop : {}
     end
 
-    def run
-      if @command
-        TaskwarriorWeb::Runner.run(self)
-      else
-        raise MissingCommandError
-      end
-    end
-
   end
-
-  class MissingCommandError < Exception; end
 end

data/lib/taskwarrior-web/command_builder.rb

@@ -0,0 +1,22 @@
+require 'taskwarrior-web/config'
+
+module TaskwarriorWeb
+  module CommandBuilder
+    def self.included(class_name)
+      class_name.class_eval do
+        case TaskwarriorWeb::Config.task_major_version
+        when 2
+          require 'taskwarrior-web/command_builders/v2'
+          include TaskwarriorWeb::CommandBuilder::V2
+        when 1
+          require 'taskwarrior-web/command_builders/v1'
+          include TaskwarriorWeb::CommandBuilder::V1
+        else
+          raise TaskwarriorWeb::UnrecognizedTaskVersion
+        end
+      end
+    end
+  end
+
+  class UnrecognizedTaskVersion < Exception; end
+end

data/lib/taskwarrior-web/command_builders/base.rb

@@ -0,0 +1,64 @@
+module TaskwarriorWeb::CommandBuilder
+  module Base
+
+    TASK_COMMANDS = {
+      :add => 'add',
+      :query => '_query',
+      :count => 'count',
+      :complete => ':id done'
+    }    
+
+    def build
+      unless @command_string
+        task_command
+        substitute_parts if @command_string =~ /:id/
+      end
+      parse_params
+      @built = "#{self.command_string}#{params}"
+    end
+
+    def task_command
+      if TASK_COMMANDS.has_key?(@command.to_sym)
+        @command_string = TASK_COMMANDS[@command.to_sym]
+        return self
+      else
+        raise InvalidCommandError
+      end
+    end
+
+    def substitute_parts
+      if @id
+        @command_string.gsub!(':id', "uuid:#{@id.to_s}")
+        return self
+      else
+        raise MissingTaskIDError
+      end
+    end
+
+    def parse_params
+      string = ''
+      string << " '#{@params.delete(:description)}'" if @params.has_key?(:description)
+
+      if @params.has_key?(:tags)
+        tags = @params.delete(:tags)
+        tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
+        tags.each { |tag| string << " #{tag_indicator}#{tag.to_s}" } 
+      end
+
+      @params.each do |attr, value|
+        if value.respond_to? :each
+          value.each { |val| string << " #{attr.to_s}:#{val.to_s}" }
+        else
+          string << " #{attr.to_s}:#{value.to_s}"
+        end
+      end
+
+      @params = string
+      return self
+    end
+
+  end
+
+  class InvalidCommandError < Exception; end
+  class MissingTaskIDError < Exception; end
+end

data/lib/taskwarrior-web/command_builders/v1.rb

@@ -0,0 +1,35 @@
+require 'taskwarrior-web/command_builders/base'
+
+module TaskwarriorWeb::CommandBuilder::V1
+
+  include TaskwarriorWeb::CommandBuilder::Base
+    
+  def build
+    unless @command_string
+      task_command
+      substitute_parts if @command_string =~ /:id/
+    end
+    parse_params
+    @built = "#{self.command_string}#{params}"
+  end
+
+  # Overridden from TaskwarriorWeb::CommandBuilder::Base
+  #
+  # Substitute the task's ID for its UUID.
+  def substitute_parts
+    if @id
+      assign_id_from_uuid
+      @command_string.gsub!(':id', @id.to_s)
+      return self
+    else
+      raise MissingTaskIDError
+    end
+  end
+
+  def assign_id_from_uuid
+    @all_tasks ||= TaskwarriorWeb::Task.query('status.not' => [:deleted, :completed])
+    @id = @all_tasks.index { |task| task.uuid == @id } + 1
+    puts "@id in v1.rb:19: #{@id}"
+  end
+
+end

data/lib/taskwarrior-web/command_builders/v2.rb

@@ -0,0 +1,5 @@
+require 'taskwarrior-web/command_builders/base'
+
+module TaskwarriorWeb::CommandBuilder::V2
+  include TaskwarriorWeb::CommandBuilder::Base
+end

data/lib/taskwarrior-web/config.rb

@@ -4,12 +4,11 @@ module TaskwarriorWeb
   class Config
 
     def self.task_version
-      unless @task_version
-        version_line = `task version | grep '^task '`
-        @task_version = version_line.split.at(1)
-      end
+      @task_version ||= `task _version`
+    end
 
-      @task_version
+    def self.task_major_version
+      self.task_version[0,1].to_i
     end
 
     def self.file

data/lib/taskwarrior-web/public/css/styles.css

@@ -231,6 +231,7 @@ ul.view-mode-group { float: right; position: relative; top: -32px; right: 10px;
 li.view-mode a { height: 12px; width: 12px; }
 
 a#task-add { float: right; margin: 20px 0; }
+
 /********************************
  * LISTING STYLES
  *******************************/
@@ -270,10 +271,32 @@ h3.project.done a { color: #ddd; }
 .doneness-measure { background: #BBFFB6; height: 16px; text-align: center; padding-top: 4px; color: #bbb; font-size: 0.8em; }
 
 /********************************
- * INPLACE EDITING
+ * MESSAGES
  *******************************/
-.inplace-text { width: 250px; height: 30px; padding: 5px; }
-.inplace-edit, .inplace-cancel { font-style: italic; }
+#flash-messages .message {
+  background-color: #FCF8E3;
+  border: 1px solid #FBEED5;
+  border-radius: 4px 4px 4px 4px;
+  color: #C09853;
+  margin-bottom: 18px;
+  padding: 8px 35px 8px 14px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+#flash-messages .message.success {
+  background-color: #DFF0D8;
+  border-color: #D6E9C6;
+  color: #468847;
+}
+#flash-messages .message.info {
+  background-color: #D9EDF7;
+  border-color: #BCE8F1;
+  color: #3A87AD;
+}
+#flash-messages .message.error {
+  background-color: #F2DEDE;
+  border-color: #EED3D7;
+  color: #B94A48;
+}
 
 /********************************
  * TASK FORM

data/lib/taskwarrior-web/public/js/application.js

@@ -3,6 +3,7 @@ $(document).ready(function() {
 	initTooltips();
 	initDatePicker();
 	initAutocomplete();
+	initTaskCompletion();
 
 	// Fluid-specific stuff.
 	if (window.fluid) {
@@ -75,6 +76,27 @@ var initAutocomplete = function() {
 	});
 };
 
+var initTaskCompletion = function() {
+	$('input.complete').click(function() {
+		// Cache the checkbox in case we need to restore it.
+		var row = $(this).closest('tr');
+		$(this).parent().html('<img src="/images/ajax-loader.gif" />');
+		$.ajax({
+			url: '/ajax/task-complete/' + $(this).data('task-id'),
+			type: 'POST',
+			success: function(data) {
+				var message = (data === '') ? 'Task marked as completed.' : data;
+				set_message(message, 'success');
+				row.remove();
+			},
+			error: function(data) {
+				set_message('There was an error when marking the task as completed.', 'error');
+				// TODO: Re-insert the checkbox.
+			}
+		});
+	});
+};
+
 // Count updating.
 
 var getCount = function(callback) {

data/lib/taskwarrior-web/runner.rb

@@ -1,61 +1,16 @@
 require 'taskwarrior-web/config'
 
 module TaskwarriorWeb
-  class Runner
+  module Runner
 
     TASK_BIN = 'task'
 
-    TASK_COMMANDS = {
-      :add => 'add',
-      :query => '_query',
-      :count => 'count'
-    }
-
-    def self.run(command_obj)
-      command = build(command_obj)
-      # Add some logging
-      `#{TASK_BIN} #{command}`
-    end
-
-    def self.build(command_obj)
-      command = task_command(command_obj)
-      command = substitute_parts(command, command_obj) if command =~ /:id/
-      params = parsed_params(command_obj.params)
-      "#{command}#{params}"
-    end
-
-    def self.task_command(command_obj)
-      if TASK_COMMANDS.has_key?(command_obj.command.to_sym)
-        TASK_COMMANDS[command_obj.command.to_sym]
-      else
-        raise InvalidCommandError
-      end
-    end
-
-    def self.substitute_parts(task_command, command_obj)
-      if command_obj.id
-        task_command.gsub(':id', command_obj.id.to_s)
-      else
-        raise MissingTaskIDError
-      end
-    end
-
-    def self.parsed_params(params)
-      String.new.tap do |string|
-        string << " '#{params.delete(:description)}'" if params.has_key?(:description)
-
-        if params.has_key?(:tags)
-          tags = params.delete(:tags)
-          tag_indicator = TaskwarriorWeb::Config.property('tag.indicator') || '+'
-          tags.each { |tag| string << " #{tag_indicator}#{tag.to_s}" } 
-        end
-
-        params.each { |attr, value| string << " #{attr.to_s}:#{value.to_s}" }
-      end
+    def run
+      @built ||= build
+      to_run = "#{TASK_BIN} #{@built}"
+      puts "Final command: #{to_run}"
+      `#{to_run}`
     end
 
   end
-
-  class InvalidCommandError < Exception; end
-  class MissingTaskIDError < Exception; end
 end

data/lib/taskwarrior-web/task.rb

@@ -26,6 +26,10 @@ module TaskwarriorWeb
       Command.new(:add, nil, self.to_hash).run
     end
 
+    def complete!
+      Command.new(:complete, self.uuid).run
+    end
+
     # Make sure that the tags are an array.
     def tags=(value)
       @tags = value.is_a?(String) ? value.gsub(', ', ',').split(',') : value

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

@@ -5,10 +5,6 @@
       <li><a href="<%= path %>"<%= ' class="selected"' if @current_page.index(path) == 0 %>><%= text %></a></li>
     <% end %>
   </ul>
-  <ul class="button-group view-mode-group">
-    <li id="view-mode-list" class="view-mode"><a class="button tooltip" data-tooltip="View items in a list" href="javascript:void(0);"><img src="/images/list-view.png" /></a></li>
-    <li id="view-mode-grid" class="view-mode"><a class="button tooltip" data-tooltip="View items in a grid" href="javascript:void(0);"><img src="/images/grid-view.png" /></a></li>
-  </ul>
 </nav>
 <nav id="subnav-bar">
   <ul>

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

@@ -2,6 +2,9 @@
   <table>
     <thead>
       <tr>
+        <% if params[:status] == 'pending' %>
+          <th></th>
+        <% end %>
         <th>Description</th>
         <th>Project</th>
         <th>Due</th>
@@ -16,6 +19,9 @@
         <% else %>
           <tr class="<%= task.status %>">
         <% end %>
+          <% if params[:status] == 'pending' %>
+            <td><input type="checkbox" class="complete" data-task-id="<%= task.uuid %>" /></td>
+          <% end %>
           <td>
             <%= task.description %>
             <% unless task.annotations.nil? || task.annotations.empty? %>

data/spec/models/command_builder_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'taskwarrior-web/command_builder'
+
+RSpec::Mocks::setup(TaskwarriorWeb::Config)
+
+describe TaskwarriorWeb::CommandBuilder do
+  describe '.included' do
+    context 'when v2 is reported' do
+      it 'should include CommandBuilder V2 module' do
+        TaskwarriorWeb::Config.should_receive(:task_version).and_return('2.0.1')
+        TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
+        TestCommandClass.should include(TaskwarriorWeb::CommandBuilder::V2)
+      end
+    end
+
+    context 'when v1 is reported' do
+      it 'should include CommandBuilder V1 module' do
+        TaskwarriorWeb::Config.should_receive(:task_version).and_return('1.9.4')
+        TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
+        TestCommandClass.should include(TaskwarriorWeb::CommandBuilder::V1)
+      end
+    end
+
+    context 'when an invalid version number is reported' do
+      it 'should throw an UnrecognizedTaskVersion exception' do
+        TaskwarriorWeb::Config.should_receive(:task_version).and_return('95.583.3')
+        expect { 
+          TestCommandClass.class_eval { include TaskwarriorWeb::CommandBuilder }
+        }.should raise_exception(TaskwarriorWeb::UnrecognizedTaskVersion)
+      end
+    end
+  end
+end
+
+class TestCommandClass; end
+
+module TaskwarriorWeb::CommandBuilder::V2; end

data/spec/models/command_builders/base_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'taskwarrior-web/command'
+require 'ostruct'
+
+describe TaskwarriorWeb::CommandBuilder::Base do
+  describe '#substitute_parts' do
+    before do
+      @command = TaskwarriorWeb::Command.new(:complete, 34588)
+    end
+
+    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.command_string.should eq('1 done')
+    end
+
+    it 'should throw an error if the command has no task ID' do
+      @command.id = nil
+      expect { @command.substitute_parts }.to raise_error(TaskwarriorWeb::CommandBuilder::MissingTaskIDError)
+    end
+  end
+
+  describe '#parse_params' do
+    it 'should create a string from the passed paramters' do
+      command = TaskwarriorWeb::Command.new(:query, nil, :test => 14, :none => :none, :hello => :hi)
+      command.parse_params
+      command.params.should eq(' test:14 none:none hello:hi')
+    end
+
+    it 'should prefix tags with the tag.indicator if specified' do
+      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(';')
+      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
+      command.parse_params
+      command.params.should eq(' ;today ;tomorrow') 
+    end
+
+    it 'should prefix tags with a + if no tag.indicator is specified' do
+      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(nil)
+      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
+      command.parse_params
+      command.params.should eq(' +today +tomorrow') 
+    end
+
+    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")
+    end
+  end  
+end

data/spec/models/command_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'taskwarrior-web/command'
 
 describe TaskwarriorWeb::Command do
-  describe '.initialize' do
+  describe '#initialize' do
     context 'when the command, id, and params are specified' do
       it 'should set the passed variables' do
         command = TaskwarriorWeb::Command.new('test', 3, :hello => :hi, :none => :none)
@@ -19,21 +19,4 @@ describe TaskwarriorWeb::Command do
       command.params.should eq({ :hello => :hi, :none => :none })
     end
   end
-
-  describe '#run' do
-    before do
-      @command = TaskwarriorWeb::Command.new('test', 4)
-    end
-
-    it 'should pass the object to the Runner' do
-      TaskwarriorWeb::Runner.should_receive(:run).with(@command).and_return('{}')
-      @command.run
-    end
-
-    it 'should raise an exception if no command is specified' do
-      command = TaskwarriorWeb::Command.new(nil, 5)
-      expect { command.run }.to raise_error(TaskwarriorWeb::MissingCommandError)
-    end
-
-  end
 end

data/spec/models/runner_spec.rb

@@ -3,72 +3,48 @@ require 'taskwarrior-web/runner'
 
 describe TaskwarriorWeb::Runner do
   before do
-    @command = TaskwarriorWeb::Command.new(:add)
-  end
-
-  describe '.run' do
-    context 'valid, without a command' do
-      before do
-        TaskwarriorWeb::Runner.should_receive(:`).and_return('{}')
-      end
-
-      it 'should return the stdout' do
-        TaskwarriorWeb::Runner.run(@command).should eq('{}')
-      end
-
-      it 'should not call .substitute_parts if not necessary' do
-        TaskwarriorWeb::Runner.should_not_receive(:substitute_parts)
-        TaskwarriorWeb::Runner.run(@command)
-      end
-    end
-
-    context 'invalid' do
-      it 'should throw an exception if the command is not valid' do
-        @command.command = :test
-        expect { TaskwarriorWeb::Runner.run(@command) }.to raise_error(TaskwarriorWeb::InvalidCommandError)
-      end
-    end
-
-    context 'with a given command' do
-      it 'should execute the given command' do
-        TaskwarriorWeb::Runner.should_receive(:`).with('task add').and_return('{}')
-        TaskwarriorWeb::Runner.run(@command)
-      end
+    TestCommandClass.class_eval do |class_name|
+      include TaskwarriorWeb::Runner
     end
+    @object = TestCommandClass.new
   end
 
-  describe '.substitute_parts' do
-    it 'should replace the :id string with the given task ID' do
-      command = TaskwarriorWeb::Command.new(:complete, 4)
-      TaskwarriorWeb::Runner.substitute_parts(':id done', command).should eq('4 done')
+  describe 'include' do
+    it 'should make the class respond to the run command' do
+      @object.should respond_to(:run)
     end
 
-    it 'should throw an error if the command has no task ID' do
-      expect { TaskwarriorWeb::Runner.substitute_parts(':id done', @command) }.to raise_error(TaskwarriorWeb::MissingTaskIDError)
+    it 'should add a TASK_VERSION constant' do
+      @object.class.const_get(:TASK_BIN).should eq('task')
     end
   end
 
-  describe '.parsed_params' do
-    it 'should create a string from the passed paramters' do
-      command = TaskwarriorWeb::Command.new(:query, nil, :test => 14, :none => :none, :hello => :hi)
-      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' test:14 none:none hello:hi')
+  describe '#run' do
+    before do
+      @object.should_receive(:`).and_return('{"new_thing" => "old_thing"}')
     end
 
-    it 'should prefix tags with the tag.indicator if specified' do
-      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(';')
-      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
-      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' ;today ;tomorrow') 
+    context 'when the command has not been built' do
+      it 'should build the command' do
+        @object.should_receive(:build).and_return('build command')
+        @object.run
+      end
     end
 
-    it 'should prefix tags with a + if no tag.indicator is specified' do
-      TaskwarriorWeb::Config.should_receive(:property).with('tag.indicator').and_return(nil)
-      command = TaskwarriorWeb::Command.new(:add, nil, :tags => [:today, :tomorrow])
-      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(' +today +tomorrow') 
+    context 'when the command has been built' do
+      it 'should not build the command' do
+        @object.instance_variable_set(:@built, 'command set manually')
+        @object.should_not_receive(:build)
+        @object.run
+      end
     end
 
-    it 'should pull out the description parameter' do
-      command = TaskwarriorWeb::Command.new(:add, nil, :description => 'Hello', :status => :pending)
-      TaskwarriorWeb::Runner.parsed_params(command.params).should eq(" 'Hello' status:pending")
+    it 'should return the stdout' do
+      @object.should_receive(:build).and_return('build command')
+      @object.run.should eq('{"new_thing" => "old_thing"}')
     end
   end
+
 end
+
+class TestCommandClass; end

data/spec/models/task_spec.rb

@@ -19,21 +19,24 @@ describe TaskwarriorWeb::Task do
   end
 
   describe '.query' do
+    before do
+      @command = TaskwarriorWeb::Command.new(:query)
+      TaskwarriorWeb::Command.should_receive(:new).with(:query, nil).and_return(@command)
+    end
+
     it 'should create and run a new Command object' do
-      command = TaskwarriorWeb::Command.new(:query)
-      TaskwarriorWeb::Command.should_receive(:new).with(:query, nil).and_return(command)
-      command.should_receive(:run).and_return('{}')
+      @command.should_receive(:run).and_return('{}')
       TaskwarriorWeb::Task.query
     end
 
     it 'should parse the JSON received from the `task` command' do
-      TaskwarriorWeb::Runner.should_receive(:run).and_return('{}')
+      @command.should_receive(:run).and_return('{}')
       ::JSON.should_receive(:parse).with('[{}]').and_return([])
       TaskwarriorWeb::Task.query
     end
 
     it 'should not parse the results when there are no matching tasks' do
-      TaskwarriorWeb::Runner.should_receive(:run).and_return('No matches.')
+      @command.should_receive(:run).and_return('No matches.')
       ::JSON.should_not_receive(:parse)
       TaskwarriorWeb::Task.query
     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     = '0.0.15'
+  s.version     = '1.0.0'
   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.15
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70154504021780 !ruby/object:Gem::Requirement
+  requirement: &70160263316020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154504021780
+  version_requirements: *70160263316020
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70154504020500 !ruby/object:Gem::Requirement
+  requirement: &70160263313300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154504020500
+  version_requirements: *70160263313300
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70154504040200 !ruby/object:Gem::Requirement
+  requirement: &70160263347360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154504040200
+  version_requirements: *70160263347360
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70154504039160 !ruby/object:Gem::Requirement
+  requirement: &70160263345300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154504039160
+  version_requirements: *70160263345300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70154504036820 !ruby/object:Gem::Requirement
+  requirement: &70160263342060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504036820
+  version_requirements: *70160263342060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70154504034640 !ruby/object:Gem::Requirement
+  requirement: &70160263340640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504034640
+  version_requirements: *70160263340640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70154504033940 !ruby/object:Gem::Requirement
+  requirement: &70160263363240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504033940
+  version_requirements: *70160263363240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70154504049400 !ruby/object:Gem::Requirement
+  requirement: &70160263362440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504049400
+  version_requirements: *70160263362440
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70154504048520 !ruby/object:Gem::Requirement
+  requirement: &70160263361760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504048520
+  version_requirements: *70160263361760
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70154504047860 !ruby/object:Gem::Requirement
+  requirement: &70160263359760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154504047860
+  version_requirements: *70160263359760
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -143,6 +143,10 @@ files:
 - lib/taskwarrior-web.rb
 - lib/taskwarrior-web/app.rb
 - lib/taskwarrior-web/command.rb
+- lib/taskwarrior-web/command_builder.rb
+- lib/taskwarrior-web/command_builders/base.rb
+- lib/taskwarrior-web/command_builders/v1.rb
+- lib/taskwarrior-web/command_builders/v2.rb
 - lib/taskwarrior-web/config.rb
 - lib/taskwarrior-web/helpers.rb
 - lib/taskwarrior-web/public/css/gh-buttons.css
@@ -174,8 +178,6 @@ files:
 - 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
 - lib/taskwarrior-web/views/404.erb
 - lib/taskwarrior-web/views/_navigation.erb
@@ -186,6 +188,10 @@ files:
 - lib/taskwarrior-web/views/task_form.erb
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
+- spec/models/command_builder_spec.rb
+- spec/models/command_builders/base_spec.rb
+- spec/models/command_builders/v1_spec.rb
+- spec/models/command_builders/v2_spec.rb
 - spec/models/command_spec.rb
 - spec/models/runner_spec.rb
 - spec/models/task_spec.rb
@@ -211,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2283855477715549866
+      hash: -1098967059428710404
 requirements: []
 rubyforge_project: taskwarrior-web
 rubygems_version: 1.8.11
@@ -221,6 +227,10 @@ summary: Web frontend for taskwarrior command line task manager.
 test_files:
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
+- spec/models/command_builder_spec.rb
+- spec/models/command_builders/base_spec.rb
+- spec/models/command_builders/v1_spec.rb
+- spec/models/command_builders/v2_spec.rb
 - spec/models/command_spec.rb
 - spec/models/runner_spec.rb
 - spec/models/task_spec.rb

data/lib/taskwarrior-web/runners/v1.rb

@@ -1,11 +0,0 @@
-module TaskwarriorWeb
-  module Runner
-    module Version1
-
-      def self.run
-        puts 'Called versioned run method.'
-      end
-
-    end
-  end
-end

data/lib/taskwarrior-web/runners/v2.rb

@@ -1,7 +0,0 @@
-module TaskwarriorWeb
-  module Runner
-    module Version2
-
-    end
-  end
-end