hcutil 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3618c39717485726f3dd3e5ef4a72b96f99acf4
-  data.tar.gz: db70565f9a28b15923f7142e29b846621927ee7f
+  metadata.gz: bf3a6882a040189533cd1a350eb8fc306cce1218
+  data.tar.gz: 8289619d46f7cd79cf2ef67c0d9aa68adb88823a
 SHA512:
-  metadata.gz: e7ff2825adbb74364a3ddc8c1323ac7916c4ee8638dfd8c6abf178302232c2cd339959be6c54e61b06a887b799212d5969d270a2b74f0c895445477a80360bab
-  data.tar.gz: 8424f71db151157a418918739e40f101b03487d4f6319c758b8b13d6439c9aa642a0db560131a0846938fe0fd6476b4ab28576e88fe416b16e7cab731044066d
+  metadata.gz: 963143ee74e502eba3e0dc746c4a4a8d0f4373bf3352b5253fd59f160a7921ba210ebfa3e75bc8bc38b86e31cd9a8fa159182456ceff7f9c865c152a859481ce
+  data.tar.gz: 4be63ce8ec8198671b38a14e563edfcb1540d5442ec8b9685255efce8cd1a771bff201b0acc9c1d8a59ffadc0d649af531a7190107fe32cf071bdc60b4997a39

data/lib/hcutil/auth.rb

@@ -1,10 +1,4 @@
 module HCUtil
-  class AuthError < StandardError
-    def initialize(msg = 'AuthError')
-      super
-    end
-  end
-
   class Auth
 
     attr_reader :auth_token
@@ -12,7 +6,7 @@ module HCUtil
     def initialize(options = {})
       home_env = ENV['HOME']
       if home_env.nil_or_empty? or not Dir.exist?(ENV['HOME'])
-        raise(AuthError, 'HOME env var not set or dir does not exist')
+        raise(Errors::AuthError, 'HOME env var not set or dir does not exist')
       end
 
       auth_file = File.join(ENV['HOME'], '.hcapi')
@@ -20,7 +14,7 @@ module HCUtil
         @auth_token = File.read(auth_file).gsub("\n", ' ').squeeze(' ')
         $stderr.puts("Auth token: #{auth_token}") if options[:verbose]
       else
-        raise(AuthError, 'missing auth token file ~/.hcapi')
+        raise(Errors::AuthError, 'missing auth token file ~/.hcapi')
       end
     end
   end

data/lib/hcutil/cli.rb

@@ -3,8 +3,9 @@
 
 require 'thor'
 require 'hcutil/version'
+require 'hcutil/errors'
 require 'hcutil/copier'
-require 'hcutil/pinger'
+require 'hcutil/paster'
 
 module HCUtil
   class CLI < Thor
@@ -24,11 +25,6 @@ module HCUtil
     end
 
     desc('copy ROOM_NAME', 'copy chat messages from ROOM_NAME')
-    option(:room,
-           :desc => 'HipChat room with which to work',
-           :aliases => '-r',
-           :type => :string,
-           :default => 'Client Services')
     option(:date,
            :desc => 'Date from which to copy messages',
            :type => :string,
@@ -43,17 +39,30 @@ module HCUtil
       begin
         copier = HCUtil::Copier.new(room_name, options)
         copier.copy()
-      rescue AuthError, CopierError => e
+      rescue Errors::HCUtilError => e
         $stderr.puts("[error] #{e.message}")
       end
     end
 
-    desc('ping TICKET_NUM RESPONSE_FILE SUMMARY', 'Ping Client Services HipChat room for ticket TICKET_NUM with text from RESPONSE_FILE. SUMMARY is optional.')
-    def ping(ticket_num, response_file, summary=nil)
+    desc('paste FILE', 'Paste from file (- for stdin) into HipChat room')
+    option(:room,
+           :desc => 'HipChat room name or number into which to paste data',
+           :type => :string,
+           :aliases => '-r',
+           :default => 61640)
+    option(:ticket,
+           :desc => 'Ticket number, optional. If present will create message header',
+           :type => :numeric,
+           :aliases => '-t')
+    option(:summary,
+           :desc => 'Summary, optional. If present will create message header',
+           :type => :string,
+           :aliases => '-s')
+    def paste(file)
       begin
-        pinger = HCUtil::Pinger.new(ticket_num, response_file, summary, options)
-        pinger.ping()
-      rescue AuthError, PingerError => e
+        paster = HCUtil::Paster.new(file, options)
+        paster.paste()
+      rescue Errors::HCUtilError => e
         $stderr.puts("[error] #{e.message}")
       end
     end

data/lib/hcutil/copier.rb

@@ -1,13 +1,8 @@
+require 'hcutil/errors'
 require 'hcutil/op_base'
 
 module HCUtil
 
-  class CopierError < StandardError
-    def initialize(msg = 'CopierError')
-      super
-    end
-  end
-
   class Copier < OpBase
     def initialize(room_name = 'Client Services', options = {})
       super(options)
@@ -24,7 +19,8 @@ module HCUtil
           :auth_token => @auth.auth_token
         }
       }
-      RestClient.get('https://api.hipchat.com/v2/room', param_arg) do |response, request, result|
+      uri = 'https://api.hipchat.com/v2/room'
+      RestClient.get(uri, param_arg) do |response, request, result|
         if result.is_a? Net::HTTPSuccess
           json = JSON.parse(response.body)
           items = json['items']
@@ -36,10 +32,14 @@ module HCUtil
             end
           end
         else
