waddup 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9412cd78378d88a3daf9f219baa2cc1a35fd81d7
-  data.tar.gz: c749fa77c45f8a397b86c90c32d56e02e0f8b637
+  metadata.gz: 124b07086882a87d52aeac3f2774ef9189eb9c6c
+  data.tar.gz: a760abd321c924beca39c80bb54dbd190277b7ac
 SHA512:
-  metadata.gz: a8b44de7bd90cfeedfc321be128d67fe72ba714756dea4cb359cddf80e0e4b6eddf636e11c9880649816cfabcac17b19c26d3e57092402890ba473247e8ef108
-  data.tar.gz: fdc7a2ca6d6f514cad0f679b2ec4b1a3024391164642bfdf2649779e890a053492c0af2aed343de3d7cb9d23ffe5b0011453572da59f6997bbfcd686fd598afa
+  metadata.gz: c56e90b616d1d99204b4e9a09f138d925522fa8fed652b4d4a9aa6c0b2f2825ef35b57251c8cd152a7d8fe2a1d08bb344643b70e22cebaa66c30d788b176f838
+  data.tar.gz: 2dbe261c3af49768d231a8e30c258c44743067f8efecf54b9f4ec3f52fd560d3260bb03d12572ceae4138ca4883f333eb69341d23e9fd9930bd1facd9c9a9108

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-18mode
-  - rbx-19mode
-script: bundle exec rake test
+script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### v0.1.0 - November 29, 2013
+- Drop support for 1.8.7 and 1.9.2.
+- From/to arguments are treated as past by default.
+- Git source considers all branches and excludes merge commits.
+- Events obtained through AppleScript are now sorted correctly.
+- Improve Apple Mail source performance.
+
 ### v0.0.2 - October 30, 2013
 - Initial alpha release with Git, Apple Mail and Apple Calender sources.
 

data/README.md

@@ -10,7 +10,7 @@ Waddup is a Ruby gem that retraces your activities from arbitrary sources - such
 
 Perfect for those who have lost track of what they have worked on.
 
-**Supported Ruby versions: 1.8.7 or higher**
+**Supported Ruby versions: 1.9.3 or higher**
 
 Licensed under the **MIT** license, see LICENSE for more information.
 

data/Rakefile

