markdo 0.1.12.alpha → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0c9843069eef9e0921a739b08dde846b0c3ed7a
-  data.tar.gz: 3326d05636a1b2b27df418566cfc2649700467fd
+  metadata.gz: 8cf29e2812f3d3e9255c6d41f5dcf8e5d9189d1b
+  data.tar.gz: 0b80852e80c4a2811bd145d4cbdded25dded1b97
 SHA512:
-  metadata.gz: c7f2a3a72fe77433b8e250b389bd8033577418c1e523a938ee53cd57ebf20064de9589e58be7e9cf9d8fe9b9dc0f2e93f665102cd436ee7a51aa3cae085956d0
-  data.tar.gz: 385c8bc61d9ab5ebb11bb01cb24d27fd98b452cc07f83d457186db5060daf77448b3790c71699f461f834f3ecc8494e18de9410d5750a72e75205a63590d140a
+  metadata.gz: cdf73056e10da33f0bf5bb944cc1f4eeb120a4d39acf7980b48a776cd866fc57d6901ff7328f2bc951ce286d0bed2b62ddcee3962649c66edb4b6fb1f8001a83
+  data.tar.gz: ef10cc6fa44dc3eae0cec2eb0236d8b34c973718ef0d2ba25359633142a33a577c472d5c264532188f5350d322ea2004288d3098aef504d1f83f48bc79879daf

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+coverage

data/.travis.yml

@@ -1,9 +1,15 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+sudo: required
+services:
+- docker
+install:
+- docker-compose build
+script:
+- docker-compose up
+deploy:
+  provider: rubygems
+  api_key:
+    secure: BS7n3GjoKC+K3i0ce0rbUwnJThcEiJ5+4+LPr1Oeb1CueCQ2wQkGJSyyZjUOCPywHtkLXpG+7VUkiRFIADm7ecvQ936VuOklzQfEbmsXVRjr9iZw1pG6sTzS0ua+YQJG8Ejl9SNYqtUGAGxAahWlZAiY375EdqoVE2aoqK4lmwERy3D1gwWt/vkv/0y7XRARaWui35XvozKQ9wUaZ423z2xMDCX8O4Ah9s/zEJujjKi+FeVhuaQOC6KXZV9I7CyR2F1ENG9OxT/IJ2Cejv6L0T88fRMwvejsph9PSQIlcDHVmV39P1PTWz51hzYd76Zh+8oK6WZFx+aEkusQ+RSUyq4LF6hWX8YLGZS4XsJk0z7wBEVMZdEQSW2oC+cECFv9tjWbljym6ZeX4E8lvCREsljtxdNTkmoZTBI+iXZpuQyYi27zUdM+EyHGNRVJ3mdA0nFRtNjPVegmi7lHzDCtFielI0PeXQKAUzZwtKFKaTxA87hkibJzMddwzWu51zJJXXqnop7aM1jJa4EDTFzagCy6p36KHvyLj0e1eCF4O/i6ucBp3ls70nApBupoK+zs2X+ZN+O1k5KUHYXGJdS4+ttxr58Qb+RhVj/3Uu0FLSfXzo8fFBhAn88k8slfYM9yfIPlvTKplCNpd50011CeWkgiqVT22QOThyeWi5g/Wpk=
+  gem: markdo
+  on:
+    tags: true
+    repo: benjaminoakes/markdo

data/Dockerfile

@@ -1,18 +1,32 @@
-FROM alpine:3.4
+FROM ubuntu:16.04
 
-RUN echo 'apk update && apk add "$1"' > /usr/local/bin/pkg-apk
+RUN echo 'apt-get update && apt-get install --no-install-recommends -y "$1"' > /usr/local/bin/pkg-deb
+RUN echo 'gem install --no-ri --no-rdoc "$1"' > /usr/local/bin/pkg-gem
+RUN echo 'npm install --global "$1"' > /usr/local/bin/pkg-npm
 RUN chmod +x /usr/local/bin/pkg-*
 
 # Used for building the gem
-RUN pkg-apk git
+RUN pkg-deb git=1:2.7.4-0ubuntu1
 
-RUN pkg-apk ruby
-RUN pkg-apk ruby-bundler
+# The Ubuntu-provided `phantomjs` is quite old.  The below solution installs way more Node.js stuff than I'd like, but otherwise it's pretty painless.
+RUN pkg-deb npm=3.5.2-0ubuntu4
+RUN pkg-deb nodejs-legacy=4.2.6~dfsg-1ubuntu4
+RUN pkg-deb libfontconfig1=2.11.94-0ubuntu1.1
+RUN pkg-deb bzip2=1.0.6-8
+RUN pkg-npm phantomjs-prebuilt@2.1.12
 
