hcutil 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2d4db37dec70fc55763424aeb341cae0a595ee
-  data.tar.gz: f1b7ae56e3ebc44be84c593d73a2f2cd0162149f
+  metadata.gz: 719f8fb9e87a73f65d314c91fd8308c45c1a52a6
+  data.tar.gz: 75591063b81f07c1fd0772c1a7d981749768b34f
 SHA512:
-  metadata.gz: 3f5112d7905de4e6f90c8160b1320ad82cfee7605e4c4fbbbab667606614e3f35ebdabfbd9686a0b65ecfb9a26aee0ba7a57583be49beec709b1552ebe94e45c
-  data.tar.gz: a2968479fcc425d637b87df4d056c34c0c3502f5c9b21c9be588801e14dd5193f1905eb1cc0ce551905d65a6d8de2c70607b6071c45a27ed2c6b499f1ce74ef1
+  metadata.gz: 264f41c29b7d4f8b61b83d3d83a17ed3ee6b992be5b43218fa16620d80a2709428b7558edfcf99d1b9d9d38a80efec20724151300d07c28094d16c1114780c4d
+  data.tar.gz: f79033e32d7a4c5ca2c945128bf7c76c4ce9638e4fd4d8c3e906badaf6006dbdaacce92d3b35ef3d78f790e1c9fc775bc5d3aa65031fbdcf400a4edad6b93fd3

data/lib/hcutil.rb

@@ -1,4 +1,3 @@
 require 'hcutil/version'
 require 'hcutil/cli'
 require 'hcutil/extensions'
-

data/lib/hcutil/cli.rb

@@ -29,7 +29,7 @@ module HCUtil
            :desc => 'Date from which to copy messages',
            :type => :string,
            :aliases => '-d',
-           :default => Time.now.utc)
+           :default => Time.now)
     option(:num_items,
            :desc => 'Number of chat messages to copy',
            :aliases => '-n',

data/lib/hcutil/copier.rb

@@ -1,5 +1,4 @@
 require 'hcutil/errors'
-require 'hcutil/extensions'
 require 'hcutil/op_base'
 require 'uri'
 require 'cgi'
@@ -10,7 +9,7 @@ module HCUtil
     def initialize(room_name = 'Client Services', options = {})
       super(options)
       @room_name = room_name
-      @num_items = @options[:num_items] || 25
+      @num_items = @options[:num_items] ||25
     end
 
     def get_room_id(start_index=0)
@@ -26,7 +25,7 @@ module HCUtil
           }
         }
         uri_direct = uri + URI.escape("/#{@room_name}")
-        RestClient.get(uri_direct, param_arg) do |response, request, result|
+        get_request(uri_direct, param_arg) do |response, request, result|
           if result.is_a? Net::HTTPSuccess
             json = JSON.parse(response.body)
             if json['id']
@@ -49,7 +48,7 @@ module HCUtil
 
       room_id = 0
 
-      RestClient.get(uri, param_arg) do |response, request, result|
+      get_request(uri, param_arg) do |response, request, result|
         if result.is_a? Net::HTTPSuccess
           json = JSON.parse(response.body)
           if json['items']
@@ -82,91 +81,51 @@ module HCUtil
       return room_id
     end
 
-    def get_history(room_id, chat_date, msg_count, start_index, jsons)
+    def copy
+      room_id = get_room_id
+      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
 
       param_arg = {
         :accept => :json,
         :params => {
           :auth_token => @auth.auth_token,
           :date => chat_date,
-          'start-index' => start_index,
-          'max-results' => 100
+          'max-results' => @num_items
         }
       }
 
       uri = "https://api.hipchat.com/v2/room/#{room_id}/history"
       json = nil
-      RestClient.get(uri, param_arg) do |response, request, result|
+      get_request(uri, param_arg) do |response, request, result|
         if result.is_a? Net::HTTPSuccess
           json = JSON.parse(response.body)
