pingdom-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ffa63ace83f83dd9b97e1dd159ba7a753f70d41
-  data.tar.gz: 0b16ddc7d7e923543e228472541122220b76f24c
+  metadata.gz: d26b9daf54a57d95ad034c06430f3bc6dce57358
+  data.tar.gz: 58256c3143d356b4f68eb8acd21844f4c195c5de
 SHA512:
-  metadata.gz: 07d58bfd20ee1718ca48e8d9b4816beb6ba7293a350333e48dc22dcc007519c933b55c29f331f592487494f9938485472ad0b590c88c77bb1d56337731b6d9bc
-  data.tar.gz: 0823efdca46119122eebfe6f2a4863f9d251b16af724cfe2033f9eb49634e29e2fc1423685b60684bfe31915eabaebe4317fdcbcea70126877714ed32315f350
+  metadata.gz: 9fdbc50dbe9338006c0e409791e0a3b66ef27fcd210b1562d52e50c1a47c745a462f74f8dac947f40e486b4e52112ed3bb3c52be1f71d940afd2b8f979018d2b
+  data.tar.gz: 996b2788483c515e6335073705361d66f671beca3538a725d944610fb2b9f3f41daf346cf80b3f51098e81e020d49928f95fad9125f8fa8b4fa731c6e7d016ee

data/bin/pingdom-cli

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
 require 'pingdom/cli'
 
 Pingdom::Cli::CLI.start

data/lib/pingdom/cli/cli.rb

@@ -19,42 +19,47 @@ module Pingdom
 
       desc "config", "config"
       def config
-        puts @config.to_json
+        puts_json @config
       end
 
       desc "checks", "checks"
       def checks
-        puts @core.checks.to_json
+        puts_json @core.checks
       end
 
       desc "actions", "actions"
       def actions
-        puts @core.actions.to_json
+        puts_json @core.actions
       end
 
       desc "contacts", "contacts"
       def contacts
-        puts @core.contacts.to_json
+        puts_json @core.contacts
       end
 
       desc "probes", "probes"
       def probes
-        puts @core.probes.to_json
+        puts_json @core.probes
       end
 
       desc "reference", "reference"
       def reference
-        puts @core.reference.to_json
+        puts_json @core.reference
       end
 
       desc "reports_public", "reports_public"
       def reports_public
-        puts @core.reports_public.to_json
+        puts_json @core.reports_public
       end
 
       desc "settings", "settings"
       def settings
-        puts @core.settings.to_json
+        puts_json @core.settings
+      end
+
+      desc "credits", "credits"
+      def credits
+        puts_json @core.credits
       end
 
       desc "pause", "pause"
@@ -72,6 +77,12 @@ module Pingdom
       def update
         puts @core.update(options['params'])
       end
+
+      private
+
+      def puts_json(object)
+        puts JSON.pretty_generate(object)
+      end
     end
   end
 end

data/lib/pingdom/cli/core.rb

@@ -7,59 +7,70 @@ module Pingdom
 
       def initialize(config)
         @config = config
-        @url_base = "https://#{CGI::escape @config['user']}:#{CGI::escape @config['password']}@api.pingdom.com/api/2.0/"
-        @header = {"App-Key" => @config['app_key']}
+        @url_base = "https://api.pingdom.com/api/2.0/"
+        @header = { "App-Key" => @config['app_key'] }
       end
 
       def checks
-        response = RestClient.get(get_url('checks'), @header)
+        response = get_resource('checks').get
         results = JSON.parse(response.body, :symbolize_names => true)
-        results[:checks].each do |result|
+        results[__method__].each do |result|
           result[:lasttesttime] = Time.at(result[:lasttesttime]) unless result[:lasttesttime].nil?
           result[:lasterrortime] = Time.at(result[:lasterrortime]) unless result[:lasterrortime].nil?
           result[:created] = Time.at(result[:created]) unless result[:created].nil?
         end
-        results
+        results[__method__]
       end
 
       def actions
-        response = RestClient.get(get_url('actions'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('actions').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def contacts
-        response = RestClient.get(get_url('contacts'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('contacts').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def probes
-        response = RestClient.get(get_url('probes'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('probes').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def reference
-        response = RestClient.get(get_url('reference'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('reference').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def reports_public
-        response = RestClient.get(get_url('reports.public'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('reports.public').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def settings
-        response = RestClient.get(get_url('settings'), @header)
-        JSON.parse(response.body, :symbolize_names => true)
+        response = get_resource('settings').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
+      end
+
+      def credits
+        response = get_resource('credits').get
+        JSON.parse(response.body, :symbolize_names => true)[__method__]
       end
 
       def update(params)
-        response = RestClient.put(get_url('checks'), params, @header)
+        response = get_resource('checks').put(params)
         response.body
       end
 
       private
-      def get_url(action)
-        @url_base + action
+      def get_resource(action)
+        resource = RestClient::Resource.new(
+          @url_base + action,
+          :user  =>  @config['user'],
+          :password  =>  @config['password'],
+          :headers => { 'App-Key' => @config['app_key'] },
+          :verify_ssl => false
+        )
       end
     end
   end

data/lib/pingdom/cli/version.rb

@@ -1,6 +1,6 @@
 module Pingdom
   module Cli
     # pingdom-cli version
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingdom-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: pingdom simple command line interface