usaidwat 0.0.3 → 0.0.4

data/bin/usaidwat

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'usaidwat'
+require 'usaidwat/utils'
 
 
 VERSION = "usaidwat v#{USaidWat::VERSION}"
@@ -34,7 +35,12 @@ if ARGV.length == 0
 else
   subreddit = ARGV.shift
   comments = reddit_user.comments_for_subreddit subreddit
+  unless comments
+    puts "No comments by #{reddit_user.username} for #{subreddit}."
+    exit 0
+  end
   is_first = true
+  run_pager
   width = `tput cols`.to_i rescue 80
   comments.each do |c|
     puts '-' * width unless is_first

data/lib/usaidwat/reddit.rb

@@ -8,7 +8,7 @@ require 'json'
 
 class Hash
   def to_query
-    data = self.keys.inject([]) { |parts, key| parts << [URI.encode(key.to_s), URI.encode(self[key].to_s)] }
+    data = keys.inject([]) { |parts, key| parts << [URI.encode(key.to_s), URI.encode(self[key].to_s)] }
     data.map{ |t| t.join '=' }.join '&'
   end
 end
@@ -17,47 +17,75 @@ module USaidWat
   class RedditUser
     COMMENT_COUNT = 100
     COMMENTS_PER_PAGE = 25
+    CACHE_AGE = 300
     
     attr_reader :username
     
     def initialize(username)
       @username = username
-      self.ensure_cache_dir!
     end
     
     def profile_url
-      "http://www.reddit.com/user/#{self.username}"
+      "http://www.reddit.com/user/#{username}"
     end
     
     def comments_url
-      "#{self.profile_url}/comments"
+      "#{profile_url}/comments"
     end
     
     def last_update
-      return Time.at 0 unless File.exists? self.cache_timestamp_file
-      Time.parse File.open(self.cache_timestamp_file).read.chomp
+      return Time.at 0 unless File.exists? cache_timestamp_file
+      Time.parse File.open(cache_timestamp_file).read.chomp
+    end
+    
+    def update_cache(force=false)
+      FileUtils.mkdir_p cache_dir
+      
+      is_outdated = Time.now - last_update > CACHE_AGE
+      if force or is_outdated
+        FileUtils.rm_rf cache_dir
+        FileUtils.mkdir_p cache_dir
+        
+        comments = Array.new
+        after = nil
+        pages = COMMENT_COUNT / COMMENTS_PER_PAGE
+        pages.times do |i|
+          query = i == 0 ? '' : {:count => COMMENTS_PER_PAGE, :after => after}.to_query
+          url = "#{comments_url}.json?#{query}"
+          resp = Net::HTTP.get_response 'www.reddit.com', url
+          unless resp.code.to_i == 200
+            $stderr.puts "Could not retrieve comments: #{resp.message}"
+            return nil
+          end
+          resp = JSON.parse resp.body
+          if resp.key? 'error'
+            $stderr.puts "Could not retrieve comments: #{resp['error'] || 'Unknown error'}"
+            return nil
+          end
+          comments += resp['data']['children']
+          after = resp['data']['after']
+        end
+        cache_comments comments
+      end
     end
     
-    def retrieve_comments(options={})
-      return self.retrieve_comments_from_cache unless Time.now - self.last_update > 300
-      count = options[:count] || COMMENT_COUNT
-      cache = options[:cache] || true
-      self.destroy_cache!
-      comments = self.fetch_comments count
-      return nil unless comments
-      self.cache_comments comments if cache
+    def retrieve_comments
+      update_cache
       subreddits = Hash.new { |h,k| h[k] = 0 }
-      comments.each do |comment|
-        subreddit = comment['data']['subreddit']
-        subreddits[subreddit] += 1
+      Dir.chdir(comments_dir) do
+        Dir['*'].each do |sr|
+          next unless File.directory? sr
+          Dir["#{sr}/*"].each { |f| subreddits[sr] += 1 }
+        end
       end
       subreddits.sort { |a,b| b[1] <=> a[1] }
     end
     
     def comments_for_subreddit(subreddit)
-      self.retrieve_comments
+      update_cache
       comments = []
-      subreddit_dir = File.join self.comments_dir, subreddit
+      subreddit_dir = File.join comments_dir, subreddit
+      return nil unless File.exists? subreddit_dir
       Dir.chdir(subreddit_dir) do
         Dir['*'].each do |f|
           path = File.join subreddit_dir, f
@@ -68,83 +96,39 @@ module USaidWat
       comments
     end
     