-          raise(CopierError, "REST error: #{result}|#{response}")
+          raise(Errors::RESTError.new(result, uri, response))
         end
       end
 
+      if room_id == 0
+        raise(Errors::CopierError, "Room with name '#{@room_name}' could not be found")
+      end
+
       chat_date = @options[:date]
       $stderr.puts("Getting history for #{chat_date.to_s}") if @verbose
 
@@ -52,12 +52,13 @@ module HCUtil
         }
       }
 
+      uri = "https://api.hipchat.com/v2/room/#{room_id}/history"
       json = nil
-      RestClient.get("https://api.hipchat.com/v2/room/#{room_id}/history", param_arg) do |response, request, result|
+      RestClient.get(uri, param_arg) do |response, request, result|
         if result.is_a? Net::HTTPSuccess
           json = JSON.parse(response.body)
         else
-          raise(CopierError, "REST error: #{result}|#{response}")
+          raise(Errors::RESTError.new(result, uri, response))
         end
       end
 

data/lib/hcutil/errors.rb

@@ -0,0 +1,32 @@
+module HCUtil
+  module Errors
+
+    class HCUtilError < StandardError; end
+
+    class AuthError < HCUtilError
+      def initialize(msg = 'AuthError')
+        super
+      end
+    end
+
+    class RESTError < HCUtilError
+      def initialize(result, uri, response)
+        super("#{result.code} #{result.msg}\n#{uri}\n#{response}")
+      end
+    end
+
+    class CopierError < HCUtilError
+      def initialize(msg = 'CopierError')
+        super
+      end
+    end
+
+    class PasterError < HCUtilError
+      def initialize(msg = 'PasterError')
+        super
+      end
+    end
+
+  end
+end
+

data/lib/hcutil/paster.rb

@@ -0,0 +1,59 @@
+require 'uri'
+require 'hcutil/errors'
+require 'hcutil/op_base'
+
+module HCUtil
+
+  class Paster < OpBase
+    def initialize(file, options = {})
+      super(options)
+      if file == '-' or File.exists?(file)
+        @file = file
+      else
+        raise(Errors::PasterError, "Response file '#{file}' does not exist")
+      end
+      @room = options[:room]
+      @ticket = options[:ticket]
+      @summary = options[:summary]
+    end
+
+    def paste
+      if @file == '-'
+        file_contents = $stdin.read
+      else
+        file_contents = File.read(@file)
+      end
+
+      if @ticket
+        ticket_text = "ticket ##{@ticket} - "
+      end
+      unless ticket_text.nil_or_empty? and @summary.nil_or_empty?
+        paste_header = "#{ticket_text}#{@summary}\n"
+      end
+      message = <<"EOT"
+#{paste_header}
+#{file_contents}
+EOT
+      post_data = {
+        :message_format => 'text',
+        :color => 'purple',
+        :message => message
+      }
+
+      header_args = {
+        :content_type => :json,
+        :accept => :json,
+        :authorization => "Bearer #{@auth.auth_token}"
+      }
+
+      room_esc = URI.escape(@room.to_s)
+      uri = "https://api.hipchat.com/v2/room/#{room_esc}/notification"
+      RestClient.post(uri, post_data.to_json, header_args) do |response, request, result|
+        unless result.is_a? Net::HTTPSuccess
+          raise(Errors::RESTError.new(result, uri, response))
+        end
+      end
+    end
+  end
+end
+

data/lib/hcutil/version.rb

@@ -1,3 +1,3 @@
 module HCUtil
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcutil
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Luke Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -66,9 +66,10 @@ files:
 - lib/hcutil/auth.rb
 - lib/hcutil/cli.rb
 - lib/hcutil/copier.rb
+- lib/hcutil/errors.rb
 - lib/hcutil/extensions.rb
 - lib/hcutil/op_base.rb
-- lib/hcutil/pinger.rb
+- lib/hcutil/paster.rb
 - lib/hcutil/version.rb
 homepage: http://github.com/lukebakken/hipchat-util
 licenses: []

data/lib/hcutil/pinger.rb

@@ -1,53 +0,0 @@
-require 'hcutil/op_base'
-
-module HCUtil
-
-  class PingerError < StandardError
-    def initialize(msg = 'PingerError')
-      super
-    end
-  end
-
-  class Pinger < OpBase
-    def initialize(ticket_num = nil, response_file = nil, summary = nil, options = {})
-      super(options)
-      if ticket_num =~ /^[0-9]{4,}$/
-        @ticket_num = ticket_num
-      else
-        raise(PingerError, 'Ticket number must be 4 or more digits')
-      end
-      if File.exists?(response_file)
-        @response_file = response_file
-      else
-        raise(PingerError, "Response file '#{response_file}' does not exist")
-      end
-      @summary = summary
-    end
-
-    def ping
-      message = <<"EOT"
-ticket ##{@ticket_num} - #{@summary}
-#{File.read(@response_file)}
-EOT
-      post_data = {
-        :message_format => 'text',
-        :color => 'purple',
-        :message => message
-      }
-
-      header_args = {
-        :content_type => :json,
-        :accept => :json,
-        :authorization => "Bearer #{@auth.auth_token}"
-      }
-
-      RestClient.post('https://api.hipchat.com/v2/room/61640/notification',
-                      post_data.to_json, header_args) do |response, request, result|
-        unless result.is_a? Net::HTTPSuccess
-          raise(PingerError, "REST error: #{result}|#{response}")
-        end
-      end
-    end
-  end
-end
-