org_mode 0.0.3 → 0.0.4

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 gem "commander"
 gem "facets"
 gem "mustache"
+gem "colorize"
 
 group :development do
   if RUBY_VERSION =~ /^1\.9/
@@ -21,6 +22,7 @@ group :test do
   gem "timecop"
   gem "guard-cucumber"
   gem "popen4"
+  gem "pry"
 end
 
 

data/bin/org-mode

@@ -11,22 +11,20 @@ program :description, 'Formats and extracts information out of org-mode files'
 program :help_formatter, :compact
 
 command :agenda do |c|
-  c.syntax = 'org-mode agenda [options]'
-  c.summary = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
+  c.syntax = 'org-mode agenda [options] *org-mode-files'
+  c.summary = 'Displays information on scheduled items'
+  c.description = nil
+  c.example 'extract information on scheduled items out of files', 'org-mode agenda an-org-file.org'
+  c.option '--no-color', 'Do not use color in output'
   c.when_called OrgMode::Commands::Agenda, :execute
 end
 
 command :update do |c|
-  c.syntax = 'Orgy update [options]'
-  c.summary = ''
-  c.description = ''
+  c.syntax = 'org-mode update [options]'
+  c.summary = 'Reformats an org-file'
+  c.description = 'Reformat and update the org-file. Converting the org-file to a standard format'
   c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
-  c.action do |args, options|
-    # Do something or c.when_called Orgy::Commands::Update
-  end
+  c.option '--archive-done', 'Archives done items'
+  c.when_called OrgMode::Commands::Update, :execute
 end
 

data/features/cmdline_agenda.feature

@@ -11,12 +11,11 @@ Feature: agenda
       """
     When the script is executed on the org-file
     When the script is called with "agenda"
-    Then the output should be
-      """
-      Agenda ()
-        2012-01-01
-          TODO Scheduled task 
-      """
+    Then the output should contain "Agenda"
+    And the output should contain "2012-01-01"
+    And the output should contain "15:15"
+    And the output should contain "TODO"
+    And the output should contain "Scheduled task"
 
   # @focus
   # Scenario: should limit restults in a day view

data/features/cmdline_update.feature

@@ -0,0 +1,42 @@
+Feature: org-mode update <orgfile>
+  org-mode script should reformat a file correctly
+  to a user can easily reformat an org-file in a 
+  standarized way. This also enables certain
+  filters to be applied.
+
+  Scenario: should present meaningfull agenda information
+    Given we have an org-file with the following content
+      """
+      a header
+      * TODO Scheduled task <1-1-2012 Wed 15:15>
+      content that will be indented
+      multiline that is
+      ** TODO Scheduled task <1-1-2012 Wed 15:15-16:15>
+      some other content that will be indented
+      """
+    When the script is called with "update"
+    Then the output should be
+      """
+      a header
+      
+      * TODO <2012-01-01 Sun 15:15> Scheduled task
+        content that will be indented
+        multiline that is
+      ** TODO <2012-01-01 Sun 15:15-16:15> Scheduled task
+         some other content that will be indented
+      """
+
+  # @focus
+  # Scenario: should limit restults in a day view
+  #   Given date is "1-1-2012 15:00"
+  #   And we have an org-file with the following content
+  #     """
+  #     * TODO Todays task <1-1-2012 Wed 15:15>
+  #     * TODO Tommorrows task <2-1-2012 Wed 15:15>
+  #     """
+  #   When the script is called with "agenda today"
+  #   Then the output should be
+  #     """
+  #     Todays activities:
+  #       TODO Todays task
+  #     """

data/features/steps.rb

@@ -30,6 +30,10 @@ end
 Then /^the output should be$/ do |string|
   @stdout.should == string
 end
+Then /^the output should contain "([^""]*)"$/ do |pattern|
+  @stdout.should match(pattern)
+end
+
 Then /^the error should be$/ do |string|
   @script_error.stderr.chomp.should == string
 end

data/lib/capture_stdout.rb