+RUN pkg-deb build-essential=12.1ubuntu2
+RUN pkg-deb ruby2.3
+RUN pkg-deb ruby2.3-dev
+
+RUN pkg-deb libffi-dev=3.2.1-4
+RUN pkg-gem ffi:1.9.14
+
+RUN pkg-gem bundler:1.12.5
 COPY Gemfile $HOME/
 COPY lib/markdo/fake_version.rb $HOME/lib/markdo/version.rb
-
 COPY markdo.gemspec $HOME/
-RUN bundle
+RUN bundle install
 
 WORKDIR /src
+CMD guard --no-bundler-warning

data/Guardfile

@@ -0,0 +1,11 @@
+# vim: set ft=ruby:
+
+guard 'rake', task: 'spec:opal:phantomjs' do
+  watch %r{^lib/.+\.rb$}
+  watch %r{^spec/.+\.rb$}
+end
+
+guard 'rake', task: 'spec' do
+  watch %r{^lib/.+\.rb$}
+  watch %r{^spec/.+\.rb$}
+end

data/README.md

@@ -46,18 +46,21 @@ See `markdo help` for more information.
 
     add "string"          Add a task to the inbox.  (Set $MARKDO_ROOT and $MARKDO_INBOX.)
     edit                  Edit $MARKDO_ROOT in $EDITOR.
+    forecast              Display tasks due in the next week.  (@due(YYYY-MM-DD) format.)
     help, --help          Display this help text.
+    inbox                 Display contents of $MARKDO_INBOX.
     ics                   Make an iCalendar feed of all due dates in Markdo.  Can be imported
                           or subscribed to if on a remote server.
     overview              Get overview of overdue, starred, today's, and tomorrow's tasks.
-    overdue               Search *.md files for previous dates.  (YYYY-MM-DD format.)
+    overdue               Search *.md files for tasks due on previous dates.  (@due(YYYY-MM-DD) format.)
+    process               Move lines from $MARKDO_INBOX to other files, one at a time.
     tag "string"          Search *.md files for @string.
-    today                 Search *.md files for today's date.  (YYYY-MM-DD format.)
-    tomorrow              Search *.md files for tomorrow's date.  (YYYY-MM-DD format.)
-    rss                   Make an RSS feed of all links in Markdo.  Useful as a live bookmark.
+    today                 Search *.md files for tasks due today.  (@due(YYYY-MM-DD) format.)
+    tomorrow              Search *.md files for tasks due tomorrow.  (@due(YYYY-MM-DD) format.)
     star, starred         Search *.md files for @star.
     summary               Display counts.
     query, q "string"     Search *.md files for string.
+    week                  Search *.md files for due dates in the next week.  (@due(YYYY-MM-DD) format.)
     version, --version    Display the version.
 
 ## Contributing
@@ -70,6 +73,8 @@ See `markdo help` for more information.
 
 ### Development Environment
 
-    host$ sudo docker build -t markdo .
-    host$ sudo docker run --rm -v $PWD:/src -i -t markdo sh -l
-    container$ rake
+```
+docker-compose build
+docker-compose run guard # run tests interactively
+docker-compose run build # build the gem
+```

data/Rakefile

@@ -1,14 +1,18 @@
 require "bundler/gem_tasks"
-require 'rake/testtask'
 
-task default: 'test'
-
-Rake::TestTask.new('test') do |t|
-  t.libs = %w(lib test)
-  t.test_files = FileList.new("test/**/*_test.rb")
-end
+task default: %w(spec spec:opal:phantomjs)
 
 task :clean do
   require 'fileutils'
   FileUtils.rm_rf('pkg')
 end
+
+require 'rspec/core/rake_task'
+
+desc "Run the specs."
+RSpec::Core::RakeTask.new('spec')
+
+require 'opal/rspec/rake_task'
+Opal::RSpec::RakeTask.new('spec:opal:phantomjs') do |server, task|
+  server.append_path 'lib'
+end

data/bin/markdo

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'markdo'
 
-Markdo::CLI.new(STDOUT, STDERR, ENV).run(*ARGV)
+Markdo::CLI.new.run(*ARGV)

data/docker-compose.yml

@@ -0,0 +1,9 @@
+guard:
+  build: .
+  volumes:
+    - .:/src
+build:
+  build: .
+  volumes:
+    - .:/src
+  command: script/build

data/lib/markdo/cli.rb

