kameleon-builder 2.7.1 → 2.7.2

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.7.2
+-------------
+
+Released on February 17th 2016
+
+- Added ``interactive_cmd`` option to set a more apropriate interactive shell command
+- Removed bash errexit flag to force bash to trap interruption
+
 Version 2.7.1
 -------------
 

data/contrib/kameleon_exec_cmd.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-set -o errexit
 set -o pipefail
 set -o allexport
 

data/lib/kameleon/cli.rb

@@ -56,7 +56,7 @@ module Kameleon
         end
         begin
           tpl = RecipeTemplate.new(template_path)
-          tpl.resolve!
+          tpl.resolve! :strict => false
         rescue
           raise TemplateNotFound, "Template '#{template_name}' not found. " \
                                   "To see all templates, run the command "\
@@ -81,7 +81,7 @@ module Kameleon
           template_path = template_path + '.yaml'
         end
         tpl = RecipeTemplate.new(template_path)
-        tpl.resolve!
+        tpl.resolve! :strict => false
         tpl.display_info
       end
       map %w(-h --help) => :help

data/lib/kameleon/context.rb

@@ -6,16 +6,18 @@ module Kameleon
     attr_accessor :shell
     attr_accessor :name
     attr_accessor :cmd
+    attr_accessor :interactive_cmd
     attr_accessor :workdir
     attr_accessor :local_workdir
     attr_accessor :proxy
     attr_accessor :env_files
 
 
-    def initialize(name, cmd, workdir, exec_prefix, local_workdir, env_files,
-                   kwargs = {})
+    def initialize(name, cmd, interactive_cmd, workdir, exec_prefix,
+                   local_workdir, env_files, kwargs = {})
       @name = name.downcase
       @cmd = cmd
+      @interactive_cmd = interactive_cmd
       @workdir = workdir
       @exec_prefix = exec_prefix
       @local_workdir = local_workdir
@@ -128,7 +130,7 @@ module Kameleon
       #TODO: Load env and history
       load_shell
       Kameleon.ui.info("Starting interactive shell")
-      @shell.fork_and_wait
+      @shell.start_interactive
     rescue ShellError => e
       e.message.split( /\r?\n/ ).each {|m| Kameleon.ui.error m }
     end

data/lib/kameleon/engine.rb

@@ -92,7 +92,7 @@ module Kameleon
       proxy_cache_in = @recipe.global["in_context"]["proxy_cache"]
 
       Kameleon.ui.debug("Building local context [local]")
-      @local_context = Context.new("local", "bash", @cwd, "", @cwd,
+      @local_context = Context.new("local", "bash", "bash", @cwd, "", @cwd,
                                    @recipe.env_files,
                                    :proxy => @recipe.global["proxy_local"],
                                    :lazyload => lazyload,
@@ -100,6 +100,7 @@ module Kameleon
       Kameleon.ui.debug("Building external context [out]")
       @out_context = Context.new("out",
                                  @recipe.global["out_context"]["cmd"],
+                                 @recipe.global["out_context"]["interactive_cmd"],
                                  @recipe.global["out_context"]["workdir"],
                                  @recipe.global["out_context"]["exec_prefix"],
                                  @cwd,
@@ -111,6 +112,7 @@ module Kameleon
       Kameleon.ui.debug("Building internal context [in]")
       @in_context = Context.new("in",
                                 @recipe.global["in_context"]["cmd"],
+                                @recipe.global["in_context"]["interactive_cmd"],
                                 @recipe.global["in_context"]["workdir"],
                                 @recipe.global["in_context"]["exec_prefix"],
                                 @cwd,

data/lib/kameleon/recipe.rb

@@ -100,6 +100,20 @@ module Kameleon
       end.flatten!
       @steps_dirs.uniq!
 
+      # Set default value for in_ctx and out_ctx options
+      %w(out_context in_context).each do |context_name|
+        unless yaml_recipe.keys.include? "global"
+          yaml_recipe["global"] = {}
+        end
+        unless yaml_recipe["global"].keys.include? context_name
+          yaml_recipe["global"][context_name] = {}
+        end
+        @global[context_name].merge!(yaml_recipe["global"][context_name])
+        yaml_recipe["global"][context_name] = @global[context_name]
+        unless yaml_recipe["global"][context_name].keys.include? "interactive_cmd"
+          yaml_recipe["global"][context_name]["interactive_cmd"] = yaml_recipe["global"][context_name]['cmd'] 
+        end
+      end
       # Load Global variables
       @global.merge!(yaml_recipe.fetch("global", {}))
       # merge cli variable with recursive variable overload
@@ -506,7 +520,7 @@ module Kameleon
         end
         Kameleon.ui.verbose("#{real_path} : nonexistent")
       end
-      fail RecipeError, "Cannot found data '#{partial_path}' unsed in '#{step_path}'"
+      fail RecipeError, "Cannot found data '#{partial_path}' used in '#{step_path}'"
     end
 
     def resolve!(kwargs = {})

data/lib/kameleon/shell.rb

@@ -14,6 +14,7 @@ module Kameleon
 
     def initialize(context)
       @cmd = context.cmd.chomp
+      @interactive_cmd = context.interactive_cmd.chomp
       @context_name = context.name
       @local_workdir = context.local_workdir
       @shell_workdir = context.workdir
@@ -45,6 +46,9 @@ module Kameleon
 
       @shell_cmd = "source #{@default_bashrc_file} 2> /dev/null; "\
                    "#{@cmd} --rcfile #{@bashrc_file}"
+      @interactive_shell_cmd = "source #{@default_bashrc_file} 2> /dev/null; "\
+                   "#{@interactive_cmd} --rcfile #{@bashrc_file}"
+
       Kameleon.ui.debug("Initialize shell (#{self})")
       # Injecting all variables of the options and assign the variables
       instance_variables.each do |v|
@@ -238,8 +242,8 @@ SCRIPT
       return get_status
     end
 
-    def fork_and_wait
-      process, _, _ = fork("inherit")
+    def start_interactive
+      process, _, _ = fork("interactive")
       process.wait()
     end
 
@@ -285,8 +289,13 @@ SCRIPT
     end
 
     def fork(io)
-      command = ["bash", "-c", @shell_cmd]
-      Kameleon.ui.info("Starting process: #{@cmd.inspect}")
+      if io.eql? "interactive"
+        command = ["bash", "-c", @interactive_shell_cmd]
+        Kameleon.ui.info("Starting interactive command: #{@interactive_shell_cmd.inspect}")
+      else
+        command = ["bash", "-c", @shell_cmd]
+        Kameleon.ui.info("Starting command: #{@cmd.inspect}")
+      end
       Kameleon.ui.debug("Starting shell process: #{ command.inspect}")
       ChildProcess.posix_spawn = true
       process = ChildProcess.build(*command)
@@ -299,7 +308,7 @@ SCRIPT
         process.io.stderr = stderr_writer
         # sets up pipe so process.io.stdin will be available after .start
         process.duplex = true
-      elsif io.eql? "inherit"
+      elsif io.eql? "interactive"
         process.io.inherit!
       end
 

data/version.txt

@@ -1 +1 @@
-2.7.1
+2.7.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess