Merge pull request #258 from 3pillarlabs/develop

Merge PR #257

Makefile

@@ -295,7 +295,11 @@ push_release_tag:
 
 release_tag:
 	if [ -z "${PUSHED_RELEASE_TAG}" ]; then \
-		if ${CHANGES} docker-compose.yml; then \
+		${CHANGES} docker-compose.yml; \
+		docker_changed=$${?}; \
+		${CHANGES} hailstorm-cli/lib/hailstorm/cli/version.rb; \
+		cli_changed=$${?}; \
+		if [ $${docker_changed} -eq 0 ] || [ $${cli_changed} -eq 0 ]; then \
 			make push_release_tag; \
 		fi; \
 	fi

hailstorm-cli/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hailstorm-cli (1.0.18-java)
+    hailstorm-cli (1.0.17-java)
       hailstorm (= 5.1.16)
 
 GEM

hailstorm-cli/lib/hailstorm/cli/version.rb

@@ -3,6 +3,6 @@
 # Version
 module Hailstorm
   module Cli
-    VERSION = '1.0.18'
+    VERSION = '1.0.17'
   end
 end

hailstorm-cli/lib/hailstorm/controller/cli.rb

@@ -38,7 +38,7 @@ def current_project
   def process_commands
     logger.debug { ["\n", '*' * 80, "Application started at #{Time.now}", '-' * 80].join("\n") }
 
-    puts %{Welcome to the Hailstorm (version #{Hailstorm::VERSION}) shell.
+    puts %{Welcome to the Hailstorm shell (v.#{Hailstorm::Cli::VERSION}, gem v.#{Hailstorm::VERSION} ).
 Type help to get started...
 }
     trap('INT', proc { logger.warn('Type [quit|exit|ctrl+D] to exit shell') })