dscli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659a1cd137fc6ed362875305de3707027c51bc5f
-  data.tar.gz: 5d16b69ae18941506917be9d88593b2e65d3ce06
+  metadata.gz: bcb9011506fd048a9047144b94be5210103adf7a
+  data.tar.gz: 353e70a778602fb99364f06fc522f9f7bf8aae61
 SHA512:
-  metadata.gz: ab99b542b44b8e6f62d827cfe5e92db0c0dabe422b1a15dd3c7addd10b8bf7da9b16ba0c078dd3ba20de8ca2f5a6c748169b89e58466abe9c4e92e4556dd3b16
-  data.tar.gz: 2570c8b218b4599f0c7b074965cc67e4dae79a460429874d34d3ea10b9aa5e39f23f6dc86417189981d1d75191599eec223aab58392b1e69d90831b9a88b315c
+  metadata.gz: 036721549d4ecefa74ccf1f8c5aff2ec7cdae6f6139b32008b9d560dfc770abc63c2837b793f52ad71a8c069a917b93917140e223e2297830c308d81850a4902
+  data.tar.gz: de5e4d1d16c95e79f26805bab9a57b8abec6d2938674f253385f7cbf33da2cef743ee86ab967731d9ed2863b2d6fcfbb6ff23ecffcf856ea55bead5be053afd5

data/lib/dscli.rb

@@ -1,10 +1,10 @@
 dir = File.dirname(__FILE__)
-require dir + "/dscli/push"
-require dir + "/dscli/historics"
-require dir + "/dscli/source"
-require dir + "/dscli/core"
-require dir + "/dscli/cli"
-require dir + "/dscli/version"
-require dir + "/dscli/api"
-require dir + "/dscli/storage"
-require dir + "/dscli/parameters"
+require dir + '/dscli/push'
+require dir + '/dscli/historics'
+require dir + '/dscli/source'
+require dir + '/dscli/core'
+require dir + '/dscli/cli'
+require dir + '/dscli/version'
+require dir + '/dscli/api'
+require dir + '/dscli/storage'
+require dir + '/dscli/parameters'

data/lib/dscli/api.rb

@@ -87,15 +87,22 @@ module Dscli
     end
 
     def push_log(id)
-
       if id.nil?
         response = @datasift.push.log
       else
         response = @datasift.push.log_for(id)
       end
-
       return response[:data]
+    end
 
+    def push_pause(id)
+      response = @datasift.push.pause(id)
+      return response
+    end
+
+    def push_resume(id)
+      response = @datasift.push.resume(id)
+      return response
     end
 
     #######################################################
@@ -119,6 +126,14 @@ module Dscli
       return @datasift.historics.delete(id)
     end
 
+    def historics_pause(id)
+      return @datasift.historics.pause(id)
+    end
+
+    def historics_resume(id)
+      return @datasift.historics.resume(id)
+    end
+
     #######################################################
     #     MANAGED SOURCES
     #######################################################
@@ -148,7 +163,5 @@ module Dscli
       response = @datasift.managed_source.log(id,1,20)
       response[:data]
     end
-
   end
-
 end

data/lib/dscli/historics.rb

@@ -1,68 +1,80 @@
 class Historics < Thor
-  
-  desc 'list [page]', 'Lists all historic queries'
+
+  desc 'list [page]', 'Lists all Historics queries'
   def list(page = 1)
     api = Dscli::API.new
     results = api.historics_list(page)
 
-    puts "\nTotal Historic Queries: #{results.count}\n\n"
+    puts "\nTotal Historics Queries: #{results.count}\n\n"
     puts 'ID                   | Name                 | Created                    | Definition Hash                   | Status   '
     puts '---------------------------------------------------------------------------------------------------------------------------'
 
     results[:data].each { |s| puts "#{s[:id]} | #{ '%-20.20s' % s[:name] } |  #{Time.at(s[:created_at])} | #{ s[:definition_id] } | #{s[:status]}" }
     puts "\n"
-
   end
 
-  desc 'get (id)', 'Gets details of a historic query'
+  desc 'get (id)', 'Gets details of an Historics query'
   def get(id)
-    
-    begin
-      api = Dscli::API.new
-      response = api.historics_get(id)
-      puts response[:data].to_yaml
-    rescue ApiResourceNotFoundError => e
-      puts "Specified historic query '#{id}' was not found. It may have already been deleted."
-    end
-
+    api = Dscli::API.new
+    response = api.historics_get(id)
+    puts response[:data].to_yaml
+  rescue ApiResourceNotFoundError => e
+    puts "Specified historic query '#{id}' was not found. It may have already been deleted."
   end
 
