RubyGems - gridcli - Versions diffs - 0.0.5 → 0.0.6 - Mend

gridcli 0.0.5 → 0.0.6

Files changed (32) hide show

data/README.rdoc +39 -3
data/gridcli.gemspec +1 -0
data/lib/gridcli/commands/base.rb +21 -0
data/lib/gridcli/commands/dislike.rb +2 -1
data/lib/gridcli/commands/friends.rb +1 -1
data/lib/gridcli/commands/help.rb +1 -1
data/lib/gridcli/commands/like.rb +2 -1
data/lib/gridcli/commands/list.rb +2 -1
data/lib/gridcli/commands/message.rb +19 -8
data/lib/gridcli/commands/plugin.rb +28 -0
data/lib/gridcli/commands/pprint.rb +3 -5
data/lib/gridcli/commands/profile.rb +13 -1
data/lib/gridcli/commands/search.rb +2 -1
data/lib/gridcli/commands/signup.rb +2 -0
data/lib/gridcli/commands/status.rb +3 -2
data/lib/gridcli/commands/subgrid.rb +30 -0
data/lib/gridcli/commands/update.rb +7 -5
data/lib/gridcli/config.rb +2 -18
data/lib/gridcli/hooks.rb +15 -0
data/lib/gridcli/plugins.rb +39 -0
data/lib/gridcli/pprinter.rb +117 -30
data/lib/gridcli/resources/post.rb +26 -4
data/lib/gridcli/resources/user.rb +4 -0
data/lib/gridcli/stats.rb +13 -0
data/lib/gridcli/storage/base.rb +2 -2
data/lib/gridcli/storage/files.rb +6 -4
data/lib/gridcli/subgrids.rb +35 -0
data/lib/gridcli/version.rb +1 -1
data/lib/gridcli/ymlhash.rb +28 -0
data/lib/gridcli.rb +32 -12
metadata +33 -11
data/TODO +0 -13

data/README.rdoc CHANGED Viewed

@@ -1,6 +1,6 @@
 = gridcli -- A command line interface to The Grid
-The Grid is a command line social network that is always in offline mode.
+The Grid is a command line social network that is fast, modular, and simple.
 To install:
   gem install gridcli
@@ -14,7 +14,9 @@ To show your profile:
   grid profile
 To update your profile:
-  grid profile [--github-username <username>] [--name <name>]
+  grid profile [--github-username <username>] [--name <name>] [--avatar <avatar text file>]
+If you want a profile pic, use a program like jp2a to convert a jpeg image to ascii format first.
 To show someone else's profile:
   grid profile <username>
@@ -28,7 +30,7 @@ To list your friends:
 == Messaging
 To send a message to a list of users:
-  grid message <username>[,<username>,...] [<subject>] <body>
+  grid message <username>[,<username>,...] [-s <subject>] [-b <body>] [-f <body file>]
 To send a status update, like, or dislike to your friends:
   grid status <status message>
@@ -49,6 +51,9 @@ The <when> parameter is free form text and can be a range ("x to y").  For insta
   grid search message "chronic" "two weeks ago to today"
   grid search all "the grid" "1 month ago to last week"
+You can see your messages in your ~/.grid directory.  For instance, if you want to search all likes using grep:
+  grep -RiI ~/.grid/like "grid"
 == Listing Posts
 You can list any type (or all types) of posts.
   grid list <like|dislike|message|status|all> [<when>]
@@ -65,6 +70,37 @@ To block another user:
 This will "unfriend" them and they will no longer see your posts.
