Merge lp:~sergiusens/snapcraft/1500857 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Revert type to plugin

[Zygmunt Krynicki (zyga)]

+1, looks good

review: Approve

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'docs/intro.md'
--- docs/intro.md	2015-09-24 17:06:18 +0000
+++ docs/intro.md	2015-09-29 13:38:14 +0000
@@ -32,12 +32,12 @@
 build other parts. Each part is managed by a snapcraft plugin and parts
 are usually independent of each other.
 
-## Type of a Part
+## Plugin
 
-Each part has a `type` associated to it, this `type` provides the mechanism
-to handle it. The `type` a part has is extendable through plugins, there are
-a variety of plugins already included for python 2 and 3, go, java, and cmake or
-autotools based projects.
+Each part has a `plugin` associated to it, this `plugin` provides the mechanism
+to handle it. Parts are driven through plugins, there are a variety of plugins
+already included for python 2 and 3, go, java, and cmake or autotools based
+projects.
 
 ## Lifecycle
 

=== modified file 'docs/your-first-snap.md'
--- docs/your-first-snap.md	2015-09-22 12:54:13 +0000
+++ docs/your-first-snap.md	2015-09-29 13:38:14 +0000
@@ -104,11 +104,11 @@
 
     parts:
       cam:
-        type: go-project
+        plugin: go-project
         source: git://github.com/mikix/golang-static-http
 
 You've just defined a `part` inside `parts` named `cam`, but you
