infunnel_cli 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29bdf4eff04be1ed41c2c767f0b59758e78d08c7
-  data.tar.gz: 9051898b34982bef33fa0d112238d9d003b2491e
+  metadata.gz: faf6be0d4126e71bdb618b23d1cc8e5dc530f78e
+  data.tar.gz: 4971635bcf6e381e84dd609c299f03a99688367a
 SHA512:
-  metadata.gz: be9da7a876f951e460729d23fa7e00bbffcd0f2bc8355f31b94ad3c83a490fda41f5c81f0378367f66eee69aeec23762eaa2bf2b34e870fb304245e34c075d80
-  data.tar.gz: 7d07d28f8eb4543486b8559ec5900b350538c405f49786adfe295e09cbe35c1f37053988a9fcf489e21d7c2ce11dbf277852d021bcb161497d5215856b1256ab
+  metadata.gz: 26d55e42cdc5c5a134d90972dca56dee0e6451f39f4cd43cebe8effbf6cfc2b1bfaa0780945396486fa83c168e9e259f6c08766a9892396549e2c1f2d42b0e05
+  data.tar.gz: 2d0a3a0019253478986d8e1ff4d855e8873e81c5e0d07ab193fb4e5388acb064c467c5fa7f1d4aa17f6aa323a941a928346a4981882e20a351780b132a3eeb88

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/README.md

@@ -15,11 +15,16 @@ gem push infunnel_cli-x.x.x.gem
 
 Add warnings if no eloqua credentials are stored in keychain.
 
+### Misc
 
+docs for thor: http://whatisthor.com/
 
+more docs for thor: http://www.rubydoc.info/github/wycats/thor/Thor/Shell/Color
 
-### Misc
+### Usage of the cli on mac
 
-docs for thor: http://whatisthor.com/
+pipe results into copy memory: infunnel_cli option_list find 4 --html | pbcopy
+
+## Future improvements
 
-more docs for thor: http://www.rubydoc.info/github/wycats/thor/Thor/Shell/Color
+Make account name editable so you dont have to spell out the full company name 

data/bin/infunnel_cli

@@ -2,4 +2,4 @@
 
 require 'infunnel_cli'
 
-InfunnelCli::HammerOfTheGods.start( ARGV )
+InfunnelCli::Tools.start( ARGV )

data/infunnel_cli.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["lundevallan"]
   spec.email         = ["linus.lundevall@infunnel.se"]
   spec.summary       = "A cli for working with marketing automation."
-  spec.description   = "A cli for working with marketing automation. Connects to the eloqua-api."
+  spec.description   = "Connects to the eloqua-api. Only works on mac os since it depends on keychain to store credentials."
   spec.homepage      = "http://infunnel.se"
   spec.license       = "MIT"
 
@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.2'
+
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'httparty', '~> 0.13.7'
   spec.add_dependency 'nokogiri', '1.6.7.2'

data/lib/eloqua_api_service/campaign.rb

@@ -0,0 +1,15 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class Campaign < Service
+    BASE_PATH = "/API/REST/2.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/campaign/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/campaigns?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/contact.rb