-  desc 'stop (id)', 'Stops a historic query'
+  desc 'stop (id)', 'Stops an Historics query'
   def stop(id)
     api = Dscli::API.new
-      
-    begin
-      response = api.historics_stop(id)
+    response = api.historics_stop(id)
 
-      if response[:http][:status] == 204
-        puts "Historic query '#{id}' stopped successfully"
-      else
-        # TODO: How do we handle a different code?
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified historic query '#{id}' not found. It may have been deleted."
+    if response[:http][:status] == 204
+      puts "Historic query '#{id}' stopped successfully"
+    else
+      response
     end
-
+  rescue ApiResourceNotFoundError => e
+    puts "Specified historic query '#{id}' not found. It may have been deleted."
   end
 
-  desc 'delete (id)', 'Deletes a historic query'
+  desc 'delete (id)', 'Deletes an Historics query'
   def delete(id)
     api = Dscli::API.new
+    response = api.historics_delete(id)
 
-    begin
+    if response[:http][:status] == 204
+      puts "Historic query '#{id}' deleted successfully"
+    else
+      response
+    end
+  rescue ApiResourceNotFoundError => e
+    puts "Specified historic query '#{id}' not found. It may have already been deleted."
+  end
 
-      response = api.historics_delete(id)
+  desc 'pause (id)', 'Pauses an Historics query'
+  def pause(id)
+    api = Dscli::API.new
+    response = api.historics_pause(id)
 
-      if response[:http][:status] == 204
-        puts "Historic query '#{id}' deleted successfully"
-      else
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified historic query '#{id}' not found. It may have already been deleted."
+    if response[:http][:status] == 204
+      puts "Historics query '#{id}' paused successfully"
+    else
+      response
     end
-
+  rescue ApiResourceNotFoundError => e
+    puts "Specified Historics query '#{id}' not found."
   end
 
-end
+  desc 'resume (id)', 'Resumes a paused Historics query'
+  def resume(id)
+    api = Dscli::API.new
+    response = api.historics_resume(id)
+
+    if response[:http][:status] == 204
+      puts "Historics query '#{id}' resumed successfully"
+    else
+      response
+    end
+  rescue ApiResourceNotFoundError => e
+    puts "Specified Historics query '#{id}' not found."
+  end
+end

data/lib/dscli/outputParams.rb

@@ -4,141 +4,141 @@ module Dscli
   class OutputParams
     include Interactive
 
-    FORMATS = ["json_new_line", "json_meta", "json_array"]
-    S3_ACL = ["private", "public-read", "public-read-write", "authenticated-read", "bucket-owner-read", "bucket-owner-full-control"]
-    HTTP_AUTH_TYPE = ["none", "basic"]
+    FORMATS = ['json_new_line', 'json_meta', 'json_array']
+    S3_ACL = ['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control']
+    HTTP_AUTH_TYPE = ['none', 'basic']
     DELIVERY_FREQUENCY = [0, 10, 30, 60, 300]
-    MAX_SIZE = ["100KB", "250KB", "500KB", "1MB", "2MB", "5MB", "10MB", "20MB"]
-    HTTP_METHOD = ["POST", "PUT"]
-    BOOL = ["true", "false"]
+    MAX_SIZE = ['100KB', '250KB', '500KB', '1MB', '2MB', '5MB', '10MB', '20MB']
+    HTTP_METHOD = ['POST', 'PUT']
+    BOOL = ['true', 'false']
 
     def acl
-      ask "ACL", choices: S3_ACL.each, indexed: true, default: S3_ACL.first
+      ask 'ACL', choices: S3_ACL.each, indexed: true, default: S3_ACL.first
     end
 
     def api_hostname
-      ask "Splunk Storm REST API host"
+      ask 'Splunk Storm REST API host'
     end
 
     def auth_access_key
-      ask "AWS access key"
+      ask 'AWS access key'
     end
 
     def auth_access_token
-      ask "Splunk Storm REST access token"
+      ask 'Splunk Storm REST access token'
     end
 
     def auth_password
-      ask "Authentication password"
+      ask 'Authentication password'
     end
 
     def auth_secret_key
-      ask "AWS secret key"
+      ask 'AWS secret key'
     end
 
     def auth_username
-      ask "Authentication username"
+      ask 'Authentication username'
     end
 
     def auth_type
