41726 Adding shot environment for photoshop, flame, shell and other various cleanups (#36)

gomezll · web-flow · commit a6fb7ac7efda · 2017-06-26T17:45:19.000-07:00
diff --git a/env/includes/flame/project.yml b/env/includes/flame/project.yml
@@ -9,7 +9,7 @@
 # not expressly granted therein are reserved by Shotgun Software Inc.
 #
 
-# this configuration defines the behavior of the Houdini Integration when it
+# this configuration defines the behavior of the Flame Integration when it
 # is running in its project level configuration
 
 includes:
diff --git a/env/includes/flame/shot.yml b/env/includes/flame/shot.yml
@@ -0,0 +1,25 @@
+# Copyright (c) 2017 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this configuration defines the behavior of the Flame Integration when it
+# is running in its project level configuration
+
+includes:
+- ../common/engines.yml
+
+
+# the flame integration is built into flame
+# we only include the engine here so that we can launch flame
+# from shotgun desktop and shotgun.
+flame.shot:
+  apps:
+  location: "@common.engines.tk-flame.location"
+
diff --git a/env/includes/photoshopcc/apps.yml b/env/includes/photoshopcc/apps.yml
@@ -0,0 +1,84 @@
+# Copyright (c) 2017 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this include configuration defines the common app behavior of the Photoshop Integration
+# when it is running at various levels of configuration
+
+includes:
+- ../common/apps.yml
+- ../common/settings/tk-multi-publish2.yml
+
+
+photoshopcc.apps.tk-multi-publish2:
+  help_url: "@common.apps.tk-multi-publish2.help_url"
+  collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/photoshopcc.basic/collector.py"
+  publish_plugins:
+    - "@common.settings.tk-multi-publish2.publish_file"
+    - "@common.settings.tk-multi-publish2.upload_version"
+    - name: Begin file versioning
+      hook: "{config}/tk-multi-publish2/photoshopcc.basic/start_version_control.py"
+      settings: {}
+    - "@common.settings.tk-multi-publish2.publish_photoshop_document"
+    - name: Upload for review
+      hook: "{config}/tk-multi-publish2/photoshopcc.basic/upload_version.py"
+      settings: {}
+  location: "@common.apps.tk-multi-publish2.location"
+
+photoshopcc.apps.tk-multi-loader2:
+  action_mappings:
+    Photoshop Image: [add_as_a_layer, open_file]
+    Rendered Image: [add_as_a_layer, open_file]
+    Image: [add_as_a_layer, open_file]
+    Texture: [add_as_a_layer, open_file]
+  actions_hook: "{self}/tk-photoshopcc_actions.py"
+  entities:
+  - caption: Current Project
+    type: Hierarchy
+    root: "{context.project}"
+    publish_filters: []
+  - caption: My Tasks
+    type: Query
+    entity_type: Task
+    filters:
+    - [project, is, "{context.project}"]
+    - [task_assignees, is, "{context.user}"]
+    hierarchy: [entity, content]
+  # ignore publishes without a status. with zero config, it is very easy
+  # to publish the same path multiple times. the default zero config publish
+  # plugins will clear the status of previous publishes of the same path.
+  # this filter means only the latest publish will be displayed.
+  publish_filters: [["sg_status_list", "is_not", null]]
+  location: "@common.apps.tk-multi-loader2.location"
+
+photoshopcc.apps.tk-multi-shotgunpanel:
+  shotgun_fields_hook: "{self}/shotgun_fields.py"
+  actions_hook: "{self}/general_actions.py"
+  action_mappings:
+    PublishedFile:
+    - actions: [publish_clipboard]
+      filters: {}
+    - actions: [add_as_a_layer, open_file]
+      filters: {published_file_type: Photoshop Image}
+    - actions: [add_as_a_layer, open_file]
+      filters: {published_file_type: Rendered Image}
+    - actions: [add_as_a_layer, open_file]
+      filters: {published_file_type: Image}
+    - actions: [add_as_a_layer, open_file]
+      filters: {published_file_type: Texture}
+    Task:
+    - actions: [assign_task, task_to_ip]
+      filters: {}
+    Version:
+    - actions: [quicktime_clipboard, sequence_clipboard]
+      filters: {}
+  enable_context_switch: true
+  location: "@common.apps.tk-multi-shotgunpanel.location"
+
diff --git a/env/includes/photoshopcc/project.yml b/env/includes/photoshopcc/project.yml
@@ -13,10 +13,9 @@
 # is running in its project level configuration
 
 includes:
-- ../common/frameworks.yml
 - ../common/engines.yml
 - ../common/apps.yml
-- ../common/settings/tk-multi-publish2.yml
+- apps.yml
 
 
 photoshopcc.project:
@@ -25,70 +24,11 @@ photoshopcc.project:
 
     tk-multi-pythonconsole: "@common.apps.tk-multi-pythonconsole"
 
-    tk-multi-publish2:
-      help_url: "@common.apps.tk-multi-publish2.help_url"
-      collector: "{config}/tk-multi-publish2/basic/collector.py:{config}/tk-multi-publish2/photoshopcc.basic/collector.py"
-      publish_plugins:
-        - "@common.settings.tk-multi-publish2.publish_file"
-        - "@common.settings.tk-multi-publish2.upload_version"
-        - name: Begin file versioning
-          hook: "{config}/tk-multi-publish2/photoshopcc.basic/start_version_control.py"
-          settings: {}
-        - "@common.settings.tk-multi-publish2.publish_photoshop_document"
-        - name: Upload for review
-          hook: "{config}/tk-multi-publish2/photoshopcc.basic/upload_version.py"
-          settings: {}
-      location: "@common.apps.tk-multi-publish2.location"
+    tk-multi-publish2: "@photoshopcc.apps.tk-multi-publish2"
 
-    tk-multi-loader2:
-      action_mappings:
-        Photoshop Image: [add_as_a_layer, open_file]
-        Rendered Image: [add_as_a_layer, open_file]
-        Image: [add_as_a_layer, open_file]
-        Texture: [add_as_a_layer, open_file]
-      actions_hook: "{self}/tk-photoshopcc_actions.py"
-      entities:
-      - caption: Current Project
-        type: Hierarchy
-        root: "{context.project}"
-        publish_filters: []
-      - caption: My Tasks
-        type: Query
-        entity_type: Task
-        filters:
-        - [project, is, "{context.project}"]
-        - [task_assignees, is, "{context.user}"]
-        hierarchy: [entity, content]
-      # ignore publishes without a status. with zero config, it is very easy
-      # to publish the same path multiple times. the default zero config publish
-      # plugins will clear the status of previous publishes of the same path.
-      # this filter means only the latest publish will be displayed.
-      publish_filters: [["sg_status_list", "is_not", null]]
-      location: "@common.apps.tk-multi-loader2.location"
+    tk-multi-loader2: "@photoshopcc.apps.tk-multi-loader2"
 
-    tk-multi-shotgunpanel:
-      shotgun_fields_hook: "{self}/shotgun_fields.py"
-      actions_hook: "{self}/general_actions.py"
-      action_mappings:
-        PublishedFile:
-        - actions: [publish_clipboard]
-          filters: {}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Photoshop Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Rendered Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Texture}
-        Task:
-        - actions: [assign_task, task_to_ip]
-          filters: {}
-        Version:
-        - actions: [quicktime_clipboard, sequence_clipboard]
-          filters: {}
-      enable_context_switch: true
-      location: "@common.apps.tk-multi-shotgunpanel.location"
+    tk-multi-shotgunpanel: "@photoshopcc.apps.tk-multi-shotgunpanel"
 
   shelf_favorites: []
   debug_logging: true