@@ -0,0 +1,26 @@
+require 'eloqua_api_service/service'
+require 'date'
+module EloquaApiService
+  class Contact < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/data/contact/#{id}?depth=complete", @options))
+    end
+
+    def activities(contact_id:)
+
+      responses = []
+      types = ['emailOpen', 'emailSend', 'emailClickThrough', 'emailSubscribe', 'emailUnsubscribe', 'formSubmit', 'webVisit', 'campaignMembership']
+      types.each do |type|
+        response = self.class.get("#{BASE_PATH}/data/activities/contact/#{contact_id}?type=#{type}&startDate=#{Time.new(2000,7,6).strftime('%s')}&endDate=#{Time.new(2100,7,9).strftime('%s')}&count=1000&depth=complete", @options)
+        responses << parse(response) rescue []
+      end
+      responses
+    end
+
+    def search(term: '')
+      parse(self.class.get("#{BASE_PATH}/data/contacts?search=*#{term}*&depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/contact_list.rb

@@ -0,0 +1,15 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class ContactList < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/contact/list/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/contact/lists?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/contact_segment.rb

@@ -0,0 +1,15 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class ContactSegment < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/contact/segment/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/contact/segments?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/credential.rb

@@ -1,25 +1,22 @@
 module EloquaApiService
   class Credential
 
-    attr_reader :key, :defaults
+    attr_reader :key, :options
 
     DEFAULT_SERVICE = 'infunnel_cli_default'
     LABEL = 'infunnel_cli'
 
     def initialize
       @key = nil
-      @defaults = {
+      @options = {
         label: LABEL
       }
     end
 
     def find(account: nil)
-      unless account
-        @key = default
-        return @key
-      end
+      return default unless account
 
-      @key ||= Keychain.generic_passwords.where(account: account).first
+      Keychain.generic_passwords.where(account: account).first
     end
 
     def all
@@ -29,7 +26,7 @@ module EloquaApiService
     def create(make_default: nil, options: {})
       find(account: options[:account]).delete if find(account: options[:account])
 
-      Keychain.generic_passwords.create(@defaults.merge(options))
+      Keychain.generic_passwords.create(@options.merge(options))
 
       if make_default || !default
         set_default(account: options[:account])
@@ -37,18 +34,18 @@ module EloquaApiService
     end
 
     def default
-      default_account = Keychain.generic_passwords.where(service: DEFAULT_SERVICE).first
-      if default_account
-        @default ||= Keychain.generic_passwords.where(account: default_account.account).first
+      default_pointer = Keychain.generic_passwords.where(service: DEFAULT_SERVICE).first
+      if default_pointer
+        @default ||= Keychain.generic_passwords.where(account: default_pointer.account).first
       end
     end
 
     def set_default(account:)
-      default = Keychain.generic_passwords.where(service: DEFAULT_SERVICE).first
-      default.delete if default
+      default_pointer = Keychain.generic_passwords.where(service: DEFAULT_SERVICE).first
+      default_pointer.delete if default_pointer
 
       Keychain.generic_passwords.create({
-        password: 'none',
+        password: '-',
         service:  DEFAULT_SERVICE,
         account:  account
         })

data/lib/eloqua_api_service/custom_object.rb

@@ -0,0 +1,19 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class CustomObject < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/customObject/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/customObjects?depth=complete", @options))
+    end
+
+    def data_by_id(id:)
+      parse(self.class.get("#{BASE_PATH}/data/customObject/#{id}?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/email.rb

@@ -5,6 +5,7 @@ module EloquaApiService
 
     def find(id:)
       response = self.class.get("/API/REST/1.0/assets/email/#{id}", @options)
+      puts response.body
       parsed_response = JSON.parse(response.body, symbolize_names: true) rescue nil
     end
 

data/lib/eloqua_api_service/form.rb

@@ -2,27 +2,23 @@ require 'eloqua_api_service/service'
 
 module EloquaApiService
   class Form < Service
+    BASE_PATH = "/API/REST/1.0"
 
     def find(id:)
-      response = self.class.get("/API/REST/1.0/assets/form/#{id}", @options)
-      parsed_response = JSON.parse(response.body, symbolize_names: true)
+      parse(self.class.get("#{BASE_PATH}/assets/form/#{id}?depth=complete", @options))
     end
 
     def all
-      response = self.class.get("/API/REST/1.0/assets/forms", @options)
-      parsed_response = JSON.parse(response.body, symbolize_names: true)
+      parse(self.class.get("#{BASE_PATH}/assets/forms?depth=complete", @options))
     end
 
-    def search(term: '', options: {})
-      parse( self.class.get("/API/REST/1.0/assets/forms?search=*#{term}*&depth=complete", @options) )
+    def search(term: '')
+      parse(self.class.get("#{BASE_PATH}/assets/forms?search=*#{term}*&depth=complete", @options))
     end
 
     def data(id:, options: {})
       start_at = options[:start_at] || 0
-
-      response = self.class.get("/API/REST/1.0/data/form/#{id}?startAt=#{start_at.to_i}", @options)
-      parsed_response = JSON.parse(response.body, symbolize_names: true)
+      parse(self.class.get("#{BASE_PATH}/data/form/#{id}?startAt=#{start_at.to_i}", @options))
     end
-
   end
 end

data/lib/eloqua_api_service/login.rb

@@ -13,7 +13,7 @@ module EloquaApiService
 
     def get_options
       @options = { headers: {
-        "Authorization" => "Basic #{@credentials.password}",
+        'Authorization' => "Basic #{@credentials.password}",
         'Content-Type' => 'application/json'
         },
         body: {}
@@ -25,7 +25,7 @@ module EloquaApiService
 
       @options = {
       headers: {
-        "Authorization" => "Basic #{@eloqua_auth}",
+        'Authorization' => "Basic #{@eloqua_auth}",
         'Content-Type' => 'application/json'
         },
         body: {}

data/lib/eloqua_api_service/option_list.rb

@@ -0,0 +1,15 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class OptionList < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/optionList/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/optionLists?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/program.rb

@@ -0,0 +1,19 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class Program < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/assets/program/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/assets/programs?depth=complete", @options))
+    end
+
+    def find_step(id)
+       parse(self.class.get("#{BASE_PATH}/assets/program/step/#{id}?depth=Complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/service.rb

@@ -12,7 +12,7 @@ module EloquaApiService
       self.class.base_uri @credentials.service
 
       @options = { headers: {
-        "Authorization" => "Basic #{@credentials.password}",
+        'Authorization' => "Basic #{@credentials.password}",
         'Content-Type' => 'application/json'
         },
         body: {}
@@ -22,5 +22,9 @@ module EloquaApiService
     def parse(response)
       JSON.parse(response.body, symbolize_names: true)
     end
+
+    def parse_body(body)
+      JSON.parse(body, symbolize_names: true)
+    end
   end
 end

data/lib/eloqua_api_service/user.rb

@@ -0,0 +1,15 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class User < Service
+    BASE_PATH = "/API/REST/1.0"
+
+    def find(id:)
+      parse(self.class.get("#{BASE_PATH}/system/user/#{id}?depth=complete", @options))
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/system/users?depth=complete", @options))
+    end
+  end
+end

data/lib/eloqua_api_service/visitor.rb

@@ -0,0 +1,25 @@
+require 'eloqua_api_service/service'
+
+module EloquaApiService
+  class Visitor < Service
+    BASE_PATH = "/API/REST/2.0"
+
+    def find_by_guid(guid:)
+      response = self.class.get("#{BASE_PATH}/data/visitors?search=externalId=#{guid}&page=1&count=5", @options)
+      parse(response)
+    end
+
+    def all
+      parse(self.class.get("#{BASE_PATH}/data/forms?depth=complete", @options))
+    end
+
+    def search(term: '')
+      parse(self.class.get("#{BASE_PATH}/data/forms?search=*#{term}*&depth=complete", @options))
+    end
+
+    def data(id:, options: {})
+      start_at = options[:start_at] || 0
+      parse(self.class.get("#{BASE_PATH}/data/form/#{id}?startAt=#{start_at.to_i}", @options))
+    end
+  end
+end

data/lib/infunnel_cli/cli/base.rb

@@ -5,6 +5,15 @@ require 'eloqua_api_service/login'
 require 'eloqua_api_service/credential'
 require 'eloqua_api_service/email'
 require 'eloqua_api_service/form'
+require 'eloqua_api_service/contact'
+require 'eloqua_api_service/visitor'
+require 'eloqua_api_service/option_list'
+require 'eloqua_api_service/program'
+require 'eloqua_api_service/campaign'
+require 'eloqua_api_service/user'
+require 'eloqua_api_service/custom_object'
+require 'eloqua_api_service/contact_segment'
+require 'eloqua_api_service/contact_list'
 
 module InfunnelCli
   module CLI
@@ -12,6 +21,17 @@ module InfunnelCli
 
       private
 
+      def format_value(key, value)
+        if ['createdAt', 'updatedAt', 'activityDate'].any? { |word| key.to_s.include?(word) }
+          return parse_date(value)
+        end
+        return value
+      end
+
+      def parse_date(unix_date)
+        DateTime.strptime(unix_date, '%s').strftime('%Y-%m-%d %H:%M:%S')
+      end
+
       def clear(text)
         "\e[0m#{text}\e[0m"
       end

data/lib/infunnel_cli/cli/campaign.rb

@@ -0,0 +1,29 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class Campaign < Base
+
+      desc "find :id", "Show Campaign with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::Campaign.new(account: options[:account]).find(id: id).each do |k, v|
+          puts "#{k}: #{v}"
+        end
+      end
+
+      desc "all", "All Campaigns in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::Campaign.new(account: options[:account]).all[:elements].each do |program|
+          puts '-'*90
+          program.each do |k, v|
+            puts "#{k}: #{v}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/contact.rb

@@ -0,0 +1,76 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class Contact < Base
+
+      desc "find :id", "Sow form with id"
+      option :account, aliases: :a
+      option :verbose, aliases: :v
+      def find( id )
+         contact_print(contacts: [EloquaApiService::Contact.new(account: options[:account]).find(id: id)], options: options)
+      end
+
+      desc "search :term", "Find contact by search"
+      option :account, aliases: :a
+      option :verbose, aliases: :v
+      def search(term)
+        contact_print(contacts: EloquaApiService::Contact.new(account: options[:account]).search(term: term)[:elements], options: options)
+      end
+
+      desc "activities :contact_id", "Show activities for contant by id"
+      option :account, aliases: :a
+      option :verbose, aliases: :v
+      def activities(contact_id)
+        activities = EloquaApiService::Contact.new(account: options[:account]).activities(contact_id: contact_id)
+
+        activities.each do |a|
+          a.each do |e|
+            puts
+            e.each do |k, v|
+              if k == :details
+                puts "#{white k}:"
+                v.each do |_k, _v|
+                  puts "#{ clear _k } #{ clear _v}"
+                end
+              else
+                puts "#{ white k }: #{ clear format_value(k,v)}"
+              end
+            end
+          end
+        end
+        puts activities.count
+      end
+
+      private
+
+      def contact_print(contacts: [], options: {})
+        contacts.each_with_index do |contact, index|
+          string =  "Id: #{contact[:id]}, "
+          string += "emailAddress: #{contact[:emailAddress]}, "
+          string += "created_at: #{parse_date(contact[:createdAt])}, "
+          string += "updated_at: #{parse_date(contact[:updatedAt])} "
+
+          if options[:verbose]
+            blacklisted = [
+              :updatedAt,
+              :createdAt,
+              :id,
+              :emailAddress#,
+              #:fieldValues
+            ]
+
+            string += "\n\nFields: \n"
+            string += contact.reject{ |k| blacklisted.include?(k) }.map{ |k, v| " #{k}: #{v} \n" }.join('')
+          end
+          puts index.odd? ? black(on_white(string)) : white(on_black(string))
+          puts ''
+        end
+      end
+
+      def parse_date(unix_date)
+        DateTime.strptime(unix_date, '%s').strftime('%Y-%m-%d %H:%M')
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/contact_list.rb

@@ -0,0 +1,30 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class ContactList < Base
+
+      desc "find :id", "Show contact list with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::ContactList.new(account: options[:account]).find(id: id).each do |k, v|
+
+          puts "#{k}: #{v}"
+        end
+      end
+
+      desc "all", "All contact lists in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::ContactList.new(account: options[:account]).all[:elements].each do |list|
+          puts '-'*90
+          list.each do |k, v|
+            puts "#{k}: #{v}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/contact_segment.rb

@@ -0,0 +1,30 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class ContactSegment < Base
+
+      desc "find :id", "Show contact segment with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::ContactSegment.new(account: options[:account]).find(id: id).each do |k, v|
+
+          puts "#{k}: #{v}"
+        end
+      end
+
+      desc "all", "All contact segments in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::ContactSegment.new(account: options[:account]).all[:elements].each do |segment|
+          puts '-'*90
+          segment.each do |k, v|
+            puts "#{k}: #{v}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/custom_object.rb

@@ -0,0 +1,47 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class CustomObject < Base
+
+      desc "find :id", "Show CustomObject with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::CustomObject.new(account: options[:account]).find(id: id).each do |k, v|
+
+          puts "#{k}: #{v}"
+        end
+      end
+
+      desc "all", "All CustomObjects in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::CustomObject.new(account: options[:account]).all[:elements].each do |custom_object|
+          puts '-'*90
+          custom_object.each do |k, v|
+            puts "#{k}: #{v}"
+          end
+        end
+      end
+
+      desc "get data by id", "CustomObjects data by id"
+      option :account, aliases: :a
+      def data(id)
+        EloquaApiService::CustomObject.new(account: options[:account]).data_by_id(id: id)[:elements].each do |custom_object|
+          puts '-'*90
+          custom_object.each do |k, v|
+            if k == :fieldValues
+              v.each do |_k, _v|
+                puts "#{_k}: #{_v}"
+              end
+            else
+              puts "#{k}: #{v}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/eloqua.rb

@@ -2,7 +2,7 @@ module InfunnelCli
   module CLI
     class Eloqua < Base
 
-      desc "Login", "Login to eloqua and save credentials in keychain"
+      desc "login", "Login to eloqua and save credentials in keychain"
       option :default, aliases: :d, :type => :boolean
       def login
         say("Login to eloqua and save credentials in keychain")

data/lib/infunnel_cli/cli/form.rb

@@ -8,101 +8,158 @@ module InfunnelCli
       option :links, aliases: :l
       option :full, aliases: :f
       option :account, aliases: :a
+      option :verbose, aliases: :v
       def find( id )
-         puts EloquaApiService::Form.new(account: options[:account]).find(id: 50)
-      end
+       form_print(forms: [EloquaApiService::Form.new(account: options[:account]).find(id: id)], options: options)
+     end
+
+     desc "all", "All forms in current eloqua account"
+     option :links, aliases: :l
+     option :full, aliases: :f
+     option :account, aliases: :a
+     option :verbose, aliases: :v
+     def all
+       form_print(forms: EloquaApiService::Form.new(account: options[:account]).all[:elements], options: options)
+     end
+
+     desc "search :term", "Find form by search on it's name"
+     option :account, aliases: :a
+     option :verbose, aliases: :v
+     def search(term)
+      form_print(forms: EloquaApiService::Form.new(account: options[:account]).search(term: term)[:elements], options: options)
+    end
 
-      desc "all", "All forms in current eloqua account"
-      option :links, aliases: :l
-      option :full, aliases: :f
-      option :account, aliases: :a
-      def all
-         puts EloquaApiService::Form.new(account: options[:account]).all[:elements]
-      end
+    desc "data :id", "Get form submissions by form id"
+    option :live, aliases: :l
+    option :raw, aliases: :r
+    option :count, aliases: :c
+    option :csv
+    option :full, aliases: :f
+    option :account, aliases: :a
+    def data(form_id)
 
-      desc "search :term", "Find form by search on it's name"
-      option :account, aliases: :a
-      option :verbose, aliases: :v
-      def search(term)
-         EloquaApiService::Form.new(account: options[:account]).search(term: term)[:elements].each_with_index do |form, index|
-          string = "Id: #{form[:id]}, "
-          string += "name: #{form[:name]}, "
-          string += "fields: #{form[:elements].count}, "
-          string += "created_at: #{parse_date(form[:createdAt])}, "
-          string += "updated_at: #{parse_date(form[:updatedAt])} "
-          if options[:verbose]
-            string += "\n\nFields: \n"
-            string += form[:elements].map{ |e| " " +
-              e.reject{ |k| [:style, :validations].include?(k)
-              }.map{ |k, v| "#{k}: #{v}" }.join(', ')
-              }.join("\n")
-          end
-          puts (index.odd? ? black(on_white(string)) : white(on_black(string)))
-          puts ''
-        end
+      start_at = options[:full] ? 0 : Time.now - (5*360*24*3600)
+      fetch_options = { start_at: start_at, account: options[:account]}
+
+      form = EloquaApiService::Form.new(account: options[:account]).find(id: form_id)
+      elements = form[:elements]
+
+      unless options[:csv]
+        puts black on_white "Form name: #{form[:name]}"
+        puts black on_white "Id: #{form[:id]}"
+        puts black on_white "Submits after: #{start_at}"
       end
 
-      desc "data :id", "Get form submissions by form id"
-      option :live, aliases: :l
-      option :full, aliases: :f
-      option :account, aliases: :a
-      def data(form_id)
+      submissions = data_fetch(form_id: form_id, options: fetch_options)
 
-        start_at = options[:full] ? 0 : Time.now - (76*3600)
-        fetch_options = { start_at: start_at, account: options[:account] }
+      if options[:count]
+        puts submissions.size
+        return
+      end
 
-        form = EloquaApiService::Form.new(account: options[:account]).find(id: form_id)
-        elements = form[:elements]
+      if options[:raw]
+        puts submissions.to_json
+        return
+      end
 
-        puts black on_white "Form name: " + form[:name]
-        puts black on_white "Id: " + form[:id]
-        puts black on_white "Submits after: #{start_at}"
+      first = true
+
+      if options[:live]
+        while true
+          new_data = data_fetch(form_id: form_id, options: fetch_options)
+          data_print(submissions: new_data, elements: elements) if first
 
-        submissions = data_fetch(form_id: form_id, options: fetch_options)
+          only_new = new_data.reject { |s| submissions.map{ |old| old[:id] }.include?(s[:id]) }
+          data_print(submissions: only_new, elements: elements) if only_new != submissions && !first
 
-        first = true
+          submissions = new_data
+          first = false
+          sleep 7
+        end
+      else
+        data_print(submissions: submissions, elements: elements, options: { csv: options[:csv] } )
+        if options[:full]
+          puts "Total submissions: #{submissions.count}"
+        end
+      end
+    end
 
-        if options[:live]
-          while true
-            new_data = data_fetch(form_id: form_id, options: fetch_options)
-            data_print(submissions: new_data, elements: elements) if first
+    private
 
-            only_new = new_data.reject { |s| submissions.map{ |old| old[:id] }.include?(s[:id]) }
-            data_print(submissions: only_new, elements: elements) if only_new != submissions && !first
+    def form_print(forms: [], options: {})
 
-            submissions = new_data
-            first = false
-            sleep 7
+      forms.each_with_index do |form, index|
+        string = "Id: #{form[:id]}, "
+        string += "name: #{form[:name]}, "
+        string += "fields: #{form[:elements].count}, "
+        string += "created_at: #{parse_date(form[:createdAt])}, "
+        string += "updated_at: #{parse_date(form[:updatedAt])} "
+        if options[:verbose]
+          string += "\n\nFields: \n"
+          string += form[:elements].map{ |e| " " +
+            e.reject{ |k| [:style, :validations].include?(k)
+              }.map{ |k, v| "#{k}: #{v}" }.join(', ')
+              }.join("\n")
+            end
+            puts (index.odd? ? black(on_white(string)) : white(on_black(string)))
+            puts ''
           end
-        else
-          data_print(submissions: submissions, elements: elements)
         end
-      end
 
-      private
+        def data_fetch(form_id: nil, options: {})
+          start_at = options[:start_at] || Time.now - (76*3600)
+          EloquaApiService::Form.new(account: options[:account]).data(id: form_id, options: {start_at: start_at})[:elements]
+        end
 
-      def data_fetch(form_id: nil, options: {})
-        start_at = options[:start_at] || Time.now - (76*3600)
-        EloquaApiService::Form.new(account: options[:account]).data(id: form_id, options: {start_at: start_at})[:elements]
-      end
+        def data_print(submissions: [], elements: {}, options: {})
+
+          if options[:csv]
+            csv_heading = []
+            rows = []
+            submissions.reverse.each_with_index do |submission, index|
+
+              row = []
+              if index == 0
+                csv_heading = elements.map {|e| e[:htmlName] }
+                csv_heading << "submittedAt"
+              end
+              submission[:fieldValues].each_with_index do |field, index|
+                field_name = elements.find { |element| element[:id] == field[:id] }
+                row << field[:value] rescue ''
+              end
+
+              rows << row
+              row << Time.at(submission[:submittedAt].to_i)
+
+            end
+
+            csv_string = CSV.generate do |csv|
+              csv << csv_heading
+              rows.each do |row|
+                csv << row
+              end
+            end
+
+            puts csv_string
+            return submissions
+          end
 
-      def data_print(submissions: [], elements: {})
-         submissions.reverse.each do |submission|
-          row = []
-          row << "Id: #{submission[:id]}"
-          submission[:fieldValues].each do |field|
-            field_name = elements.find { |element| element[:id] == field[:id] }
-            row << "#{magenta(field_name[:htmlName])}: #{yellow(field[:value])}"
+          submissions.reverse.each do |submission|
+            row = []
+            row << "Id: #{submission[:id]}"
+            submission[:fieldValues].each do |field|
+              field_name = elements.find { |element| element[:id] == field[:id] }
+              row << "#{magenta(field_name[:htmlName])}: #{yellow(field[:value])}" rescue nil
+            end
+            row << "At: #{Time.at(submission[:submittedAt].to_i)} \n\n"
+            puts row.join(', ')
           end
-          row << "At: #{Time.at(submission[:submittedAt].to_i)} \n\n"
-          puts row.join(', ')
+          return submissions
         end
-        return submissions
-      end
 
-      def parse_date(unix_date)
-        DateTime.strptime(unix_date, '%s').strftime('%Y-%m-%d %H:%M')
+        def parse_date(unix_date)
+          DateTime.strptime(unix_date, '%s').strftime('%Y-%m-%d %H:%M')
+        end
       end
     end
   end
-end

data/lib/infunnel_cli/cli/option_list.rb

@@ -0,0 +1,41 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class OptionList < Base
+
+      desc "find :id", "Sow option list with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        ol = EloquaApiService::OptionList.new(account: options[:account]).find(id: id)
+
+        if options[:format]
+          ol[:elements].each do |f|
+            puts "#{f[:displayName]}|#{f[:value]}"
+          end
+        elsif options[:html]
+          puts "<select name='#{ol[:name]}'>"
+          ol[:elements].each do |f|
+            puts "<option value='#{f[:value]}'>#{f[:displayName]}</option>"
+          end
+          puts "</select>"
+        else
+          puts ol
+        end
+      end
+
+      desc "all", "All option lists in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::OptionList.new(account: options[:account]).all[:elements].each do |ol|
+          puts '-' * 90
+          ol.each do |k, v|
+            puts "#{k}: #{v}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/program.rb

@@ -0,0 +1,46 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class Program < Base
+
+      desc "find :id", "Show program with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::Program.new(account: options[:account]).find(id: id).each do |k, v|
+
+            if k == :steps
+              puts 'Steps: '
+              v.each do |_k, _v|
+                find_step(_k[:id])
+              end
+            else
+              puts "#{k}: #{v}"
+            end
+        end
+      end
+
+      desc "all", "All programs in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::Program.new(account: options[:account]).all[:elements].each do |program|
+          puts '-'*90
+          program.each do |k, v|
+              puts "#{black on_white  k}: #{v}"
+          end
+        end
+      end
+
+      desc "find_sted", "Find a program step by id"
+      option :account, aliases: :a
+      def find_step(id)
+        puts '-'*90
+        EloquaApiService::Program.new(account: options[:account]).find_step(id).each do |k, v|
+          puts "#{k}: #{v}"
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/user.rb

@@ -0,0 +1,30 @@
+require 'infunnel_cli/cli/base'
+
+module InfunnelCli
+  module CLI
+    class User < Base
+
+      desc "find :id", "Show user with id"
+      option :account, aliases: :a
+      option :format, aliases: :f
+      option :html
+      def find( id )
+        EloquaApiService::User.new(account: options[:account]).find(id: id).each do |k, v|
+
+          puts "#{k}: #{format_value(k,v)}"
+        end
+      end
+
+      desc "all", "All users in current eloqua account"
+      option :account, aliases: :a
+      def all
+        EloquaApiService::User.new(account: options[:account]).all[:elements].each do |user|
+          puts '-'*90
+          user.each do |k, v|
+            puts "#{k}: #{format_value(k,v)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli/visitor.rb

@@ -0,0 +1,33 @@
+require 'infunnel_cli/cli/base'
+require 'benchmark'
+
+module InfunnelCli
+  module CLI
+    class Visitor < Base
+
+      desc "find_by_guid :id", "Get form submissions by form id"
+      option :live, aliases: :l
+      option :full, aliases: :f
+      option :account, aliases: :a
+      def find_by_guid(guid)
+
+        response = EloquaApiService::Visitor.new(account: options[:account]).find_by_guid(guid: format_guid(guid))
+        response[:elements].each do |e|
+          puts '-'*90
+          puts e
+        end
+        puts response
+        puts EloquaApiService::Contact.new(account: options[:account]).find(id: response[:elements][0][:contactId]) rescue "No contact id on this  visitor."
+      end
+
+      private
+
+      def format_guid(guid)
+        unless guid.include? "-"
+          return guid.dup.insert(8, '-').insert(13,'-').insert(18,'-').insert(23,'-').downcase
+        end
+        guid
+      end
+    end
+  end
+end

data/lib/infunnel_cli/cli.rb

@@ -2,17 +2,56 @@ require 'thor'
 require 'infunnel_cli/cli/email'
 require 'infunnel_cli/cli/eloqua'
 require 'infunnel_cli/cli/form'
+require 'infunnel_cli/cli/contact'
+require 'infunnel_cli/cli/visitor'
+require 'infunnel_cli/cli/option_list'
+require 'infunnel_cli/cli/program'
+require 'infunnel_cli/cli/campaign'
+require 'infunnel_cli/cli/user'
+require 'infunnel_cli/cli/custom_object'
+require 'infunnel_cli/cli/contact_segment'
+require 'infunnel_cli/cli/contact_list'
 require 'keychain'
 #require 'ruby-keychain'
 
 module InfunnelCli
-  class HammerOfTheGods < Thor
+  class Tools < Thor
 
-    desc "email COMMANDS", ""
+    desc "email", ""
     subcommand "email", InfunnelCli::CLI::Email
-    desc "login COMMANDS", ""
+
+    desc "eloqua", ""
     subcommand "eloqua", InfunnelCli::CLI::Eloqua
-    desc "form COMMANDS", ""
+
+    desc "form", ""
     subcommand "form", InfunnelCli::CLI::Form
+
+    desc "contact", ""
+    subcommand "contact", InfunnelCli::CLI::Contact
+
+    desc "visitor", ""
+    subcommand "visitor", InfunnelCli::CLI::Visitor
+
+    desc "option_list", ""
+    subcommand "option_list", InfunnelCli::CLI::OptionList
+
+    desc "program", ""
+    subcommand "program", InfunnelCli::CLI::Program
+
+    desc "campaign", ""
+    subcommand "campaign", InfunnelCli::CLI::Campaign
+
+    desc "user", ""
+    subcommand "user", InfunnelCli::CLI::User
+
+    desc "custom_object", ""
+    subcommand "custom_object", InfunnelCli::CLI::CustomObject
+
+    desc "contact_segment", ""
+    subcommand "contact_segment", InfunnelCli::CLI::ContactSegment
+
+    desc "contact_list", ""
+    subcommand "contact_list", InfunnelCli::CLI::ContactList
+
   end
 end

data/lib/infunnel_cli/version.rb

@@ -1,3 +1,3 @@
 module InfunnelCli
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infunnel_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - lundevallan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,7 +114,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.2.2
-description: A cli for working with marketing automation. Connects to the eloqua-api.
+description: Connects to the eloqua-api. Only works on mac os since it depends on
+  keychain to store credentials.
 email:
 - linus.lundevall@infunnel.se
 executables:
@@ -122,7 +123,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -130,17 +130,35 @@ files:
 - Rakefile
 - bin/infunnel_cli
 - infunnel_cli.gemspec
+- lib/eloqua_api_service/campaign.rb
+- lib/eloqua_api_service/contact.rb
+- lib/eloqua_api_service/contact_list.rb
+- lib/eloqua_api_service/contact_segment.rb
 - lib/eloqua_api_service/credential.rb
+- lib/eloqua_api_service/custom_object.rb
 - lib/eloqua_api_service/email.rb
 - lib/eloqua_api_service/form.rb
 - lib/eloqua_api_service/login.rb
+- lib/eloqua_api_service/option_list.rb
+- lib/eloqua_api_service/program.rb
 - lib/eloqua_api_service/service.rb
+- lib/eloqua_api_service/user.rb
+- lib/eloqua_api_service/visitor.rb
 - lib/infunnel_cli.rb
 - lib/infunnel_cli/cli.rb
 - lib/infunnel_cli/cli/base.rb
+- lib/infunnel_cli/cli/campaign.rb
+- lib/infunnel_cli/cli/contact.rb
+- lib/infunnel_cli/cli/contact_list.rb
+- lib/infunnel_cli/cli/contact_segment.rb
+- lib/infunnel_cli/cli/custom_object.rb
 - lib/infunnel_cli/cli/eloqua.rb
 - lib/infunnel_cli/cli/email.rb
 - lib/infunnel_cli/cli/form.rb
+- lib/infunnel_cli/cli/option_list.rb
+- lib/infunnel_cli/cli/program.rb
+- lib/infunnel_cli/cli/user.rb
+- lib/infunnel_cli/cli/visitor.rb
 - lib/infunnel_cli/version.rb
 homepage: http://infunnel.se
 licenses:
@@ -152,9 +170,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="