+== Subgrids
+Subgrids are groups that you manage and are defined in a local config file.
+To create a subgrid, use:
+  grid subgrid @mygroup bob,john,snakeplisskin
+To see what subgrids exist:
+  grid subgrid
+To see what users are in a particular subgrid:
+  grid subgrid @mygroup
+You can then use the group as though it were a user.  For instance, to send a message to @mygroup:
+  grid message @mygroup -s "hey guys" -b "Let's go make a rum ham."
+If you prefer to simply edit the config file, you can do so (the file is located at ~/.grid/subgrids).
+== Plugins
+Plugins are easy to create and can register hooks.  To install/uninstall a plugin, use:
+  grid plugin install <name>
+  grid plugin uninstall <name>
+To see a list of installed plugins:
+  grid plugin
+An example plugin is the echo plugin:
+  grid plugin install echo
+This command will install the gem "grid-plugin-echo" and load it each time the gridcli gem is loaded.  It uses the available hooks:
+* before_post_creation(post_hash)
+* before_signup(username)
+* before_update
+and prints out a message whenever a user signs up, a post is created, or the update command is called.  You can see the code for the echo module at https://github.com/bmuller/grid-plugin-echo.

data/gridcli.gemspec CHANGED Viewed

@@ -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("activesupport", ">= 3.0.10")
   s.add_dependency("chronic", ">= 0.6.4")
   s.add_dependency("json", ">= 1.6.1")
   s.add_dependency("colorize", ">= 0.5.8")

data/lib/gridcli/commands/base.rb CHANGED Viewed

@@ -7,6 +7,7 @@ module GridCLI
     def initialize(cmd, desc, default_opts = nil)
       @config = GridCLI.config
+      @stats = GridCLI.stats
       @cmd = cmd
       @desc = desc
       @opts = default_opts || {}
@@ -19,6 +20,21 @@ module GridCLI
       @optp.on(*args) { |u| yield u }
     end
+    def add_format_option
+      msg = "Specify output format (json, cmdcolor, cmd, textline)"
+      add_option("-o format", "--output-format format", msg) { |o|
+        @opts[:output_format] = o
+      }
+    end
+    def output_format
+      @opts[:output_format] || "cmdcolor"
+    end
+    def pprint(json)
+      puts PrettyPrinter.new(json, output_format)
+    end
     def usage(cmd_opts=nil)
       cmd_opts ||= ""
       @optp.banner = "Usage: grid #{@cmd} #{cmd_opts} [options]"
@@ -26,6 +42,11 @@ module GridCLI
       exit
     end
+    def error(msg)
+      puts msg
+      exit 1
+    end
     def parse_dates(datestring)
       dates = [nil, nil]
       return dates if datestring.nil? or datestring.strip == ""

data/lib/gridcli/commands/dislike.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module GridCLI
   class DislikeCommand < BaseCommand
     def initialize
       super "dislike", "Dislike something."
+      add_format_option
     end
     def usage
@@ -21,7 +22,7 @@ module GridCLI
         return
       end
-      puts post
+      pprint post.to_post_json
     end
   end

data/lib/gridcli/commands/friends.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module GridCLI
         log "Getting all friends of '#{username}'"
         friends = Friendship.find(:all, :params => { :id => username })
         friends.each { |f|
-          puts f
+          pprint f.user.to_json
         }
         puts "You have no friends :(" if friends.length == 0
       rescue ActiveResource::ForbiddenAccess

data/lib/gridcli/commands/help.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module GridCLI
       end
       puts "Usage: grid <cmd>\n\nAvailable commands:\n\n"