@@ -1,74 +1,42 @@
-require 'markdo/add_command'
-require 'markdo/edit_command'
-require 'markdo/forecast_command'
-require 'markdo/help_command'
-require 'markdo/ics_command'
-require 'markdo/inbox_command'
-require 'markdo/overview_command'
-require 'markdo/process_command'
-require 'markdo/query_command'
-require 'markdo/rss_command'
-require 'markdo/star_command'
-require 'markdo/summary_command'
-require 'markdo/tag_command'
-require 'markdo/today_command'
-require 'markdo/tomorrow_command'
-require 'markdo/week_command'
-require 'markdo/version_command'
+require 'markdo/commands'
 
 module Markdo
   class CLI
-    def initialize(stdout, stderr, full_env)
-      @stdout = stdout
-      @stderr = stderr
-      @full_env = full_env
+    def initialize(command_support = CommandSupport.new)
+      @stdin = command_support.stdin
+      @stdout = command_support.stdout
+      @stderr = command_support.stderr
+      @full_env = command_support.env
     end
 
     def run(command_name = 'help', *args)
       command = case command_name
-                when 'add'
-                  AddCommand
-                when 'edit'
-                  EditCommand
-                when 'forecast'
-                  ForecastCommand
-                when 'ics'
-                  IcsCommand
-                when 'inbox'
-                  InboxCommand
-                when 'overdue'
-                  OverdueCommand
-                when 'overview'
-                  OverviewCommand
-                when 'process'
-                  ProcessCommand
-                when 'query', 'q'
+                when 'q'
                   QueryCommand
-                when 'rss'
-                  RssCommand
-                when 'star', 'starred'
+                when 'starred'
                   StarCommand
-                when 'summary'
-                  SummaryCommand
-                when 'tag'
-                  TagCommand
-                when 'today'
-                  TodayCommand
-                when 'tomorrow'
-                  TomorrowCommand
-                when 'version', '--version'
+                when '--version'
                   VersionCommand
-                when 'week'
-                  WeekCommand
                 else
-                  HelpCommand
+                  choose_command_class(command_name)
                 end
 
-      command.new(@stdout, @stderr, env).run(*args)
+      command_support = CommandSupport.new(stdin: @stdin,
+                                           stdout: @stdout,
+                                           stderr: @stderr,
+                                           env: merged_env)
+      command.new(command_support).run(*args)
     end
 
     private
 
+    def choose_command_class(command_name)
+      command_class_name = "#{command_name.capitalize}Command"
+      ::Markdo.const_get(command_class_name)
+    rescue NameError
+      HelpCommand
+    end
+
     def default_env
       {
         'MARKDO_ROOT' => '.',
@@ -76,7 +44,7 @@ module Markdo
       }
     end
 
-    def env
+    def merged_env
       default_env.merge(@full_env)
     end
   end

data/lib/markdo/command_support.rb

@@ -0,0 +1,14 @@
+module Markdo
+  class CommandSupport
+    attr_reader :stdin, :stdout, :stderr, :env, :today
+    attr_writer :stdin
+    
+    def initialize(stdin: STDIN, stdout: STDOUT, stderr: STDERR, env: ENV, today: Date.today)
+      @stdin = stdin
+      @stdout = stdout
+      @stderr = stderr
+      @env = env
+      @today = today
+    end
+  end
+end

data/lib/markdo/commands.rb

@@ -0,0 +1,16 @@
+require 'markdo/commands/add_command'
+require 'markdo/commands/edit_command'
+require 'markdo/commands/forecast_command'
+require 'markdo/commands/help_command'
+require 'markdo/commands/ics_command'
+require 'markdo/commands/inbox_command'
+require 'markdo/commands/overview_command'
+require 'markdo/commands/process_command'
+require 'markdo/commands/query_command'
+require 'markdo/commands/star_command'
+require 'markdo/commands/summary_command'
+require 'markdo/commands/tag_command'
+require 'markdo/commands/today_command'
+require 'markdo/commands/tomorrow_command'
+require 'markdo/commands/week_command'
+require 'markdo/commands/version_command'

data/lib/markdo/{add_command.rb → commands/add_command.rb}

@@ -1,4 +1,4 @@
-require 'markdo/command'
+require 'markdo/commands/command'
 
 module Markdo
   class AddCommand < Command
@@ -6,7 +6,7 @@ module Markdo
       task = String(task)
 
       unless task.strip.empty?
-        File.open(inbox_path, 'a') do |file|
+        File.open(data_source.inbox_path, 'a') do |file|
           file.puts(template(task))
         end
       end
@@ -17,9 +17,5 @@ module Markdo
     def template(task)
       "- [ ] #{task}"
     end
