Fix for Sublime Packaging

salcosta · salcosta · commit 799944cac59e · 2018-06-15T09:07:30.000-05:00
diff --git a/Commands/create_connection.py b/Commands/create_connection.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/enter_credentials.py b/Commands/enter_credentials.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/load_all_snow_record.py b/Commands/load_all_snow_record.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/load_modified_records.py b/Commands/load_modified_records.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/load_snow_record.py b/Commands/load_snow_record.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/load_snow_table.py b/Commands/load_snow_table.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/open_service_now_record.py b/Commands/open_service_now_record.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 import webbrowser
diff --git a/Commands/refresh_snow_record.py b/Commands/refresh_snow_record.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Commands/test_connection.py b/Commands/test_connection.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Common/__init__.py b/Common/__init__.py
@@ -1,2 +1,2 @@
 # from .utils import *
-# from .rest_client import *
+# from .rest_client import *
diff --git a/Common/utils.py b/Common/utils.py
@@ -12,7 +12,7 @@
 import codecs
 from datetime import datetime
 import time
-from rest_client import *
+from Common.rest_client import *
 
 table_field_list = '{"asmt_metric": [{"field": "script","extension": "js"}],"automation_pipeline_transformer_javascript": [{"field": "script","extension": "js"}],"bsm_chart": [{"field": "chart","extension": "js"}, {"field": "filter","extension": "js"}],"bsm_context_menu": [{"field": "script","extension": "js"}],"bsm_map_filter": [{"field": "filter","extension": "js"}],"chat_queue": [{"field": "not_available","extension": "html"}],"ci_identifier": [{"field": "script","extension": "js"}],"clm_contract_history": [{"field": "terms_and_conditions","extension": "html"}],"clone_cleanup_script": [{"field": "script","extension": "js"}],"cmdb_ci_outage": [{"field": "details","extension": "html"}],"cmdb_ci_translation_rule": [{"field": "rule","extension": "js"}],"cmdb_depreciation": [{"field": "script","extension": "js"}],"cmdb_sw_license_calculation": [{"field": "calculation","extension": "js"}],"cmn_map_page": [{"field": "script","extension": "js"}],"cmn_relative_duration": [{"field": "script","extension": "js"}],"cmn_schedule_page": [{"field": "client_script","extension": "js"}, {"field": "server_script","extension": "js"}],"connect_action": [{"field": "script","extension": "js"}],"content_block": [{"field": "condition","extension": "js"}],"content_block_detail": [{"field": "script","extension": "js"}],"content_block_lists": [{"field": "script","extension": "js"}],"content_block_programmatic": [{"field": "programmatic_content","extension": "html"}],"content_css": [{"field": "style","extension": "css"}],"content_page_rule": [{"field": "advanced_condition","extension": "js"}],"content_type_detail": [{"field": "script","extension": "js"}],"cxs_table_config": [{"field": "search_as_script","extension": "js"}],"diagrammer_action": [{"field": "script","extension": "js"}],"discovery_classy": [{"field": "script","extension": "js"}],"discovery_port_probe": [{"field": "script","extension": "js"}],"discovery_probes": [{"field": "script","extension": "js"}, {"field": "post_processor_script","extension": "js"}],"ecc_agent_capability_value_test": [{"field": "script","extension": "js"}],"ecc_agent_ext": [{"field": "script","extension": "js"}],"ecc_agent_script": [{"field": "script","extension": "js"}],"ecc_agent_script_include": [{"field": "script","extension": "js"}],"ecc_handler": [{"field": "condition_script","extension": "js"}, {"field": "script","extension": "js"}],"expert_panel_template": [{"field": "script","extension": "js"}],"expert_panel_transition": [{"field": "transition_script","extension": "js"}],"fm_distribution_cost_rule": [{"field": "script","extension": "js"}],"fm_expense_allocation_rule": [{"field": "script","extension": "js"}],"item_option_new": [{"field": "description","extension": "html"}],"itil_agreement_ci": [{"field": "description","extension": "html"}],"itil_agreement_target_ci": [{"field": "description","extension": "html"}],"kb_submission": [{"field": "text","extension": "html"}],"live_table_notification": [{"field": "before_script","extension": "js"}],"metric_definition": [{"field": "script","extension": "js"}],"ngbsm_context_menu": [{"field": "script","extension": "js"}],"ngbsm_filter": [{"field": "filter","extension": "js"}],"ngbsm_script": [{"field": "script_plain","extension": "js"}],"ola": [{"field": "performance","extension": "html"}],"pa_scripts": [{"field": "script","extension": "js"}],"planned_change_validation_script": [{"field": "script","extension": "js"}],"planned_task": [{"field": "html_description","extension": "html"}],"pm_portfolio_project": [{"field": "html_description","extension": "html"}],"process_guide": [{"field": "advanced_condition","extension": "js"}],"process_step_approval": [{"field": "approval_script","extension": "js"}, {"field": "approver_script","extension": "js"}, {"field": "rejection_script","extension": "js"}],"proposed_change_verification_rules": [{"field": "rule_script","extension": "js"}],"question": [{"field": "default_html_value","extension": "html"}],"release_feature": [{"field": "documentation","extension": "html"}],"release_task": [{"field": "documentation","extension": "html"}],"risk_conditions": [{"field": "advanced_condition","extension": "js"}],"sc_cart_item": [{"field": "hints","extension": "html"}],"sc_cat_item": [{"field": "delivery_plan_script","extension": "js"}, {"field": "entitlement_script","extension": "js"}],"sc_cat_item_delivery_task": [{"field": "condition_script","extension": "js"}, {"field": "generation_script","extension": "js"}],"sc_cat_item_dt_approval": [{"field": "approval_script","extension": "js"}],"sc_cat_item_guide": [{"field": "validator","extension": "js"}, {"field": "script","extension": "js"}],"sc_cat_item_option": [{"field": "description","extension": "html"}],"sc_cat_item_producer": [{"field": "script","extension": "js"}],"sc_category": [{"field": "entitlement_script","extension": "js"}],"sc_ic_aprvl_type_defn": [{"field": "approver_script","extension": "js"}],"sc_ic_aprvl_type_defn_staging": [{"field": "approver_script","extension": "js"}],"sc_ic_task_assign_defn": [{"field": "assignment_script","extension": "js"}],"sc_ic_task_assign_defn_staging": [{"field": "assignment_script","extension": "js"}],"scheduled_data_export": [{"field": "pre_script","extension": "js"}],"scheduled_data_export": [{"field": "post_script","extension": "js"}],"sf_sm_order": [{"field": "auto_script_script","extension": "js"}, {"field": "ui_action_script","extension": "js"}],"sf_sm_task": [{"field": "auto_script_script","extension": "js"}, {"field": "ui_action_script","extension": "js"}],"sf_state_flow": [{"field": "automatic_script","extension": "js"}, {"field": "manual_script","extension": "js"}],"signature_image": [{"field": "signed_name","extension": "html"}, {"field": "data","extension": "js"}],"sla": [{"field": "reponsibilities","extension": "html"}, {"field": "change_procedures","extension": "html"}, {"field": "disaster_recovery","extension": "html"}, {"field": "notes","extension": "html"}, {"field": "description","extension": "html"}, {"field": "signatures","extension": "html"}, {"field": "service_goals","extension": "html"}, {"field": "security_notes","extension": "html"}, {"field": "incident_procedures","extension": "html"}],"sn_sec_cmn_calculator": [{"field": "script_values","extension": "js"}, {"field": "advanced_condition","extension": "js"}],"sn_sec_cmn_integration": [{"field": "integration_factory_script","extension": "js"}, {"field": "processor_factory_script","extension": "js"}],"sn_si_incident": [{"field": "pir","extension": "html"}],"sn_si_severity_calculator": [{"field": "advanced_condition","extension": "js"}],"sp_angular_provider": [{"field": "script","extension": "js"}],"sp_css": [{"field": "css","extension": "css"}],"sp_instance": [{"field": "css","extension": "css"}, {"field": "widget_parameters","extension": "js"}],"sp_ng_template": [{"field": "template","extension": "html"}],"sp_page": [{"field": "css","extension": "css"}],"sp_portal": [{"field": "quick_start_config","extension": "js"}],"sp_rectangle_menu_item": [{"field": "record_script","extension": "js"}],"sp_widget": [{"field": "template","extension": "html"}, {"field": "css","extension": "css"}, {"field": "link","extension": "js"}, {"field": "client_script","extension": "js"}, {"field": "script","extension": "js"}],"sys_amb_processor": [{"field": "user_subscribe_listener","extension": "js"}, {"field": "channel_create_advanced_authorization","extension": "js"}, {"field": "message_send_advanced_authorization","extension": "js"}, {"field": "user_unsubscribe_listener","extension": "js"}, {"field": "message_send_listener","extension": "js"}, {"field": "message_receive_listener","extension": "js"}, {"field": "channel_subscribe_advanced_authorization","extension": "js"}, {"field": "message_receive_advanced_authorization","extension": "js"}],"sys_dictionary": [{"field": "calculation","extension": "js"}],"sys_email_canned_message": [{"field": "body","extension": "html"}],"sys_embedded_help_action": [{"field": "onclick","extension": "js"}],"sys_home": [{"field": "text","extension": "html"}],"sys_impex_entry": [{"field": "script","extension": "js"}],"sys_impex_map": [{"field": "script","extension": "js"}],"sys_installation_exit": [{"field": "script","extension": "js"}],"sys_listener_detail": [{"field": "script","extension": "js"}],"sys_nav_link": [{"field": "url_script","extension": "js"}, {"field": "text_script","extension": "js"}],"sys_navigator": [{"field": "script","extension": "js"}],"sys_process_flow": [{"field": "description","extension": "html"}],"sys_processor": [{"field": "script","extension": "js"}],"sys_push_notif_act_script": [{"field": "script","extension": "js"}],"sys_push_notif_msg_content": [{"field": "script","extension": "js"}],"sys_relationship": [{"field": "insert_callback","extension": "js"}, {"field": "apply_to","extension": "js"}, {"field": "query_from","extension": "js"}, {"field": "query_with","extension": "js"}],"sys_report": [{"field": "content","extension": "html"}],"sys_script": [{"field": "script","extension": "js"}],"sys_script_ajax": [{"field": "script","extension": "js"}],"sys_script_client": [{"field": "script","extension": "js"}],"sys_script_email": [{"field": "script","extension": "js"}],"sys_script_fix": [{"field": "script","extension": "js"}],"sys_script_include": [{"field": "script","extension": "js"}],"sys_script_validator": [{"field": "validator","extension": "js"}],"sys_security_acl": [{"field": "script","extension": "js"}],"sys_service_api": [{"field": "script","extension": "js"}],"sys_soap_message": [{"field": "wsdl_xml","extension": "html"}],"sys_soap_message_function": [{"field": "envelope","extension": "html"}],"sys_soap_message_import": [{"field": "external_document","extension": "html"}],"sys_soap_message_test": [{"field": "response","extension": "html"}, {"field": "request","extension": "html"}],"sys_transform_entry": [{"field": "source_script","extension": "js"}],"sys_transform_map": [{"field": "script","extension": "js"}],"sys_transform_script": [{"field": "script","extension": "js"}],"sys_ui_action": [{"field": "script","extension": "js"}],"sys_ui_context_menu": [{"field": "dynamic_actions_script","extension": "js"}, {"field": "on_show_script","extension": "js"}, {"field": "action_script","extension": "js"}],"sys_ui_list_control": [{"field": "edit_condition","extension": "js"}, {"field": "new_condition","extension": "js"}, {"field": "link_condition","extension": "js"}, {"field": "empty_condition","extension": "js"}, {"field": "filter_condition","extension": "js"}, {"field": "columns_condition","extension": "js"}],"sys_ui_list_control_embedded": [{"field": "new_condition","extension": "js"}, {"field": "empty_condition","extension": "js"}, {"field": "columns_condition","extension": "js"}, {"field": "link_condition","extension": "js"}],"sys_ui_list_script_client": [{"field": "script","extension": "js"}],"sys_ui_list_script_server": [{"field": "script","extension": "js"}],"sys_ui_macro": [{"field": "xml","extension": "html"}],"sys_ui_ng_action": [{"field": "script","extension": "js"}],"sys_ui_page": [{"field": "html","extension": "html"}, {"field": "processing_script","extension": "js"}, {"field": "client_script","extension": "js"}],"sys_ui_policy": [{"field": "script_true","extension": "js"}, {"field": "script_false","extension": "js"}],"sys_ui_script": [{"field": "script","extension": "js"}],"sys_ui_title": [{"field": "script","extension": "js"}],"sys_update_diff": [{"field": "payload_diff","extension": "html"}],"sys_update_preview_xml": [{"field": "payload_diff","extension": "html"}],"sys_upgrade_history_log": [{"field": "payload_diff","extension": "html"}],"sys_web_service": [{"field": "script","extension": "js"}],"sys_widgets": [{"field": "script","extension": "js"}],"sys_ws_operation": [{"field": "operation_script","extension": "js"}],"sysauto": [{"field": "condition","extension": "js"}],"sysauto_report": [{"field": "report_body","extension": "html"}],"sysauto_script": [{"field": "script","extension": "js"}],"sysevent_email_action": [{"field": "message_html","extension": "html"}, {"field": "advanced_condition","extension": "js"}],"sysevent_email_style": [{"field": "style","extension": "html"}],"sysevent_email_template": [{"field": "message_html","extension": "html"}],"sysevent_in_email_action": [{"field": "reply_email","extension": "html"}, {"field": "script","extension": "js"}],"sysevent_script_action": [{"field": "script","extension": "js"}],"sysrule_escalate": [{"field": "advanced_condition","extension": "js"}, {"field": "assignment_script","extension": "js"}],"sysrule_view": [{"field": "script","extension": "js"}],"task_activity": [{"field": "message","extension": "html"}],"tm_test": [{"field": "test_data","extension": "html"}, {"field": "test_description","extension": "html"}],"tm_test_case": [{"field": "prereq","extension": "html"}],"tm_test_case_instance": [{"field": "prereq","extension": "html"}],"tm_test_instance": [{"field": "test_description","extension": "html"}],"tm_test_plan": [{"field": "instructions","extension": "html"}],"treemap_metric": [{"field": "custom_script","extension": "js"}, {"field": "click_through_url_script","extension": "js"}],"u_field_testing": [{"field": "u_html","extension": "html"}],"usageanalytics_count_cfg": [{"field": "script","extension": "js"}],"user_criteria": [{"field": "script","extension": "js"}],"wf_activity_definition": [{"field": "script","extension": "js"}],"wf_element_activity": [{"field": "input_process_script","extension": "js"}, {"field": "processing_script","extension": "js"}, {"field": "output_process_script","extension": "js"}],"wf_workflow_version": [{"field": "on_cancel","extension": "js"}],"workbench_config": [{"field": "phase_actions","extension": "js"}]}'
 
