dscli 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be97fdf910c4c1f9dba126aeff2867551efaeee1
-  data.tar.gz: c8390e2ca3fce6db88e4761cf51311b0043b86de
+  metadata.gz: 9742d9c0950b2e48c61b676a8373d27fa5b13c6c
+  data.tar.gz: c6cd518e48efd480348a3ecadaa14815151e2ea5
 SHA512:
-  metadata.gz: 9c74ffe5247d7dde77d097851ff4e1531a70c2632e27506b339507003c5ed4e0c4d4708e7112ae9fee737eab03936c3048bb8a609e3e0964fa1a741cf6d23a6a
-  data.tar.gz: a542e3cc952a3335ff4d1c222b90229ecc624854746e0be9250c1fe910ee803f855d6fe7f6859685fb752e02612b4a727b604968ea376e0e55db0ea66d011cc8
+  metadata.gz: cf49bbb677cc4a28debf4c23af619ccd2d40e66b80cfbaebd8d4157e1e8d40b5236af1046195c4bbc80ec210e09e976c2dfae3158c246a4ac7e61bad1bf4543a
+  data.tar.gz: 21f94e1c8156ddb1a87b920f049765075738403c48c997cd45b40436ba79c9fbe6db3bcbd48d3c7f45b6fd29b4a33a75502e7317a68ae1bd3c8b6af8ad5661b0

data/README.md

@@ -2,7 +2,6 @@
 
 DSCLI is a command line wrapper around the DataSift API Client Library for Ruby.
 It was built by the DataSift Support Team to help speed up tasks we found ourselves frequently repeating.
-Version 0.0.1 offers support for only some of the core API functions. Support for the Push and Historics APIs is on it's way.
 
 ## Installation
 
@@ -12,15 +11,25 @@ This tool was intended for use as a CLI tool only:
 
 ## Usage
 
-First, call ``` dscli config ``` to enter your DataSift API credentials. This will store your username and API key in a new file called ~/.datasiftcli
+First, call ``` dscli config ``` to enter your DataSift API credentials. This will store your username and API key in a new file called ~/.datasiftcli. 
 You should then be free to use any of following commands:
 
-    dscli compile (csdl)  # Compile CSDL
-    dscli config          # Configure your DataSift API credentials
-    dscli dpu (hash)      # Find the DPU cost of a given stream hash
-    dscli help [COMMAND]  # Describe available commands or one specific command
-    dscli stream (hash)   # Stream interactions from a DataSift stream to the command line
-    dscli usage [period]  # Find your stream and license fee usage
+    dscli balance              # Gets your current plan and balance
+    dscli compile (csdl)       # Compile CSDL
+    dscli config               # Configure your DataSift API credentials
+    dscli dpu (hash)           # Find the DPU cost of a given stream hash
+    dscli help [COMMAND]       # Describe available commands or one specific command
+    dscli historics <command>  # Run commands relating to historics
+    dscli push <command>       # Run commands relating to push subscriptions
+    dscli source <command>     # Run commands relating to managed sources
+    dscli stream (hash)        # Stream interactions from a DataSift stream to the command line
+    dscli usage [period]       # Find your stream and license fee usage
+
+
+## Example Usage
+
+    $ dscli compile 'interaction.content contains "coffee"'
+    => ce9d18e45a53dfa2dfde7747f8c5d98b
 
 ## Contributing
 

data/bin/dscli

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+require 'thor'
 require 'dscli'
+require 'yaml'
+
+CLI.start
 
-Dscli::Commands.start(ARGV)

data/lib/dscli/api.rb

@@ -8,7 +8,7 @@ module Dscli
     def initialize
       storage = Dscli::Storage.new
       config = storage.get_auth
-      @config = {:username => config[:auth][:username], :api_key => config[:auth][:api_key], :enable_ssl => false}
+      @config = {:username => config[:auth][:username], :api_key => config[:auth][:api_key], :enable_ssl => true}
       @datasift = DataSift::Client.new(@config)
     end
 
@@ -32,12 +32,17 @@ module Dscli
       dpu = response[:data]
     end
 
+    def balance
+      response = @datasift.balance
+      return response[:data]
+    end
+
     def stream(hash)
       on_delete  = lambda { |stream, m| puts m }
       on_error   = lambda { |stream, e| puts 'A serious error has occurred: ' + e.message.to_s }
       on_message = lambda { |message, stream, hash| puts Yajl::Encoder.encode(message) }
       on_connect = lambda { |stream| stream.subscribe(hash, on_message) }
