adn-cli 0.0.5 → 0.0.6

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => :spec
+
+Rake::TestTask.new(:spec) do |t|
+  t.test_files = FileList['spec/**/*_spec.rb']
+end

data/adn-cli.gemspec

@@ -8,6 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Command line client for App.net}
   gem.homepage      = "https://github.com/adn-rb/adn-cli"
 
+  gem.required_ruby_version = '>= 1.9.2'
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -15,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ADN::CLI::VERSION
 
-  gem.add_runtime_dependency('adn', '~> 0.3.4')
+  gem.add_runtime_dependency('adn', '~> 0.3.5')
   gem.add_runtime_dependency('ansi', '~> 1.4.3')
 end

data/lib/adn/cli.rb

@@ -8,6 +8,7 @@ require 'ansi/table'
 
 require_relative "cli/version"
 require_relative "cli/global_stream"
+require_relative "cli/unified_stream"
 require_relative "auth"
 
 trap("INT"){ exit }
@@ -21,8 +22,14 @@ module ADN
     end
 
     def initialize
-      if ARGV.empty? && STDIN.tty?
-        GlobalStream.start
+      if STDIN.tty?
+        if ["-u", "--unified"].include?(ARGV.first)
+          UnifiedStream.start
+        elsif ["-g", "--global"].include?(ARGV.first) || ARGV.empty?
+          GlobalStream.start
+        else
+          puts "Unknown parameters: #{ARGV.inspect}"
+        end
       else
         send_post $stdin.read.strip
       end

data/lib/adn/cli/global_stream.rb

@@ -1,36 +1,11 @@
 # encoding: UTF-8
 
-require 'yaml'
+require_relative 'terminal_stream'
 
 module ADN
   class CLI
-    class GlobalStream
-      include ANSI::Code
-      include ANSI::Terminal
-
-      def self.start
-        gs = new(ADN::User.me)
-        loop { gs.show sleep: 4 }
-      rescue SocketError
-        exit
-      end
-
-      def initialize(user)
-        @user = user
-      end
-
-      def show(options)
-        get_global_stream.tap { |r|
-          show_posts(r)
-          update_since_id(r)
-        }
-
-        sleep options[:sleep]
-      end
-
-      private
-
-      def get_global_stream
+    class GlobalStream < TerminalStream
+      def get_stream
         params = {
           count: 10,
           include_directed_posts: 1,
@@ -41,42 +16,6 @@ module ADN
 
         ADN::API::Post.global_stream(params)
       end
-
-      def update_since_id(response)
-        if response['data'].any?
-          @since_id = response['data'].first['id']
-        end
-      end
-
-      def show_posts(response)
-        response['data'].reverse.each { |p|
-          puts line + post_heading(p) + colorized_text(p)
-          puts p['annotations'].to_yaml.ansi(:black) if p['annotations'].any?
-        }
-      end
-
-      def post_heading(p)
-        heading_line "#{p['user']['username']}".ansi(:blue) +
-                     " (#{p['user']['name'].strip})".ansi(:yellow),
-                     p['id'].ansi(:black)
-      end
-
-      def heading_line(left,right)
-        spaces = terminal_width - unansi(left + right).length
-        "#{left}#{" " * spaces}#{right}\n"
-      end
-
-      def colorized_text(p)
-        text_color = p['user']['follows_you'] ? :cyan : :white
-        text_color = :green if p['user']['you_follow']
-        text_color = :magenta if p['user']['id'] == @user.user_id
-
-        ANSI.color(text_color) { p['text'] }
-      end
-
-      def line(char = '_')
-        "#{char * terminal_width}\n".ansi(:black)
-      end
     end
   end
 end

data/lib/adn/cli/terminal_stream.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+require 'yaml'
+
+module ADN
+  class CLI
+    class TerminalStream
+      include ANSI::Code
+      include ANSI::Terminal
+
+      def self.start
+        stream = new(ADN::User.me)
+        loop { stream.show sleep: 4 }
+      rescue SocketError
+        exit
+      end
+
+      def initialize(user)
+        @user = user
+      end
+
+
+      def show(options)
+        get_stream.tap do |r|
+          show_posts(r)
+          update_since_id(r)
+        end
+
+        sleep options[:sleep]
+      end
+
+      def get_stream
+        raise NoMethodError, "Should be implemented by child class"
+      end
+
+      private
+
+      def update_since_id(response)
+        if response['data'].any?
+          @since_id = response['data'].first['id']
+        end
+      end
+
+      def show_posts(response)
+        response['data'].reverse.each do |p|
+          puts line + post_heading(p) + colorized_text(p)
+          puts p['annotations'].to_yaml.ansi(:black) if p['annotations'].any?
+        end
+      end
+
+      def post_heading(p)
+        heading_line "#{p['user']['username']}".ansi(:blue) +
+                     " (#{p['user']['name'].strip})".ansi(:yellow),
+                     p['id'].ansi(:black)
+      end
+
+      def heading_line(left,right)
+        spaces = terminal_width - unansi(left + right).length
+        "#{left}#{" " * spaces}#{right}\n"
+      end
+
+      def colorized_text(p)
+        text_color = p['user']['follows_you'] ? :cyan : :white
+        text_color = :green if p['user']['you_follow']
+        text_color = :magenta if p['user']['id'] == @user.user_id
+
+        p['entities']['mentions'].tap do |mentions|
+          if mentions.any? &&
+             mentions.map { |m| m['id'] }.include?(@user.user_id)
+            text_color = :red
+          end
+        end
+
+        ANSI.color(text_color) { p['text'] }
+      end
+
+      def line(char = '_')
+        "#{char * terminal_width}\n".ansi(:black)
+      end
+    end
+  end
+end

data/lib/adn/cli/unified_stream.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+require_relative 'terminal_stream'
+
+module ADN
+  class CLI
+    class UnifiedStream < TerminalStream
+      def get_stream
+        params = {
+          count: 10,
+          include_directed_posts: 1,
+          include_annotations: 1
+        }
+
+        params[:since_id] = @since_id unless @since_id.nil?
+
+        ADN::API::Post.unified_stream(params)
+      end
+    end
+  end
+end

data/lib/adn/cli/version.rb

@@ -2,6 +2,9 @@
 
 module ADN
   class CLI
-    VERSION = "0.0.5"
+    MAJOR = 0
+    MINOR = 0
+    TINY  = 6
+    VERSION = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+
+require 'minitest/spec'
+require 'minitest/autorun'
+
+begin
+  require 'minitest/pride'
+rescue LoadError
+  puts "Install the minitest gem if you want colored output"
+end
+
+require "find"
+
+%w{./lib}.each do |load_path|
+  Find.find(load_path) { |f| require f if f.match(/\.rb$/) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adn
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -63,8 +63,11 @@ files:
 - lib/adn/auth.rb
 - lib/adn/cli.rb
 - lib/adn/cli/global_stream.rb
+- lib/adn/cli/terminal_stream.rb
+- lib/adn/cli/unified_stream.rb
 - lib/adn/cli/version.rb
 - public/index.html
+- spec/spec_helper.rb
 homepage: https://github.com/adn-rb/adn-cli
 licenses: []
 post_install_message: 
@@ -76,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,5 +92,5 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line client for App.net
-test_files: []
-has_rdoc: 
+test_files:
+- spec/spec_helper.rb