-      ask "Auth type", choices: HTTP_AUTH_TYPE.each, indexed: true, default: HTTP_AUTH_TYPE.first
+      ask 'Auth type', choices: HTTP_AUTH_TYPE.each, indexed: true, default: HTTP_AUTH_TYPE.first
     end
 
     def bucket
-      ask "Bucket name"
+      ask 'Bucket name'
     end
 
     def collection_name
-      ask "MongoDB Collection name"
+      ask 'MongoDB Collection name'
     end
 
     def database
-      ask "Numeric ID of your existing Redis database"
+      ask 'Numeric ID of your existing Redis database'
     end
 
     def db_name
-      ask "Database name"
+      ask 'Database name'
     end
 
     def delivery_frequency
-      ask "Delivery frequency (seconds)", choices: DELIVERY_FREQUENCY.each, indexed: true, default: DELIVERY_FREQUENCY.first
+      ask 'Delivery frequency (seconds)', choices: DELIVERY_FREQUENCY.each, indexed: true, default: DELIVERY_FREQUENCY.first
     end
 
     def directory
-      ask "Directory"
+      ask 'Directory'
     end
 
     def file_prefix
-      ask "Optional filename prefix", default: "DataSift"
+      ask 'Optional filename prefix', default: 'DataSift'
     end
 
     def format
-      ask "Output format", choices: FORMATS.each, indexed: true
+      ask 'Output format', choices: FORMATS.each, indexed: true
     end
 
     def host
-      ask "The host to connect to"
+      ask 'The host to connect to'
     end
 
     def list
-      ask "Name of a Redis list to stores interactions"
+      ask 'Name of a Redis list to stores interactions'
     end
 
     def max_size
-      max_size = ask "Max delivery size", choices: MAX_SIZE.each, indexed: true, default: MAX_SIZE.last
+      max_size = ask 'Max delivery size', choices: MAX_SIZE.each, indexed: true, default: MAX_SIZE.last
       human_size_to_number(max_size)
     end
 
     def method
-      ask "HTTP request type", choices: HTTP_METHOD.each, indexed: true, default: HTTP_METHOD.first
+      ask 'HTTP request type', choices: HTTP_METHOD.each, indexed: true, default: HTTP_METHOD.first
     end
 
     def port
-      ask "Port on the remote machine"
+      ask 'Port on the remote machine'
     end
 
     def project_id
-      ask "ID of your Splunk Storm REST project"
+      ask 'ID of your Splunk Storm REST project'
     end
 
     def region
-      ask "AWS region the destination table is set up in"
+      ask 'AWS region the destination table is set up in'
     end
 
     def server_level_auth_password
-      ask "Server-level authentication password"
+      ask 'Server-level authentication password'
     end
 
     def server_level_auth_username
-      ask "Server-level authentication username"
+      ask 'Server-level authentication username'
     end
 
     def source
-      ask "Label used to mark data delivered to Zoomdata"
+      ask 'Label used to mark data delivered to Zoomdata'
     end
 
     def table
-      ask "Name of the table to use"
+      ask 'Name of the table to use'
     end
 
     def type
-      ask "The type that you want to use for the index"
+      ask 'The type that you want to use for the index'
     end
 
     def url
-      ask "The URL to post data to"
+      ask 'The URL to post data to'
     end
 
     def use_gzip
-      ask "Use GZip?", choices: BOOL.each, indexed: true, default: BOOL.last
+      ask 'Use GZip?', choices: BOOL.each, indexed: true, default: BOOL.last
     end
 
     def use_ssl
-      ask "Use SSL?", choices: BOOL.each, indexed: true, default: BOOL.last
+      ask 'Use SSL?', choices: BOOL.each, indexed: true, default: BOOL.last
     end
 
     def verify_ssl
-      ask "Verify SSL certificate?", choices: BOOL.each, indexed: true, default: BOOL.last
+      ask 'Verify SSL certificate?', choices: BOOL.each, indexed: true, default: BOOL.last
     end
 
     ###############
@@ -149,8 +149,8 @@ module Dscli
 
     def human_size_to_number(size)
       value = size.scan(/[A-Z]+\d*|\d+/)
-      bytes = value[0].to_i * 1024 if value[1] == "KB"
-      bytes = value[0].to_i * 1024 * 1024 if value[1] == "MB"
+      bytes = value[0].to_i * 1024 if value[1] == 'KB'
+      bytes = value[0].to_i * 1024 * 1024 if value[1] == 'MB'
       return bytes.to_s
     end
 

data/lib/dscli/parameters.rb

