MuranoCLI 3.2.1.pre.beta.5 → 3.2.1.pre.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff5244477f257826ba1be660294833275bbaaba10ee563f23f6db6db34a0881
-  data.tar.gz: ac6ebd0919a011d68edfcb2b5a72f92a44ba7a7e12c03bb62cae9be315b6c79e
+  metadata.gz: c7b6f4d6e31bdd654e04f1fc4c2ed30d90f94de8947b59164ffe6319d8ed7d97
+  data.tar.gz: 8ff84467a6042cb45824f35d84718996e6f8475493b2916d27e8d2db516e3d36
 SHA512:
-  metadata.gz: c2f0256be1282cb71a11482e148df6cd38e2a698e7fb22b53870b8517234c8ae4ef16785dd5e850be16da89492a1f508f90730d15c997c932edff181d842e145
-  data.tar.gz: 0dc91210f3647e1da4ec36c4b11d8bf0bfd9d8d753907df3b95f15191b9f9c1fe854c699814fac974edaba6f49aac08815890320c071dbce0bbdb60aa35d2f42
+  metadata.gz: 178bb7cc8e13a7defdadc041cf7e6dfc75ef9f0cfbeabbc5c7aaabf3904ecadc2b97bc8a3ac4402258cc786bf26bd6ec1701c56b5371b80f3da93f05a87f3ccb
+  data.tar.gz: ed15592b431a4c0e7c5e4e68f26a83801e83585b157ed5110c14861095f0f138701e27e05a68524278f6d41462e1b8dd7081943f9c21aee908383d1f6cf3ea9c

data/Gemfile

@@ -26,6 +26,8 @@ gem 'mime-types-data', '~> 3.2016.0521'
 #  WAS: gem 'commander', '~> 4.4.6'
 #  NOW: gem 'murano-cli-commander', '~> 4.4.10'
 gem 'murano-cli-commander', '~> 4.4.10'
+# We forked whirly to fix width calculation (strip color codes first).
+gem 'murano-cli-whirly', '~> 0.2.7'
 #gem 'orderedhash', '~> 0.0.6'
 gem 'os', '~> 1.0.0'
 gem 'paint', '~> 2.0.0'
@@ -40,7 +42,6 @@ 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'

data/HISTORY.md

@@ -2,6 +2,17 @@
 
 ---------------------------------------------------------------------------
 
+## Murano CLI v3.2.1.pre.beta.6 (2018-08-09)
+
+### Improved
+
+- Update from `whirly` gem to `murano-cli-whirly` (Issue: [MUR-7654](https://i.exosite.com/jira/browse/MUR-7654))
+
+  - Fixes problem with line breaks disrupting progress display
+    (when color codes are present).
+
+---------------------------------------------------------------------------
+
 ## Murano CLI v3.2.1.pre.beta.5 (2018-08-09)
 
 ### New

data/MuranoCLI.gemspec

@@ -33,6 +33,9 @@ And so much more.
   #   s.post_install_message = %(...)
 
   s.files         = `git ls-files`.split("\n")
+  # (lb): MAYBE/2018-08-09: Do we need to include spec files in the gem?
+  #   I added the spec/fixtures/snapshots directory and the Gem size
+  #   went from 295 Kb to 757 Kb!
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
@@ -57,6 +60,7 @@ And so much more.
   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('murano-cli-whirly', '~> 0.2.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')
@@ -69,7 +73,6 @@ And so much more.
   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')
 
   # `bundle install --with=test`
   #s.add_development_dependency('bundler', '~> 1.7.6')

data/docs/release.rst

@@ -189,6 +189,26 @@ WARNING: You will never again be able to publish another release using the same
 
   $ gem yank murano-cli-commander -v ${CUR_VERS}
 
+======================================
+Forked Whirly Gem Release Instructions
+======================================
+
+::
+
+  CUR_VERS='0.2.7'
+
+  git tag -a "v${CUR_VERS}" -m "Version ${CUR_VERS}" develop
+  git push origin "v${CUR_VERS}"
+
+  # Test it.
+  rake spec
+
+  # Build it.
+  rake gem
+
+  # Publish it (to Rubygems).
+  rake release
+
 ##########################################
 Troubleshooting Gem Release/Publish Issues
 ##########################################

data/lib/MrMurano/progress.rb

@@ -7,9 +7,9 @@
 
 require 'highline'
 require 'inflecto'
+require 'murano-cli-whirly'
 require 'os'
 require 'singleton'
-require 'whirly'
 
 module MrMurano
   # Progress is a singleton (evil!) that implements a terminal progress bar.

data/lib/MrMurano/verbosing.rb

@@ -9,11 +9,11 @@ require 'csv'
 require 'highline'
 require 'inflecto'
 require 'json'
+require 'murano-cli-whirly'
 require 'os'
 require 'paint'
 require 'pp'
 require 'terminal-table'
-require 'whirly'
 require 'yaml'
 require 'MrMurano/progress'
 

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.2.1.pre.beta.5'
+  VERSION = '3.2.1.pre.beta.6'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.beta.5
+  version: 3.2.1.pre.beta.6
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.7
+- !ruby/object:Gem::Dependency
+  name: murano-cli-whirly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -318,20 +332,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: whirly
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement