MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/Gemfile

@@ -10,8 +10,10 @@ source 'http://rubygems.org'
 #gemspec
 
 gem 'certified', '1.0.0'
-gem 'commander', '~> 4.4.3'
+# (lb): I forked commander to fix empty-string args issue; see murano-cli-commander.
+#   gem 'commander', '~> 4.4.4'
 gem 'dotenv', '~> 2.1.1'
+gem 'dumb_delegator', '~> 0.8.0'
 gem 'eventmachine', '~> 1.2.5'
 gem 'faye-websocket', '~> 0.10.7'
 gem 'highline', '~> 1.7.8'
@@ -22,6 +24,7 @@ gem 'json', '~> 2.1.0'
 gem 'json-schema', '~> 2.7.0'
 gem 'mime-types', '~> 3.1'
 gem 'mime-types-data', '~> 3.2016.0521'
+gem 'murano-cli-commander', '~> 4.4.7'
 #gem 'orderedhash', '~> 0.0.6'
 gem 'os', '~> 1.0.0'
 gem 'paint', '~> 2.0.0'
@@ -33,17 +36,20 @@ gem 'rainbow', '~> 2.2.2'
 #   Windows build fails unless `rake` is packaged.
 gem 'rake', '~> 12.1.0'
 gem 'terminal-table', '~> 1.8.0'
+gem 'tty-editor', '~> 0.4.0'
+gem 'unicode-display_width', '~> 1.3.2'
 gem 'vine', '~> 0.4'
 gem 'whirly', '~> 0.2.4'
 
 group :test do
   #gem 'bundler', '~> 1.7.6'
   gem 'byebug', '~> 9.0.6'
-  gem 'coderay', require: false
+  #gem 'coderay', require: false
   #gem 'rake', '~> 10.1.1'
   gem 'rspec', '~> 3.5'
   gem 'rubocop', '~> 0.49.1'
-  gem 'simplecov', require: false
+  #gem 'simplecov', require: false
+  gem 'simplecov', '~> 0.16.1'
   gem 'webmock', '~> 2.3.0'
   gem 'websocket-driver', '~> 0.7.0'
   #gem 'vcr'

data/MuranoCLI.gemspec

@@ -38,8 +38,10 @@ And so much more.
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('certified', '1.0.0')
-  s.add_runtime_dependency('commander', '~> 4.4.3')
+  # (lb): I forked commander to fix empty-string args issue; see murano-cli-commander.
+  #   s.add_runtime_dependency('commander', '~> 4.4.4')
   s.add_runtime_dependency('dotenv', '~> 2.1.1')
+  s.add_runtime_dependency('dumb_delegator', '~> 0.8.0')
   # 2017-08-15: Getting warning when running --user-install gem in 2.4.0. [lb]:
   #   Ignoring eventmachine-1.2.3 because its extensions are not built.
   #     Try: gem pristine eventmachine --version 1.2.3
@@ -54,6 +56,7 @@ And so much more.
   s.add_runtime_dependency('json-schema', '~> 2.7.0')
   s.add_runtime_dependency('mime-types', '~> 3.1')
   s.add_runtime_dependency('mime-types-data', '~> 3.2016.0521')
+  s.add_runtime_dependency('murano-cli-commander', '~> 4.4.7')
   #s.add_runtime_dependency('orderedhash', '~> 0.0.6')
   s.add_runtime_dependency('os', '~> 1.0.0')
   s.add_runtime_dependency('paint', '~> 2.0.0')
@@ -61,15 +64,15 @@ And so much more.
   #   It's included by json, so make sure it's the old one.
   s.add_runtime_dependency('public_suffix', '~> 2.0.5')
   s.add_runtime_dependency('rainbow', '~> 2.2.2')
+  # 2017-09-12: MRMUR-160/MRMUR-161: (lb): Windows build fails without `rake`.
+  s.add_runtime_dependency('rake', '~> 12.1.0')
   s.add_runtime_dependency('terminal-table', '~> 1.8.0')