-
-    def inbox_path
-      File.join(@env['MARKDO_ROOT'], @env['MARKDO_INBOX'])
-    end
   end
 end

data/lib/markdo/commands/command.rb

@@ -0,0 +1,33 @@
+require 'markdo/command_support'
+require 'markdo/data_source'
+require 'markdo/models/task_collection'
+
+module Markdo
+  class Command
+    def initialize(command_support)
+      @command_support = command_support
+      @stdin = command_support.stdin
+      @stdout = command_support.stdout
+      @stderr = command_support.stderr
+      @env = command_support.env
+      @today = command_support.today
+    end
+
+    def run
+    end
+
+    protected
+
+    def data_source
+      DataSource.new(@env)
+    end
+
+    def task_collection
+      TaskCollection.new(data_source.lines_from_all, @today)
+    end
+
+    def inbox_task_collection
+      TaskCollection.new(data_source.lines_from_inbox, @today)
+    end
+  end
+end

data/lib/markdo/{edit_command.rb → commands/edit_command.rb}

@@ -1,10 +1,10 @@
 require 'shellwords'
-require 'markdo/command'
+require 'markdo/commands/command'
 
 module Markdo
   class EditCommand < Command
     def run
-      system("#{@env['EDITOR']} #{safe_markdo_root}")
+      Kernel.system("#{@env['EDITOR']} #{safe_markdo_root}")
     end
 
     private

data/lib/markdo/commands/forecast_command.rb

@@ -0,0 +1,41 @@
+require 'date'
+require 'markdo/commands/command'
+
+module Markdo
+  class ForecastCommand < Command
+    def run
+      dates_over_the_next_week.each do |date|
+        abbreviation = abbreviations_by_wday(date.wday)
+        count = task_collection.due_on(date).length
+
+        @stdout.puts("#{abbreviation}: #{count}")
+      end
+
+      due_next_week = task_collection.due_between(@today + 7,
+                                                  @today + 14)
+      @stdout.puts("Next: #{due_next_week.length}")
+    end
+
+    private
+
+    def abbreviations_by_wday(wday)
+      abbrevs = {
+        0 => 'Su',
+        1 => 'Mo',
+        2 => 'Tu',
+        3 => 'We',
+        4 => 'Th',
+        5 => 'Fr',
+        6 => 'Sa',
+      }
+
+      abbrevs[wday]
+    end
+
+    private
+
+    def dates_over_the_next_week
+      (2..7).to_a.map { |offset| @today + offset }
+    end
+  end
+end

data/lib/markdo/{help_command.rb → commands/help_command.rb}

@@ -1,4 +1,4 @@
-require 'markdo/command'
+require 'markdo/commands/command'
 
 module Markdo
   class HelpCommand < Command
@@ -8,26 +8,25 @@ Markdown-based task manager.
 
     add "string"          Add a task to the inbox.  (Set $MARKDO_ROOT and $MARKDO_INBOX.)
     edit                  Edit $MARKDO_ROOT in $EDITOR.
-    forecast              Display counts of dates in the next week.  (YYYY-MM-DD format.)
+    forecast              Display tasks due in the next week.  (@due(YYYY-MM-DD) format.)
     help, --help          Display this help text.
     inbox                 Display contents of $MARKDO_INBOX.
     ics                   Make an iCalendar feed of all due dates in Markdo.  Can be imported
                           or subscribed to if on a remote server.
     overview              Get overview of overdue, starred, today's, and tomorrow's tasks.
-    overdue               Search *.md files for previous dates.  (YYYY-MM-DD format.)
+    overdue               Search *.md files for tasks due on previous dates.  (@due(YYYY-MM-DD) format.)
     process               Move lines from $MARKDO_INBOX to other files, one at a time.
     tag "string"          Search *.md files for @string.
-    today                 Search *.md files for today's date.  (YYYY-MM-DD format.)
-    tomorrow              Search *.md files for tomorrow's date.  (YYYY-MM-DD format.)
-    rss                   Make an RSS feed of all links in Markdo.  Useful as a live bookmark.
+    today                 Search *.md files for tasks due today.  (@due(YYYY-MM-DD) format.)
+    tomorrow              Search *.md files for tasks due tomorrow.  (@due(YYYY-MM-DD) format.)
     star, starred         Search *.md files for @star.
     summary               Display counts.
     query, q "string"     Search *.md files for string.
-    week                  Search *.md files for dates in the next week.  (YYYY-MM-DD format.)
+    week                  Search *.md files for due dates in the next week.  (@due(YYYY-MM-DD) format.)
     version, --version    Display the version.
 EOF
 
-      exit 1
+      Kernel.exit(1)
     end
   end
 end