diff --git a/Events/save_listener.py b/Events/save_listener.py
@@ -1,4 +1,4 @@
-from utils import *
+from Common.utils import *
 import sublime
 import sublime_plugin
 
diff --git a/Reloader/module_loader.py b/Reloader/module_loader.py
@@ -7,7 +7,8 @@ def load ( moduleDirectories, pluginGlobals ):
 	modulePaths       = []
 
 	for path in sys.path:
-		if path.endswith ( "Sublime Text 3" + os.sep + "Packages" ):
+		print(path)
+		if path.endswith ( "Sublime Text 3" + os.sep + "Installed Packages" + os.sep + "servicenow-sync.sublime-package" ):
 			packagesPath = path
 			break
 
diff --git a/ServiceNowSync.py b/ServiceNowSync.py
@@ -1,18 +1,22 @@
-print("ServiceNowSync V2.0 Loaded...\n");
+import os
+import sys
+import sublime, sublime_plugin
+import imp
 
-from .Reloader import module_loader
+plugin = os.path.realpath(__file__)
+directory = os.path.dirname(plugin)
+	
+if directory not in sys.path:
+    sys.path.append(directory)
 
-moduleDirectories = [ "ServiceNowSync\\Common", "ServiceNowSync\\Commands", "ServiceNowSync\\Events" ]
-module_loader.load ( moduleDirectories, globals() )
-
-from create_connection import *
-from create_diff_scratch import *
-from enter_credentials import *
-from load_all_snow_record import *
-from load_snow_record import *
-from load_snow_table import *
-from load_modified_records import *
-from open_service_now_record import *
-from refresh_snow_record import *
-from test_connection import *
-from save_listener import *
+from Commands.create_connection import *
+from Commands.create_diff_scratch import *
+from Commands.enter_credentials import *
+from Commands.load_all_snow_record import *
+from Commands.load_snow_record import *
+from Commands.load_snow_table import *
+from Commands.load_modified_records import *
+from Commands.open_service_now_record import *
+from Commands.refresh_snow_record import *
+from Commands.test_connection import *
+from Events.save_listener import *
diff --git a/__init__.py b/__init__.py
diff --git a/package-metadata.json b/package-metadata.json
@@ -0,0 +1 @@
+{"sublime_text": "*", "platforms": ["*"], "dependencies": [], "version": "2018.06.15.04.20.22", "description": "ServiceNow Sublime Text 3 Integration", "url": "https://github.com/salcosta/servicenow-sync"}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from utils import *`
	`1`	`+from Common.utils import *`
`2`	`2`	`import sublime`
`3`	`3`	`import sublime_plugin`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# from .utils import *`
`2`		`-# from .rest_client import *`
	`2`	`+# from .rest_client import *`