-      on_close   = lambda { |stream| puts 'closed' }
+      on_close   = lambda { |stream, message| puts "Closed #{stream}: #{message}" }
 
       on_datasift_message = lambda do |stream, message, hash|
         puts "DataSift Message #{hash} ==> #{message}"
@@ -57,16 +62,92 @@ module Dscli
         end
     end
 
-    #
-    # Push API endpoints
-    #
-    #
+    #######################################################
+    #     PUSH
+    #######################################################
+
+    def push_list(page)
+      response = @datasift.push.get(page)
+      response[:data]
+    end
+
+    def push_get(id)
+      response = @datasift.push.get_by_subscription(id)
+      return response
+    end
+
+    def push_stop(id)
+      response = @datasift.push.stop(id)
+      puts response
+    end
+
+    def push_delete(id)
+      response = @datasift.push.delete(id)
+      return response
+    end
+
+    def push_log(id)
+
+      if id.nil?
+        response = @datasift.push.log
+      else
+        response = @datasift.push.log_for(id)
+      end
+
+      return response[:data]
+
+    end
+
+    #######################################################
+    #     HISTORICS
+    #######################################################
 
-    #def pushcreate(name)
-    #  storage = Dscli::Storage.new
-    #  endpoint = storage.get_push_endpoint(name)
-    #  puts endpoint
-    #end
+    def historics_list(page)
+      response = @datasift.historics.get(20,page)
+      response[:data]
+    end
+
+    def historics_get(id)
+      return @datasift.historics.get_by_id(id)
+    end
+
+    def historics_stop(id)
+      return @datasift.historics.stop(id)
+    end
+
+    def historics_delete(id)
+      return @datasift.historics.delete(id)
+    end
+
+    #######################################################
+    #     MANAGED SOURCES
+    #######################################################
+
+    def source_list(page)
+      response = @datasift.managed_source.get(nil,nil,page,20)
+      response[:data]
+    end
+
+    def source_get(id)
+      return @datasift.managed_source.get(id)
+    end
+
+    def source_start(id)
+      return @datasift.managed_source.start(id)
+    end
+
+    def source_stop(id)
+      return @datasift.managed_source.stop(id)
+    end
+
+    def source_delete(id)
+      return @datasift.managed_source.delete(id)
+    end
+
+    def source_log(id)
+      response = @datasift.managed_source.log(id,1,20)
+      response[:data]
+    end
 
   end
 

data/lib/dscli/cli.rb

@@ -0,0 +1,53 @@
+class CLI < Thor
+
+  #######################################################
+  #     Top-level commands 
+  #######################################################  
+  desc 'config', 'Configure your DataSift API credentials'
+  def config
+  	input = Dscli::Parameters.new.user_config(options)
+  	puts input.to_yaml
+  	open(ENV['HOME'] + '/.datasiftcli', 'w') do |f|
+      f.write input.to_yaml
+    end
+  end
+
+  desc 'compile (csdl)', 'Compile CSDL'
+  def compile(csdl)
+    api = Dscli::API.new
+    definition = api.compile(csdl)
+    puts definition
+  end
+
+  desc 'usage [period]', 'Find your stream and license fee usage'
+  def usage(period = 'day')
+    api = Dscli::API.new
+    puts Yajl::Encoder.encode(api.usage(period), :pretty => true)
+  end
+
+  desc 'dpu (hash)', 'Find the DPU cost of a given stream hash'
+  def dpu(hash)
+    api = Dscli::API.new
+    puts Yajl::Encoder.encode(api.dpu(hash), :pretty => true)
+  end
+
+  desc 'stream (hash)', 'Stream interactions from a DataSift stream to the command line'
+  def stream(hash)
+    api = Dscli::API.new
+    api.stream(hash)
+  end
+
+  desc 'balance', 'Gets your current plan and balance'
+  def balance
+    api = Dscli::API.new
+    puts api.balance
+  end
+
+  #######################################################
+  #     Second-level commands 
+  #######################################################  
+  register(Push, 'push', 'push <command>', 'Run commands relating to push subscriptions')
+  register(Historics, 'historics', 'historics <command>', 'Run commands relating to historics')
+  register(Source, 'source', 'source <command>', 'Run commands relating to managed sources')
+
+end