diff --git a/env/includes/photoshopcc/shot.yml b/env/includes/photoshopcc/shot.yml
@@ -0,0 +1,36 @@
+# Copyright (c) 2017 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this configuration defines the behavior of the Photoshop Integration when it
+# is running in its shot level configuration
+
+includes:
+- ../common/engines.yml
+- ../common/apps.yml
+- apps.yml
+
+
+photoshopcc.shot:
+  apps:
+    tk-multi-about: "@common.apps.tk-multi-about"
+
+    tk-multi-pythonconsole: "@common.apps.tk-multi-pythonconsole"
+
+    tk-multi-publish2: "@photoshopcc.apps.tk-multi-publish2"
+
+    tk-multi-loader2: "@photoshopcc.apps.tk-multi-loader2"
+
+    tk-multi-shotgunpanel: "@photoshopcc.apps.tk-multi-shotgunpanel"
+
+  shelf_favorites: []
+  debug_logging: true
+  location: "@common.engines.tk-photoshopcc.location"
+
diff --git a/env/includes/photoshopcc/site.yml b/env/includes/photoshopcc/site.yml
@@ -13,10 +13,9 @@
 # is running in its project level configuration
 
 includes:
-- ../common/frameworks.yml
 - ../common/engines.yml
 - ../common/apps.yml