-      Runner.commands.each { |klass|
+      Runner.commands.sort { |a,b| a.to_s <=> b.to_s }.each { |klass|
         inst = klass.new
         puts "\t#{inst.cmd.ljust(25) + inst.desc}"
       }

data/lib/gridcli/commands/like.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module GridCLI
   class LikeCommand < BaseCommand
     def initialize
       super "like", "Like something."
+      add_format_option
     end
     def usage
@@ -21,7 +22,7 @@ module GridCLI
         return
       end
-      puts post
+      pprint post.to_post_json
     end
   end

data/lib/gridcli/commands/list.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module GridCLI
   class ListCommand < BaseCommand
     def initialize
       super "list", "List posts of a particular kind or all posts"
+      add_format_option
     end
     def usage
@@ -16,7 +17,7 @@ module GridCLI
       parse_opts args
       log "Showing #{type} posts in range #{dates.first || 'first'} - #{dates.last || 'last'}"
-      GridCLI.storage.list(type, dates[0], dates[1])
+      GridCLI.storage.list(type, dates[0], dates[1], output_format)
     end
   end

data/lib/gridcli/commands/message.rb CHANGED Viewed

@@ -1,24 +1,35 @@
+require 'active_support/core_ext'
 module GridCLI
   class MessageCommand < BaseCommand
     def initialize
       super "message", "Send a message to a friend or group of friends."
+      add_option("-s subject", "--subject subject", "Subject for message") { |s| @opts[:subject] = s }
+      add_option("-f file", "--file file", "File to use for message body") { |f| @opts[:file] = f }
+      add_option("-b body", "--body body", "Message body") { |b| @opts[:body] = b }
+      add_format_option
     end
     def usage
-      super "<username>[,<username>,...] [<subject>] <body>"
+      super "<username>[,<username>,...]"
     end
     def run(args)
       usage if args.length < 2
       recipients = args.shift
-      if args.length > 1 and not args[1].start_with?('-')
-        subject = args.shift
-      else
-        subject = args.first.slice(0,30) + "..."
-      end
-      body = args.shift
       parse_opts args
+      body = nil
+      if not @opts[:file].nil?
+        error("File '#{@opts[:file]}' does not exist.") unless File.exists? @opts[:file]
+        body = File.read(@opts[:file])
+      elsif not @opts[:body].nil?
+        body = @opts[:body]
+      end
+      error("Body cannot be blank. Use one of -f or -b") if body.nil?
+      subject = @opts[:subject].nil? ? body.truncate(30) : @opts[:subject]
       begin
         log "Trying to send a message '#{subject}' to '#{recipients}'"
         post = Post::Message.create :subject => subject, :body => body, :recipients => recipients, :posttype => 'message'
@@ -27,7 +38,7 @@ module GridCLI
         return
       end
-      puts post
+      pprint post.to_post_json
     end
   end

data/lib/gridcli/commands/plugin.rb ADDED Viewed

@@ -0,0 +1,28 @@
+module GridCLI
+  class PluginCommand < BaseCommand
+    def initialize
+      super "plugin", "Install / uninstall plugins"
+    end
+    def usage
+      super "[<install|uninstall> <name>]"
+    end
+    def run(args)
+      if args.length == 0
+        puts "The following plugins are installed: "
+        puts GridCLI.plugins['enabled'].join(', ')
+      elsif args.length == 2 and args.first == "install"
+        log "Attempting to install gem grid-plugin-#{args[1]}"
+        GridCLI.plugins.install args[1]
+      elsif args.length == 2 and args.first == "uninstall"
+        log "Attempting to uninstall gem grid-plugin-#{args[1]}"
+        GridCLI.plugins.uninstall args[1]
+      else
+        usage
+      end
+    end
+  end
+  Runner.register "plugin", PluginCommand
+end

data/lib/gridcli/commands/pprint.rb CHANGED Viewed

@@ -2,16 +2,14 @@ module GridCLI
   class PPrintCommand < BaseCommand
     def initialize
       super "pprint", "A program that will pretty print posts/users"
+      add_format_option
     end
     def run(args)
-      usage if args.length != 0
+      parse_opts args
       ARGV.clear
-      ARGF.each { |line|
-        puts PrettyPrinter.new(line)
-        puts
-      }
+      ARGF.each { |line| pprint(line) }
     end
   end

data/lib/gridcli/commands/profile.rb CHANGED Viewed

@@ -10,6 +10,11 @@ module GridCLI
         @opts[:name] = u
         @opts[:update] = true
       }
+      add_option("--avatar file", "Set your avatar (a text file)") { |u|
+        @opts[:avatar] = u
+        @opts[:update] = true
+      }
+      add_format_option
     end
     def usage
@@ -34,11 +39,18 @@ module GridCLI
       # if we're supposed to update, do so
       if @opts[:update]
         [:github_username, :name].each { |n| user.send("#{n.to_s}=", @opts[n]) }
+        unless @opts[:avatar].nil?
+          if File.exists?(@opts[:avatar])
+            user.avatar = File.read(@opts[:avatar])
+          else
+            error("File #{@opts[:avatar]} does not exist")
+          end
+        end
         user.id = username
         user.save
       end