@@ -0,0 +1,13 @@
+require 'stringio'
+ 
+def capture_stdout
+  out = StringIO.new
+  old_stdout = $stdout
+  $stdout = out
+  yield
+  out.rewind
+  return out.read
+ensure
+  $stdout = old_stdout
+end
+ 

data/lib/org_mode/commands/agenda.rb

@@ -1,9 +1,9 @@
 require 'org_mode/parser'
 require 'org_mode/loader'
 require 'org_mode/reporters/agenda'
+require 'org_mode/presenters/console'
 
 require 'core_ext/string'
-require 'mustache'
 
 module OrgMode::Commands
   class Agenda
@@ -18,19 +18,9 @@ module OrgMode::Commands
 
       file_collection = OrgMode::Loader.load_and_parse_files(*args)
       agenda_reporter = OrgMode::Reporters::Agenda.new(file_collection)
+      text_presenter  = OrgMode::Presenters::Agenda::Console.new(agenda_reporter)
 
-      tmpl_vars = {}
-      tmpl_vars[:noi_per_date] = agenda_reporter.open_nodes_grouped_by_day
-
-      puts Mustache.render <<-eos.strip_indent(8), tmpl_vars
-        Agenda ()
-        {{#noi_per_date}}
-          {{date}}
-          {{#nodes}}
-            {{todo_state}}{{title}}
-          {{/nodes}}
-          {{/noi_per_date}}
-      eos
+      puts text_presenter.open_items_per_day_colorized
 
     rescue SystemCallError => e
       puts "Encountered a little problem: #{e}"

data/lib/org_mode/commands/update.rb

@@ -1,4 +1,23 @@
+require 'org_mode/parser'
+require 'org_mode/loader'
+require 'org_mode/formatters/textual'
+require 'org_mode/processors/archive_done'
+
 module OrgMode::Commands
   class Update
+    def execute(args, options)
+      org_file = OrgMode::Loader.load_and_parse_file(args[0])
+
+      if options.archive_done
+        org_file = OrgMode::Processors::ArchiveDone.new(org_file).process
+      end
+
+      org_formatter = OrgMode::Formatters::Textual.new(org_file)
+
+      puts org_formatter.format
+
+    rescue StandardError => e
+      puts "Encountered a little problem: #{e}"
+    end
   end
 end

data/lib/org_mode/formatters/textual.rb

@@ -0,0 +1,48 @@
+require 'org_mode'
+require 'facets/kernel/blank'
+
+module OrgMode
+  module Formatters
+    class Textual
+      def initialize(org_file)
+        @org_file = org_file
+      end
+
+      def format
+        [ @org_file.header,
+          @org_file.nodes.map {|n| format_node(n)} * "\n",
+          @org_file.footer ].reject(&:blank?) * "\n\n"
+      end
+
+      def format_node(node)
+        [format_title(node), format_content(node)].reject(&:blank?) * "\n" 
+      end
+
+      def format_title(node)
+        stars = "*" * node.stars
+        [stars, node.todo_state, format_date(node), node.title].reject(&:blank?) * ' '
+      end
+
+      def format_content(node)
+        node.content.lines.map do |l|
+          [" " * node.indent, l].join
+        end.join
+      end
+
+      def format_date(node)
+        date = if node.date_end_time
+                 "#{node.date_start_time.strftime('%Y-%m-%d %a %H:%M')}-#{node.date_end_time.strftime('%H:%M')}"
+               elsif node.date_start_time
+                 "#{node.date_start_time.strftime('%Y-%m-%d %a %H:%M')}"
+               elsif node.date
+                 "#{node.date.strftime('%Y-%m-%d %a')}"
+               else
+                 nil
+               end
+
+        date ? "<#{date}>" : nil
+      end
+
+    end
+  end
+end

data/lib/org_mode/node_utils.rb

@@ -0,0 +1,20 @@
+module OrgMode
+  class NodeUtils
+    # Public: transforms a sequental list of 
+    # nodes into a tree structure setting
+    # parents and children on the nodes
+    def self.convert_sequential_nodelist_into_tree(nodes)
+      parent_stack = []
+      nodes.map! do |node| 
+        node.parent = parent_stack[node.stars - 1]
+        if node.parent
+          node.parent.children << node
+        end
+        parent_stack[node.stars] = node
+      end
+
+      # filter out all non root nodes
+      nodes.select(&:root_node?)
+    end
+  end
+end

data/lib/org_mode/parser.rb

@@ -7,6 +7,7 @@
 # Parser is decoupled from object model to make it easy to write updated
 # parsers or use a database to serialize an org-mode file out of.
 require 'org_mode'
+require 'org_mode/node_utils'
 require 'date'
 
 module OrgMode
@@ -29,18 +30,18 @@ module OrgMode
       # Returns OrgMode::File object containing all
       # information of the file. 
       def parse(buffer)
-        b, nodes, e =  parse_buffer(buffer)
-
-        parent_stack = []
-        nodes.map! do |title, content| 
-          node = NodeParser.parse(title,content) 
-          node.parent = parent_stack[node.stars - 1]
-          if node.parent
-            node.parent.children << node
-          end
-          parent_stack[node.stars] = node
+        b, nodes, e  = parse_buffer(buffer)
+
+        parsed_nodes = parse_nodes(nodes)
+        root_nodes   = NodeUtils.convert_sequential_nodelist_into_tree(parsed_nodes)
+
+        return File.new(b,root_nodes,e)
+      end
+
+      def parse_nodes(nodes)
+        nodes.map do |title,content|
+          NodeParser.parse(title,content) 
         end
-        return File.new(b,nodes,e)
       end
 
       def parse_buffer(buffer)
@@ -110,11 +111,11 @@ module OrgMode
         def parse_extract_dates(node)
           _, extracted_date, start_time, end_time = node.title.match(RxDateRegexp).to_a
           node.title = node.title.gsub(RxDateRegexp, '') 
+          node.title.strip!
 
-          if extracted_date
-            node.date_start_time = DateTime.parse("#{extracted_date} #{start_time}")
-            node.date_end_time = DateTime.parse("#{extracted_date} #{end_time}")
-          end
+          node.date = DateTime.parse(extracted_date) if extracted_date
+          node.date_start_time = DateTime.parse("#{extracted_date} #{start_time}") if start_time
+          node.date_end_time = DateTime.parse("#{extracted_date} #{end_time}") if end_time
         end
 
       RxEmptyLine = /^\s*$/

data/lib/org_mode/presenters/console.rb

@@ -0,0 +1,51 @@
+require 'colorize'
+require 'capture_stdout'
+
+module OrgMode
+  module Presenters
+    module Agenda
+        
+      class Console
+        def initialize reporter
+          @agenda_reporter = reporter
+        end
+
+        def open_items_per_day_colorized
+          capture_stdout do
+            now = DateTime.now
+            puts "Agenda: open items grouped by day [#{now.strftime('%Y-%m-%d %H:%M')}]".yellow.underline
+            puts
+            ongbd = @agenda_reporter.open_nodes_grouped_by_day
+            ongbd.each do |e|
+              puts "#{e.date}".blue.underline
+              e.nodes.each do |n|
+                color = :green
+                color = :red if n.date_start_time && n.node.date_start_time < now
+                color = :red if n.date && n.node.date < now
+                  
+                puts "  " + node_line(n).send(color)
+              end
+              puts
+            end
+          end
+        end
+
+        private
+
+        def node_line(n)
+          title = [n.todo_state, n.title].reject(&:nil?) * ' '
+          if n.appointment?
+            if n.date_end_time
+              "%s-%s %s" % [n.date_start_time, n.date_end_time, title]
+            else
+              "%s       %s" % [n.date_start_time, title]
+            end
+          else
+            "ALL-DAY     %s" % [title]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/org_mode/processors/archive_done.rb

@@ -0,0 +1,69 @@
+require 'org_mode'
+require 'core_ext/string'
+require 'delegate'
+
+module OrgMode
+  module Processors
+    class ArchiveDoneOrgFile < SimpleDelegator
+      def initialize(org_file)
+        super(org_file)
+      end
+
+      def archived_root_node
+        select_by_title(/^Archived$/, :stars => 1).first
+      end
+
+      def create_archived_root_node
+        self.root_nodes << OrgMode::Node.new.tap do |n|
+          n.title = "Archived"
+          n.content = <<-eos.strip_indent(10)
+          This node contains archived items. Appended
+          due to calling the script with update --archive-done
+          eos
+          n.stars = 1
+        end
+      end
+
+      def move_done_trees_to_archived_root_node
+        processed_nodes = []
+        self.nodes.each do |n|
+          # if not done move to processed nodes
+          # if done append to archived_root_node
+        end
+      end
+    end
+
+    class ArchiveDone
+      def initialize(org_file)
+        @org_file = ArchiveDoneOrgFile.new(org_file)
+      end
+
+      def process
+        @org_file.create_archived_root_node unless @org_file.archived_root_node
+
+        to_be_archived_trees = []
+        walk_and_update_node_children @org_file do |children|
+          to_be_archived_trees << children.select(&:done?)
+          children.reject(&:done?)
+        end
+
+        @org_file.archived_root_node.children.concat(  to_be_archived_trees.flatten )
+
+        @org_file
+      end
+
+      # Private: walks all nodes
+      # but updates children array with
+      # return value of called function.
+      #
+      # Can be used to extract nodes from
+      # tree
+      def walk_and_update_node_children(node, &block)
+        node.children = block.call(node.children)
+        node.children.map do |n|
+          walk_and_update_node_children(n, &block) 
+        end
+      end
+    end
+  end
+end

data/lib/org_mode/reporters/agenda.rb

@@ -1,4 +1,5 @@
 require 'facets/to_hash'
+require 'facets/ostruct'
 
 module OrgMode
   module Reporters
@@ -26,17 +27,21 @@ module OrgMode
         # build a nice orderd struct
         noi_per_day.keys.sort.map do |date|
           { :date => date, :nodes => noi_per_day[date].map { |n| node_to_hash(n) } }
-        end
+        end.map(&:to_ostruct)
+
       end
 
       private
 
     def node_to_hash(node)
-      rv = [:title, :content, :todo_state, :date, :stars].
+      rv = [:title, :content, :todo_state, :date, :date_start_time, :date_end_time, :stars, :appointment?].
         map { |k| [ k, node.send(k) ] }.to_h
 
       rv[:date] = rv[:date].strftime('%Y-%m-%d %H:%M') if rv[:date]
-      rv
+      rv[:date_start_time] = rv[:date_start_time].strftime('%H:%M') if rv[:date_start_time]
+      rv[:date_end_time] = rv[:date_end_time].strftime('%H:%M') if rv[:date_end_time]
+      rv[:node] = node
+      rv.to_ostruct
     end
 
     end

data/lib/org_mode/version.rb

@@ -1,3 +1,3 @@
 module OrgMode
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/org_mode.rb

@@ -14,9 +14,8 @@ require "org_mode/version"
 
 module OrgMode
 
-
   class Node
-    attr_accessor :title, :content, :stars, :date_start_time, :date_end_time, :todo_state
+    attr_accessor :title, :content, :stars, :date, :date_start_time, :date_end_time, :todo_state
     attr_accessor :parent, :children
 
     def initialize
@@ -24,9 +23,6 @@ module OrgMode
       @children = []
     end
 
-    alias :date :date_start_time
-    alias :date= :date_start_time=
-
     def indent 
       stars + 1
     end 
@@ -39,6 +35,10 @@ module OrgMode
       !date.nil?
     end
 
+    def appointment?
+      !!( date_start_time || date_end_time )
+    end
+
     def open?
       not done?
     end
@@ -50,24 +50,47 @@ module OrgMode
   end
 
   module FileInterface
-    def root_nodes
-      nodes.select(&:root_node?)
-    end
-
     def scheduled_nodes
       nodes.select(&:scheduled?)
     end
+
+    def select_by_title(pattern, props={})
+      result = nodes
+      props.each do |k,v|
+        result = result.select {|n| n.send(k) == v } 
+      end
+      result.select {|n| n.title =~ pattern}
+    end
   end
 
   class File
-    attr_accessor :header, :nodes, :footer
+    attr_accessor :header, :root_nodes, :footer
 
     include FileInterface
 
-    def initialize(header, nodes, footer)
+    # For universial children accessor
+    # file is just a node
+    alias :children :root_nodes
+    alias :children= :root_nodes=
+
+    def initialize(header, root_nodes, footer)
       @header = header
       @footer = footer
-      @nodes = nodes
+      @root_nodes = root_nodes
+    end
+
+    def nodes
+      serialize_nodes(root_nodes)
+    end
+
+    private
+
+    # recusively serializes 
+    # the nodes
+    def serialize_nodes(nodes)
+      nodes.map do |n|
+       [n] + serialize_nodes(n.children) 
+      end.flatten
     end
   end
 
@@ -83,5 +106,10 @@ module OrgMode
     def nodes
       files.map(&:nodes).flatten
     end
+
+    def root_nodes
+      nodes.select(&:root_node?)
+    end
+
   end
 end

data/org_mode.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "commander", ["~> 4.0"]
   s.add_runtime_dependency "facets", ["~> 2.9"]
   s.add_runtime_dependency "mustache", ["~> 0.99"]
+  s.add_runtime_dependency "colorize", ["~> 0.5"]
 end

data/spec/lib/org_mode/commands/agenda_spec.rb

@@ -1,23 +1,13 @@
 require 'org_mode/commands/agenda'
-require 'tempfile'
-require 'core_ext/string'
-require 'support/capture_stdout'
-require 'support/write_into_tempfile'
 require 'timecop'
 
-# Helper to execute agenda and compare the output
-def execute_and_compare_stdout_with args, options, expected_output
-  output = capture_stdout do
-    @org_mode_commands_agenda.execute(args, options)
-  end
-  output.should == expected_output
-end
+require 'lib/org_mode/commands/helpers'
 
 describe OrgMode::Commands::Agenda do
   before do
     Timecop.freeze('2012-01-01 15:00')
 
-    @org_mode_commands_agenda = OrgMode::Commands::Agenda.new
+    @cmd = @org_mode_commands_agenda = OrgMode::Commands::Agenda.new
   end
 
   context '#execute' do
@@ -26,11 +16,8 @@ describe OrgMode::Commands::Agenda do
         org_file = write_into_tempfile <<-eos.strip_indent(10)
           * TODO Scheduled task <1-1-2012 Wed 15:15>
         eos
-        execute_and_compare_stdout_with [org_file.path], stub, <<-eos.strip_indent(10)
-          Agenda ()
-            2012-01-01
-              TODO Scheduled task 
-        eos
+        execute_and_output_should_contain @cmd, [org_file.path], stub,  
+          /TODO/, /2012-01-01/, /15:15/ ,/Scheduled task/
       end
     end
     context 'when loaded with two files' do
@@ -41,14 +28,8 @@ describe OrgMode::Commands::Agenda do
         org_file2 = write_into_tempfile <<-eos.strip_indent(10)
           * TODO Scheduled task on the 1th <1-1-2012 Wed 15:15>
         eos
-        execute_and_compare_stdout_with [org_file, org_file2].map(&:path), stub, 
-          <<-eos.strip_indent(10)
-          Agenda ()
-            2012-01-01
-              TODO Scheduled task on the 1th 
-            2012-01-05
-              TODO Scheduled task on the 5th 
-        eos
+        execute_and_output_should_contain @cmd, [org_file, org_file2].map(&:path), stub, 
+          /TODO/, /2012-01-01/, /15:15/ ,/Scheduled task/,  /on the 1th/, /on the 5th/
       end
     end
   end

data/spec/lib/org_mode/commands/helpers.rb

@@ -0,0 +1,20 @@
+require 'tempfile'
+require 'core_ext/string'
+require 'support/write_into_tempfile'
+require 'capture_stdout'
+
+# Helper to execute agenda and compare the output
+def execute_and_compare_stdout_with cmd, args, options, expected_output
+  output = capture_stdout do
+    cmd.execute(args, options)
+  end
+  output.should == expected_output
+end
+def execute_and_output_should_contain cmd, args, options, *expected_output
+  output = capture_stdout do
+    cmd.execute(args, options)
+  end
+  expected_output.each do |pattern|
+    output.should match( pattern )
+  end
+end

data/spec/lib/org_mode/commands/update_spec.rb

@@ -0,0 +1,39 @@
+require 'org_mode/commands/update'
+require 'lib/org_mode/commands/helpers'
+
+describe OrgMode::Commands::Update do
+  before do
+    @cmd = OrgMode::Commands::Update.new
+  end
+
+  context '#execute' do
+    context 'without options' do
+      it 'reformats a file correctly' do
+        org_file = write_into_tempfile <<-eos.strip_indent(10)
+          * TODO Scheduled task <1-1-2012 Wed 15:15>
+        eos
+        execute_and_compare_stdout_with @cmd, [org_file.path], stub(:archive_done => false), <<-eos.strip_indent(10)
+          * TODO <2012-01-01 Sun 15:15> Scheduled task
+        eos
+      end
+    end
+    context 'option --archive-done' do
+      it 'archives the subtree as expected' do
+        org_file = write_into_tempfile <<-eos.strip_indent(10)
+          * TODO Scheduled task <1-1-2012 Wed 15:15>
+          ** DONE Scheduled child task <1-1-2012 Wed 12:15>
+          *** TODO Scheduled child of child
+        eos
+        execute_and_compare_stdout_with @cmd, [org_file.path], stub(:archive_done => true), <<-eos.strip_indent(10)
+          * TODO <2012-01-01 Sun 15:15> Scheduled task
+          * Archived
+            This node contains archived items. Appended
+            due to calling the script with update --archive-done
+          
+          ** DONE <2012-01-01 Sun 12:15> Scheduled child task
+          *** TODO Scheduled child of child
+        eos
+      end
+    end
+  end
+end

data/spec/lib/org_mode/formatters/textual_spec.rb

@@ -0,0 +1,46 @@
+require 'org_mode/formatters/textual'
+require 'support/blueprints'
+
+describe OrgMode::Formatters::Textual do
+  let(:org_file) do
+    nodes = []
+    files = []
+    nodes << OrgMode::Node.make(:stars => 1, 
+                                :todo_state => 'DONE', 
+                                :date => Date.parse('2012-06-01'))
+
+    # make helper for this
+    date = DateTime.parse('2012-02-01')
+    date_start = DateTime.parse('2012-02-01 15:00')
+    date_end = DateTime.parse('2012-02-01 16:00')
+    nodes << OrgMode::Node.make(:stars => 2, :date=>Date.parse('2012-02-03'))
+    nodes << OrgMode::Node.make(:stars => 3, :date=>date_start,
+                                             :date_end_time=>date_end,
+                                             :date_start_time=>date_start)
+    OrgMode::File.make(:nodes => nodes)
+  end
+
+
+  context '#format' do
+    before do
+      formatter = OrgMode::Formatters::Textual.new(org_file) 
+      @output = formatter.format
+    end
+
+    it "is formatted as expected" do
+      @output.should == <<-eos.gsub(/^ {1,8}/,'').chomp
+        aheader
+        
+        * DONE <2012-06-01 Fri> org-node
+          org-node content
+        ** TODO <2012-02-03 Fri> org-node
+           org-node content
+        *** TODO <2012-02-01 Wed 15:00-16:00> org-node
+            org-node content
+        
+        afooter
+      eos
+    end
+  end
+
+end

data/spec/lib/org_mode/parser_spec.rb

@@ -180,14 +180,20 @@ describe OrgMode::NodeParser do
       end
       context "node title with date time" do
         let(:node) {OrgMode::NodeParser.parse('** Date node title <2012-02-03 Wed 15:15>', nil)}
-        it "parses the date-time from the title correcty" do
-          node.date.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 15:15'
+        it "parses the date from the title correcty" do
+          node.date.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 00:00'
+        end
+        it "parses the date_start_time from the title correcty" do
+          node.date_start_time.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 15:15'
+        end
+        it "parses the date_end_time from the title correcty" do
+          node.date_end_time.should be_nil
         end
       end
       context "node title with date-range" do
         let(:node) {OrgMode::NodeParser.parse('** Date node title <2012-02-03 Wed 15:15-16:15>', nil)}
         it "parses the date from the title correcty" do
-          node.date.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 15:15'
+          node.date.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 00:00'
         end
         it "parses the start_tiem correctly" do
           node.date_start_time.strftime('%Y-%m-%d %H:%M').should == '2012-02-03 15:15'

data/spec/lib/org_mode/processors/archive_done_spec.rb

@@ -0,0 +1,44 @@
+require 'org_mode/processors/archive_done'
+require 'support/blueprints'
+require 'support/include_hash'
+require 'timecop'
+
+# When can we archive a tree
+#
+# we can archive a tree when all dones
+# of a tree are done. Or the root-tree is done
+
+describe OrgMode::Processors::ArchiveDone do
+
+  let(:org_file) do
+    nodes = []
+    nodes << OrgMode::Node.make(:stars => 1, 
+                                :todo_state => 'DONE', 
+                                :date => Date.parse('2012-06-01'))
+    nodes << OrgMode::Node.make(:stars => 2, :date=>Date.parse('2012-02-03'))
+    nodes << OrgMode::Node.make(:stars => 3, :date=>DateTime.parse('2012-02-01 15:00'))
+    OrgMode::File.make(:nodes => nodes)
+  end
+
+  context '#process' do
+    let(:processed_org_file) do
+      processor = OrgMode::Processors::ArchiveDone.new(org_file)
+      processor.process
+    end
+
+    context 'archived_node' do
+      let(:archived_nodes) do
+        processed_org_file.select_by_title(/^Archived$/, :stars => 1)
+      end
+
+      it 'should have created a node "Archived"' do
+        archived_nodes.length.should == 1
+      end
+
+      it 'should have added the DONE tree to the archived ones' do
+        #archived_nodes[0].children.length.should == 1
+      end
+    end
+  end
+
+end

data/spec/lib/org_mode/reporters/agenda_spec.rb

@@ -36,35 +36,6 @@ describe OrgMode::Reporters::Agenda do
       nodecount_per_date = reported.map { |e| [e[:date], e[:nodes].length] }
       nodecount_per_date.should == [["2012-02-01", 2], ["2012-02-03", 1], ["2012-02-05", 1]]
     end
-    it "should result in the following subhashes" do
-      reported.should ==
-         [{:date=>"2012-02-01",
-           :nodes=>
-            [{:title=>"org-node",
-              :content=>"org-node content",
-              :todo_state=>"TODO",
-              :date=>"2012-02-01 00:00",
-              :stars=>1},
-             {:title=>"org-node",
-              :content=>"org-node content",
-              :todo_state=>"TODO",
-              :date=>"2012-02-01 15:00",
-              :stars=>3}]},
-          {:date=>"2012-02-03",
-           :nodes=>
-            [{:title=>"org-node",
-              :content=>"org-node content",
-              :todo_state=>"TODO",
-              :date=>"2012-02-03 00:00",
-              :stars=>2}]},
-          {:date=>"2012-02-05",
-           :nodes=>
-            [{:title=>"org-node",
-              :content=>"org-node content",
-              :todo_state=>"TODO",
-              :date=>"2012-02-05 00:00",
-              :stars=>2}]}]
-    end
     it "it ignores the DONE task" do
       dates = reported.map {|e| e[:date] }
       dates.should_not include("2012-06-01")

data/spec/lib/org_mode_spec.rb

@@ -1,4 +1,5 @@
 require 'org_mode'
+require 'org_mode/node_utils'
 require 'support/blueprints'
 
 describe OrgMode::File do

data/spec/support/blueprints.rb

@@ -1,4 +1,5 @@
 require 'org_mode'
+require 'org_mode/node_utils'
 
 class OrgMode::Node
   def self.make(attrs={})
@@ -7,6 +8,8 @@ class OrgMode::Node
       n.stars = attrs[:stars] || rand(4)
       n.content = attrs[:content] || "org-node content"
       n.date = attrs[:date]
+      n.date_start_time = attrs[:date_start_time]
+      n.date_end_time = attrs[:date_end_time]
       n.todo_state = attrs[:todo_state] || 'TODO'
     end
   end
@@ -15,7 +18,8 @@ end
 class OrgMode::File
   def self.make(attrs={})
     nodes = attrs[:nodes] || Array.new(2) { OrgMode::Node.make }
-    self.new("aheader", nodes , "afooter")
+    root_nodes = OrgMode::NodeUtils.convert_sequential_nodelist_into_tree(nodes)
+    self.new("aheader", root_nodes , "afooter")
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: org_mode
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Boy Maas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -77,6 +77,21 @@ dependencies:
         version: "0.99"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: colorize
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  type: :runtime
+  version_requirements: *id005
 description: Org-mode parser, presenter, and reformatter. Read more about it on the github pages.
 email: 
 - boy.maas@gmail.com
@@ -96,22 +111,32 @@ files:
 - features/cmdline_handles_errors_cracefully.feature
 - features/cmdline_noparams.feature
 - features/cmdline_todos.feature
+- features/cmdline_update.feature
 - features/steps.rb
 - features/support/env.rb
 - features/support/org_mode_script.rb
+- lib/capture_stdout.rb
 - lib/core_ext/string.rb
 - lib/org_mode.rb
 - lib/org_mode/commands.rb
 - lib/org_mode/commands/agenda.rb
 - lib/org_mode/commands/update.rb
+- lib/org_mode/formatters/textual.rb
 - lib/org_mode/loader.rb
+- lib/org_mode/node_utils.rb
 - lib/org_mode/parser.rb
+- lib/org_mode/presenters/console.rb
+- lib/org_mode/processors/archive_done.rb
 - lib/org_mode/reporters/agenda.rb
 - lib/org_mode/version.rb
 - org_mode.gemspec
 - spec/data/org-file-01-simple-node-structure.org
 - spec/lib/org_mode/commands/agenda_spec.rb
+- spec/lib/org_mode/commands/helpers.rb
+- spec/lib/org_mode/commands/update_spec.rb
+- spec/lib/org_mode/formatters/textual_spec.rb
 - spec/lib/org_mode/parser_spec.rb
+- spec/lib/org_mode/processors/archive_done_spec.rb
 - spec/lib/org_mode/reporters/agenda_spec.rb
 - spec/lib/org_mode_spec.rb
 - spec/support/blueprints.rb
@@ -156,12 +181,17 @@ test_files:
 - features/cmdline_handles_errors_cracefully.feature
 - features/cmdline_noparams.feature
 - features/cmdline_todos.feature
+- features/cmdline_update.feature
 - features/steps.rb
 - features/support/env.rb
 - features/support/org_mode_script.rb
 - spec/data/org-file-01-simple-node-structure.org
 - spec/lib/org_mode/commands/agenda_spec.rb
+- spec/lib/org_mode/commands/helpers.rb
+- spec/lib/org_mode/commands/update_spec.rb
+- spec/lib/org_mode/formatters/textual_spec.rb
 - spec/lib/org_mode/parser_spec.rb
+- spec/lib/org_mode/processors/archive_done_spec.rb
 - spec/lib/org_mode/reporters/agenda_spec.rb
 - spec/lib/org_mode_spec.rb
 - spec/support/blueprints.rb