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

[Sergio Schvezov]

Support --version with small note on snapcraft help

[John Lenton (chipaca)]

lgtm!

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/snapcraft/1501222 into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/main.py:32:9: E126 continuation line over-indented for hanging indent

[lp:~sergiusens/snapcraft/1501222]

257. By Sergio Schvezov on 2015-10-28

Support --version with small note on snapcraft help by sergiusens approved by chipaca

=== modified file 'debian/control'
--- debian/control	2015-10-19 14:45:26 +0000
+++ debian/control	2015-10-28 17:35:21 +0000
@@ -11,6 +11,7 @@
                python3-fixtures,
                python3-jsonschema,
                python3-lxml,
+               python3-pkg-resources,
                python3-requests,
                python3-setuptools,
                python3-testscenarios,
@@ -31,6 +32,7 @@
          python3-apt,
          python3-jsonschema,
          python3-lxml,
+         python3-pkg-resources,
          python3-requests,
          python3-yaml,
          sudo,

=== modified file 'setup.py'
--- setup.py	2015-10-14 18:14:47 +0000
+++ setup.py	2015-10-28 17:35:21 +0000
@@ -23,7 +23,7 @@
 
 
 setup(name="snapcraft",
-      version="0",
+      version='0.4',
       description="Easily craft snaps",
       author_email="[e-mail]",
       url="https://launchpad.net/snapcraft",

=== modified file 'snapcraft/main.py'
--- snapcraft/main.py	2015-10-27 19:35:58 +0000
+++ snapcraft/main.py	2015-10-28 17:35:21 +0000
@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import pkg_resources
 import sys
 
 import snapcraft.cmds
@@ -23,6 +24,13 @@
 from snapcraft import help
 from snapcraft import log
 
+try:
+    _version = pkg_resources.require('snapcraft')[0].version
+except pkg_resources.DistributionNotFound:
+    _version = 'devel'
+_VERSION = '%(prog)s ({}). Run "%(prog)s help" to get started.'.format(
+    _version)
+
 
 def main():
     log.configure()
@@ -39,6 +47,9 @@
                                          parents=[force_parser])
     cmd_parser.add_argument('part', nargs='*')
 
+    root_parser.add_argument('--version', action='version',
+                             version=_VERSION)
+
     # Command parsers
 
     parser = subparsers.add_parser('init', help='start a project')