-      puts user
+      pprint user.to_json
     end
   end

data/lib/gridcli/commands/search.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module GridCLI
   class SearchCommand < BaseCommand
     def initialize
       super "search", "Search posts"
+      add_format_option
     end
     def usage
@@ -18,7 +19,7 @@ module GridCLI
       parse_opts args
       log "Showing #{type} posts in range #{dates.first || 'first'} - #{dates.last || 'last'}"
-      GridCLI.storage.search(type, query, dates[0], dates[1])
+      GridCLI.storage.search(type, query, dates[0], dates[1], output_format)
     end
   end

data/lib/gridcli/commands/signup.rb CHANGED Viewed

@@ -14,6 +14,8 @@ module GridCLI
       username = args.shift
       parse_opts args
+      username = GridCLI.hooker.invoke :before_signup, username
       @config["username"] = username
       @config.save

data/lib/gridcli/commands/status.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module GridCLI
   class StatusCommand < BaseCommand
     def initialize
       super "status", "Send a status update to all friends."
+      add_format_option
     end
     def usage
@@ -20,8 +21,8 @@ module GridCLI
         puts "There was an error sending your status.  Please make sure it's not empty."
         return
       end
-      puts post
+      pprint post.to_post_json
     end
   end

data/lib/gridcli/commands/subgrid.rb ADDED Viewed

@@ -0,0 +1,30 @@
+module GridCLI
+  class SubgridCommand < BaseCommand
+    def initialize
+      super "subgrid", "Create / read / update subgrids (groups)"
+    end
+    def usage
+      super "[<groupname> [<comma separated list of users>]]"
+    end
+    def run(args)
+      subgrids = SubGrids.new
+      groups = (args.length == 0) ? subgrids.groups : [args.shift]
+      # if setting users...
+      if args.length > 0
+        subgrids.set_group(groups.first, args.first.split(","))
+      end
+      groups.each { |gname|
+        error("Group not found: #{gname}") unless subgrids.groups.include? gname
+        puts "#{gname} has users: #{subgrids.get_group(gname).join(', ')}"
+      }
+    end
+  end
+  Runner.register "subgrid", SubgridCommand
+end

data/lib/gridcli/commands/update.rb CHANGED Viewed

@@ -2,11 +2,14 @@ module GridCLI
   class UpdateCommand < BaseCommand
     def initialize
       super "update", "Download all messages"
+      add_format_option
     end
     def run(args)
       parse_opts args
-      last_sha = @config['last_sha']
+      last_sha = @stats['last_sha']
+      GridCLI.hooker.invoke :before_update
       begin
         if last_sha.nil?
@@ -32,11 +35,10 @@ module GridCLI
         posts.each { |p|
           type = p.known_attributes.first
           json = p.send(type).to_json(:root => type)
-          puts PrettyPrinter.new(json)
-          puts
+          pprint json
         }
-        @config['last_sha'] = GridCLI.storage.append(posts)
-        @config.save
+        @stats['last_sha'] = GridCLI.storage.append(posts)
+        @stats.save
         # run again if we got back 300 posts
         run(args) if posts.length == 300

data/lib/gridcli/config.rb CHANGED Viewed

@@ -1,19 +1,7 @@
-require 'yaml'
 module GridCLI
-  class Config < Hash
+  class Config < YMLHash
     def initialize
-      # Initialize the grid config / message dir
-      @griddir = File.expand_path(File.join("~", ".grid"))
-      Dir.mkdir(@griddir) if not File.exists?(@griddir)
-      # This is a hash, so initialize it, set w/ default config options, then set
-      # with any config options in the ~/.grid/config file
-      @conffile = File.join(@griddir, "config")
-      super
-      update default_config
-      # if conf file exists, update this obj w/ it's values.  Otherwise, create file
-      File.exists?(@conffile) ? update(YAML.load_file(@conffile)) : save
+      super "config"
     end
@@ -23,9 +11,5 @@ module GridCLI
         'token' => rand(36**31).to_s(36)
       }
     end