-could call it anything. That part has a two options: A `type` option that
+could call it anything. That part has a two options: A `plugin` option that
 tells Snapcraft how to interpret the part (in this case, it's a Go project),
 and a `source` option telling Snapcraft where to download the code.
 
@@ -138,7 +138,7 @@
 
     parts:
       cam:
-        type: go-project
+        plugin: go-project
         source: git://github.com/mikix/golang-static-http
         stage-packages:
           - fswebcam
@@ -185,16 +185,16 @@
 
     parts:
       cam:
-        type: go-project
+        plugin: go-project
         source: git://github.com/mikix/golang-static-http
         stage-packages:
           - fswebcam
       glue:
-        type: copy
+        plugin: copy
         files:
           webcam-webui: bin/webcam-webui
 
-A part of type `copy` takes a list of files to just directly copy without
+The `copy` plugin takes a list of files to just directly copy without
 building or downloading anything. In this case, we just want to put our glue
 script in the `bin/` directory.
 
@@ -219,7 +219,7 @@
 
     parts:
       cam:
-        type: go-project
+        plugin: go-project
         source: git://github.com/mikix/golang-static-http
         stage-packages:
           - fswebcam
@@ -234,7 +234,7 @@
           - $fswebcam
           - $go-server
       glue:
-        type: copy
+        plugin: copy
         files:
           webcam-webui: bin/webcam-webui
 

=== modified file 'examples/downloader-with-wiki-parts/snapcraft.yaml'
--- examples/downloader-with-wiki-parts/snapcraft.yaml	2015-09-22 08:24:33 +0000
+++ examples/downloader-with-wiki-parts/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,7 +10,7 @@
 
 parts:
     main:
-        type: make-project
+        plugin: make-project
         source: .
         after:
             - curl

=== modified file 'examples/godd/snapcraft.yaml'
--- examples/godd/snapcraft.yaml	2015-09-22 13:27:11 +0000
+++ examples/godd/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,7 +10,7 @@
 
 parts:
   godd:
-    type: go-project
+    plugin: go-project
     source: git://github.com/mvo5/godd
     stage-packages: [libgudev-1.0-dev]
     snap:

=== modified file 'examples/gopaste/snapcraft.yaml'
--- examples/gopaste/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/gopaste/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -11,5 +11,5 @@
 
 parts:
   gopaste:
-    type: go-project
+    plugin: go-project
     source: git://github.com/wisnij/gopaste/gopasted

=== modified file 'examples/java-hello-world/snapcraft.yaml'
--- examples/java-hello-world/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/java-hello-world/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,8 +10,8 @@
 
 parts:
     local:
-        type: ant-project
+        plugin: ant-project
         source: .
     wrapper:
-        type: make-project
+        plugin: make-project
         source: .

=== modified file 'examples/libpipeline/snapcraft.yaml'
--- examples/libpipeline/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/libpipeline/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,10 +10,10 @@
 
 parts:
     pipelinetest:
-        type: make-project
+        plugin: make-project
         source: lp:~mterry/+junk/pipelinetest
         after:
             - libpipeline
     libpipeline:
-        type: autotools-project
+        plugin: autotools-project
         source: lp:~mterry/libpipeline/printf

=== modified file 'examples/py2-project/snapcraft.yaml'
--- examples/py2-project/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/py2-project/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,7 +10,7 @@
 
 parts:
   spongeshaker:
-    type: python2-project
+    plugin: python2-project
     source: git://github.com/markokr/spongeshaker.git
   make-project:
     source: .

=== modified file 'examples/py3-project/snapcraft.yaml'
--- examples/py3-project/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/py3-project/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -10,9 +10,9 @@
 
 parts:
   spongeshaker:
-    type: python3-project
+    plugin: python3-project
     source: git://github.com/markokr/spongeshaker.git
   sha3:
-    type: copy
+    plugin: copy
     files:
      sha3sum.py: bin/sha3sum

=== modified file 'examples/qmldemo/snapcraft.yaml'
--- examples/qmldemo/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/qmldemo/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -15,8 +15,8 @@
 
 parts:
   qml:
-    type: qml
+    plugin: qml
   qmldemo:
-    type: copy
+    plugin: copy
     files:
       demo.qml: demo.qml

=== modified file 'examples/tomcat-maven-webapp/snapcraft.yaml'
--- examples/tomcat-maven-webapp/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/tomcat-maven-webapp/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -15,11 +15,11 @@
 
 parts:
     webapp:
-        type: maven-project
+        plugin: maven-project
         source: git://github.com/lool/snappy-mvn-demo.git
     tomcat:
-        type: tar-content
+        plugin: tar-content
         source: http://mirrors.ircam.fr/pub/apache/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.tar.gz
     local-files:
-        type: make-project
+        plugin: make-project
         source: .

=== modified file 'examples/webcam-webui/snapcraft.yaml'
--- examples/webcam-webui/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ examples/webcam-webui/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -11,7 +11,7 @@
 
 parts:
   cam:
-    type: go-project
+    plugin: go-project
     source: git://github.com/mikix/golang-static-http
     stage-packages:
       - fswebcam
@@ -30,9 +30,9 @@
       - $go-server
       - -usr/share/doc
   glue:
-    type: copy
+    plugin: copy
     files:
       webcam-webui: bin/webcam-webui
   config:
-    type: python3-project
+    plugin: python3-project
     source: .

=== modified file 'integration-tests/data/bzr-head/snapcraft.yaml'
--- integration-tests/data/bzr-head/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/bzr-head/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,6 +7,6 @@
 
 parts:
     bzr:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: bzr

=== modified file 'integration-tests/data/bzr-tag/snapcraft.yaml'
--- integration-tests/data/bzr-tag/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/bzr-tag/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,7 +7,7 @@
 
 parts:
     bzr:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: bzr
         source-tag: initial

=== modified file 'integration-tests/data/conflicts/snapcraft.yaml'
--- integration-tests/data/conflicts/snapcraft.yaml	2015-09-17 06:24:37 +0000
+++ integration-tests/data/conflicts/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,9 +7,9 @@
 
 parts:
   p1:
-    type: make-project
+    plugin: make-project
     source: .
   p2:
-    type: make-project
+    plugin: make-project
     source: ./p2
     after: [p1]

=== modified file 'integration-tests/data/dependencies/snapcraft.yaml'
--- integration-tests/data/dependencies/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/dependencies/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,13 +7,13 @@
 
 parts:
   p1:
-    type: make-project
+    plugin: make-project
     source: p1
   p2:
-    type: make-project
+    plugin: make-project
     source: p2
     after: [p1]
   p3:
-    type: make-project
+    plugin: make-project
     source: p3
     after: [p2]

=== modified file 'integration-tests/data/git-branch/snapcraft.yaml'
--- integration-tests/data/git-branch/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/git-branch/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,7 +7,7 @@
 
 parts:
     git:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: git
         source-branch: second

=== modified file 'integration-tests/data/git-head/snapcraft.yaml'
--- integration-tests/data/git-head/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/git-head/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,6 +7,6 @@
 
 parts:
     git:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: git

=== modified file 'integration-tests/data/git-tag/snapcraft.yaml'
--- integration-tests/data/git-tag/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/git-tag/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,7 +7,7 @@
 
 parts:
     git:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: git
         source-tag: initial

=== modified file 'integration-tests/data/hg-branch/snapcraft.yaml'
--- integration-tests/data/hg-branch/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/hg-branch/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,7 +7,7 @@
 
 parts:
     mercurial:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: hg
         source-branch: second

=== modified file 'integration-tests/data/hg-head/snapcraft.yaml'
--- integration-tests/data/hg-head/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/hg-head/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,6 +7,6 @@
 
 parts:
     mercurial:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: hg

=== modified file 'integration-tests/data/hg-tag/snapcraft.yaml'
--- integration-tests/data/hg-tag/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/hg-tag/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,7 +7,7 @@
 
 parts:
     mercurial:
-        type: make-project
+        plugin: make-project
         source: .
         source-type: hg
         source-tag: initial

=== modified file 'integration-tests/data/pip-requirements/snapcraft.yaml'
--- integration-tests/data/pip-requirements/snapcraft.yaml	2015-09-23 04:14:51 +0000
+++ integration-tests/data/pip-requirements/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,8 +7,8 @@
 
 parts:
   python2:
-    type: python2-project
+    plugin: python2-project
     requirements: requirements.txt
   python3:
-    type: python3-project
+    plugin: python3-project
     requirements: requirements.txt

=== modified file 'integration-tests/data/pypi-config/snapcraft.yaml'
--- integration-tests/data/pypi-config/snapcraft.yaml	2015-09-20 14:34:08 +0000
+++ integration-tests/data/pypi-config/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -12,5 +12,5 @@
 
 parts:
   config:
-    type: python3-project
+    plugin: python3-project
     source: .

=== modified file 'integration-tests/data/simple-copy/snapcraft.yaml'
--- integration-tests/data/simple-copy/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/simple-copy/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,6 +7,6 @@
 
 parts:
   copy-example:
-    type: copy
+    plugin: copy
     files:
       src: dst

=== modified file 'integration-tests/data/simple-scons/snapcraft.yaml'
--- integration-tests/data/simple-scons/snapcraft.yaml	2015-09-29 10:42:52 +0000
+++ integration-tests/data/simple-scons/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,5 +7,5 @@
 
 parts:
   scons-project:
-    type: scons-project
+    plugin: scons-project
     source: .

=== modified file 'integration-tests/data/simple-tar/snapcraft.yaml'
--- integration-tests/data/simple-tar/snapcraft.yaml	2015-09-29 07:15:17 +0000
+++ integration-tests/data/simple-tar/snapcraft.yaml	2015-09-29 13:38:14 +0000
@@ -7,30 +7,30 @@
 
 parts:
   oneflat:
-    type: tar-content
+    plugin: tar-content
     source: oneflat.tar.bz2
   onedeep:
-    type: tar-content
+    plugin: tar-content
     source: onedeep.tar.gz
   nodir:
-    type: tar-content
+    plugin: tar-content
     source: nodir.tar.xz
   flat:
-    type: tar-content
+    plugin: tar-content
     source: flat.tar.xz
   simple:
-    type: tar-content
+    plugin: tar-content
     source: simple.tar.bz2
   evil-parent:
-    type: tar-content
+    plugin: tar-content
     source: evil-parent.tar.gz
   evil-slash:
-    type: tar-content
+    plugin: tar-content
     source: evil-slash.tar.gz
   readonly-files:
-    type: tar-content
+    plugin: tar-content
     source: readonly-files.tar.gz
   project:
-    type: make-project
+    plugin: make-project
     source: project.tar.xz
     source-type: tar

=== modified file 'snapcraft/tests/test_yaml.py'
--- snapcraft/tests/test_yaml.py	2015-09-21 05:04:31 +0000
+++ snapcraft/tests/test_yaml.py	2015-09-29 13:38:14 +0000
@@ -61,7 +61,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         snapcraft.yaml.Config()
@@ -85,7 +85,7 @@
   part1:
     after:
       - part2wiki
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         snapcraft.yaml.Config()
@@ -119,10 +119,10 @@
 
 parts:
   p1:
-    type: go
+    plugin: go
     after: [p2]
   p2:
-    type: go
+    plugin: go
     after: [p1]
 """)
         with self.assertRaises(snapcraft.yaml.SnapcraftLogicError) as raised:
@@ -145,7 +145,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
@@ -167,7 +167,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
@@ -189,7 +189,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
@@ -210,7 +210,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
@@ -231,7 +231,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
 """)
 
@@ -254,7 +254,7 @@
 
 parts:
   part1:
-    type: go
+    plugin: go
     stage-packages: [fswebcam]
     filesets:
       wget:
@@ -298,7 +298,7 @@
             'icon': 'my-icon.png',
             'parts': {
                 'part1': {
-                    'type': 'project',
+                    'plugin': 'project',
                 },
             },
         }

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-09-23 15:54:52 +0000
+++ snapcraft/yaml.py	2015-09-29 13:38:14 +0000
@@ -80,9 +80,9 @@
         for part_name in self.data.get("parts", []):
             properties = self.data["parts"][part_name] or {}
 
-            plugin_name = properties.get("type", part_name)
-            if "type" in properties:
-                del properties["type"]
+            plugin_name = properties.get("plugin", part_name)
+            if "plugin" in properties:
+                del properties["plugin"]
 
             if "after" in properties:
                 after_requests[part_name] = properties["after"]