@@ -1,9 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:test) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/*_spec.rb'
   spec.rspec_opts = ['--color']
 end
 
-task :default => :test
+task test: :spec
+task default: :spec

data/lib/waddup.rb

@@ -1,5 +1,6 @@
 require 'waddup/event'
 require 'waddup/extension'
+require 'waddup/extensions/file_system'
 require 'waddup/extensions/system'
 require 'waddup/extensions/applescript'
 require 'waddup/registry'

data/lib/waddup/cli.rb

@@ -7,9 +7,9 @@ module Waddup
     attr_accessor :sources, :from, :to
 
     KEYWORDS = {
-      :sources => %w[with],
-      :from    => %w[from since],
-      :to      => %w[to until uptil upto through]
+      sources: %w[with],
+      from:    %w[from since],
+      to:      %w[to until uptil upto through]
     }
 
     KEYWORD_BOUNDARY = "(?:\\s#{KEYWORDS.values.flatten.join('|\\s')}|\\Z)"
@@ -23,11 +23,11 @@ module Waddup
       end
 
       parse_keyword :from do |match|
-        @from = Chronic.parse match[1]
+        @from = Chronic.parse match[1], context: :past
       end
 
       parse_keyword :to do |match|
-        @to = Chronic.parse match[1]
+        @to = Chronic.parse match[1], context: :past
       end
     end
 

data/lib/waddup/extensions/applescript.rb

@@ -3,7 +3,7 @@ module Waddup
   module Extension::AppleScript
     include Waddup::Extension::System
 
-    # Runs given AppleScript
+    # Runs given AppleScript on disk
     #
     # Options:
     #
@@ -13,7 +13,7 @@ module Waddup
     def applescript(script, options = {})
       args = options.delete(:args) || []
       arguments = args.map { |arg| " '#{arg}'" }.join
-      results = run("osascript -s s -e '#{script}'#{arguments}")
+      results = run("osascript -s s '#{script}'#{arguments}")
 
       # TODO: This is very scary, find alternatives!
       eval "[#{results[1...-1]}]" if options.delete(:as_ruby)
@@ -22,7 +22,7 @@ module Waddup
     # Whether AppleScript is available
     def applescript?
       osx? && begin
-        run('osalang', :quietly => true).include? 'AppleScript'
+        run('osalang', quietly: true).include? 'AppleScript'
       end
     end
 

data/lib/waddup/extensions/file_system.rb

@@ -0,0 +1,14 @@
+require 'pathname'
+
+module Waddup
+
+  module Extension::FileSystem
+
+    # Resolves folder for given path
+    def folder_of(path)
+      Pathname.new(path).dirname
+    end
+
+  end
+
+end

data/lib/waddup/sources/apple_calendar.rb

@@ -3,29 +3,12 @@ module Waddup
   class Source::AppleCalendar < Waddup::Source
     include Waddup::Extension::AppleScript
     extend Waddup::Extension::AppleScript
+    extend Waddup::Extension::FileSystem
 
     ALIAS = 'ical'
     ICON  = "\xF0\x9F\x93\x85 "
 
-    EVENT_SCRIPT = %Q{
-      on run argv
-        set window_from to date (item 1 of argv)
-        set window_to   to date (item 2 of argv)
-
-        tell application "Calendar"
-          set results to {}
-
-          set cdars to (events whose start date <= window_to and end date > window_from) in every calendar
-          repeat with cdar in cdars
-            repeat with evt in cdar
-              set end of results to {summary:summary of evt, start_date:start date of evt as string, end_date:end date of evt as string}
-            end repeat
-          end repeat
-
-          results
-        end tell
-      end run
-    }
+    EVENT_SCRIPT = folder_of(__FILE__) + 'apple_calender/events.applescript'
 
     # Aggregates calendar events
     #
@@ -36,14 +19,14 @@ module Waddup
     #
     def events(from, to)
       results = applescript EVENT_SCRIPT,
-        :as_ruby => true,
-        :args    => [from.strftime('%d/%m/%Y %H:%M'), to.strftime('%d/%m/%Y %H:%M')]
+        as_ruby: true,
+        args:    [from.strftime('%d/%m/%Y %H:%M'), to.strftime('%d/%m/%Y %H:%M')]
 
       results.map do |result|
         Waddup::Event.new do |e|
           e.label   = result[:summary]
-          e.at      = DateTime.parse(result[:start_date])
-          e.until   = DateTime.parse(result[:end_date])
+          e.at      = Time.parse(result[:start_date])
+          e.until   = Time.parse(result[:end_date])
           e.source  = self
         end
       end

data/lib/waddup/sources/apple_calender/events.applescript

@@ -0,0 +1,17 @@
+on run argv
+  set window_from to date (item 1 of argv)
+  set window_to   to date (item 2 of argv)
+
+  tell application "Calendar"
+    set results to {}
+
+    set cdars to (events whose start date <= window_to and end date > window_from) in every calendar
+    repeat with cdar in cdars
+      repeat with evt in cdar
+        set end of results to {summary:summary of evt, start_date:start date of evt as string, end_date:end date of evt as string}
+      end repeat
+    end repeat
+
+    results
+  end tell
+end run

data/lib/waddup/sources/apple_mail.rb

@@ -3,36 +3,12 @@ module Waddup
   class Source::AppleMail < Waddup::Source
     include Waddup::Extension::AppleScript
     extend Waddup::Extension::AppleScript
+    extend Waddup::Extension::FileSystem
 
     ALIAS = 'mail'
     ICON  = "\xE2\x9C\x89\xEF\xB8\x8F "
 
-    # Until OSX Mavericks handles Gmail's sent-mailbox correctly, resort to
-    # iterating through all mailboxes and identify sent messages by sender
-    #
-    # See: http://tidbits.com/article/14219
-    SENT_MAIL_SCRIPT = %Q{
-      on run argv
-        set window_from to date (item 1 of argv)
-        set window_to   to date (item 2 of argv)
-
-        tell application "Mail"
-          set results to {}
-
-          repeat with acct in every account
-            set username to user name of acct
-            set mboxes to (messages whose sender contains username and date sent >= window_from and date sent <= window_to) in every mailbox in acct
-            repeat with mbox in mboxes
-              repeat with msg in mbox
-                set the end of results to {subject:subject of msg, datetime:date sent of msg as string}
-              end
-            end repeat
-          end repeat
-
-          results
-        end tell
-      end run
-    }
+    SENT_MAIL_SCRIPT = folder_of(__FILE__) + 'apple_mail/sent_mail.applescript'
 
     # Aggregates sent mail events
     #
@@ -43,13 +19,13 @@ module Waddup
     #
     def events(from, to)
       results = applescript SENT_MAIL_SCRIPT,
-        :as_ruby => true,
-        :args    => [from.strftime('%d/%m/%Y %H:%M'), to.strftime('%d/%m/%Y %H:%M')]
+        as_ruby: true,
+        args:    [from.strftime('%d/%m/%Y %H:%M'), to.strftime('%d/%m/%Y %H:%M')]
 
       results.map do |result|
         Waddup::Event.new do |e|
           e.label  = result[:subject]
-          e.at     = DateTime.parse(result[:datetime])
+          e.at     = Time.parse(result[:datetime])
           e.source = self
         end
       end

data/lib/waddup/sources/apple_mail/sent_mail.applescript

@@ -0,0 +1,24 @@
+on run argv
+  set window_from to date (item 1 of argv)
+  set window_to   to date (item 2 of argv)
+
+  tell application "Mail"
+    set results to {}
+
+    repeat with acct in every account
+      set username to user name of acct
+      try
+        set mbox to mailbox "[Gmail]/All Mail" of acct
+      on error
+        set mbox to mailbox "Sent" of acct
+      end try
+
+      set msgs to (messages whose sender contains username and date sent >= window_from and date sent <= window_to) in mbox
+      repeat with msg in msgs
+        set the end of results to {subject:subject of msg, datetime:date sent of msg as string}
+      end repeat
+    end repeat
+
+    results
+  end tell
+end run

data/lib/waddup/sources/git.rb

@@ -62,11 +62,11 @@ module Waddup
     def events_for_repo(from, to, repo)
       repo_label = self.class.label_for_repo repo
 
-      results = run "git --git-dir='#{repo}' log --author='#{author}' --since='#{from.iso8601}' --until='#{to.iso8601}' --format='format:#{GIT_FORMAT}'"
+      results = run "git --git-dir='#{repo}' log --all --no-merges --author='#{author}' --since='#{from.iso8601}' --until='#{to.iso8601}' --format='format:#{GIT_FORMAT}'"
       results.scan(EXTRACT_PATTERN).map do |hash, datetime, subject|
         Waddup::Event.new do |e|
           e.label  = "[#{repo_label}] #{subject}"
-          e.at     = DateTime.parse(datetime)
+          e.at     = Time.parse(datetime)
           e.source = self
         end
       end
@@ -89,7 +89,7 @@ module Waddup
 
     # Requires Git to be installed successfully
     def self.usable?
-      run 'git --version', :quietly => true
+      run 'git --version', quietly: true
       $?.success?
     end
 

data/lib/waddup/version.rb

@@ -1,5 +1,5 @@
 module Waddup
 
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 
 end

data/spec/spec_helper.rb

@@ -1,14 +1,30 @@
-if RUBY_VERSION >= '1.9.3'
-  require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require 'waddup'
 
 Dir['./spec/support/**/*.rb'].sort.each { |file| require file }