-    def save
-      File.open(@conffile, 'w') { |f| YAML.dump(self, f) }
-    end
   end
 end

data/lib/gridcli/hooks.rb ADDED Viewed

@@ -0,0 +1,15 @@
+module GridCLI
+  class Hooker
+    def initialize
+      @hooks = {}
+    end
+    def register(name, &method)
+      @hooks[name] = @hooks.fetch(name, []) + [method]
+    end
+    def invoke(name, arg=nil)
+      @hooks.fetch(name, []).inject(arg) { |params,proc| proc.call(params) }
+    end
+  end
+end

data/lib/gridcli/plugins.rb ADDED Viewed

@@ -0,0 +1,39 @@
+require 'rubygems/gem_runner'
+module GridCLI
+  class Plugins < YMLHash
+    def initialize
+      super "plugins"
+    end
+    def default_config
+      {
+        'enabled' => [],
+        'disabled' => []
+      }
+    end
+    def install(name)
+      name = "grid-plugin-#{name}" unless name.start_with?("grid-plugin-")
+      unless fetch('enabled', []).include? name
+        self['enabled'] << name
+        save
+      end
+      Gem::GemRunner.new.run ["install", name, "--no-rdoc", "--no-ri"]
+    end
+    def uninstall(name)
+      name = "grid-plugin-#{name}" unless name.start_with?("grid-plugin-")
+      return unless fetch('enabled', []).include? name
+      self['enabled'].delete(name)
+      save
+      Gem::GemRunner.new.run ["uninstall", name]
+    end
+    def include!
+      fetch('enabled', []).each { |m|
+        require m
+      }
+    end
+  end
+end

data/lib/gridcli/pprinter.rb CHANGED Viewed

@@ -2,47 +2,134 @@ require 'json'
 require 'colorize'
 module GridCLI
-  class PrettyPrinter
-    def initialize(string)
-      begin
-        j = JSON.parse(string)
-        type = j.keys.first
-        @contents = j[type]
-        @created_at = Time.parse(@contents['created_at']).localtime.to_s
-        @pretty = case type
-                  when "message" then pprint_message
-                  when "like" then pprint_like
-                  when "dislike" then pprint_dislike
-                  when "status" then pprint_status
-                  else string
-                  end
-      rescue JSON::ParserError
-        @pretty = string
-      end
+  class PPTextLineFormat
+    def self.all(parsed)
+      parsed.map { |k,v| "#{k}: #{v}" }.join("; ")
+    end
+    def self.like(original, parsed)
+      self.all(parsed)
+    end
+    def self.dislike(original, parsed)
+      self.all(parsed)
+    end
+    def self.status(original, parsed)
+      self.all(parsed)
+    end
+    def self.message(original, parsed)
+      self.all(parsed)
+    end
+    def self.user(original, parsed)
+      self.all(parsed)
+    end
+  end
+  class PPCmdFormat
+    def self.like(original, parsed)
+      "on #{@created_at} #{@contents['from_username']} liked #{@contents['body']}\n\n"
+    end
+    def self.dislike(original, parsed)
+      "on #{@created_at} #{@contents['from_username']} disliked #{@contents['body']}\n\n"
+    end
+    def self.status(original, parsed)
+      "on #{@created_at} #{@contents['from_username']} was #{@contents['body']}\n\n"
+    end
+    def self.message(original, parsed)
+      s = "Message from: #{parsed['from_username']}\n"
+      s+= "Subject: #{parsed['subject']}\n"
+      s+= "Date: #{parsed['created_at']}\n"
+      s+= "To: #{parsed['recipients']}\n"
+      s+= "#{parsed['body']}\n\n"
+    end
+    def self.user(original, parsed)
+      s = "#{parsed['username']}\n"
+      s+= "created: #{parsed['created_at']}\n"
+      (parsed.keys - ['created_at', 'username', 'avatar']).each { |key|
+        next if parsed[key].nil?
+        s += "#{key}: #{parsed[key]}\n"
+      }
+      s+= parsed['avatar'] unless parsed['avatar'].nil?
+      s += "\n"
+    end
+  end
+  class PPCmdColorFormat < PPCmdFormat
+    def self.like(original, parsed)
+      super(original, parsed).green
+    end
+    def self.dislike(original, parsed)
+      super(original, parsed).red
     end
