currently 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,3 @@
 pkg/*
+.rvmrc
+tmp/*

data/Gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    currently (0.0.1)
+      catch
+      trollop
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    builder (3.0.0)
+    catch (0.0.7)
+      faraday_middleware (~> 0.6)
+      hashie (~> 1.0.0)
+      multi_json (~> 1.0.0)
+    childprocess (0.2.1)
+      ffi (~> 1.0.6)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    faraday_middleware (0.7.0)
+      faraday (~> 0.7.3)
+    ffi (1.0.9)
+    gherkin (2.4.14)
+      json (>= 1.4.6)
+    hashie (1.0.0)
+    json (1.5.3)
+    multi_json (1.0.3)
+    multipart-post (1.1.3)
+    rack (1.3.2)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.6)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  currently!

data/README.markdown

@@ -26,12 +26,16 @@ You can add multiple tags (contexts) to `currently` by using the `-c` flag; you
 
 Of course, there are some fun uses for the data (plotting what times of the day you're most active, etc) so your old entries are stored. You can view the last *n* entries with the `-n` option: `currently -n 5`
 
+To Install
+----------
+
+    gem install currently
 
 Todo
 ----
 * read/write configs from `~/.currentlyrc`
 * write to `~/.currentlog`
-* catch.com integration
+* catch.com integration (including offline storage until connectivity is up?)
 * show awesomeWM wibox example
 * auto-infer location tags from geolocation API
 * color output

data/Rakefile

@@ -12,6 +12,8 @@ task :default do
   puts "  to run after installing, run `currently`"
   puts "  to clean packages, run `rake clobber`"
   puts
+  puts "  to test: rake build && rake install && cucumber"
+  puts
   puts "  for more tasks run `rake -T`"
   puts
 end

data/currently.gemspec

@@ -26,5 +26,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "trollop"
+  s.add_runtime_dependency "catch"
+  s.add_development_dependency "aruba"
 end

data/features/basic_cli_usage.feature

@@ -0,0 +1,9 @@
+# this is a silly language
+# let's look into not using pseudo-english for everything
+Feature: basic CLI commands
+
+  Scenario: getting help
+  When I run `currently --help`
+  Then the exit status should be 0
+  And the output should contain "usage"
+  And the output should contain "currently"

data/features/basic_file_usage.feature

@@ -0,0 +1,25 @@
+Feature: basic filestore usage
+
+  Scenario: no file
+    Given an empty file named "test/scratch/currentlog"
+    When I remove the file "test/scratch/currentlog"
+    And I run `currently -f test/scratch/currentlog`
+    Then the exit status should be 0
+    And the output should contain "entry log is empty"
+    And the file "~/.currentlog" should not exist
+
+  Scenario: empty file
+    Given an empty file named "test/scratch/currentlog"
+    When I run `currently -f test/scratch/currentlog`
+    Then the exit status should be 0
+    And the output should contain "entry log is empty"
+
+  Scenario: write one
+    Given an empty file named "test/scratch/currentlog"
+    When I remove the file "test/scratch/currentlog"
+    And I run `currently -f test/scratch/currentlog test data`
+    And I run `currently -f test/scratch/currentlog`
+    Then the exit status should be 0
+    And the output should contain exactly "test data\n"
+    And a file named "test/scratch/currentlog" should exist
+    And the file "test/scratch/currentlog" should contain "test data"

data/features/support/env.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/lib/currently.rb

@@ -1,4 +1,7 @@
-require "currently/version"
+require 'currently/version'
+require 'currently/filestore'
+require 'currently/catchstore'
+require 'trollop'
 
 module Currently
   class << self
@@ -9,7 +12,56 @@ module Currently
 
   class Application
     def run
-      puts "currently hasn't been written yet!"
+      opts = Trollop::options do
+        version "currently v#{VERSION} (c) 2011 Mike Stipicevic"
+        banner <<-EOS
+  currently is a 'concentration log' designed to keep track of what you
+  are working or thinking about right at this moment.
+
+  usage:
+            currently [options] [entry]
+
+  leaving out an entry will display the last one entered
+
+  available [options] are:
+EOS
+
+        opt :filestore, "use local filestore", :type => :string
+        opt :context, "select a context (work, home, etc)", :type => :string
+        opt :catch, "use catch, specify username:password", :type => :string
+      end
+
+      unless opts[:catch]
+        fname = ENV["HOME"] + "/.currentlog"
+        fname = opts[:filestore] if opts[:filestore] 
+        backingstore = Filestore.new(fname)
+      else
+        user = opts[:catch].split(":")[0]
+        Trollop::die :catch, "must be in the format: username:password" if opts[:catch].split(":").length < 2
+        pw = opts[:catch].split(":")[1]
+        backingstore = Catchstore.new(user,pw)
+      end
+
+      if ARGV.count > 0
+        text = ARGV.join(" ")
+        if opts[:context]
+          ent = Entry.new(text,[opts[:context]])
+        else
+          ent = Entry.new(text)
+        end
+        backingstore.save(ent)
+      else
+        if opts[:context]
+          last = backingstore.last(1,opts[:context])
+        else
+          last = backingstore.last
+        end
+        if last.count > 0 then
+          puts last.first.to_s
+        else
+          puts "[ entry log is empty ]"
+        end
+      end
     end
   end
 end

data/lib/currently/backingstore.rb

@@ -0,0 +1,18 @@
+module Currently
+class Backingstore
+  # retrieves last n entries
+  def last(n = 1, context = nil)
+    raise "not implemented!"
+  end
+
+  # retrieves all entries (or as many as can be found)
+  def all
+    raise "not implemented!"
+  end
+
+  # saves the provided entry
+  def save(entry)
+    raise "not implemented!"
+  end
+end
+end

data/lib/currently/catchstore.rb

@@ -0,0 +1,35 @@
+require 'currently/backingstore'
+require 'currently/entry'
+require 'catch'
+
+module Currently
+  class Catchstore < Backingstore
+  def initialize(user,pass)
+    @catch = Catch::Client.new(:username => user, :password => pass)
+    @context = "#iac"
+  end
+
+  # retrieves last n entries
+  def last(n = 1,context = nil)
+    context ||= @context
+    note_ids = @catch.search(context,:limit => n).map{|x| x["id"].to_i}
+    ents = note_ids.map{|x|
+      e = @catch.note(x)
+      # Entry.new(e["text"],e["tags"],e["created_at"])
+      # tags are already in the text, we don't want dupes
+      Entry.new(e["text"],[],e["created_at"])
+    }
+    ents
+  end
+
+  # retrieves all entries (or as many as can be found)
+  def all
+    super
+  end
+
+  # saves the provided entry
+  def save(entry)
+    @catch.add_note(:text => entry.to_s + " #{@context}")
+  end
+  end
+end

data/lib/currently/entry.rb

@@ -0,0 +1,18 @@
+module Currently
+class Entry
+  def initialize(text,contexts = [],ts = Time.now.to_s)
+    @text = text
+    @contexts = contexts
+    @timestamp = ts
+  end
+
+  def to_s
+    @text + @contexts.map{|x| "#" + x}.join(" ")
+  end
+
+  # put this into sep module?
+  def serialize_to_line
+    @timestamp.to_s + "| " + @text + " " + @contexts.map{|x| "#" + x}.join(" ")
+  end
+end
+end

data/lib/currently/filestore.rb

@@ -0,0 +1,53 @@
+require 'currently/backingstore'
+require 'currently/entry'
+
+module Currently
+class Filestore < Backingstore
+  def initialize(filename)
+    # raise "log file #{filename} doesn't exist!" unless File.exists? filename
+    @filename = filename
+  end
+
+  # retrieves last n entries
+  def last(n = 1)
+    self.parse.last n
+  end
+
+  # retrieves all entries (or as many as can be found)
+  def all
+    self.parse
+  end
+
+  # saves the provided entry
+  def save(entry)
+    File.open(@filename,"a"){|f|
+      f.puts entry.serialize_to_line
+    }
+  end
+
+  def parse
+    # sloooooooow
+    entries = []
+    return entries unless File.exists? @filename
+    File.open(@filename) {|f|
+      f.readlines.each{|l|
+        chunks = l.split("|")
+        ts = chunks[0]
+        rest = chunks[1..-1].join("|").split(" ")
+        contexts = []
+        rest.reverse.each {|c|
+          if c =~ /^\#.+/
+            contexts << c[1..-1]
+          else
+            break
+          end
+        }
+        contexts = contexts.reverse
+        text = rest[0..-(contexts.length + 1)].join(" ")
+        entries << Entry.new(text,contexts,ts)
+      }
+      entries
+    }
+  end
+end
+end

data/lib/currently/version.rb

@@ -1,3 +1,3 @@
 module Currently
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: currently
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000 -07:00
-default_executable: 
-dependencies: []
+date: 2011-08-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &86045460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *86045460
+- !ruby/object:Gem::Dependency
+  name: catch
+  requirement: &86045250 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *86045250
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &86045040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *86045040
 description: ! "    'currently' is a console application designed to keep a running
   'concentration log'\n    of what you are currently doing in the moment. It is ideal
   for capturing your thoughts\n    at work before the weekend so you're ready to go
@@ -27,14 +59,22 @@ files:
 - .gitignore
 - COPYING
 - Gemfile
+- Gemfile.lock
 - README.markdown
 - Rakefile
 - bin/currently
 - currently.gemspec
+- features/basic_cli_usage.feature
+- features/basic_file_usage.feature
+- features/support/env.rb
 - lib/currently.rb
+- lib/currently/backingstore.rb
+- lib/currently/catchstore.rb
+- lib/currently/entry.rb
+- lib/currently/filestore.rb
 - lib/currently/version.rb
 - pkg/.gitignore
-has_rdoc: true
+- tmp/aruba/.gitignore
 homepage: https://github.com/wickedchicken/i_am_currently
 licenses: []
 post_install_message: 
@@ -55,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: currently
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: the 'currently' concentration log application