data/lib/dscli/connectors.rb

@@ -0,0 +1,97 @@
+module Dscli
+  class Connectors
+
+    CONNECTORS = [["HTTP", "http"],
+                  ["CouchDB", "couchdb"],
+                  ["DynamoDB", "dynamodb"],
+                  ["ElasticSearch", "elasticsearch"],
+                  ["FTP", "ftp"],
+                  ["Google BigQuery", "bigquery"],
+                  ["MongoDB", "mongodb"],
+                  ["MySQL", "mysql"],
+                  ["Pull", "pull"],
+                  ["Redis", "redis"],
+                  ["S3", "s3"],
+                  ["SFTP", "sftp"],
+                  ["Splunk Storm REST", "splunkstormrest"],
+                  ["Splunk Enterprise", "splunkenterprise"],
+                  ["Zoomdata", "zoomdata"]]
+
+    def list
+      conenctors = CONNECTORS.map { |c| c[1] }
+    end
+
+    def setOutputParams(connector)
+      @op = Dscli::OutputParams.new
+      @push = {}
+      @push[:auth] = {}
+      @push[:server_level_auth] = {}
+      self.send(connector)
+    end
+
+
+    #
+    # Method to create each Push Destination
+    #
+
+    def http
+    end
+
+    def couchdb
+    end
+
+    def dynamodb
+    end
+
+    def elasticsearch
+    end
+
+    def ftp
+    end
+
+    def bigquery
+    end
+
+    def mongodb
+    end
+
+    def mysql
+    end
+
+    def pull
+      @push[:format] = @op.format
+      return @push
+    end
+
+    def redis
+    end
+
+    def s3
+      @push[:auth][:access_key] = @op.auth_access_key
+      @push[:auth][:secret_key] = @op.auth_secret_key
+      @push[:bucket] = @op.bucket
+      @push[:directory] = @op.directory
+      @push[:acl] = @op.acl
+      @push[:file_prefix] = @op.file_prefix
+      @push[:max_size] = @op.max_size
+      return @push
+    end
+
+    def sftp
+    end
+
+    def splunkstormrest
+    end
+
+    def splunkenterprise
+    end
+
+    def zoomdata
+    end
+
+
+
+
+  end
+end
+

data/lib/dscli/core.rb

@@ -0,0 +1,7 @@
+require 'thor'
+require 'yaml'
+
+class Core < Thor
+  
+
+end

data/lib/dscli/historics.rb

