MuranoCLI 3.1.0.beta.8 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a496a97244bc5b3c72007dbeca1b1aba1727c5b04d30e0918ee89ea8bdfe7299
-  data.tar.gz: 9c2b8a4552c037a649c09eafe16eeed9ef758c85d2ac091bd13054ad5c5f7056
+  metadata.gz: e90d2b8f700e2d6622118f28d8e1a1759706205cb35affe3e0aee7d742961644
+  data.tar.gz: 6a8ea0aa65cb39d5312ae0451337173d3a38b735867860868cf54bcfe7a144ca
 SHA512:
-  metadata.gz: 9fd6b6278866a777328db9aa3921e1e27f239ffdd4d880b97502c50e824d910e3ecaa5e6063cb5b6c8cad1813d6d7d16081cc9f38f53e281a367135a61c21fd4
-  data.tar.gz: e66db775e437b051dcee81a55f84861bb0fca0d022a144ee617cacb5ac3b86809731fdfffcd385e8622e04fa6d85129c08a533869313f25b3fb1989179a3d9e7
+  metadata.gz: b41ce85c7df8e2ffb269d4322be5e0e97b1b944325eab6a852ffda53368a2c51b6a1a4ac8e2485ddbbe45e47c80ed6520d89a85b488f91a0293015a2b93957fd
+  data.tar.gz: 1d44b6f3dcb5f3c84685f1fcf1bf1de47bf1d2a5b6496212487bbd843a13f8779515ea0a8d2eda65d1ef5fe4c783510d0491d2670eb62ff89be08a47259f17d7

data/dockers/Dockerfile.2.2.9

@@ -2,11 +2,21 @@ FROM ruby:2.2.9-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
 
+RUN \
+  echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
+    >> /etc/apt/sources.list \
+  && 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
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
 WORKDIR /app
 COPY . /app
 

data/dockers/Dockerfile.2.3.6

@@ -2,11 +2,21 @@ 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
 
+RUN \
+  echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
+    >> /etc/apt/sources.list \
+  && 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
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
 WORKDIR /app
 COPY . /app
 

data/dockers/Dockerfile.2.4.3

@@ -2,11 +2,21 @@ FROM ruby:2.4.3-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
 
+RUN \
+  echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
+    >> /etc/apt/sources.list \
+  && 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
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
 WORKDIR /app
 COPY . /app
 

data/dockers/Dockerfile.2.5.0

@@ -2,11 +2,21 @@ FROM ruby:2.5.0-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
 
+RUN \
+  echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
+    >> /etc/apt/sources.list \
+  && 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
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+
 WORKDIR /app
 COPY . /app
 

data/dockers/Dockerfile.m4

@@ -8,7 +8,7 @@ USER root
 
 dnl # Jenkins defaults to the ASCII encoding, but we want UTF-8.
 dnl #
-dnl # FIXME/MEH: (lb): Murano CLI still has encoding issues, e.g.,
+dnl # FIXME/MEH: (lb): Murano CLI may still have encoding issues, e.g.,
 dnl # the highline.say() command crashes on some strings, complaining:
 dnl #
 dnl #   invalid byte sequence in US-ASCII
@@ -17,25 +17,22 @@ dnl # which we currently work around by running Murand CLI in ASCII, e.g.,
 dnl #
 dnl #   murano --no-progress --no-color --ascii ...
 dnl #
-dnl # which means our Jenkins/Docker test is not quite testing how
-dnl # people usually run the app. Oh well.
+dnl # (lb): I tried to install en_US.UTF-8, e.g., using `locale-gen` and
+dnl # `update-locale`, but I couldn't make it work. The Docker container
+dnl # at least has C.UTF-8 encoding, which I think just has a different
+dnl # sort order than en_us.UTF-8.
 dnl #
-dnl # ((lb): I had hoped that setting ENV herein would help, and while it
-dnl # does change the encoding for the `docker exec` command that Jenkins
-dnl # runs later, it doesn't fix the "invalid byte sequence" error.)
+dnl # NOTE: If you try to change to en_US.UTF-8, which is not installed,
+dnl # you'll see: `setlocale: LC_ALL: cannot change locale (en_US.UTF-8)`.
 dnl #
-dnl # NOTE: You cannot change the encoding from the Execute Shell build
-dnl # command. If you tried, you'd see, e.g.,:
+dnl # Set the locale, which changes the encoding for the `docker exec`
+dnl # command that Jenkins runs later.
 dnl #