-    def pprint_like
-      "on #{@created_at} #{@contents['from_username']} liked #{@contents['body']}".green
+    def self.status(original, parsed)
+      super(original, parsed).cyan
     end
-    def pprint_dislike
-      "on #{@created_at} #{@contents['from_username']} disliked #{@contents['body']}".red
+    def self.message(original, parsed)
+      s = "Message from: ".cyan + parsed['from_username'] + "\n"
+      s+= "Subject: ".cyan + parsed['subject'] + "\n"
+      s+= "Date: ".cyan + parsed['created_at'] + "\n"
+      s+= "To: ".cyan + parsed['recipients'] + "\n"
+      s+= "#{parsed['body']}\n\n"
     end
-    def pprint_status
-      "on #{@created_at} #{@contents['from_username']} was #{@contents['body']}".cyan
+    def self.user(original, parsed)
+      s = "username: ".magenta + "#{parsed['username']}\n".yellow
+      s+= "created: ".magenta + "#{parsed['created_at']}\n"
+      (parsed.keys - ['created_at', 'username', 'avatar']).each { |key|
+        next if parsed[key].nil?
+        s += "#{key}: ".magenta + "#{parsed[key]}\n"
+      }
+      s+= parsed['avatar'] unless parsed['avatar'].nil?
+      s += "\n"
+    end
+  end
+  class PrettyPrinter
+    # format can be one of :cmdcolor, :cmd, :textline, :json
+    def initialize(string, format=nil)
+      @format = format.nil? ? :cmdcolor : format.intern
+      @original = string
+      begin
+        j = JSON.parse(string)
+        @type = j.keys.first
+        @contents = j[@type]
+        @contents['created_at'] = Time.parse(@contents['created_at']).localtime.to_s
+      rescue JSON::ParserError
+        @type = nil
+        @format = nil
+        @contents = {}
+      end
     end
-    def pprint_message
-      s = "Message from: ".cyan + @contents['from_username'] + "\n"
-      s+= "Subject: ".cyan + @contents['subject'] + "\n"
-      s+= "Date: ".cyan + @created_at + "\n"
-      s+= "To: ".cyan + @contents['recipients'] + "\n"
-      s+= @contents['body']
+    def formatters
+      { :cmdcolor => PPCmdColorFormat, :cmd => PPCmdFormat, :textline => PPTextLineFormat }
     end
     def to_s
-      @pretty
+      formatter = formatters.fetch(@format, nil)
+      # if the format is unknown or :json return original
+      return @original if formatter.nil?
+      case @type
+      when "message" then formatter.message(@original, @contents)
+      when "like" then formatter.like(@original, @contents)
+      when "dislike" then formatter.dislike(@original, @contents)
+      when "status" then formatter.status(@original, @contents)
+      when "friend_request" then formatter.message(@original, @contents)
+      when "user" then formatter.user(@original, @contents)
+      else @original #unknown type
+      end
     end
   end
 end

data/lib/gridcli/resources/post.rb CHANGED Viewed

@@ -1,15 +1,37 @@
 module GridCLI
   module Post
-    class Message < BaseResource
+    class PostBase < BaseResource
+      # before we create, resolve names from subgrid and call hooks
+      def self.create(attributes)
+        subgrids = SubGrids.new
+        users = attributes[:recipients].split(",")
+        attributes[:recipients] = subgrids.resolve(users).join(",")
+        attributes = GridCLI.hooker.invoke :before_post_creation, attributes
+        super attributes
+      end
+      # if we just call post.to_json, the root attribute will be "post"
+      # for prettyprint, the root attribute needs to be one of: like,dislike,status,message
+      def to_post_json
+        type = self.class.name.split("::").last.downcase
+        to_json(:root => type)
+      end
+    end
+    class Message < PostBase
       self.element_name = "post"
     end
-    class Like < BaseResource
+    class Like < PostBase
       self.element_name = "post"
     end