+
+RSpec.configure do |config|
+
+  # Helper modules
+  config.extend ShellMock
+
+  config.before(:each) do
+    ShellMock.apply!
+  end
+
+  # Allow focussing on individual specs
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
+  # Run specs in random order to surface order dependencies
+  config.order = 'random'
+
+end

data/spec/support/shell_mock.rb

@@ -1,26 +1,32 @@
-# Raised when shell operations are invoked
-class ShellNotAllowedError < StandardError
-
-  def initialize(command)
-    msg =  "Shell operation is not allowed: #{command}\n\n"
-    msg << "You can stub this request with the following snippet:\n\n"
-    msg << "stub_shell(\"#{command}\", :output => '', :exitstatus => 0)\n "
-    super msg
-  end
+module ShellMock
 
-end
+  # Raised when shell operations are invoked
+  class ShellNotAllowedError < StandardError
 
-# Prevent invoking shell operations
-class Object
+    def initialize(command)
+      msg =  "Shell operation is not allowed: #{command}\n\n"
+      msg << "You can stub this request with the following snippet:\n\n"
+      msg << "stub_shell(\"#{command}\", output: '', exitstatus: 0)\n "
+      super msg
+    end
 
-  def `(command)
-    raise ShellNotAllowedError, command
   end
 
-  def system(command)
-    raise ShellNotAllowedError, command
+  # Applies shell mock functionality
+  def self.apply!
+    Object.any_instance.stub(:`).and_return do |foo|
+      raise ShellNotAllowedError, foo
+    end
+
+    Object.any_instance.stub(:system).and_return do |command|
+      raise ShellNotAllowedError, command
+    end
   end
 