-dnl #   $ export LC_ALL=en_US.UTF-8
-dnl #   setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-dnl #
-dnl # ALSO: Skip LC_ALL, otherwise when Jenkins runs `docker exec ...` you'll see:
-dnl #
-dnl #   /bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-dnl #
-ENV LANGUAGE en_US.UTF-8
-ENV LANG en_US.UTF-8
+dnl # FIXME: (lb): Remove the --ascii switch (forced because if !tty?) and
+dnl #  see if using C.UTF-8 makes the "invalid byte sequence" error go away.
+ENV LANGUAGE C.UTF-8
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
 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
@@ -54,17 +51,21 @@ dnl # (lb): So. Weird. Sometimes the Jenkins Docker Volumes mount with 2755
 dnl # permissions. Othertimes with 2777. In case this happens again, I'll
 dnl # leaving this code here. Give jenkins user power to fix permissions on the
 dnl # mounted Volumes: /app/report and /app/coverage mount as 2755 root:root.
+dnl # 2018-01-18: This happened on the new Jenkins jobs. Maybe you only need
+dnl #   to do this once per project, and then Jenkins remembers, even when
+dnl #   the Docker container cache is invalid and the image is rebuilt?
 dnl # NOTE: Skipping `RUN apt-get upgrade -y` to run faster.
-dnl #   RUN \
-dnl #     echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
-dnl #       >> /etc/apt/sources.list \
-dnl #     && echo "deb-src http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
-dnl #       >> /etc/apt/sources.list \
-dnl #     && apt-get -qq update \
-dnl #     && apt-get install -y sudo
-dnl #   #RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-dnl #   RUN echo "jenkins ALL= NOPASSWD: chmod" >> /etc/sudoers
-dnl #
+RUN \
+  echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" \
+    >> /etc/apt/sources.list \
+  && 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
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+dnl # If you have complainst about sudoers, try:
+dnl #   RUN visudo -c
+
 dnl # Create the /app directory and give ownership to the new user, otherwise
 dnl # if we switch to the new user first, they cannot create the workdir.
 dnl #

data/dockers/README.rst

@@ -29,6 +29,26 @@ Generate Dockerfiles from the M4 template:
       > dockers/Dockerfile.${ruby_vers}
   done
 
+==============================
+Injected Environment Variables
+==============================
+
+You'll see some environs injected into the config.
+
+Some of the environs are user-specific.
+
+2018-01-19: Currently, the tests use Murano accounts created by Landon
+on https://www.exosite-staging.com/::
+
+  MURANO_USERNAME => Email. Use different accounts for each Jenkins test job.
+                            E.g., landonbouma+staging-jenkins-ruby-2.2@exosite.com
+                                  landonbouma+staging-jenkins-ruby-2.3@exosite.com
+                                  etc.
+
+  MURANO_PASSWORD => Obvious.
+
+  MURANO_BUSINESS => For each new Murano account, create a business. This is its ID.
+
 ===============================================
 Jenkins project configuration: Murano CLI Tests
 ===============================================
@@ -111,19 +131,25 @@ Jenkins project configuration: Murano CLI Tests
 
         - Network bridge: ``bridge``
 
+  - Inject environment variables to the build process ``✓``
+
+    - Properties Content::
+
+      MURANO_BUSINESS=<Business ID from www.exosite-staging.com>
+
   - Inject passwords to the build as environment variables ``✓``
 
     - Job passwords
 
       - Add
 
-        - Name: ``LANDON_PASSWORD``
+        - Name: ``MURANO_PASSWORD``
 
         - Password: ``****************``
 
       - Add
 
-        - Name: ``LANDON_USERNAME``
+        - Name: ``MURANO_USERNAME``
 
         - Password: ``****************``
 
@@ -160,7 +186,7 @@ Jenkins project configuration: Murano CLI Tests
 
 - E-mail Notification
 
-  - Recipients: ``landonbouma@exosite.com``
+  - Recipients: ``landonbouma@exosite.com miketilstra@exosite.com``
 
 =====================================================
 Jenkins project configuration: Murano CLI Gem Release

data/dockers/RELEASE.rst

