gridcli 0.0.3 → 0.0.4

data/README.rdoc

@@ -40,11 +40,31 @@ To update all messages / likes / dislikes / etc, run:
   grid update
 
 == Searching
-You can search any type (or all types) for something.  Will eventually use Chronic to allow users to specify when to search.
-  grid search <like|dislike|message|status|all> "ruby gem"
+You can search any type (or all types) for something.
+  grid search <like|dislike|message|status|all> "ruby gem" [<when>]
 
-= To Do
+The <when> parameter is free form text and can be a range ("x to y").  For instance:
+  grid search like "chronic" today
+  grid search like "chronic" yesterday
+  grid search message "chronic" "two weeks ago to today"
+  grid search all "the grid" "1 month ago to last week"
+
+== Listing Posts
+You can list any type (or all types) of posts.
+  grid list <like|dislike|message|status|all> [<when>]
+
+The <when> parameter is free form text and can be a range ("x to y").  For instance:
+  grid list like today
+  grid list like yesterday
+  grid list message "two weeks ago to today"
+  grid list all "1 month ago to last week"
+
+== Blocking Users
+To block another user:
   grid block <user>
-  grid list likes [<count>]
+
+This will "unfriend" them and they will no longer see your posts.
+
+
 
 

data/gridcli.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = GridCLI::VERSION
   s.authors     = ["Brian Muller"]
   s.email       = ["bamuller@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://gridcli.com"
   s.summary     = "A command line interface to The Grid: Social Networking, Web 0.2"
   s.description = "A command line interface to The Grid: Social Networking, Web 0.2"
   s.rubyforge_project = "gridcli"
@@ -15,6 +15,7 @@ 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("activeresource", ">= 3.0.10")
+  s.add_dependency("chronic", ">= 0.6.4")
   s.bindir = "bin"
   s.executables << "grid"
 end

data/lib/gridcli/commands/base.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'chronic'
 
 module GridCLI
   class BaseCommand
@@ -25,6 +26,19 @@ module GridCLI
       exit
     end
 
+    def parse_dates(datestring)
+      dates = [nil, nil]
+      return dates if datestring.nil? or datestring.strip == ""
+
+      # get start / end parts
+      parts = datestring.downcase.split(' to ')
+      parts << parts.first if parts.length == 1
+
+      dates[0] = (parts[0].nil? or parts[0].strip == "") ? nil : Chronic.parse(parts[0], :context => :past)
+      dates[1] = (parts.length < 2 or parts[1].strip == "") ? nil : Chronic.parse(parts[1], :context => :past)
+      dates.map { |d| d.nil? ? nil : Date.parse(d.to_s) }
+    end
+
     def parse_opts(args)
       begin
         @optp.parse(args)

data/lib/gridcli/commands/block.rb

@@ -0,0 +1,28 @@
+module GridCLI
+  class BlockCommand < BaseCommand
+    def initialize
+      super "block", "Block a user from further communication"
+    end
+
+    def usage
+      super "<username>"
+    end
+
+    def run(args)
+      # handle options
+      usage if args.length == 0
+      username = args.shift
+      parse_opts args
+
+      begin
+        log "Trying to block '#{username}'"
+        Blockage.new(:username => username).save
+        puts "User '#{username}' blocked"
+      rescue ActiveResource::ResourceNotFound
+        puts "Sorry, can't find a user with name '#{username}'"
+      end
+    end
+  end
+
+  Runner.register "block", BlockCommand
+end

data/lib/gridcli/commands/list.rb

@@ -0,0 +1,25 @@
+module GridCLI
+  class ListCommand < BaseCommand
+    def initialize
+      super "list", "List posts of a particular kind or all posts"
+    end
+
+    def usage
+      super "<like|dislike|message|status|all> [<since time>][ to <end time>]"
+    end
+
+    def run(args)
+      usage if args.length == 0
+      type = args.shift
+      usage if not [ 'like', 'dislike', 'status', 'message', 'all' ].include? type
+      period = (args.length > 0 and not args.first.start_with? '-') ? args.shift : nil
+      dates = parse_dates period
+      parse_opts args
+      
+      log "Showing #{type} posts in range #{dates.first || 'first'} - #{dates.last || 'last'}"
+      GridCLI.storage.list(type, dates[0], dates[1])
+    end
+  end
+
+  Runner.register "list", ListCommand
+end

data/lib/gridcli/commands/search.rb

@@ -5,7 +5,7 @@ module GridCLI
     end
 
     def usage
-      super "<like|dislike|message|status|all> <query> [<since time>]"
+      super "<like|dislike|message|status|all> <query> [<since time>][ to <end time>]"
     end
 
     def run(args)
@@ -13,10 +13,12 @@ module GridCLI
       type = args.shift
       usage if not [ 'like', 'dislike', 'status', 'message', 'all' ].include? type
       query = args.shift
-      dates = (args.length > 0 and not args.first.start_with? '-') ? args.shift : nil
+      period = (args.length > 0 and not args.first.start_with? '-') ? args.shift : nil
+      dates = parse_dates period
       parse_opts args
-      
-      GridCLI.storage.search(type, query, dates)
+
+      log "Showing #{type} posts in range #{dates.first || 'first'} - #{dates.last || 'last'}"
+      GridCLI.storage.search(type, query, dates[0], dates[1])
     end
   end
 

data/lib/gridcli/commands/update.rb

@@ -20,12 +20,13 @@ module GridCLI
         puts "There was an error updating your messages."
         return
       end
-      
+
+      log "Saving #{posts.length} posts."
       save posts
     end
 
     def save(posts)
-      if posts.nil? or posts.length == 0
+      if posts.length == 0
         puts "Up to date."
       else
         posts.each { |p| puts "#{p.to_s}\n\n" }

data/lib/gridcli/resources/blockage.rb

@@ -0,0 +1,4 @@
+module GridCLI
+  class Blockage < BaseResource
+  end
+end

data/lib/gridcli/runner.rb

@@ -1,9 +1,15 @@
+require 'active_resource'
+
 module GridCLI
   class Runner
     def self.run(args)
       cmd = args.shift
       cmd = "help" if not @@cmds.has_key? cmd
-      @@cmds[cmd].new.run(args)
+      begin
+        @@cmds[cmd].new.run(args)
+      rescue ActiveResource::UnauthorizedAccess
+        puts "Sorry gridder, your username or auth token is invalid."
+      end
     end
 
     def self.register(name, klass)

data/lib/gridcli/storage/base.rb

@@ -8,7 +8,11 @@ module GridCLI
       raise "Not implemented"
     end
 
-    def search(type, query, dates)
+    def search(type, query, state_date, end_date)
+      raise "Not implemented"
+    end
+
+    def list(type, start_date, end_date)
       raise "Not implemented"
     end
   end

data/lib/gridcli/storage/files.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'date'
 
 module GridCLI
   class FileStorage < StorageBase
@@ -40,13 +41,59 @@ module GridCLI
       @handles[path]
     end
 
-    def search(type, query, dates)
-      types = (type == "all") ? @types : [type]
+    def years(type)
+      Dir.glob(File.join(@basedir, type, '*')).map { |f| File.basename(f) }
+    end
+
+    def months(type, year)
+      Dir.glob(File.join(@basedir, type, year, '*')).map { |f| File.basename(f) }
+    end
+
+    def dates(type, year, month)
+      Dir.glob(File.join(@basedir, type, year, month, '*')).map { |f| File.basename(f) }
+    end
+
+    def min_date(type)
+      year = years(type).sort.first
+      month = months(type, year).sort.first
+      date = dates(type, year, month).sort.first.split('.').first
+      Date.new year.to_i, month.to_i, date.to_i
+    end
+
+    def max_date(type)
+      year = years(type).sort.last
+      month = months(type, year).sort.last
+      date = dates(type, year, month).sort.last.split('.').first
+      Date.new year.to_i, month.to_i, date.to_i
+    end
+
+    def has_type?(type)
+      Dir.glob(File.join(@basedir, type, "*")).length > 0
+    end
+
+    def files(type, start_date, end_date)
+      types = (type.strip == "all") ? @types : [type]
       types.each { |t|
-        path = File.join(@basedir, t)
+        next unless has_type?(t)
+        dates = [start_date || min_date(t), end_date || max_date(t)]
+        dates.min.upto(dates.max) { |d|
+          path = File.join(@basedir, t, d.year.to_s, d.month.to_s, d.day.to_s + ".json")
+          yield path if File.exists? path
+        }
+      }
+    end
+
+    def search(type, query, start_date, end_date)
+      files(type, start_date, end_date) { |path|
         system "grep -R \"#{query}\" #{path}"
       }
     end
 
+    def list(type, start_date, end_date)
+      files(type, start_date, end_date) { |path|
+        system "cat #{path}"
+      }
+    end
+
   end
 end

data/lib/gridcli/version.rb

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

data/lib/gridcli.rb

@@ -23,6 +23,7 @@ require 'gridcli/commands/signup'
 require 'gridcli/commands/help'
 require 'gridcli/commands/profile'
 require 'gridcli/commands/befriend'
+require 'gridcli/commands/block'
 require 'gridcli/commands/friends'
 require 'gridcli/commands/message'
 require 'gridcli/commands/status'
@@ -30,9 +31,11 @@ require 'gridcli/commands/like'
 require 'gridcli/commands/dislike'
 require 'gridcli/commands/update'
 require 'gridcli/commands/search'
+require 'gridcli/commands/list'
 
 require 'gridcli/resources/base'
 require 'gridcli/resources/user'
 require 'gridcli/resources/friendship'
 require 'gridcli/resources/post'
+require 'gridcli/resources/blockage'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gridcli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brian Muller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 -04:00
+date: 2011-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 3.0.10
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
+        version: 0.6.4
+  type: :runtime
+  version_requirements: *id002
 description: "A command line interface to The Grid: Social Networking, Web 0.2"
 email: 
 - bamuller@gmail.com
@@ -55,10 +71,12 @@ files:
 - lib/gridcli.rb
 - lib/gridcli/commands/base.rb
 - lib/gridcli/commands/befriend.rb
+- lib/gridcli/commands/block.rb
 - lib/gridcli/commands/dislike.rb
 - lib/gridcli/commands/friends.rb
 - lib/gridcli/commands/help.rb
 - lib/gridcli/commands/like.rb
+- lib/gridcli/commands/list.rb
 - lib/gridcli/commands/message.rb
 - lib/gridcli/commands/profile.rb
 - lib/gridcli/commands/search.rb
@@ -67,6 +85,7 @@ files:
 - lib/gridcli/commands/update.rb
 - lib/gridcli/config.rb
 - lib/gridcli/resources/base.rb
+- lib/gridcli/resources/blockage.rb
 - lib/gridcli/resources/friendship.rb
 - lib/gridcli/resources/post.rb
 - lib/gridcli/resources/user.rb
@@ -75,7 +94,7 @@ files:
 - lib/gridcli/storage/files.rb
 - lib/gridcli/version.rb
 has_rdoc: true
-homepage: ""
+homepage: http://gridcli.com
 licenses: []
 
 post_install_message: