lib/hackpad/cli/client.rb in hackpad-cli-0.1.0 vs lib/hackpad/cli/client.rb in hackpad-cli-0.1.1

@@ -1,7 +1,7 @@
 require 'reverse_markdown'
-require 'colorize'
+require 'paint'
 
 require_relative 'config'
 require_relative 'api'
 require_relative 'store'
 require_relative 'pad'
@@ -9,44 +9,57 @@
 
 module Hackpad
   module Cli
     class Client
 
-      def initialize(options, output = STDOUT)
+      attr_reader :config
+
+      def initialize(options, input = STDIN, output = STDOUT)
         @output = output
+        @input = input
         @options = options
-        Store.prepare @options
-        @config = Config.load @options
+        @config = Config.new @options, input, output
+        Store.prepare @config
         Api.prepare @config
-        if @options[:plain]
-          load File.expand_path('../plain_colors.rb', __FILE__)
+        if @options[:plain] == true || @config.use_colors == false
+          Paint.mode = 0
         end
       end
 
+      def workspaces
+        @config.workspaces.each do |s|
+          table s.name, s.site
+        end
+      end
+
+      def default
+        @config.change_default
+      end
+
       def stats
-        table 'Site', @config['site'].blue
+        table 'Site', Paint[@config.site, :blue]
         table 'Cached Pads', Store.count_pads
         table 'Last Refresh', Store.last_refresh || 'not refreshed yet'
       end
 
       def search(term, start = 0)
         payload = Api.search(term, start)
         payload.each do |a|
-          @output.puts "#{id_or_url a['id']} - #{unescape(a['title']).yellow}"
+          @output.puts "#{id_or_url a['id']} - #{Paint[unescape(a['title']), :yellow]}"
           @output.puts "   #{extract a['snippet']}"
         end
       end
 
       def list
         @output.puts Padlist.get_list(@options['refresh']).map { |pad|
           padline pad
         }
       end
 
-      def check
+      def getnew
         @output.puts 'New pads:'
-        padlist = Padlist.check_list(@options['refresh']).map
+        padlist = Padlist.get_new
         if padlist.count == 0
           @output.puts 'There is no new pad.'
         else
           @output.puts padlist.map { |pad|
             padline pad
@@ -55,13 +68,13 @@
       end
 
       def info(id)
         pad = Pad.new id
         pad.load 'txt'
-        table 'Id', "#{id}".bold
-        table 'Title', "#{pad.title}".yellow
-        table 'URI', "#{@config['site']}/#{id}"
+        table 'Id', Paint[id, :bold]
+        table 'Title', Paint[pad.title, :yellow]
+        table 'URI', "#{@config.site}/#{id}"
         table 'Chars', "#{pad.chars}"
         table 'Lines', "#{pad.lines}"
         table 'Guest Policy', "#{pad.guest_policy}"
         table 'Moderated', "#{pad.moderated}"
         table 'Cached', "#{pad.cached_at || 'unknown'}"
@@ -79,26 +92,26 @@
       end
 
       private
 
       def padline(pad)
-        "#{(@config['site'] + '/') if @options[:urls]}#{pad.id} - #{pad.title}"
+        "#{(@config.site + '/') if @options[:urls]}#{pad.id} - #{pad.title}"
       end
 
       def unescape(s)
         CGI.unescapeHTML s
       end
 
       def extract(s)
-        unescape(s).gsub(/<b class="hit">([^<]*)<\/b>/) { Regexp.last_match[1].cyan.bold }
+        unescape(s).gsub(/<b class="hit">([^<]*)<\/b>/) { Paint[Regexp.last_match[1], :cyan, :bold] }
       end
 
       def table(key, value)
         @output.printf "%-20s %s\n", key, value
       end
 
       def id_or_url(id)
-        "#{(@config['site'] + '/') if @options[:urls]}#{id.bold}"
+        "#{(@config.site + '/') if @options[:urls]}#{Paint[id, :bold]}"
       end
 
     end
   end
 end