@@ -5,16 +5,11 @@ module Dscli
     include Interactive
 
     def user_config(options)
-
       config = options.dup
+      username = ask 'DataSift Username'
+      api_key  = ask 'DataSift API Key'
 
-      username = ask "DataSift Username"
-      api_key  = ask "DataSift API Key"
-
-      config = {:auth => {:username => username, :api_key => api_key}}
-
-      return config
+      config = { auth: { username: username, api_key: api_key } }
     end
-
   end
-end
+end

data/lib/dscli/push.rb

@@ -17,64 +17,81 @@ class Push < Thor
 
   desc 'get (id)', 'Gets details of a push subscription'
   def get(id)
-    begin
-      api = Dscli::API.new
-      response = api.push_get(id)
-      puts response[:data].to_yaml
-    rescue ApiResourceNotFoundError => e
-      puts "Specified push subscription '#{id}' not found. It may have already been deleted."
-    end
+    api = Dscli::API.new
+    response = api.push_get(id)
+    puts response[:data].to_yaml
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found. It may have been deleted."
   end
 
   desc 'stop (id)', 'Stops a push subscription'
   def stop(id)
-    begin
-      api = Dscli::API.new
-      api.push_stop(id)
-    rescue ApiResourceNotFoundError => e
-      puts "Specified push subscription '#{id}' not found. It may have been deleted."
-    rescue BadRequestError => e
-      puts "Specified push subscription '#{id}' could not be stopped. It may have already been stopped."
-    end
+    api = Dscli::API.new
+    api.push_stop(id)
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found. It may have been deleted."
+  rescue BadRequestError
+    puts "Specified push subscription '#{id}' could not be stopped. It may have already been stopped."
   end
 
   desc 'delete (id)', 'Deletes a push subscription'
   def delete(id)
     api = Dscli::API.new
+    response = api.push_delete(id)
 
-    begin
-      response = api.push_delete(id)
-
-      if response[:http][:status] == 204
-        puts "Push subscription #{id} deleted successfully"
-      else
-        # TODO: How do we handle a different code?
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified push subscription '#{id}' not found. It may have already been deleted."
+    if response[:http][:status] == 204
+      puts "Push subscription #{id} deleted successfully"
+    else
+      # TODO: How do we handle a different code?
+      response
     end
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found. It may have already been deleted."
   end
 
   desc 'log [id]', 'Retrieves logs for all subscriptions (or for the subscription ID supplied)'
   def log(id = nil)
     api = Dscli::API.new
+    results = api.push_log(id)
+
+    puts "\nMessage count: #{results[:count]}\n\n"
 
-    begin
-      results = api.push_log(id)
+    if results[:count] > 0
+      puts ' Time                     | Subscription ID                  | Message                                          '
+      puts '-----------------------------------------------------------------------------------------------------------------'
 
-      puts "\nMessage count: #{results[:count]}\n\n"
+      results[:log_entries].each { |s| puts "#{Time.at(s[:request_time]) } | #{s[:subscription_id]} | #{ '%-50.50s' % s[:message] }" }
+      puts "\n"
+    end
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found. It may have been deleted."
+  end
 
-      if results[:count] > 0
-        puts ' Time                     | Subscription ID                  | Message                                          '
-        puts '-----------------------------------------------------------------------------------------------------------------'
+  desc 'pause (id)', 'Pauses a push subscription'
+  def pause(id)
+    api = Dscli::API.new
+    response = api.push_pause(id)
 
-        results[:log_entries].each { |s| puts "#{Time.at(s[:request_time]) } | #{s[:subscription_id]} | #{ '%-50.50s' % s[:message] }" }
-        puts "\n"
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified push subscription '#{id}' not found. It may have been deleted."
+    if response[:http][:status] == 204
+      puts "Push subscription #{id} paused successfully"
+    else
+      response
     end
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found."
   end
 
-end
+  desc 'resume (id)', 'Resumes a paused push subscription'
+  def resume(id)
+    api = Dscli::API.new
+    response = api.push_resume(id)
+
+    if response[:http][:status] == 204
+      puts "Push subscription #{id} resumed successfully"
+    else
+      response
+    end
+  rescue ApiResourceNotFoundError
+    puts "Specified push subscription '#{id}' not found."
+  end
+end

data/lib/dscli/source.rb

@@ -1,6 +1,6 @@
 class Source < Thor
 
-  desc 'list [page]', 'Lists all managed sources'
+  desc 'list [page]', 'Lists all Managed Sources'
   def list(page = 1)
     api = Dscli::API.new
     results = api.source_list(page)