-    class Dislike < BaseResource
+    class Dislike < PostBase
       self.element_name = "post"
     end
-    class Status < BaseResource
+    class Status < PostBase
       self.element_name = "post"
     end
   end

data/lib/gridcli/resources/user.rb CHANGED Viewed

@@ -1,4 +1,8 @@
 module GridCLI
   class User < BaseResource
+    def to_json(args=nil)
+      args ||= {}
+      super({ :except => ['id'] }.merge(args))
+    end
   end
 end

data/lib/gridcli/stats.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module GridCLI
+  class Stats < YMLHash
+    def initialize
+      super "stats"
+    end
+    def default_config
+      {
+        'last_sha' => nil
+      }
+    end
+  end
+end

data/lib/gridcli/storage/base.rb CHANGED Viewed

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

data/lib/gridcli/storage/files.rb CHANGED Viewed

@@ -83,15 +83,17 @@ module GridCLI
       }
     end
-    def search(type, query, start_date, end_date)
+    def search(type, query, start_date, end_date, output_format)
+      options = output_format.nil? ? "" : "-o #{output_format}"
       files(type, start_date, end_date) { |path|
-        system "grep -R \"#{query}\" #{path} | #{$0} pprint"
+        system "grep -R \"#{query}\" #{path} | #{$0} pprint #{options}"
       }
     end
-    def list(type, start_date, end_date)
+    def list(type, start_date, end_date, output_format)
+      options = output_format.nil? ? "" : "-o #{output_format}"
       files(type, start_date, end_date) { |path|
-        system "cat #{path} | #{$0} pprint"
+        system "cat #{path} | #{$0} pprint #{options}"
       }
     end

data/lib/gridcli/subgrids.rb ADDED Viewed

@@ -0,0 +1,35 @@
+module GridCLI
+  class SubGrids < YMLHash
+    def initialize
+      super "subgrids"
+    end
+    def get_group(group, stack=nil)
+      stack ||= []
+      if stack.include? group
+        puts "Recursive subgrid definition detected."
+        exit 1
+      end
+      stack << group
+      fetch(group, "").split(" ").map { |user|
+        user.start_with?('@') ? get_group(user, stack) : user
+      }.flatten
+    end
+    def groups
+      keys
+    end
+    def set_group(name, members)
+      self[name] = members.join(" ")
+      save
+    end
+    def resolve(userlist)
+      userlist.map { |user|
+        user.start_with?('@') ? get_group(user) : user
+      }
+    end
+  end
+end

data/lib/gridcli/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module GridCLI
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/gridcli/ymlhash.rb ADDED Viewed

@@ -0,0 +1,28 @@
+require 'yaml'
+module GridCLI
+  class YMLHash < Hash
+    def initialize(fname)
+      # Initialize the grid dir
+      @griddir = File.expand_path(File.join("~", ".grid"))
+      Dir.mkdir(@griddir) if not File.exists?(@griddir)
+      # This is a hash, so initialize it, set w/ default config options, then set
+      # with any config options in the ~/.grid/#{fname} file
+      @conffile = File.join(@griddir, fname)
+      super
+      update default_config
+      # if conf file exists, update this obj w/ it's values.  Otherwise, create file
+      File.exists?(@conffile) ? update(YAML.load_file(@conffile)) : save
+    end
+    def default_config
+      {}
+    end
+    def save
+      File.open(@conffile, 'w') { |f| YAML.dump(self, f) }
+    end
+  end
+end

data/lib/gridcli.rb CHANGED Viewed

@@ -3,7 +3,12 @@ require 'active_resource'
 require 'gridcli/storage/base'
 require 'gridcli/storage/files'
+require 'gridcli/ymlhash'
 require 'gridcli/config'
+require 'gridcli/subgrids'
+require 'gridcli/stats'
+require 'gridcli/hooks'
+require 'gridcli/plugins'
 module GridCLI
   def self.config
@@ -13,31 +18,46 @@ module GridCLI
   def self.storage
     @storage ||= FileStorage.new
   end