@@ -0,0 +1,132 @@
+###################################
+MURANO CLI GEM RELEASE INSTRUCTIONS
+###################################
+
+(lb): It'd be nice to script this. But for now, copy-paste!
+
+###########################
+One-time Setup Instructions
+###########################
+
+Sign Up for RubyGems Account
+----------------------------
+
+- Sign up for account and request access to Murano CLI gem.
+
+  https://rubygems.org/
+
+- Murano CLI RubyGems.org Repo
+
+  https://rubygems.org/gems/MuranoCLI
+
+Checkout Murano CLI locally
+---------------------------
+
+E.g., this is how (lb) does it::
+
+  MURCLI_BASE=/exo/clients/exosite/MuranoCLIs
+  mkdir -p ${MURCLI_BASE}
+  cd ${MURCLI_BASE}
+  git clone git@github.com:exosite/MuranoCLI.git exosite+MuranoCLI
+
+###################################
+Copy-paste Gem Release Instructions
+###################################
+
+Set that latest version
+-----------------------
+
+Set the release version, e.g.,::
+
+  MURCLI_VER="3.1.0.beta.8"
+  MURCLI_REL="v${MURCLI_VER}"
+
+Choose a release: pre or official
+---------------------------------
+
+Official Gem Release::
+
+  MURCLI_REF="master"
+
+Beta/Pre-release Gem Release::
+
+  MURCLI_REF="develop"
+
+Trigger the Gem release build
+-----------------------------
+
+Set the variables above, and then tag the appropriate branch::
+
+  cd ${MURCLI_BASE}/exosite+MuranoCLI
+  git checkout ${MURCLI_REL}
+  git pull
+
+  git tag -a "${MURCLI_REL}" -m "Release tag: ${MURCLI_REL}" ${MURCLI_REF}
+  git push origin "${MURCLI_REL}"
+
+Wait for the build to start
+---------------------------
+
+The Jenkins build server is on a five minute poll. You can either
+start the build yourself, or you can wait for it to start.
+
+- Jenkins server URL
+
+  https://jenkins.exosite.com/job/MuranoCLI/job/Murano%20CLI%20Gem%20Release/
+
+Download the built Gem and publish it
+-------------------------------------
+
+Create a GitHub token and store in an environ::
+
+  GITHUB_TOKEN="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+
+Download the built Gem from GitHub::
+
+  mkdir -p /tmp/gem_push
+  pushd /tmp/gem_push
+
+  OWNER="exosite"
+  REPO="MuranoCLI"
+  #
+  curl --header "Authorization: token ${GITHUB_TOKEN}" \
+       --header "Accept: application/json" \
+       --remote-name \
+       --location https://api.github.com/repos/${OWNER}/${REPO}/releases
+  cat releases
+  #
+  curl --header "Authorization: token ${GITHUB_TOKEN}" \
+       --header "Accept: application/json" \
+       --remote-name \
+       --location \
+         https://api.github.com/repos/${OWNER}/${REPO}/releases/tags/v${MURCLI_VER}
+  cat v${MURCLI_VER}
+  ASSET_ID=$(cat v${MURCLI_VER} | jq '.assets[0].id')
+  echo ${ASSET_ID}
+  #
+  wget \
+    -q \
+    --auth-no-challenge \
+    --header='Accept:application/octet-stream' \
+    https://${GITHUB_TOKEN}:@api.github.com/repos/${OWNER}/${REPO}/releases/assets/${ASSET_ID} \
+    -O MuranoCLI-${MURCLI_VER}.gem
+
+Publish the gem::
+
+  gem push MuranoCLI-${MURCLI_VER}.gem
+  popd
+  rm /tmp/gem_push/MuranoCLI-${MURCLI_VER}.gem
+  rm /tmp/gem_push/${ASSET_ID}
+  rmdir /tmp/gem_push
+
+Test!::
+
+  gem uninstall MuranoCLI
+  murano -v
+
+  gem install MuranoCLI
+  murano -v
+
+  gem install MuranoCLI --pre
+  murano -v
+

data/dockers/docker-test.sh

@@ -45,21 +45,19 @@
 
 [[ -z ${WORKSPACE} ]] && echo "ERROR: Expected WORKSPACE to be set" && exit 1
 