+  s.add_runtime_dependency('tty-editor', '~> 0.4.0')
   s.add_runtime_dependency('vine', '~> 0.4')
   s.add_runtime_dependency('whirly', '~> 0.2.4')
-  # LATER/2017-09-12: See MRMUR-160 and MRMUR-161:
-  #   Windows build fails unless `rake` is packaged.
-  s.add_runtime_dependency('rake', '~> 12.1.0')
 
   # `bundle install --with=test`
-  s.add_development_dependency('bundler', '~> 1.7.6')
+  #s.add_development_dependency('bundler', '~> 1.7.6')
   s.add_development_dependency('byebug', '~> 9.0.6')
   #s.add_development_dependency('coderay', '~> ???')
   #s.add_development_dependency('rake', '~> 12.1.0')

data/Rakefile

@@ -86,6 +86,7 @@ desc 'Run Rubocop linter'
 task :rubocop do
   sh %(rubocop -D -c .rubocop.yml)
 end
+task lint: :rubocop
 
 desc 'Clean out junk from prior hot tests'
 task :test_clean_up do

data/dockers/Dockerfile.2.2.9

@@ -15,7 +15,8 @@ RUN \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
   && apt-get install -y sudo
-RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
+RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -25,9 +26,9 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  gem install bundler && \
+  sudo gem install bundler && \
   gem install rspec && \
-  bundler install && \
+  bundle install --with test && \
   rake build
 
 RUN gem install \
@@ -35,3 +36,5 @@ RUN gem install \
     'require "/app/lib/MrMurano/version.rb"; puts MrMurano::VERSION' \
   ).gem
 
+# vim:tw=0:ts=4:sw=4:noet:ft=conf:
+

data/dockers/Dockerfile.2.3.6

@@ -15,7 +15,8 @@ RUN \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
   && apt-get install -y sudo
-RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
+RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -25,9 +26,9 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  gem install bundler && \
+  sudo gem install bundler && \
   gem install rspec && \
-  bundler install && \
+  bundle install --with test && \
   rake build
 
 RUN gem install \
@@ -35,3 +36,5 @@ RUN gem install \
     'require "/app/lib/MrMurano/version.rb"; puts MrMurano::VERSION' \
   ).gem
 
+# vim:tw=0:ts=4:sw=4:noet:ft=conf:
+

data/dockers/Dockerfile.2.4.3

@@ -15,7 +15,8 @@ RUN \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
   && apt-get install -y sudo
-RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
+RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -25,9 +26,9 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  gem install bundler && \
+  sudo gem install bundler && \
   gem install rspec && \
-  bundler install && \
+  bundle install --with test && \
   rake build
 
 RUN gem install \
@@ -35,3 +36,5 @@ RUN gem install \
     'require "/app/lib/MrMurano/version.rb"; puts MrMurano::VERSION' \
   ).gem
 
+# vim:tw=0:ts=4:sw=4:noet:ft=conf:
+

data/dockers/Dockerfile.2.5.0

@@ -15,7 +15,8 @@ RUN \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
   && apt-get install -y sudo
-RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
+RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -25,9 +26,9 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  gem install bundler && \
+  sudo gem install bundler && \
   gem install rspec && \
-  bundler install && \
+  bundle install --with test && \
   rake build
 
 RUN gem install \
@@ -35,3 +36,5 @@ RUN gem install \
     'require "/app/lib/MrMurano/version.rb"; puts MrMurano::VERSION' \
   ).gem
 
+# vim:tw=0:ts=4:sw=4:noet:ft=conf:
+

data/dockers/Dockerfile.GemRelease

@@ -1,9 +1,10 @@
-FROM ruby:2.2.9-jessie
+FROM ruby:2.3.6-jessie
 
 USER root
 
-ENV LANGUAGE en_US.UTF-8
-ENV LANG en_US.UTF-8
+ENV LANGUAGE C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
 RUN useradd -m -s /bin/bash --uid 1001 -G root jenkins
 
