MuranoCLI 3.2.1.pre.beta.6 → 3.2.1.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b6f4d6e31bdd654e04f1fc4c2ed30d90f94de8947b59164ffe6319d8ed7d97
-  data.tar.gz: 8ff84467a6042cb45824f35d84718996e6f8475493b2916d27e8d2db516e3d36
+  metadata.gz: bfbb8f408935daa8c012e04617a69badbba68c3bde1aad3fb9efe8973d83961e
+  data.tar.gz: 73075b87b642254cb03aa6d80c5801c9b566027d5f3b1d39a2abc7db19c4d036
 SHA512:
-  metadata.gz: 178bb7cc8e13a7defdadc041cf7e6dfc75ef9f0cfbeabbc5c7aaabf3904ecadc2b97bc8a3ac4402258cc786bf26bd6ec1701c56b5371b80f3da93f05a87f3ccb
-  data.tar.gz: ed15592b431a4c0e7c5e4e68f26a83801e83585b157ed5110c14861095f0f138701e27e05a68524278f6d41462e1b8dd7081943f9c21aee908383d1f6cf3ea9c
+  metadata.gz: d2de8997ef9b11542b6872505dd0c32933a482a90abc45f7f332a6ecafec861696e8bfc8bd87569b2ef656a2d72ec5e5dbbf9ee5b1dcfe530655285efe6583c7
+  data.tar.gz: dfa7c497d18314135484ba8c54cd4a1b683c8a81f873f2d5d3f3b53d49b1542f4acb8d2855ab6491d03386ce5fcf323750160d8915048c01a15e7991176a72f2

data/HISTORY.md

@@ -2,6 +2,16 @@
 
 ---------------------------------------------------------------------------
 
+## Murano CLI v3.2.1.pre.beta.7 (2018-08-09)
+
+### Improved
+
+- Decrease Murano CLI Gem install size. (Issue: [MUR-7654](https://i.exosite.com/jira/browse/MUR-7654))
+
+  - Was 300 Kb, now 200 Kb.
+
+---------------------------------------------------------------------------
+
 ## Murano CLI v3.2.1.pre.beta.6 (2018-08-09)
 
 ### Improved

data/MuranoCLI.gemspec

@@ -32,12 +32,43 @@ And so much more.
   # If you want to print a message on Gem install, use the P.I.M., e.g.,:
   #   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) }
+  # (lb): 2018-08-09: Do we need to include spec files in the gem?
+  #
+  #   I added the WebMock snapshots infrastructure, and a kabillion files
+  #   under spec/fixtures/snapshots directory, and the Gem size inflated
+  #   from 295 Kb to 757 Kb!
+  #
+  #   This is the old file collector:
+  #
+  #     s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  #
+  #   We could try without all the snapshots, e.g.,:
+  #
+  #     s.test_files = \
+  #       `git ls-files -- {test,spec,features}/* \
+  #         | grep -v '^spec/fixtures/snapshots' \
+  #       `.split("\n")
+  #
+  #   Or, better yet, because test_files is only used by the old,
+  #   useless, why-would-you-expect-a-user-to-test-a-gem task,
+  #   `gem test`, we should just not include any test files.
+  #
+  #   Similarly, we should exclude spec files from the list of normal
+  #   gem files, too. Here's the original files collector:
+  #
+  #     s.files = `git ls-files`.split("\n")
+  #
+  #   And following is syntax similar to what the bundler template suggests, from
+  #
+  #     https://github.com/bundler/bundler/blob/e41edd133a737ed95581a4e850076c7160289269/lib/bundler/templates/newgem/newgem.gemspec.tt
+  #
+  #   (Essentially, we just want bin/ and lib/ files, and maybe some top-level
+  #    files, like MuranoCLI.gemspec, but include all top-level files; I don't
+  #    know gems well enough, and we've already saved substantial weight. (Back
+  #    down to 205 Kb, even less than the original 295 Kb.)
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(dockers|docs|spec)/}) }
+
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('certified', '1.0.0')

data/Rakefile

@@ -12,9 +12,26 @@ require 'tmpdir'
 
 task default: %i[test]
 
