kameleon-builder 2.6.0 → 2.6.1

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.6.0
+current_version = 2.6.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}

data/CHANGES

@@ -1,6 +1,13 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.6.1
+-------------
+
+Released on August 12th 2015
+
+- Cli global parameters overwrite all recipe key:value parameters
+
 Version 2.6.0
 -------------
 

data/lib/kameleon/engine.rb

@@ -298,7 +298,7 @@ module Kameleon
         raise AbortError, "Execution aborted..." if answer.nil?
         answer.chomp!
         if responses.keys.include?(answer)
-          Kameleon.ui.info("User choice : [#{answer}] #{responses[answer]}")
+          Kameleon.ui.info("User choice: [#{answer}] #{responses[answer]}")
           if ["o", "i", "l"].include?(answer)
             if answer.eql? "l"
               @local_context.start_shell

data/lib/kameleon/recipe.rb

@@ -17,6 +17,7 @@ module Kameleon
     attr_accessor :base_recipes_files
     attr_accessor :data_files
     attr_accessor :env_files
+    attr_accessor :cli_global
 
     def initialize(path, kwargs = {})
       @path = Pathname.new(File.expand_path(path))

data/lib/kameleon/utils.rb

@@ -4,7 +4,7 @@ module Kameleon
 
     def self.resolve_vars(raw, yaml_path, initial_variables, recipe, kwargs = {})
       raw = resolve_data_dir_vars(raw, yaml_path, initial_variables, recipe, kwargs)
-      return resolve_simple_vars(raw, yaml_path, initial_variables, kwargs)
+      return resolve_simple_vars(raw, yaml_path, initial_variables, recipe, kwargs)
     end
 
     def self.resolve_data_dir_vars(raw, yaml_path, initial_variables, recipe, kwargs)
@@ -12,7 +12,7 @@ module Kameleon
       matches = raw.to_enum(:scan, reg).map { Regexp.last_match }
       matches.each do |m|
         unless m.nil?
-          path = resolve_simple_vars(m[1], yaml_path, initial_variables, kwargs)
+          path = resolve_simple_vars(m[1], yaml_path, initial_variables, recipe, kwargs)
           resolved_path = recipe.resolve_data_path(path, yaml_path)
           raw.gsub!(m[0], "\"#{resolved_path}\"")
         end
@@ -20,7 +20,8 @@ module Kameleon
       return raw
     end
 
-    def self.resolve_simple_vars(raw, yaml_path, initial_variables, kwargs)
+    def self.resolve_simple_vars(raw, yaml_path, initial_variables, recipe, kwargs)
+      initial_variables.merge! recipe.cli_global
       raw.to_s.gsub(/\$\$\{[a-zA-Z0-9\-_]+\}|\$\$[a-zA-Z0-9\-_]+/) do |var|
         # remove the dollars
         if var.include? "{"
@@ -36,7 +37,7 @@ module Kameleon
             fail RecipeError, "#{yaml_path}: variable #{var} not found in local or global"
           end
         end