@@ -0,0 +1,68 @@
+class Historics < Thor
+  
+  desc 'list [page]', 'Lists all historic queries'
+  def list(page = 1)
+    api = Dscli::API.new
+    results = api.historics_list(page)
+
+    puts "\nTotal Historic 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'
+  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
+
+  end
+
+  desc 'stop (id)', 'Stops a historic query'
+  def stop(id)
+    api = Dscli::API.new
+      
+    begin
+      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."
+    end
+
+  end
+
+  desc 'delete (id)', 'Deletes a historic query'
+  def delete(id)
+    api = Dscli::API.new
+
+    begin
+
+      response = api.historics_delete(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."
+    end
+
+  end
+
+end

data/lib/dscli/outputParams.rb

@@ -0,0 +1,159 @@
+require 'interact'
+
+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"]
+    DELIVERY_FREQUENCY = [0, 10, 30, 60, 300]
+    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
+    end
+
+    def api_hostname
+      ask "Splunk Storm REST API host"
+    end
+
+    def auth_access_key
+      ask "AWS access key"
+    end
+
+    def auth_access_token
+      ask "Splunk Storm REST access token"
+    end
+
+    def auth_password
+      ask "Authentication password"
+    end
+
+    def auth_secret_key
+      ask "AWS secret key"
+    end
+
+    def auth_username
+      ask "Authentication username"
+    end
+
+    def auth_type
+      ask "Auth type", choices: HTTP_AUTH_TYPE.each, indexed: true, default: HTTP_AUTH_TYPE.first
+    end
+
+    def bucket
+      ask "Bucket name"
+    end
+
+    def collection_name
+      ask "MongoDB Collection name"
+    end
+
+    def database
+      ask "Numeric ID of your existing Redis database"
+    end
+
+    def db_name
+      ask "Database name"
+    end
+
+    def delivery_frequency
+      ask "Delivery frequency (seconds)", choices: DELIVERY_FREQUENCY.each, indexed: true, default: DELIVERY_FREQUENCY.first
+    end
+
+    def directory
+      ask "Directory"
+    end
+
+    def file_prefix
+      ask "Optional filename prefix", default: "DataSift"
+    end
+
+    def format
+      ask "Output format", choices: FORMATS.each, indexed: true
+    end
+
+    def host
+      ask "The host to connect to"
+    end
+
+    def list
+      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
+      human_size_to_number(max_size)
+    end
+
+    def method
+      ask "HTTP request type", choices: HTTP_METHOD.each, indexed: true, default: HTTP_METHOD.first
+    end
+
+    def port
+      ask "Port on the remote machine"
+    end
+
+    def project_id
+      ask "ID of your Splunk Storm REST project"
+    end
+
+    def region
+      ask "AWS region the destination table is set up in"
+    end
+
+    def server_level_auth_password
+      ask "Server-level authentication password"
+    end
+
+    def server_level_auth_username
+      ask "Server-level authentication username"
+    end
+
+    def source
+      ask "Label used to mark data delivered to Zoomdata"
+    end
+
+    def table
+      ask "Name of the table to use"
+    end
+
+    def type
+      ask "The type that you want to use for the index"
+    end
+
+    def url
+      ask "The URL to post data to"
+    end
+
+    def use_gzip
+      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
+    end
+
+    def verify_ssl
+      ask "Verify SSL certificate?", choices: BOOL.each, indexed: true, default: BOOL.last
+    end
+
+    ###############
+
+    #TODO properly add back in the namespacing. i.e. op_params.auth.passw
+
+    private
+
+    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"
+      return bytes.to_s
+    end
+
+  end
+end
+

data/lib/dscli/push.rb

@@ -0,0 +1,80 @@
+class Push < Thor
+
+  desc 'list [page]', 'Lists all current subscriptions'
+  def list(page = 1)
+    api = Dscli::API.new
+    results = api.push_list(page)
+
+    puts "\nTotal Subscriptions: #{results[:subscriptions].count}\n\n"
+    if results[:subscriptions].count > 0
+      puts 'ID                               | Name                 | Output Type | Created                    | Status   '
+      puts '--------------------------------------------------------------------------------------------------------------'
+
+      results[:subscriptions].each { |s| puts "#{s[:id]} | #{ '%-20.20s' % s[:name] } | #{ '%-11.11s' % s[:output_type] } |  #{Time.at(s[:created_at])} | #{s[:status]}" }
+      puts "\n"
+    end
+  end
+
+  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
+  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
+  end
+
+  desc 'delete (id)', 'Deletes a push subscription'
+  def delete(id)
+    api = Dscli::API.new
+
+    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."
+    end
+  end
+
+  desc 'log [id]', 'Retrieves logs for all subscriptions (or for the subscription ID supplied)'
+  def log(id = nil)
+    api = Dscli::API.new
+
+    begin
+      results = api.push_log(id)
+
+      puts "\nMessage count: #{results[:count]}\n\n"
+
+      if results[:count] > 0
+        puts ' Time                     | Subscription ID                  | Message                                          '
+        puts '-----------------------------------------------------------------------------------------------------------------'
+
+        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."
+    end
+  end
+
+end

data/lib/dscli/source.rb

@@ -0,0 +1,110 @@
+class Source < Thor
+
+  desc 'list [page]', 'Lists all managed sources'
+  def list(page = 1)
+    api = Dscli::API.new
+    results = api.source_list(page)
+
+    puts "\nTotal Managed Sources: #{results.count}\n\n"
+    puts 'ID                               | Name                 | Type                 | Status'
+    puts '-----------------------------------------------------------------------------------------------------'
+
+    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
+
+  end
+
+  desc 'start (id)', 'Starts the specified source'
+  def start(id)
+
+  	api = Dscli::API.new
+      
+    begin
+      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."
+    end
+
+  end
+
+  desc 'stop (id)', 'Stops the specified source'
+  def stop(id)
+
+  	api = Dscli::API.new
+      
+    begin
+      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."
+    end
+
+  end
+
+  desc 'delete (id)', 'Deletes a managed source'
+  def delete(id)
+    api = Dscli::API.new
+
+    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."
+    end
+
+  end
+
+  desc 'logs (id)', 'Retrieves the log for a managed source'
+  def logs(id = nil)
+    api = Dscli::API.new
+
+    begin
+
+    	results = api.source_log(id)
+
+	    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
+   
+  end
+
+end

data/lib/dscli/storage.rb

@@ -19,34 +19,11 @@ module Dscli
           f.write(Yajl::Encoder.encode(auth) + "\n")
         }
       end