-export MURANO_USERNAME="${LANDON_USERNAME}"
-export MURANO_PASSWORD="${LANDON_PASSWORD}"
-
 [[ -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
 [user]
-  name = landonbouma+jenkins-nix@exosite.com
+  name = ${MURANO_USERNAME}
 [business]
-  id = hd7opcgbyjfqd7vi
+  id = ${MURANO_BUSINESS}
 [net]
-  host = bizapi.hosted.exosite.io
+  host = bizapi-staging.hosted.exosite.io
 EOCFB
 export MURANO_CONFIGFILE="${WORKSPACE}/test.run.muranocfg"
 
@@ -81,8 +79,8 @@ 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.
-#   chmod 2777 /app/report
-#   chmod 2777 /app/coverage
+sudo chmod 2777 /app/report
+sudo chmod 2777 /app/coverage
 
 echo "############################################################################################"
 echo "Testing \"$(murano -v)\" on \"$(ruby -v)\""

data/lib/MrMurano/commands/logs.rb

@@ -228,6 +228,7 @@ Used to group logs together for one endpoint request.
     cmd_add_format_options_pretty(cmd)
     cmd_add_format_options_raw(cmd)
     cmd_add_format_options_message_only(cmd)
+    cmd_add_format_options_omit_headers(cmd)
     cmd_add_format_options_one_line(cmd)
     cmd_add_format_options_align_columns(cmd)
     cmd_add_format_options_indent_body(cmd)
@@ -249,7 +250,11 @@ Used to group logs together for one endpoint request.
   end
 
   def cmd_add_format_options_message_only(cmd)
-    cmd.option '-o', '--message-only', %(Show only headers and the 'print' message)
+    cmd.option '-o', '--message-only', %(Show only the 'print' message, and maybe headers)
+  end
+
+  def cmd_add_format_options_omit_headers(cmd)
+    cmd.option '-O', '--omit-headers', %(Omit headers)
   end
 
   def cmd_add_format_options_one_line(cmd)
@@ -265,7 +270,7 @@ Used to group logs together for one endpoint request.
   end
 
   def cmd_add_format_options_separators(cmd)
-    cmd.option '--[no-]separators', %(Indent body content in formatted output)
+    cmd.option '--[no-]separators', %(Show separators between log entries)
   end
 
   def cmd_add_format_options_include_tracking(cmd)
@@ -370,6 +375,7 @@ Use a "#{INCLUDE_INDICATOR}" or "#{EXCLUDE_INDICATOR}" prefix to include or excl
       pretty: true,
       raw: false,
       message_only: false,
+      omit_headers: false,
       one_line: false,
       tracking: false,
       sprintf: '%Y-%m-%d %H:%M:%S',

data/lib/MrMurano/makePretty.rb

@@ -111,13 +111,18 @@ module MrMurano
     def self.log_pretty_assemble_header(line, options)
       out = ''
       raw = ''
+      out, raw = log_pretty_assemble_header_meta(line, out, raw, options)
+      out, _raw = log_pretty_header_add_message(line, out, raw, options)
+      out.empty? && out || out + "\n"
+    end
+
+    def self.log_pretty_assemble_header_meta(line, out, raw, options)
+      return [out, raw] if options.omit_headers
       out, raw = log_pretty_header_add_event_timestamp(line, out, raw, options)
       out, raw = log_pretty_header_add_murano_tracking(line, out, raw, options)
       out, raw = log_pretty_header_add_log_record_type(line, out, raw, options)
       out, raw = log_pretty_header_add_abbreviated_sev(line, out, raw, options)
-      out, raw = log_pretty_header_add_a_service_event(line, out, raw, options)
-      out, _raw = log_pretty_header_add_message(line, out, raw, options)
-      out + "\n"
+      log_pretty_header_add_a_service_event(line, out, raw, options)
     end
 
     def self.log_pretty_header_add_abbreviated_sev(line, out, raw, options)

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.1.0.beta.8'
+  VERSION = '3.1.0'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/cmd_common.rb

@@ -250,9 +250,10 @@ RSpec.shared_context 'CI_CMD' do
     #     +Linked ΓÇÿsyncdowntestprd1e8b4034ΓÇÖ to ΓÇÿsyncdowntestapp23d5135bΓÇÖ
     #
     # which we can solve with an encode call. (Or but using norm quotes.)
-    str.nil? && "" || str.encode!(
-      'UTF-8', 'UTF-8').tr(%(‘), %(')).tr(%(’), %(')
-    )
+    str.nil? && '' ||
+      str.encode!(
+        'UTF-8', 'UTF-8'
+      ).tr(%(‘), %(')).tr(%(’), %('))
   end
 
   # *** rb-commander goodies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.8
+  version: 3.1.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -469,6 +469,7 @@ files:
 - dockers/Dockerfile.GemRelease
 - dockers/Dockerfile.m4
 - dockers/README.rst
+- dockers/RELEASE.rst
 - dockers/docker-test.sh
 - dockers/gem-release.sh
 - docs/basic_example.rst
@@ -660,9 +661,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.4