-        return $` + resolve_simple_vars(value.to_s + $', yaml_path, initial_variables, kwargs)
+        return $` + resolve_simple_vars(value.to_s + $', yaml_path, initial_variables, recipe, kwargs)
       end
     end
 

data/scripts/bumpversion.py

@@ -0,0 +1,184 @@
+#!/usr/bin/env python
+# coding: utf-8
+from __future__ import unicode_literals, print_function
+import os
+import re
+
+from io import open
+import datetime
+import subprocess
+
+from argparse import RawTextHelpFormatter, ArgumentParser, FileType
+
+
+def generate_changelog_title(version):
+    version_title = "Version %s" % version
+    return version_title + "\n" + "-" * len(version_title)
+
+
+def get_release_date():
+    dt = datetime.date.today()
+    if 4 <= dt.day <= 20 or 24 <= dt.day <= 30:
+        suffix = "th"
+    else:
+        suffix = ["st", "nd", "rd"][dt.day % 10 - 1]
+    return dt.strftime("%%B %%d%s %%Y" % suffix)
+
+
+def bump_release_version(args):
+    """Automated software release workflow
+
+  * Bumps the release version number (with .bumpversion.cfg)
+  * Preloads the correct changelog template for editing
+  * Builds a source distribution
+  * Sets release date
+  * Tags the release
+
+You can run it like::
+
+    $ python bumpversion.py
+
+which will create a 'release' version (Eg. 0.7.2-dev => 0.7.2).
+
+    """
+    # Dry run 'bumpversion' to find out what the new version number
+    # would be. Useful side effect: exits if the working directory is not
+    # clean.
+    changelog = args.changelog.name
+    bumpver = subprocess.check_output(
+        ['bumpversion', 'release', '--dry-run', '--verbose'],
+        stderr=subprocess.STDOUT)
+    m = re.search(r'Parsing version \'(\d+\.\d+\.\d+)\.dev\'', bumpver)
+    current_version = m.groups(0)[0] + ".dev"
+    m = re.search(r'New version will be \'(\d+\.\d+\.\d+)\'', bumpver)
+    release_version = m.groups(0)[0]
+
+    date = get_release_date()
+
+    current_version_title = generate_changelog_title(current_version)
+    release_version_title = generate_changelog_title(release_version)
+    changes = ""
+    with open(changelog) as fd:
+        changes += fd.read()
+
+    changes = changes.replace(current_version_title, release_version_title)\
+                     .replace("**unreleased**", "Released on %s" % date)
+
+    with open(changelog, "w") as fd:
+            fd.write(changes)
+
+    # Tries to load the EDITOR environment variable, else falls back to vim
+    editor = os.environ.get('EDITOR', 'vim')
+    os.system("{} {}".format(editor, changelog))
+
+    subprocess.check_output(['gem', 'build', 'kameleon-builder.gemspec'])
+
+    # Have to add it so it will be part of the commit
+    subprocess.check_output(['git', 'add', changelog])
+    subprocess.check_output(
+        ['git', 'commit', '-m', 'Changelog for {}'.format(release_version)])
+
+    # Really run bumpver to set the new release and tag
+    bv_args = ['bumpversion', 'release']
+
+    bv_args += ['--new-version', release_version]
+
+    subprocess.check_output(bv_args)
+
+
+def bump_new_version(args):
+    """Increment the version number to the next development version
+
+  * Bumps the development version number (with .bumpversion.cfg)
+  * Preloads the correct changelog template for editing
+
+You can run it like::
+
+    $ python bumpversion.py newversion
+
+which, by default, will create a 'patch' dev version (0.0.1 => 0.0.2-dev).
+
+You can also specify a patch level (patch, minor, major) to change to::
+
+    $ python bumpversion.py newversion major
+
+which will create a 'major' release (0.0.2 => 1.0.0-dev)."""
+    pass
+    # Dry run 'bumpversion' to find out what the new version number
+    # would be. Useful side effect: exits if the working directory is not
+    # clean.
+    changelog = args.changelog.name
+    part = args.part
+    bumpver = subprocess.check_output(
+        ['bumpversion', part, '--dry-run', '--verbose'],
+        stderr=subprocess.STDOUT)
+    m = re.search(r'Parsing version \'(\d+\.\d+\.\d+)\'', bumpver)
+    current_version = m.groups(0)[0]
+    m = re.search(r'New version will be \'(\d+\.\d+\.\d+)\.dev\'', bumpver)
+    next_version = m.groups(0)[0] + ".dev"
+
+    current_version_title = generate_changelog_title(current_version)
+    next_version_title = generate_changelog_title(next_version)
+
+    next_release_template = "%s\n\n**unreleased**\n\n" % next_version_title
+
+    changes = ""
+    with open(changelog) as fd:
+        changes += fd.read()
+
+    changes = changes.replace(current_version_title,
+                              next_release_template + current_version_title)
+
+    with open(changelog, "w") as fd:
+            fd.write(changes)
+
+    # Tries to load the EDITOR environment variable, else falls back to vim
+    editor = os.environ.get('EDITOR', 'vim')
+    os.system("{} {}".format(editor, changelog))
+
+    # Have to add it so it will be part of the commit
+    subprocess.check_output(['git', 'add', changelog])
+    subprocess.check_output(
+        ['git', 'commit', '-m', 'Changelog for {}'.format(next_version)])
+
+    # Really run bumpver to set the new release and tag
+    bv_args = ['bumpversion', part, '--no-tag', '--new-version', next_version]
+
+    subprocess.check_output(bv_args)
+
+
+def main():
+    '''Parse command-line arguments and execute bumpversion command.'''
+
+    parser = ArgumentParser(prog='bumpversion',
+                            description='Bumpversion wrapper')
+
+    default_changelog = os.path.join(os.getcwd(), 'CHANGES')
+
+    subparsers = parser.add_subparsers(title='bumpversion wrapper commands')
+    # release command
+    release_doc = bump_release_version.__doc__
+    subparser = subparsers.add_parser("release",
+                                      description=release_doc,
+                                      formatter_class=RawTextHelpFormatter)
+    subparser.add_argument('--changelog', help='Project changelog',
+                           type=FileType(),
+                           default=default_changelog)
+    subparser.set_defaults(func=bump_release_version)
+    # newversion command
+    newversion_doc = bump_new_version.__doc__
+    subparser = subparsers.add_parser("newversion",
+                                      description=newversion_doc,
+                                      formatter_class=RawTextHelpFormatter)
+    subparser.add_argument('--changelog', help='Project changelog',
+                           type=FileType(),
+                           default=default_changelog)
+    subparser.add_argument('part', help='Part of the version to be bumped',
+                           choices=['patch', 'minor', 'major'])
+    subparser.set_defaults(func=bump_new_version)
+    # Parse argv arguments
+    args = parser.parse_args()
+    args.func(args)
+
+if __name__ == '__main__':
+    main()

data/version.txt

@@ -1 +1 @@
-2.6.0
+2.6.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -153,8 +153,7 @@ files:
 - lib/kameleon/ui.rb
 - lib/kameleon/utils.rb
 - lib/kameleon/version.rb
-- scripts/bump-dev-version.py
-- scripts/bump-release-version.py
+- scripts/bumpversion.py
 - tests/helper.rb
 - tests/recipes/steps/aliases/defaults.yaml
 - tests/recipes/steps/bootstrap/linux/bootstrap.yaml

data/scripts/bump-dev-version.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals, print_function
-import argparse
-import re
-import os
-import subprocess
-
-
-def generate_changelog_title(version):
-    version_title = "Version %s" % version
-    return version_title + "\n" + "-" * len(version_title)
-
-
-def bump_dev_version(part='patch'):
-    """ Increment the version number to the next development version
-
-    * (Configurably) bumps the development dev version number
-    * Preloads the correct changelog template for editing
-
-    You can run it like::
-
-        $ python scripts/next_release.py
-
-    which, by default, will create a 'patch' dev version (0.0.1 => 0.0.2-dev).
-
-    You can also specify a patch level (patch, minor, major) to change to::
-
-        $ python scripts/make_release.py major
-
-    which will create a 'major' release (0.0.2 => 1.0.0-dev).
-
-    """
-
-    # Dry run 'bumpversion' to find out what the new version number
-    # would be. Useful side effect: exits if the working directory is not
-    # clean.
-
-    bumpver = subprocess.check_output(
-        ['bumpversion', part, '--dry-run', '--verbose'],
-        stderr=subprocess.STDOUT)
-    m = re.search(r'Parsing version \'(\d+\.\d+\.\d+)\'', bumpver)
-    current_version = m.groups(0)[0]
-    m = re.search(r'New version will be \'(\d+\.\d+\.\d+)\.dev\'', bumpver)
-    next_version = m.groups(0)[0] + ".dev"
-
-    current_version_title = generate_changelog_title(current_version)
-    next_version_title = generate_changelog_title(next_version)
-
-    next_release_template = "%s\n\n**unreleased**\n\n" % next_version_title
-
-    changes = ""
-    with open('CHANGES') as fd:
-        changes += fd.read()
-
-    changes = changes.replace(current_version_title,
-                              next_release_template + current_version_title)
-
-    with open('CHANGES', "w") as fd:
-            fd.write(changes)
-
-    # Tries to load the EDITOR environment variable, else falls back to vim
-    editor = os.environ.get('EDITOR', 'vim')
-    os.system("{} CHANGES".format(editor))
-
-    subprocess.check_output(['python', 'setup.py', 'sdist'])
-
-    # Have to add it so it will be part of the commit
-    subprocess.check_output(['git', 'add', 'CHANGES'])
-    subprocess.check_output(
-        ['git', 'commit', '-m', 'Changelog for {}'.format(next_version)])
-
-    # Really run bumpver to set the new release and tag
-    bv_args = ['bumpversion', part, '--no-tag', '--new-version', next_version]
-
-    subprocess.check_output(bv_args)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description=bump_dev_version.__doc__,
-        formatter_class=argparse.RawTextHelpFormatter
-    )
-    parser.add_argument("part", help="Part of the version to be bumped",
-                        choices=["patch", "minor", "major"])
-    args = parser.parse_args()
-    bump_dev_version(args.part)