+end
+
+class Object
+
   # Stubs shell operations matching given command
   #
   # Options:

data/spec/waddup/sources/apple_calendar_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Waddup::Source::AppleCalendar do
-  let(:from) { DateTime.new 2013, 10, 16 }
-  let(:to)   { DateTime.new 2013, 10, 17 }
+  let(:from) { Date.new(2013, 10, 16) }
+  let(:to)   { Date.new(2013, 10, 17) }
 
   describe '#events' do
     before do
-      subject.stub_shell "osascript -s s -e '#{described_class::EVENT_SCRIPT}' '16/10/2013 00:00' '17/10/2013 00:00'",
-        :output => fixture('sources/apple_calendar.results')
+      subject.stub_shell "osascript -s s '#{described_class::EVENT_SCRIPT}' '16/10/2013 00:00' '17/10/2013 00:00'",
+        output: fixture('sources/apple_calendar.results')
     end
 
     it 'aggregates events' do
@@ -27,7 +27,7 @@ describe Waddup::Source::AppleCalendar do
 
       context 'when AppleScript is available' do
         before do
-          described_class.stub_shell 'osalang 2>&1', :output => 'AppleScript'
+          described_class.stub_shell 'osalang 2>&1', output: 'AppleScript'
         end
 
         it { should be_usable }
@@ -35,7 +35,7 @@ describe Waddup::Source::AppleCalendar do
 
       context 'when AppleScript is unavailable' do
         before do
-          described_class.stub_shell 'osalang 2>&1', :exitstatus => 1
+          described_class.stub_shell 'osalang 2>&1', exitstatus: 1
         end
 
         it { should_not be_usable }

data/spec/waddup/sources/apple_mail_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Waddup::Source::AppleMail do
-  let(:from) { DateTime.new 2013, 10, 16 }
-  let(:to)   { DateTime.new 2013, 10, 17 }
+  let(:from) { Date.new(2013, 10, 16) }
+  let(:to)   { Date.new(2013, 10, 17) }
 
   describe '#events' do
     before do