@@ -13,6 +14,7 @@ RUN \
   && echo "deb-src http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
+  && apt-get install -y sudo \
   && apt-get install -y curl \
   && apt-get install -y bzip2 \
   && apt-get install -y tar
@@ -24,11 +26,11 @@ RUN /bin/chown -R jenkins /app
 
 USER jenkins
 
-RUN cd /app && \
-  gem install bundler && \
-  gem install rspec && \
-  bundler install && \
-  rake build
+RUN cd /app
+RUN gem install bundler
+RUN gem install rspec
+RUN bundle install
+RUN rake build
 
 RUN gem install \
   pkg/MuranoCLI-$(ruby -e \

data/dockers/Dockerfile.m4

@@ -34,6 +34,20 @@ ENV LANGUAGE C.UTF-8
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
+dnl # Some DEBUGGING tricks:
+dnl #   RUN ls -la /app
+dnl #   RUN ruby -v
+dnl #   # Show: $GEM_HOME, $GEM_PATH, $GEM_ROOT, $BUNDLE_PATH, $BUNDLE_HOME, etc.
+dnl #   RUN set | grep -e '^RUBY' -e '^GEM' -e '^BUNDLE'
+dnl #   RUN gem env
+dnl #   RUN ruby -rubygems -e 'puts Gem.dir'
+dnl #   ...
+dnl #   RUN command -v bundler
+dnl #   RUN bundler -v
+dnl #
+dnl # In any case, gems are installed to:
+dnl #   /usr/local/bundle/gems
+dnl #
 dnl # Jenkins runs the Execute Shell script on Docker as the 'jenkins' user,
 dnl # but Docker is confused unless we create that user now and assign it the
 dnl # UID that gets used. ((lb): This is hacky; Ops might fix this eventually.)
@@ -62,7 +76,11 @@ RUN \
     >> /etc/apt/sources.list \
   && apt-get -qq update \
   && apt-get install -y sudo
-RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
+dnl # NOTE: It's just easier to give the jenkins user full sudo...
+dnl #   RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+dnl #   RUN echo "jenkins ALL= NOPASSWD: /usr/local/bundle/bin/gem" >> /etc/sudoers
+RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 dnl # If you have complainst about sudoers, try:
 dnl #   RUN visudo -c
 
@@ -88,9 +106,9 @@ dnl #
 USER jenkins
 
 RUN cd /app && \
-  gem install bundler && \
+  sudo gem install bundler && \
   gem install rspec && \
-  bundler install && \
+  bundle install --with test && \
   rake build
 
 dnl # Install Murano CLI.
@@ -100,5 +118,5 @@ RUN gem install \
     'require "/app/lib/MrMurano/version.rb"; puts MrMurano::VERSION' \
   ).gem
 
-dnl # vim:tw=0:ts=4:sw=4:noet:ft=conf:
-dnl
+# vim:tw=0:ts=4:sw=4:noet:ft=conf:
+

data/dockers/docker-test.sh

@@ -43,15 +43,17 @@
 # Jenkins sets a few environs, like ${WORKSPACE}, and we pull in a few
 # more from the Jenkins Environment Injector Plugin.
 
-[[ -z ${WORKSPACE} ]] && echo "ERROR: Expected WORKSPACE to be set" && exit 1
-
-[[ -z ${MURANO_USERNAME} ]] && echo "ERROR: Please set MURANO_USERNAME" && exit 1
-[[ -z ${MURANO_PASSWORD} ]] && echo "ERROR: Please set MURANO_PASSWORD" && exit 1
-[[ -z ${MURANO_BUSINESS} ]] && echo "ERROR: Please set MURANO_BUSINESS" && exit 1
+must_verify_environs () {
+  [[ -z ${WORKSPACE} ]] && echo "ERROR: Expected WORKSPACE to be set" && exit 1
+  [[ -z ${MURANO_USERNAME} ]] && echo "ERROR: Please set MURANO_USERNAME" && exit 1
+  [[ -z ${MURANO_PASSWORD} ]] && echo "ERROR: Please set MURANO_PASSWORD" && exit 1
+  [[ -z ${MURANO_BUSINESS} ]] && echo "ERROR: Please set MURANO_BUSINESS" && exit 1
+}
 
 # Create a basic Murano CLI config indicating the Murano account credentials.
 