-    def retrieve_comments_from_cache
-      subreddits = Hash.new { |h,k| h[k] = 0 }
-      Dir.chdir(self.comments_dir) do
-        Dir['*'].each do |sr|
-          next unless File.directory? sr
-          Dir["#{sr}/*"].each { |f| subreddits[sr] += 1 }
-        end
-      end
-      subreddits.sort { |a,b| b[1] <=> a[1] }
+    def to_s
+      "Reddit user: #{username}"
     end
     
-    def fetch_comments(count)
-      comments = Array.new
-      after = nil
-      pages = count / COMMENTS_PER_PAGE
-      pages.times do |i|
-        query = i == 1 ? '' : {:count => COMMENTS_PER_PAGE, :after => after}.to_query
-        url = "#{self.comments_url}.json?#{query}"
-        resp = Net::HTTP.get_response 'www.reddit.com', url
-        unless resp.code.to_i == 200
-          $stderr.puts "Could not retrieve comments: #{resp.message}"
-          return nil
-        end
-        resp = JSON.parse resp.body
-        if resp.key? 'error'
-          $stderr.puts "Could not retrieve comments: #{resp['error'] || 'Unknown error'}"
-          return nil
+    private
+      def cache_dir
+        File.join USaidWat::BASE_CACHE_DIR, username
+      end
+
+      def cache_timestamp_file
+        File.join cache_dir, 'updated'
+      end
+
+      def comments_dir
+        File.join cache_dir, 'comments'
+      end
+      
+      def cache_comments(comments)
+        comments.each do |c|
+          cid = c['data']['id']
+          sr = c['data']['subreddit']
+          body = c['data']['body']
+          parent_cache_dir = subreddit_directory! sr
+          cache_file = File.join parent_cache_dir, cid
+          File.open(cache_file, 'w') { |f| f.write body }
         end
-        comments += resp['data']['children']
-        after = resp['data']['after']
+        File.open(cache_timestamp_file, 'w') { |f| f.write Time.now }
       end
-      comments
-    end
-    
-    def cache_comments(comments)
-      comments.each do |c|
-        cid = c['data']['id']
-        sr = c['data']['subreddit']
-        body = c['data']['body']
-        parent_cache_dir = self.subreddit_directory! sr
-        cache_file = File.join parent_cache_dir, cid
-        File.open(cache_file, 'w') { |f| f.write body }
+      
+      def subreddit_directory!(subreddit)
+        path = File.join comments_dir, subreddit
+        FileUtils.mkdir_p path
+        path
       end
-      File.open(self.cache_timestamp_file, 'w') { |f| f.write Time.now }
-    end
-    
-    def cache_dir
-      File.join USaidWat::BASE_CACHE_DIR, self.username
-    end
-    
-    def cache_timestamp_file
-      File.join self.cache_dir, 'updated'
-    end
-    
-    def comments_dir
-      File.join self.cache_dir, 'comments'
-    end
-    
-    def subreddit_directory!(subreddit)
-      Dir.mkdir self.comments_dir unless File.exists? self.comments_dir
-      cache = File.join self.comments_dir, subreddit
-      Dir.mkdir cache unless File.exists? cache
-      cache
-    end
-    
-    def ensure_cache_dir!
-      Dir.mkdir USaidWat::BASE_CACHE_DIR unless File.exists? USaidWat::BASE_CACHE_DIR
-      Dir.mkdir self.cache_dir unless File.exists? self.cache_dir
-    end
-    
-    def destroy_cache!
-      FileUtils.rm_rf self.cache_dir
-      self.ensure_cache_dir!
-    end
-    
-    def to_s
-      "Reddit user: #{self.username}"
-    end
   end
 end

data/lib/usaidwat/utils.rb

@@ -0,0 +1,25 @@
+# Inspired by: http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
+def run_pager
+  return if RUBY_PLATFORM =~ /win32/
+  return unless STDOUT.tty?
+  
+  read, write = IO.pipe
+  
+  unless Kernel.fork
+    STDOUT.reopen(write)
+    STDERR.reopen(write) if STDERR.tty?
+    read.close
+    write.close
+    return
+  end
+  
+  STDIN.reopen(read)
+  read.close
+  write.close
+  
+  #ENV['LESS'] = 'FSRX'
+  
+  Kernel.select [STDIN]
+  pager = ENV['PAGER'] || 'less'
+  exec pager rescue exec '/bin/sh', '-c', pager
+end

data/lib/usaidwat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70163077554900 !ruby/object:Gem::Requirement
+  requirement: &70304619242880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70163077554900
+  version_requirements: *70304619242880
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -37,6 +37,7 @@ files:
 - bin/usaidwat
 - lib/usaidwat.rb
 - lib/usaidwat/reddit.rb
+- lib/usaidwat/utils.rb
 - lib/usaidwat/version.rb
 - usaidwat.gemspec
 homepage: ''