-          jsons.unshift(json)
-          items = json['items']
-          unless items.nil?
-            msg_count += items.count
-            links = json['links']
-            if msg_count >= @num_items or links.nil?
-              return jsons
-            else
-              next_uri = links['next']
-              unless next_uri.nil_or_empty?
-                query = URI.parse(next_uri).query
-                query_params = CGI.parse(query)
-                start_index = query_params['start-index'].first
-                $stderr.puts("retrieving history for room '#{room_id}' with start_index #{start_index} next_uri #{next_uri}") if @verbose
-                return get_history(room_id, chat_date, msg_count, start_index, jsons)
-              end
-            end
-          else
-            raise(Errors::CopierError, "Room with id '#{room_id}' - could not parse history JSON - missing 'items'")
-          end
         else
           raise(Errors::RESTError.new(result, uri, response))
         end
       end
-      return jsons
-    end
-
-    def copy
-      room_id = get_room_id
-      if room_id == 0
-        raise(Errors::CopierError, "Room with name '#{@room_name}' could not be found")
-      end
-
-      opt_date = @options[:date]
-      if opt_date.is_a?(Time)
-        chat_date = opt_date
-      else
-        chat_date = Time.parse(opt_date)
-      end
-      chat_date_utc_iso8601_s = chat_date.dup.utc.iso8601.to_s
-      $stderr.puts("Getting history for date #{chat_date.to_s} utc/iso8601 #{chat_date_utc_iso8601_s}") if @verbose
-
-      jsons = []
-      get_history(room_id, chat_date_utc_iso8601_s, 0, 0, jsons)
 
       if @debug
         chat_json_file = "messages-#{room_id}-#{chat_date.strftime('%Y-%m-%d')}.json"
-        File.open(chat_json_file, 'w') do |f|
-          jsons.each do |json|
-            f.write(json.inspect)
-          end
-        end
+        File.open(chat_json_file, 'w') { |f| f.write(json.inspect) }
         $stderr.puts "Chat JSON saved to #{chat_json_file}"
       end
 
-      jsons.each do |json|
-        items = json['items']
-        items.each do |item|
-          date = Time.parse(item['date']).strftime('%Y-%m-%d %H:%M:%S')
-          from = item['from']
-          if from.is_a?(Hash)
-            name = from['name']
-          else
-            name = from
-          end
-          message = item['message']
-          puts "#{date} #{name}: #{message}"
+      items = json['items']
+      items.each do |item|
+        date = Time.parse(item['date']).strftime('%Y-%m-%d %H:%M:%S')
+        from = item['from']
+        if from.is_a?(Hash)
+          name = from['name']
+        else
+          name = from
         end
+        message = item['message']
+        puts "#{date} #{name}: #{message}"
       end
     end
   end

data/lib/hcutil/op_base.rb

@@ -12,6 +12,34 @@ module HCUtil
       RestClient.log = 'stdout' if @debug
       @auth = Auth.new(@options)
     end
+
+    def post_request(url, payload, headers)
+      RestClient::Request.execute(:url => url, :method => :post,
+                                  :payload => payload, :headers => headers,
+                                  :ssl_version => :TLSv1_2) do |response, request, result|
+        if block_given?
+          yield(response, request, result)
+        else
+          unless result.is_a? Net::HTTPSuccess
+            raise(Errors::RESTError.new(result, url, response))
+          end
+        end
+      end
+    end
+
+    def get_request(url, headers)
+      RestClient::Request.execute(:url => url, :method => :get,
+                                  :headers => headers,
+                                  :ssl_version => :TLSv1_2) do |response, request, result|
+        if block_given?
+          yield(response, request, result)
+        else
+          unless result.is_a? Net::HTTPSuccess
+            raise(Errors::RESTError.new(result, url, response))
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/hcutil/paster.rb

@@ -46,11 +46,7 @@ EOT
 
       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
+      post_request(uri, post_data.to_json, header_args)
     end
   end
 end

data/lib/hcutil/version.rb

@@ -1,3 +1,3 @@
 module HCUtil
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcutil
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Luke Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hipchat-util
-rubygems_version: 2.2.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Utility for working with HipChat from the command line