-      #TODO Set 'else' to write over config if it already exists
     end
 
     def get_auth
       config = YAML.load(File.read(@configfile))
     end
 
-#   def add_push_endpoint(config)
-#     File.open(@configfile, 'a') { |f|
-#       f.puts Yajl::Encoder.encode(config) + "\n"
-#     }
-#   end
-
-#   def get_push_endpoint(name)
-#     parser = Yajl::Parser
-#     File.open(@configfile, 'r').each_line do |line|
-#       json = parser.parse(line)
-#       if json['name'] && json['name'] == name
-#         return json
-#       end
-#     end
-#     return ''
-#   end
-
-#    def list_push_endpoints
-#
-#    end
-#
-#
   end
 end

data/lib/dscli/version.rb

@@ -1,3 +1,3 @@
 module Dscli
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/lib/dscli.rb

@@ -1,6 +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/commands'
 require dir + '/Dscli/api'
 require dir + '/Dscli/storage'
 require dir + '/Dscli/parameters'

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dscli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason Dugdale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: datasift
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: DS CLI is a CLI wrapper for the DataSift Ruby client library, allowing
@@ -103,15 +117,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
 - bin/dscli
+- lib/dscli.rb
 - lib/dscli/api.rb
-- lib/dscli/commands.rb
+- lib/dscli/cli.rb
+- lib/dscli/connectors.rb
+- lib/dscli/core.rb
+- lib/dscli/historics.rb
+- lib/dscli/outputParams.rb
 - lib/dscli/parameters.rb
+- lib/dscli/push.rb
+- lib/dscli/source.rb
 - lib/dscli/storage.rb
 - lib/dscli/version.rb
-- lib/dscli.rb
-- LICENSE.txt
-- README.md
 homepage: https://github.com/dugjason/dscli
 licenses:
 - BSD
@@ -122,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Simple CLI wrapper for the DataSift Ruby client library

data/lib/dscli/commands.rb

@@ -1,69 +0,0 @@
-require 'thor'
-require 'yaml'
-
-module Dscli
-  class Commands < Thor
-    include Thor::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    desc 'config', 'Configure your DataSift API credentials'
-    option :user, type: :boolean, desc: 'Enter username and API key for your DataSift API user'
-    #option :push, type: :boolean, desc: 'Enter details of a new Push Destination'
-
-    def config
-
-      #if options[:user]
-        open(ENV['HOME'] + '/.datasiftcli', 'w') do |f|
-          f.write Dscli::Parameters.new.user_config(options).to_yaml
-        end
-      #end
-
-      #TODO Add other config options such as new push destinations
-    end
-
-    #
-    # Core API endpoints
-    # [ Missing /validate /balance ]
-    #
-
-    desc 'compile (csdl)', 'Compile CSDL'
-    def compile(csdl)
-      api = Dscli::API.new
-      definition = api.compile(csdl)
-      puts definition
-    end
-
-    desc 'usage [period]', 'Find your stream and license fee usage'
-    def usage(period = 'day')
-      api = Dscli::API.new
-      puts Yajl::Encoder.encode(api.usage(period), :pretty => true)
-    end
-
-    desc 'dpu (hash)', 'Find the DPU cost of a given stream hash'
-    def dpu(hash)
-      api = Dscli::API.new
-      puts Yajl::Encoder.encode(api.dpu(hash), :pretty => true)
-    end
-
-    desc 'stream (hash)', 'Stream interactions from a DataSift stream to the command line'
-    def stream(hash)
-      api = Dscli::API.new
-      api.stream(hash)
-    end
-
-    #
-    # Push API endpoints
-    #
-    #
-
-   #desc 'pushcreate', ''
-   #def pushcreate(name)
-   #  api = Dscli::API.new
-   #  api.pushcreate(name)
-   #end
-
-  end
-end