data/scripts/bump-release-version.py

@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals, print_function
-import os
-import re
-
-from io import open
-
-import argparse
-import datetime
-import subprocess
-
-
-def generate_changelog_title(version):
-    version_title = "Version %s" % version
-    return version_title + "\n" + "-" * len(version_title)
-
-
-def get_release_date():
-    dt = datetime.date.today()
-    if 4 <= dt.day <= 20 or 24 <= dt.day <= 30:
-        suffix = "th"
-    else:
-        suffix = ["st", "nd", "rd"][dt.day % 10 - 1]
-    return dt.strftime("%%B %%d%s %%Y" % suffix)
-
-
-def bumpversion():
-    """ Automated software release workflow
-
-    * (Configurably) bumps the release version number
-    * Preloads the correct changelog template for editing
-    * Builds a source distribution
-    * Sets release date
-    * Tags the release
-
-    You can run it like::
-
-        $ python scripts/bumpversion.py
-
-    """
-
-    # Dry run 'bumpversion' to find out what the new version number
-    # would be. Useful side effect: exits if the working directory is not
-    # clean.
-
-    bumpver = subprocess.check_output(
-        ['bumpversion', 'release', '--dry-run', '--verbose'],
-        stderr=subprocess.STDOUT)
-    m = re.search(r'Parsing version \'(\d+\.\d+\.\d+)\.dev\'', bumpver)
-    current_version = m.groups(0)[0] + ".dev"
-    m = re.search(r'New version will be \'(\d+\.\d+\.\d+)\'', bumpver)
-    release_version = m.groups(0)[0]
-
-    date = get_release_date()
-
-    current_version_title = generate_changelog_title(current_version)
-    release_version_title = generate_changelog_title(release_version)
-    changes = ""
-    with open('CHANGES') as fd:
-        changes += fd.read()
-
-    changes = changes.replace(current_version_title, release_version_title)\
-                     .replace("**unreleased**", "Released on %s" % date)
-
-    with open('CHANGES', "w") as fd:
-            fd.write(changes)
-
-    # Tries to load the EDITOR environment variable, else falls back to vim
-    editor = os.environ.get('EDITOR', 'vim')
-    os.system("{} CHANGES".format(editor))
-
-    # Have to add it so it will be part of the commit
-    subprocess.check_output(['git', 'add', 'CHANGES'])
-    subprocess.check_output(
-        ['git', 'commit', '-m', 'Changelog for {}'.format(release_version)])
-
-    # Really run bumpver to set the new release and tag
-    bv_args = ['bumpversion', 'release']
-
-    bv_args += ['--new-version', release_version]
-
-    subprocess.check_output(bv_args)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description=bumpversion.__doc__,
-        formatter_class=argparse.RawTextHelpFormatter
-    )
-    args = parser.parse_args()
-    bumpversion()