+  def self.stats
+    @stats ||= Stats.new
+  end
+  def self.hooker
+    @hooker ||= Hooker.new
+  end
+  def self.plugins
+    @plugins ||= Plugins.new
+  end
 end
-require 'gridcli/version'
-require 'gridcli/runner'
 require 'gridcli/pprinter'
+require 'gridcli/runner'
+require 'gridcli/version'
 require 'gridcli/commands/base'
-require 'gridcli/commands/pprint'
-require 'gridcli/commands/signup'
-require 'gridcli/commands/help'
-require 'gridcli/commands/profile'
 require 'gridcli/commands/befriend'
 require 'gridcli/commands/block'
+require 'gridcli/commands/dislike'
 require 'gridcli/commands/friends'
+require 'gridcli/commands/help'
+require 'gridcli/commands/like'
+require 'gridcli/commands/list'
 require 'gridcli/commands/message'
+require 'gridcli/commands/plugin'
+require 'gridcli/commands/pprint'
+require 'gridcli/commands/profile'
+require 'gridcli/commands/search'
+require 'gridcli/commands/signup'
 require 'gridcli/commands/status'
-require 'gridcli/commands/like'
-require 'gridcli/commands/dislike'
+require 'gridcli/commands/subgrid'
 require 'gridcli/commands/update'
-require 'gridcli/commands/search'
-require 'gridcli/commands/list'
 require 'gridcli/resources/base'
-require 'gridcli/resources/user'
+require 'gridcli/resources/blockage'
 require 'gridcli/resources/friendship'
 require 'gridcli/resources/post'
-require 'gridcli/resources/blockage'
+require 'gridcli/resources/user'
+GridCLI.plugins.include!

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gridcli
 version: !ruby/object:Gem::Version
-  hash: 21
+  hash: 19
   prerelease: false
   segments:
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors:
 - Brian Muller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00 -04:00
+date: 2011-10-08 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 19
+        segments:
+        - 3
+        - 0
+        - 10
+        version: 3.0.10
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency
+  name: chronic
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 4
         version: 0.6.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency
   name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -65,11 +81,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency
   name: colorize
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -81,7 +97,7 @@ dependencies:
         - 8
         version: 0.5.8
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 description: "A command line interface to The Grid: Social Networking, Web 0.2"
 email:
 - bamuller@gmail.com
@@ -98,7 +114,6 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- TODO
 - bin/grid
 - gridcli.gemspec
 - lib/gridcli.rb
@@ -111,13 +126,17 @@ files:
 - lib/gridcli/commands/like.rb
 - lib/gridcli/commands/list.rb
 - lib/gridcli/commands/message.rb
+- lib/gridcli/commands/plugin.rb
 - lib/gridcli/commands/pprint.rb
 - lib/gridcli/commands/profile.rb
 - lib/gridcli/commands/search.rb
 - lib/gridcli/commands/signup.rb
 - lib/gridcli/commands/status.rb
+- lib/gridcli/commands/subgrid.rb
 - lib/gridcli/commands/update.rb
 - lib/gridcli/config.rb
+- lib/gridcli/hooks.rb
+- lib/gridcli/plugins.rb
 - lib/gridcli/pprinter.rb
 - lib/gridcli/resources/base.rb
 - lib/gridcli/resources/blockage.rb
@@ -125,9 +144,12 @@ files:
 - lib/gridcli/resources/post.rb
 - lib/gridcli/resources/user.rb
 - lib/gridcli/runner.rb
+- lib/gridcli/stats.rb
 - lib/gridcli/storage/base.rb
 - lib/gridcli/storage/files.rb
+- lib/gridcli/subgrids.rb
 - lib/gridcli/version.rb
+- lib/gridcli/ymlhash.rb
 has_rdoc: true
 homepage: http://gridcli.com
 licenses: []

data/TODO DELETED Viewed

@@ -1,13 +0,0 @@
-grid list friends --of-friends
-pretty print for profiles
-ascii profiles
-circles (or grids?) - with lists stored locally.  Format:
-play: [ sally, mary, suzie ]
-work: [ bob, john ]
-everyone: [ @work, @play ]
-or something like that..