-      subject.stub_shell "osascript -s s -e '#{described_class::SENT_MAIL_SCRIPT}' '16/10/2013 00:00' '17/10/2013 00:00'",
-        :output => fixture('sources/apple_mail.results')
+      subject.stub_shell "osascript -s s '#{described_class::SENT_MAIL_SCRIPT}' '16/10/2013 00:00' '17/10/2013 00:00'",
+        output: fixture('sources/apple_mail.results')
     end
 
     it 'aggregates events' do
@@ -28,7 +28,7 @@ describe Waddup::Source::AppleMail do
 
       context 'when AppleScript is available' do
         before do
-          described_class.stub_shell 'osalang 2>&1', :output => 'AppleScript'
+          described_class.stub_shell 'osalang 2>&1', output: 'AppleScript'
         end
 
         it { should be_usable }
@@ -36,7 +36,7 @@ describe Waddup::Source::AppleMail do
 
       context 'when AppleScript is unavailable' do
         before do
-          described_class.stub_shell 'osalang 2>&1', :exitstatus => 1
+          described_class.stub_shell 'osalang 2>&1', exitstatus: 1
         end
 
         it { should_not be_usable }

data/spec/waddup/sources/git_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Waddup::Source::Git do
-  let(:from) { DateTime.new 2013, 10, 16 }
-  let(:to)   { DateTime.new 2013, 10, 17 }
+  let(:from) { Date.new(2013, 10, 16) }
+  let(:to)   { Date.new(2013, 10, 17) }
 
   describe '#author' do
     it 'obtains author from git-config' do
@@ -44,8 +44,8 @@ describe Waddup::Source::Git do
 
   describe '#events_for_repo' do
     before do
-      subject.stub_shell "git --git-dir='/waddup/.git' log --author='John Doe' --since='2013-10-16T00:00:00+00:00' --until='2013-10-17T00:00:00+00:00' --format='format:%h %ai %s'",
-        :output => fixture('sources/git.log')
+      subject.stub_shell "git --git-dir='/waddup/.git' log --all --no-merges --author='John Doe' --since='2013-10-16' --until='2013-10-17' --format='format:%h %ai %s'",
+        output: fixture('sources/git.log')
     end
 
     it 'aggregates events for given repo' do
@@ -82,7 +82,7 @@ describe Waddup::Source::Git do
   describe '::usable?' do
     context 'when git is available' do
       before do
-        described_class.stub_shell 'git --version 2>&1', :exitstatus => 0
+        described_class.stub_shell 'git --version 2>&1', exitstatus: 0
       end
 
       it { should be_usable }
@@ -90,7 +90,7 @@ describe Waddup::Source::Git do
 
     context 'when git is unavailable' do
       before do
-        described_class.stub_shell 'git --version 2>&1', :exitstatus => 1
+        described_class.stub_shell 'git --version 2>&1', exitstatus: 1
       end
 
       it { should_not be_usable }

data/waddup.gemspec

@@ -20,17 +20,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'chronic'
+  s.add_dependency 'chronic', '~> 0.10.2'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
 
-  if RUBY_VERSION >= '1.9.3'
-    s.add_development_dependency 'guard'
-    s.add_development_dependency 'guard-rspec'
-    s.add_development_dependency 'listen'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'listen'
 
-    s.add_development_dependency 'coveralls'
-    s.add_development_dependency 'simplecov'
-  end
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: waddup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Tim Kurvers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,11 +149,14 @@ files:
 - lib/waddup/event.rb
 - lib/waddup/extension.rb
 - lib/waddup/extensions/applescript.rb
+- lib/waddup/extensions/file_system.rb
 - lib/waddup/extensions/system.rb
 - lib/waddup/registry.rb
 - lib/waddup/source.rb
 - lib/waddup/sources/apple_calendar.rb
+- lib/waddup/sources/apple_calender/events.applescript
 - lib/waddup/sources/apple_mail.rb
+- lib/waddup/sources/apple_mail/sent_mail.applescript
 - lib/waddup/sources/git.rb
 - lib/waddup/version.rb
 - spec/fixtures/sources/apple_calendar.results