-tag_name = "v#{Bundler::GemHelper.gemspec.version}"
-gem_name = "MuranoCLI-#{Bundler::GemHelper.gemspec.version}.gem"
-built_gem = "pkg/#{gem_name}"
+# ***
+
+def current_ver
+  Bundler::GemHelper.gemspec.version.version
+end
+
+def tag_name
+  "v#{current_ver}"
+end
+
+def gem_name(gem_ver=nil)
+  gem_ver ||= current_ver
+  "MuranoCLI-#{gem_ver}.gem"
+end
+
+def built_gem(gem_ver=nil)
+  "pkg/#{gem_name(gem_ver)}"
+end
+
+# ***
 
 # NOTE: If you're looking for the :build task, look in the bundler code, e.g.,
 #   /usr/lib/ruby/vendor_ruby/bundler/gem_helper.rb::build_gem
@@ -29,12 +46,23 @@ task :unbob do
   sh %(gem uninstall --user-install #{built_gem})
 end
 
-desc 'Build and install into user gems directory (useful for rvm and chruby)'
-task :'install:user' do
-  sh %(rake build)
+def build_gem_install_user(gem_ver=nil)
+  # (lb) In lieu of shelling out, e.g.,
+  #   sh %(rake build)
+  # we can just invoke the task directly.
+  # (Note that .invoke executes the dependencies, but it only executes the
+  # task if it has not already been invoked; and .execute executes the task
+  # but doesn't execute its dependencies; to do both, you'd want to first
+  # .reenable, and then .invoke. And now you know.
+  Rake::Task['build'].invoke
   # Bundler::GemHelper.gemspec.base_dir is the base of the project,
   # and not the base of the gem directory.
-  sh %(gem install -i #{Gem.dir} #{built_gem})
+  sh %(gem install -i #{Gem.dir} #{built_gem(gem_ver)})
+end
+
+desc 'Build and install into user gems directory (useful for rvm and chruby)'
+task :'install:user' do
+  build_gem_install_user
 end
 
 desc 'Uninstall gem from user gems directory'
@@ -108,10 +136,6 @@ end
 
 # ***
 
-def current_ver
-  Bundler::GemHelper.gemspec.version.version
-end
-
 def verify_semantic_version!(parts, must_beta: nil)
   msg = nil
   if must_beta == true && parts.length <= 3
@@ -214,6 +238,9 @@ namespace :bump do
     $stdout.puts
     sh %(git commit -m "Version: #{current_ver} → #{next_ver}")
     $stdout.puts
+
+    build_gem_install_user(next_ver)
+
     # (lb): Meh. We could push to origin. Or not.
     #  sh %(git push origin HEAD)
     require 'rainbow'

data/lib/MrMurano/commands/business.rb

@@ -377,10 +377,6 @@ def business_find_or_ask!(acc, options)
     biz = businesses_ask_which(acc) if biz.nil?
   end
 
-  $cfg.set('business.id', nil, :internal)
-  $cfg.set('business.name', nil, :internal)
-  $cfg.set('business.fuzzy', nil, :internal)
-
   biz
 end
 

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.beta.6
+  version: 3.2.1.pre.beta.7
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -475,24 +475,6 @@ files:
 - Rakefile
 - TODO.taskpaper
 - bin/murano
-- dockers/Dockerfile.2.2.9
-- dockers/Dockerfile.2.3.6
-- dockers/Dockerfile.2.4.3
-- dockers/Dockerfile.2.5.0
-- dockers/Dockerfile.GemRelease
-- dockers/Dockerfile.m4
-- dockers/README.rst
-- dockers/RELEASE.rst
-- dockers/docker-test.sh
-- dockers/gem-release.sh
-- docs/basic_example.rst
-- docs/ci/.trustme.plugin
-- docs/ci/.trustme.sh
-- docs/ci/.trustme.vim
-- docs/completions/murano_completion-bash
-- docs/demo.md
-- docs/develop.rst
-- docs/release.rst
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
 - lib/MrMurano/AccountBase.rb
@@ -579,237 +561,6 @@ files:
 - lib/MrMurano/variegated/ruby_dig.rb
 - lib/MrMurano/verbosing.rb
 - lib/MrMurano/version.rb
-- spec/Account-Passwords_spec.rb
-- spec/Account_spec.rb
-- spec/Business_spec.rb
-- spec/ConfigFile_spec.rb
-- spec/ConfigMigrate_spec.rb
-- spec/Config_spec.rb
-- spec/Content_spec.rb
-- spec/GatewayBase_spec.rb
-- spec/GatewayDevice_spec.rb
-- spec/GatewayResource_spec.rb
-- spec/GatewaySettings_spec.rb
-- spec/HttpAuthed_spec.rb
-- spec/Http_spec.rb
-- spec/MakePretties_spec.rb
-- spec/Mock_spec.rb
-- spec/ProjectFile_spec.rb
-- spec/Setting_spec.rb
-- spec/Solution-ServiceConfig_spec.rb
-- spec/Solution-ServiceEventHandler_spec.rb
-- spec/Solution-ServiceModules_spec.rb
-- spec/Solution-UsersRoles_spec.rb
-- spec/Solution_spec.rb
-- spec/SyncRoot_spec.rb
-- spec/SyncUpDown_spec.rb
-- spec/Verbosing_spec.rb
-- spec/Webservice-Cors_spec.rb
-- spec/Webservice-Endpoint_spec.rb
-- spec/Webservice-File_spec.rb
-- spec/Webservice-Setting_spec.rb
-- spec/_workspace.rb
-- spec/cmd_business_spec.rb
-- spec/cmd_common.rb
-- spec/cmd_config_spec.rb
-- spec/cmd_content_spec.rb
-- spec/cmd_cors_spec.rb
-- spec/cmd_device_spec.rb
-- spec/cmd_domain_spec.rb
-- spec/cmd_element_spec.rb
-- spec/cmd_exchange_spec.rb
-- spec/cmd_help_spec.rb
-- spec/cmd_init_spec.rb
-- spec/cmd_keystore_spec.rb
-- spec/cmd_link_spec.rb
-- spec/cmd_logs_spec.rb
-- spec/cmd_password_spec.rb
-- spec/cmd_setting_application_spec.rb
-- spec/cmd_setting_product_spec.rb
-- spec/cmd_status_spec.rb
-- spec/cmd_syncdown_application_spec.rb
-- spec/cmd_syncdown_both_spec.rb
-- spec/cmd_syncdown_unit_spec.rb
-- spec/cmd_syncup_spec.rb
-- spec/cmd_token_spec.rb
-- spec/cmd_usage_spec.rb
-- spec/dry_run_formatter.rb
-- spec/fixtures/.mrmuranorc
-- spec/fixtures/ProjectFiles/invalid.yaml
-- spec/fixtures/ProjectFiles/only_meta.yaml
-- spec/fixtures/ProjectFiles/with_routes.yaml
-- spec/fixtures/SolutionFiles/0.2.0.json
-- spec/fixtures/SolutionFiles/0.2.0_invalid.json
-- spec/fixtures/SolutionFiles/0.2.json
-- spec/fixtures/SolutionFiles/0.3.0.json
-- spec/fixtures/SolutionFiles/0.3.0_invalid.json
-- spec/fixtures/SolutionFiles/0.3.json
-- spec/fixtures/SolutionFiles/basic.json
-- spec/fixtures/SolutionFiles/secret.json
-- spec/fixtures/configfile
-- spec/fixtures/dumped_config
-- spec/fixtures/exchange_element/element-show.json
-- spec/fixtures/exchange_element/swagger-mur-6407__10k.yaml
-- spec/fixtures/exchange_element/swagger-mur-6407__20k.yaml
-- spec/fixtures/gateway_resource_files/resources.notyaml
-- spec/fixtures/gateway_resource_files/resources.yaml
-- spec/fixtures/gateway_resource_files/resources_invalid.yaml
-- spec/fixtures/mrmuranorc_deleted_bob
-- spec/fixtures/mrmuranorc_tool_bob
-- spec/fixtures/product_spec_files/example.exoline.spec.yaml
-- spec/fixtures/product_spec_files/example.murano.spec.yaml
-- spec/fixtures/product_spec_files/gwe.exoline.spec.yaml
-- spec/fixtures/product_spec_files/gwe.murano.spec.yaml
-- spec/fixtures/product_spec_files/lightbulb-no-state.yaml
-- spec/fixtures/product_spec_files/lightbulb.yaml
-- spec/fixtures/roles-three.yaml
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value 0.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value 1.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value No.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value Yes.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value bob.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value false.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value off.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value on STDIN.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value on.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a bool value true.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a json array blob with STDIN.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  a json array blob.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  an array.webmock
-- spec/fixtures/snapshots/murano application setting Writes (using Webservice.cors)
-  appends an array.webmock
-- spec/fixtures/snapshots/murano application setting reads Webservice.cors to a file.webmock
-- spec/fixtures/snapshots/murano application setting reads Webservice.cors.webmock
-- spec/fixtures/snapshots/murano business list as json.webmock
-- spec/fixtures/snapshots/murano business list as table.webmock
-- spec/fixtures/snapshots/murano business list fewer fields.webmock
-- spec/fixtures/snapshots/murano business list only ids.webmock
-- spec/fixtures/snapshots/murano business list output to file.webmock
-- spec/fixtures/snapshots/murano business without project help.webmock
-- spec/fixtures/snapshots/murano config Needs a key.webmock
-- spec/fixtures/snapshots/murano config Reads a key.webmock
-- spec/fixtures/snapshots/murano config Removes a key.webmock
-- spec/fixtures/snapshots/murano config Sets a key.webmock
-- spec/fixtures/snapshots/murano config Sets a user key.webmock
-- spec/fixtures/snapshots/murano content life cycle.webmock
-- spec/fixtures/snapshots/murano cors sets CORS.webmock
-- spec/fixtures/snapshots/murano cors show CORS.webmock
-- spec/fixtures/snapshots/murano device activates.webmock
-- spec/fixtures/snapshots/murano device enables a batch.webmock
-- spec/fixtures/snapshots/murano device enables and lists.webmock
-- spec/fixtures/snapshots/murano device writes and reads.webmock
-- spec/fixtures/snapshots/murano domain show domain.webmock
-- spec/fixtures/snapshots/murano element edit unknown as unknown element.webmock
-- spec/fixtures/snapshots/murano element show --help.webmock
-- spec/fixtures/snapshots/murano element show as csv.webmock
-- spec/fixtures/snapshots/murano element show as default-table.webmock
-- spec/fixtures/snapshots/murano element show as json.webmock
-- spec/fixtures/snapshots/murano element show as table truncate.webmock
-- spec/fixtures/snapshots/murano element show as table wrap.webmock
-- spec/fixtures/snapshots/murano element show as yaml.webmock
-- spec/fixtures/snapshots/murano element show using ambiguous name.webmock
-- spec/fixtures/snapshots/murano element without project usage.webmock
-- spec/fixtures/snapshots/murano exchange with project list as json.webmock
-- spec/fixtures/snapshots/murano exchange with project list as table.webmock
-- spec/fixtures/snapshots/murano exchange with project list fewer fields.webmock
-- spec/fixtures/snapshots/murano exchange with project list only ids.webmock
-- spec/fixtures/snapshots/murano exchange with project list output to file.webmock
-- spec/fixtures/snapshots/murano exchange with project list purchase is already added
-  ID.webmock
-- spec/fixtures/snapshots/murano exchange with project list purchase is ambiguous
-  name.webmock
-- spec/fixtures/snapshots/murano exchange without project help.webmock
-- spec/fixtures/snapshots/murano help using commander as --help.webmock
-- spec/fixtures/snapshots/murano help using commander no args.webmock
-- spec/fixtures/snapshots/murano help using subshell no args.webmock
-- spec/fixtures/snapshots/murano help using subshell with --help.webmock
-- spec/fixtures/snapshots/murano init Won't init in HOME (gracefully).webmock
-- spec/fixtures/snapshots/murano init in empty directory with existing project.webmock
-- spec/fixtures/snapshots/murano init in empty directory without existing project.webmock
-- spec/fixtures/snapshots/murano init in existing project directory with ProjectFile.webmock
-- spec/fixtures/snapshots/murano init in existing project directory with SolutionFile
-  0.2.0.webmock
-- spec/fixtures/snapshots/murano init in existing project directory with SolutionFile
-  0.3.0.webmock
-- spec/fixtures/snapshots/murano init in existing project directory without ProjectFile.webmock
-- spec/fixtures/snapshots/murano keystore can call other commands.webmock
-- spec/fixtures/snapshots/murano keystore clearAll.webmock
-- spec/fixtures/snapshots/murano keystore deletes.webmock
-- spec/fixtures/snapshots/murano keystore gets.webmock
-- spec/fixtures/snapshots/murano keystore infos.webmock
-- spec/fixtures/snapshots/murano keystore lists.webmock
-- spec/fixtures/snapshots/murano link with project links and lists.webmock
-- spec/fixtures/snapshots/murano link with project unlinks.webmock
-- spec/fixtures/snapshots/murano link without project help.webmock
-- spec/fixtures/snapshots/murano link without project subshell vs inline using commander
-  will not list.webmock
-- spec/fixtures/snapshots/murano link without project subshell vs inline using subshell
-  will not list.webmock
-- spec/fixtures/snapshots/murano logs when project is setup tail log.webmock
-- spec/fixtures/snapshots/murano password Lists when no file.webmock
-- spec/fixtures/snapshots/murano password deletes a password.webmock
-- spec/fixtures/snapshots/murano password sets a password.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a forced string value on STDIN.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a forced string value.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a number value fiftyHalf.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a number value float 12.67.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a number value integer 12.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a number value on STDIN.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  a string value.webmock
-- spec/fixtures/snapshots/murano product setting Writes (using Device2.identity_format)
-  merges into a dictionary.webmock
-- spec/fixtures/snapshots/murano single sync without ProjectFile syncdown.webmock
-- spec/fixtures/snapshots/murano status with ProjectFile status.webmock
-- spec/fixtures/snapshots/murano status with Solutionfile 0.2.0 status.webmock
-- spec/fixtures/snapshots/murano status with Solutionfile 0.3.0 status.webmock
-- spec/fixtures/snapshots/murano status without ProjectFile matches file path.webmock
-- spec/fixtures/snapshots/murano status without ProjectFile matches route.webmock
-- spec/fixtures/snapshots/murano status without ProjectFile status.webmock
-- spec/fixtures/snapshots/murano syncdown stubbed without ProjectFile syncdown.webmock
-- spec/fixtures/snapshots/murano syncdown without ProjectFile syncdown.webmock
-- spec/fixtures/snapshots/murano syncup without ProjectFile syncup.webmock
-- spec/fixtures/snapshots/murano token with project list as table.webmock
-- spec/fixtures/snapshots/murano token without project help.webmock
-- spec/fixtures/snapshots/murano usage show usage.webmock
-- spec/fixtures/syncable_conflict/services/devdata.lua
-- spec/fixtures/syncable_conflict/services/timers.lua
-- spec/fixtures/syncable_content/assets/icon.png
-- spec/fixtures/syncable_content/assets/index.html
-- spec/fixtures/syncable_content/assets/js/script.js
-- spec/fixtures/syncable_content/modules/table_util.lua
-- spec/fixtures/syncable_content/routes/manyRoutes.lua
-- spec/fixtures/syncable_content/routes/singleRoute.lua
-- spec/fixtures/websocket/README.rst
-- spec/fixtures/websocket/logs_blather.rb
-- spec/fixtures/websocket/logs_faker.rb
-- spec/fixtures/websocket/simple_connection.rb
-- spec/fixtures/websocket/simple_options.rb
-- spec/fixtures/websocket/simple_server.rb
-- spec/fixtures/websocket/wss-echo.rb
-- spec/fixtures/websocket/wss-fake-logs.rb
-- spec/spec_helper.rb
-- spec/variegated_TruthyFalsey_spec.rb
-- spec/webmock_snapshot.rb
 homepage: https://github.com/exosite/MuranoCLI
 licenses:
 - MIT