-cat > "${WORKSPACE}/test.run.muranocfg" <<-EOCFB
+create_basic_config () {
+  cat > "${WORKSPACE}/test.run.muranocfg" <<-EOCFB
 [user]
   name = ${MURANO_USERNAME}
 [business]
@@ -59,37 +61,72 @@ cat > "${WORKSPACE}/test.run.muranocfg" <<-EOCFB
 [net]
   host = bizapi-staging.hosted.exosite.io
 EOCFB
-export MURANO_CONFIGFILE="${WORKSPACE}/test.run.muranocfg"
+  export MURANO_CONFIGFILE="${WORKSPACE}/test.run.muranocfg"
+}
 
 # Switch to the project directory and run tests.
 
-cd /app
+prepare_to_test () {
+  cd /app
 
-# Instead of `rake test_clean_up -t`, call CLI directly with --no-color.
+  # Instead of `rake test_clean_up -t`, call CLI directly with --no-color.
 
-echo "Removing existing solutions from Murano account."
+  echo "Removing existing solutions from Murano account."
 
-ruby -Ilib bin/murano solutions expunge -y --no-progress --no-color --ascii
+  ruby -Ilib bin/murano solutions expunge -y --no-progress --no-color --ascii
 
-# Fix the PATH to avoid the error:
-#
-#   /tmp/jenkins8459777890102160498.sh: line 81: rspec: command not found
-PATH=${PATH}:/usr/local/bundle/bin
+  # Fix the PATH to avoid the error:
+  #
+  #   /tmp/jenkins8459777890102160498.sh: line 81: rspec: command not found
+  PATH=${PATH}:/usr/local/bundle/bin
+
+  # (lb): Sometimes the host drive directories mount as root:root with 2755
+  # permissions. But sometimes not. If it starts happening again, you'll see
+  # Errno::EACCES: Permission denied. Uncomment the sudoers code in Dockerfile.
+  sudo chmod 2777 /app/report
+  sudo chmod 2777 /app/coverage
+}
+
+execute_tests () {
+  cd /app
+
+  echo "############################################################################################"
+  echo "Testing \"$(murano -v)\" on \"$(ruby -v)\""
+  echo "############################################################################################"
+
+  # Hint: Add `--example "<...>"` to limit the test suite.
+
+  set +e
+
+  local rspec_rsp
+
+  rspec \
+    --format html \
+    --out /app/report/index-${RVERS}.html \
+    --format documentation
+
+  rspec_rsp=$?
+
+  # BizAPI oftentimes timesout on a few tests, so try again.
+  if [[ ${rspec_rsp} -ne 0 ]]; then
+    rspec \
+      --format html \
+      --out /app/report/index-${RVERS}.html \
+      --format documentation \
+      --only-failures
 
-# (lb): Sometimes the host drive directories mount as root:root with 2755
-# permissions. But sometimes not. If it starts happening again, you'll see
-# Errno::EACCES: Permission denied. Uncomment the sudoers code in Dockerfile.
-sudo chmod 2777 /app/report
-sudo chmod 2777 /app/coverage
+    rspec_rsp=$?
+  fi
 
-echo "############################################################################################"
-echo "Testing \"$(murano -v)\" on \"$(ruby -v)\""
-echo "############################################################################################"
+  exit ${rspec_rsp}
+}
 
-# Hint: Add `--example "<...>"` to limit the test suite.
+main () {
+  must_verify_environs
+  create_basic_config
+  prepare_to_test
+  execute_tests
+}
 
-rspec \
-  --format html \
-  --out /app/report/index-${RVERS}.html \
-  --format documentation
+main "${@}"