Merge pull request #204 from intercom/as/remove_broken_v1_importer

Removal of rake import
intercom · Jun 22, 2016 · 93c6ea7 · 93c6ea7
2 parents 056a622 + 9d16b4b
commit 93c6ea7
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 554 deletions.
diff --git a/lib/intercom-rails.rb b/lib/intercom-rails.rb
@@ -9,7 +9,6 @@
 require 'intercom-rails/shutdown_helper'
 require 'intercom-rails/auto_include_filter'
 require 'intercom-rails/config'
-require 'intercom-rails/import'
 require 'intercom-rails/railtie' if defined? Rails::Railtie
 
 module IntercomRails

diff --git a/lib/intercom-rails/config.rb b/lib/intercom-rails/config.rb
@@ -94,7 +94,6 @@ def self.reset!
     config_accessor :app_id
     config_accessor :session_duration
     config_accessor :api_secret
-    config_accessor :api_key
     config_accessor :library_url
     config_accessor :enabled_environments, &ARRAY_VALIDATOR
     config_accessor :include_for_logged_out_users

diff --git a/lib/intercom-rails/exceptions.rb b/lib/intercom-rails/exceptions.rb
@@ -1,8 +1,6 @@
 module IntercomRails
 
   class Error < StandardError; end
-  class ImportError < Error; end
-  class IntercomAPIError < Error; end
   class NoUserFoundError < Error; end
   class NoCompanyFoundError < Error; end
 

diff --git a/lib/intercom-rails/import.rb b/lib/intercom-rails/import.rb
diff --git a/lib/intercom-rails/intercom.rake b/lib/intercom-rails/intercom.rake
diff --git a/lib/intercom-rails/version.rb b/lib/intercom-rails/version.rb
@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.35"
+  VERSION = "0.2.36"
 end
diff --git a/lib/rails/generators/intercom/config/config_generator.rb b/lib/rails/generators/intercom/config/config_generator.rb
@@ -8,14 +8,12 @@ def self.source_root
 
       argument :app_id, :desc => "Your Intercom app-id, which can be found here: https://app.intercom.io/apps/api_keys"
       argument :api_secret, :desc => "Your Intercom api-secret, used for secure mode", :optional => true
-      argument :api_key, :desc => "An Intercom API key, for various rake tasks", :optional => true
       argument :session_duration, :desc => "user session duration, this should match your app", :optional => true
 
       FALSEY_RESPONSES = ['n', 'no']
       def create_config_file
         @app_id = app_id
         @api_secret = api_secret
-        @api_key = api_key
         @session_duration = session_duration
         @include_for_logged_out_users = false
 

diff --git a/lib/rails/generators/intercom/config/intercom.rb.erb b/lib/rails/generators/intercom/config/intercom.rb.erb
@@ -20,16 +20,6 @@ IntercomRails.config do |config|
   # config.api_secret = "..."
   <%- end -%>
 
-  # == Intercom API Key
-  # This is required for some Intercom rake tasks like importing your users;
-  # you can generate one at https://app.intercom.io/apps/api_keys.
-  #
-  <%- if @api_key -%>
-  config.api_key = "<%= @api_key %>"
-  <%- else -%>
-  # config.api_key = "..."
-  <%- end -%>
-
   # == Enabled Environments
   # Which environments is auto inclusion of the Javascript enabled for
   #

diff --git a/spec/import_network_spec.rb b/spec/import_network_spec.rb