@@ -11,100 +11,74 @@ class Source < Thor
 
     results[:sources].each { |s| puts "#{s[:id]} | #{ '%-20.20s' % s[:name] } | #{ '%-20.20s' % s[:source_type] } | #{s[:status]}" }
     puts "\n"
-
   end
 
   desc 'get (id)', 'Gets details of a managed source'
   def get(id)
-    
-    begin
-      api = Dscli::API.new
-      response = api.source_get(id)
-      puts response[:data].to_yaml
-    rescue ApiResourceNotFoundError => e
-      puts "Specified managed source '#{id}' was not found. It may have been deleted."
-    end
-
+    api = Dscli::API.new
+    response = api.source_get(id)
+    puts response[:data].to_yaml
+  rescue ApiResourceNotFoundError
+    puts "Specified managed source '#{id}' was not found. It may have been deleted."
   end
 
   desc 'start (id)', 'Starts the specified source'
   def start(id)
-
   	api = Dscli::API.new
-      
-    begin
-      response = api.source_start(id)
+    response = api.source_start(id)
 
-      if response[:http][:status] == 200
-        puts "Managed source '#{id}' started successfully"
-      else
-        # TODO: How do we handle a different code?
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified source '#{id}' not found. It may have been deleted."
+    if response[:http][:status] == 200
+      puts "Managed source '#{id}' started successfully"
+    else
+      # TODO: How do we handle a different code?
+      response
     end
-
+  rescue ApiResourceNotFoundError
+    puts "Specified source '#{id}' not found. It may have been deleted."
   end
 
   desc 'stop (id)', 'Stops the specified source'
   def stop(id)
-
   	api = Dscli::API.new
-      
-    begin
-      response = api.source_stop(id)
+    response = api.source_stop(id)
 
-      if response[:http][:status] == 200
-        puts "Managed source '#{id}' stopped successfully"
-      else
-        # TODO: How do we handle a different code?
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Specified source '#{id}' not found. It may have been deleted."
+    if response[:http][:status] == 200
+      puts "Managed source '#{id}' stopped successfully"
+    else
+      # TODO: How do we handle a different code?
+      response
     end
-
+  rescue ApiResourceNotFoundError
+    puts "Specified source '#{id}' not found. It may have been deleted."
   end
 
   desc 'delete (id)', 'Deletes a managed source'
   def delete(id)
     api = Dscli::API.new
+    response = api.source_delete(id)
 
-    begin
-
-      response = api.source_delete(id)
-
-      if response[:http][:status] == 204
-        puts "Source '#{id}' deleted successfully"
-      else
-        response
-      end
-    rescue ApiResourceNotFoundError => e
-      puts "Source '#{id}' not found. It may have been deleted."
+    if response[:http][:status] == 204
+      puts "Source '#{id}' deleted successfully"
+    else
+      response
     end
-
+  rescue ApiResourceNotFoundError
+    puts "Source '#{id}' not found. It may have been deleted."
   end
 
   desc 'logs (id)', 'Retrieves the log for a managed source'
   def logs(id = nil)
     api = Dscli::API.new
+   	results = api.source_log(id)
 
-    begin
+	  puts "\nMessage count: #{results[:count]}\n\n"
+	  puts ' Time                     | Message                                          '
+	  puts '-----------------------------------------------------------------------------------------------------------------'
 
-    	results = api.source_log(id)
+	  results[:log_entries].each { |s| puts "#{Time.at(s[:event_time]) } | #{ '%-50.50s' % s[:message] }" }
+	  puts "\n"
 
-	    puts "\nMessage count: #{results[:count]}\n\n"
-	    puts ' Time                     | Message                                          '
-	    puts '-----------------------------------------------------------------------------------------------------------------'
-	    
-	    results[:log_entries].each { |s| puts "#{Time.at(s[:event_time]) } | #{ '%-50.50s' % s[:message] }" }
-	    puts "\n"
-
-    rescue ApiResourceNotFoundError => e
-      puts "Specified source '#{id}' not found. It may have been deleted."
-    end
-   
+  rescue ApiResourceNotFoundError
+    puts "Specified source '#{id}' not found. It may have been deleted."
   end
-
-end
+end

data/lib/dscli/version.rb

@@ -1,3 +1,3 @@
 module Dscli
-  VERSION = "0.1.3"
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dscli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jason Dugdale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,34 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: datasift
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: interact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: interact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,8 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple CLI wrapper for the DataSift Ruby client library
 test_files: []
+has_rdoc: