adn-cli 0.0.3 → 0.0.5

data/adn-cli.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ADN::CLI::VERSION
 
-  gem.add_runtime_dependency('adn', '~> 0.3')
+  gem.add_runtime_dependency('adn', '~> 0.3.4')
   gem.add_runtime_dependency('ansi', '~> 1.4.3')
 end

data/lib/adn/auth.rb

@@ -18,7 +18,8 @@ module ADN
   module Auth
     TOKEN_FILE = File.expand_path("~/.adn-cli-token")
     CLIENT_ID  = 'bQQrxrhNXGVNrnZ6dTs6LDHfSfUFSX9Q'
-    AUTH_URL   = "https://alpha.app.net/oauth/authenticate?client_id=#{CLIENT_ID}&response_type=token&redirect_uri=http://localhost:9229/authorize/&scope=stream"
+    SCOPES     = ['stream', 'write_post']
+    AUTH_URL   = "https://alpha.app.net/oauth/authenticate?client_id=#{CLIENT_ID}&response_type=token&redirect_uri=http://localhost:9229/authorize/&scope=#{SCOPES.join(',')}"
     PUBLIC     = File.expand_path(File.dirname(__FILE__)) + "/../../public"
 
     class << self

data/lib/adn/cli.rb

@@ -1,77 +1,47 @@
 # encoding: UTF-8
 
+require 'optparse'
+
 require 'adn'
 require 'ansi/core'
 require 'ansi/table'
 
 require_relative "cli/version"
+require_relative "cli/global_stream"
 require_relative "auth"
 
+trap("INT"){ exit }
+
 module ADN
   class CLI
-    include ANSI::Code
-
     def self.run
       ADN::Auth.retrieve_token unless ADN::Auth.has_token?
-      new(ADN::Auth.token)
+      ADN.token = ADN::Auth.token
+      new
     end
 
-    def initialize(token)
-      ADN.token = token
-
-      trap("INT"){ exit }
-
-      loop {
-        show_global_feed
-        sleep 4
-      }
-    end
-
-    def show_global_feed
-      get_global_feed.tap do |r|
-        show_posts(r)
-        update_since_id(r)
+    def initialize
+      if ARGV.empty? && STDIN.tty?
+        GlobalStream.start
+      else
+        send_post $stdin.read.strip
       end
     end
 
-    private
-
-    def get_global_feed
-      params = {
-        count: 10,
-        include_directed_posts: 1
-      }
-
-      params[:since_id] = @since_id unless @since_id.nil?
-
-      ADN::API::Post.global_stream(params)
-    end
-
-    def update_since_id(response)
-      if response['data'].any?
-        @since_id = response['data'].first['id']
+    def send_post(text)
+      if text.length > 256
+        abort ANSI.color(:red) { "Sorry, max 256 chars" }
       end
-    end
-
-    def show_posts(response)
-      response['data'].reverse.each do |p|
-        line
 
-        user_str = "#{p['user']['username']}".ansi(:blue) +
-                   " (#{p['user']['name'].strip})".ansi(:yellow)
+      data = { text: text }
 
-        id_str   = "id: #{p['id'].ansi(:cyan)}"
-
-        spaces = ANSI::Terminal.terminal_width -
-                 ANSI.unansi(user_str + id_str).length
-
-        puts "#{user_str}#{" " * spaces}#{id_str}\n\n#{p['text']}"
-      end
-    end
+      OptionParser.new do |opts|
+        opts.on("-r ID") { |id| data[:reply_to] = id }
+      end.parse!
 
-    def line(char = '—')
-      puts "\n"
-      puts "#{char * ANSI::Terminal.terminal_width}".ansi(:black)
+      ADN::Post.send_post data
+    rescue OptionParser::ParseError => e
+      abort "Error: #{e}"
     end
   end
 end

data/lib/adn/cli/global_stream.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+require 'yaml'
+
+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
+        params = {
+          count: 10,
+          include_directed_posts: 1,
+          include_annotations: 1
+        }
+
+        params[:since_id] = @since_id unless @since_id.nil?
+
+        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/version.rb

@@ -2,6 +2,6 @@
 
 module ADN
   class CLI
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-10 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'
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,7 @@ files:
 - bin/adn
 - lib/adn/auth.rb
 - lib/adn/cli.rb
+- lib/adn/cli/global_stream.rb
 - lib/adn/cli/version.rb
 - public/index.html
 homepage: https://github.com/adn-rb/adn-cli