-
+- apps.yml
 
 photoshopcc.site:
   apps:
@@ -49,29 +48,7 @@ photoshopcc.site:
       publish_filters: [["sg_status_list", "is_not", null]]
       location: "@common.apps.tk-multi-loader2.location"
 
-    tk-multi-shotgunpanel:
-      shotgun_fields_hook: '{self}/shotgun_fields.py'
-      actions_hook: '{self}/general_actions.py'
-      action_mappings:
-        PublishedFile:
-        - actions: [publish_clipboard]
-          filters: {}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Photoshop Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Rendered Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Image}
-        - actions: [add_as_a_layer, open_file]
-          filters: {published_file_type: Texture}
-        Task:
-        - actions: [assign_task, task_to_ip]
-          filters: {}
-        Version:
-        - actions: [quicktime_clipboard, sequence_clipboard]
-          filters: {}
-      enable_context_switch: true
-      location: "@common.apps.tk-multi-shotgunpanel.location"
+    tk-multi-shotgunpanel: '@photoshopcc.apps.tk-multi-shotgunpanel'
 
   shelf_favorites: []
   debug_logging: true
diff --git a/env/includes/shell/apps.yml b/env/includes/shell/apps.yml
@@ -0,0 +1,29 @@
+# Copyright (c) 2017 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this include configuration defines the common apps used by the Tank command 
+# shared by several of its different configurations
+
+
+includes:
+- ../common/apps.yml
+- ../common/settings/tk-multi-publish2.yml
+
+shell.apps.tk-multi-launchapp:
+  use_software_entity: true
+  location: "@common.apps.tk-multi-launchapp.location"
+
+shell.apps.tk-multi-publish2:
+  collector: "{config}/tk-multi-publish2/basic/collector.py"
+  publish_plugins:
+    - '@common.settings.tk-multi-publish2.publish_file'
+    - '@common.settings.tk-multi-publish2.upload_version'
+  location: "@common.apps.tk-multi-publish2.location"
diff --git a/env/includes/shell/project.yml b/env/includes/shell/project.yml
@@ -13,22 +13,13 @@
 # is running in all environments
 
 includes:
-- ../common/frameworks.yml
-- ../common/apps.yml
-- ../common/settings/tk-multi-publish2.yml
+- apps.yml
 
 shell.project:
   apps:
-    tk-multi-launchapp:
-      use_software_entity: true
-      location: "@common.apps.tk-multi-launchapp.location"
+    tk-multi-launchapp: '@shell.apps.tk-multi-launchapp'
 
-    tk-multi-publish2:
-      collector: "{config}/tk-multi-publish2/basic/collector.py"
-      publish_plugins:
-        - '@common.settings.tk-multi-publish2.publish_file'
-        - '@common.settings.tk-multi-publish2.upload_version'
-      location: "@common.apps.tk-multi-publish2.location"
+    tk-multi-publish2: '@shell.apps.tk-multi-publish2'
 
   location:
     version: v0.5.1
diff --git a/env/includes/shell/shot.yml b/env/includes/shell/shot.yml
@@ -0,0 +1,27 @@
+# Copyright (c) 2017 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this configuration defines the behavior of the Tank command when it
+# is running in a shot environment
+
+includes:
+- apps.yml
+
+shell.shot:
+  apps:
+    tk-multi-launchapp: '@shell.apps.tk-multi-launchapp'
+
+    tk-multi-publish2: '@shell.apps.tk-multi-publish2'
+
+  location:
+    version: v0.5.1
+    type: app_store
+    name: tk-shell
diff --git a/env/includes/shell/site.yml b/env/includes/shell/site.yml
@@ -13,14 +13,10 @@
 # is running in all environments
 
 includes:
-- ../common/frameworks.yml
-- ../common/apps.yml
+- apps.yml
 
 shell.site:
-  apps:
-    tk-multi-launchapp:
-      use_software_entity: true
-      location: "@common.apps.tk-multi-launchapp.location"
+  apps: '@shell.apps.tk-multi-launchapp'
 
   location:
     version: v0.5.1
diff --git a/env/shot.yml b/env/shot.yml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# not expressly granted therein are reserved by Shotgun Software Inc.`
`10`	`10`	`#`
`11`	`11`
`12`		`-# this configuration defines the behavior of the Houdini Integration when it`
	`12`	`+# this configuration defines the behavior of the Flame Integration when it`
`13`	`13`	`# is running in its project level configuration`
`14`	`14`
`15`	`15`	`includes:`