hcutil 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a64ad7f82b4fb5af8e88458092803beea4c84a5
-  data.tar.gz: 48b55eb4b072998fd8ef5c118033a85481a4e06c
+  metadata.gz: 77f30f1edefb05532d52792c5cb1a4db31fb6564
+  data.tar.gz: ddbf759d7463550d63f6f5d2489310cdcb4b8539
 SHA512:
-  metadata.gz: 3d65e247187b8f5b518c69786fe51cfbfefa2140383311c0e08458ff99f0886ce6f4dfc1d1882daaf1acf7b19c7ca49a947988bae7ec01ca12480f776e719496
-  data.tar.gz: 249393fa25dcb5d14e280a6dfba0ed552796ac314b9f2ad36f11378b810a874d4c90fa72ff95388dfb14878503e2682cbe241d523c4ee973f3a1725167537a59
+  metadata.gz: c36bc23ce9663b9fb30eb6ab49085aedf99286c11175e0495f99366ffe6e4bfc406afcacba2ecdd44c5dd6d5b2121f3f6e7cd1e71369b8bc94cf77d9fe9626e8
+  data.tar.gz: 319b336a8ca69bf84dfbfe0a57f6b58a794b86db1ecb558ee9ba2c491c879ae300f712dab51bd9557cf09fc5b2d4c73363504a69d1a2c9f5234f07dff1486370

data/lib/hcutil/auth.rb

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

data/lib/hcutil/cli.rb

@@ -33,15 +33,19 @@ module HCUtil
            :desc => 'Date from which to copy messages',
            :type => :string,
            :aliases => '-d',
-           :default => Time.now.to_s)
+           :default => Time.now)
     option(:num_items,
            :desc => 'Number of chat messages to copy',
            :aliases => '-n',
            :type => :numeric,
            :default => 25)
     def copy(room_name)
+      begin
       copier = HCUtil::Copier.new(room_name, options)
       copier.copy()
+      rescue AuthError, CopierError => e
+        $stderr.puts("[error] #{e.message}")
+      end
     end
   end
 end

data/lib/hcutil/copier.rb

@@ -7,6 +7,9 @@ require 'hcutil/auth'
 module HCUtil
 
   class CopierError < StandardError
+    def initialize(msg = 'CopierError')
+      super
+    end
   end
 
   class Copier
@@ -32,14 +35,18 @@ module HCUtil
         }
       }
       RestClient.get('https://api.hipchat.com/v2/room', param_arg) do |response, request, result|
-        json = JSON.parse(response.body)
-        items = json['items']
-        items.each do |item|
-          if item['name'] == @room_name
-            room_id = item['id']
-            $stderr.puts("Room '#{room_name}' has ID #{room_id}") if @verbose
-            break
+        if result.is_a? Net::HTTPSuccess
+          json = JSON.parse(response.body)
+          items = json['items']
+          items.each do |item|
+            if item['name'] == @room_name
+              room_id = item['id']
+              $stderr.puts("Room '#{@room_name}' has ID #{room_id}") if @verbose
+              break
+            end
           end
+        else
+          raise(CopierError, "REST error: #{result}|#{response}")
         end
       end
 
@@ -57,7 +64,11 @@ module HCUtil
 
       json = nil
       RestClient.get("https://api.hipchat.com/v2/room/#{room_id}/history", param_arg) do |response, request, result|
-        json = JSON.parse(response.body)
+        if result.is_a? Net::HTTPSuccess
+          json = JSON.parse(response.body)
+        else
+          raise(CopierError, "REST error: #{result}|#{response}")
+        end
       end
 
       if @debug

data/lib/hcutil/version.rb

@@ -1,3 +1,3 @@
 module HCUtil
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcutil
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luke Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json