MuranoCLI 2.2.4 → 3.0.0

data/spec/cmd_syncup_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.17 /coding: utf-8
+# frozen_string_literal: probably not yet
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
 require 'open3'
 require 'pathname'
@@ -7,24 +14,34 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('syncupTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'create', @project_name, '--save'))
+    @product_name = rname('syncupTestPrd')
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @project_name, '--save'))
+    @applctn_name = rname('syncupTestApp')
+    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_name, '--save'))
+    expect(err).to eq('')
+    soln_id = out
+    expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
+    expect(status.exitstatus).to eq(0)
+
+    out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
+    #expect(out).to a_string_starting_with("Linked product #{@product_name}")
+    olines = out.lines
+    expect(olines[0].encode!('UTF-8', 'UTF-8')).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
+    expect(olines[1]).to eq("Created default event handler\n")
     expect(err).to eq('')
-    expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
   end
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @applctn_name, '-y'))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -33,30 +50,66 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
   context "without ProjectFile" do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
-      FileUtils.move('assets','files')
+      FileUtils.move('assets', 'files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml',
+      )
+    end
+
+    def verify_err_missing_location(err)
+      elines = err.lines
+      # E.g.,
+      #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Services)
+      #   Skipping missing location ‘/tmp/d20170809-7670-z315jn/project/services’ (Interfaces)
+      expect(elines).to satisfy { |v| elines.length == 2 }
+      elines.each do |line|
+        expect(line.encode!('UTF-8', 'UTF-8')).to start_with("\e[33mSkipping missing location ‘")
+      end
     end
 
     it "syncup" do
       out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
-      expect(out).to eq('')
-      expect(err).to eq('')
+      outl = out.lines
+      # The spec tests set --no-progress, so each sync action gets reported.
+      #expect(outl[0]).to eq("Adding item state\n")
+      #expect(outl[1]).to eq("Adding item temperature\n")
+      #expect(outl[2]).to eq("Adding item uptime\n")
+      #expect(outl[3]).to eq("Adding item humidity\n")
+      (0..3).each { |ln| expect(outl[ln]).to start_with("Adding item ") }
+      expect(outl[4]).to eq("Updating product resources\n")
+      expect(outl[5]).to eq("Adding item table_util\n")
+      #expect(outl[6]).to eq("Updating item c3juj9vnmec000000_event\n")
+      # The order isn't always consistent, so just do start_with.
+      #expect(outl[7]).to eq("Updating item timer_timer\n")
+      #expect(outl[8]).to eq("Updating item user_account\n")
+      #expect(outl[9]).to eq("Updating item tsdb_exportJob\n")
+      (6..9).each { |ln| expect(outl[ln]).to start_with("Updating item ") }
+      #expect(outl[10]).to eq("Adding item POST_/api/fire\n")
+      #expect(outl[11]).to eq("Adding item PUT_/api/fire/{code}\n")
+      #expect(outl[12]).to eq("Adding item DELETE_/api/fire/{code}\n")
+      #expect(outl[13]).to eq("Adding item GET_/api/onfire\n")
+      #expect(outl[14]).to eq("Adding item /icon.png\n")
+      #expect(outl[15]).to eq("Adding item /\n")
+      #expect(outl[16]).to eq("Adding item /js/script.js\n")
+      (10..16).each { |ln| expect(outl[ln]).to start_with("Adding item ") }
+      verify_err_missing_location(err)
       expect(status.exitstatus).to eq(0)
 
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
-      expect(out).to start_with(%{Adding:\nDeleteing:\nChanging:\n})
+      #expect(out).to start_with(%{Adding:\nDeleting:\nChanging:\n})
+      #expect(out).to start_with(%{Nothing to add\nNothing to delete\nNothing to change\n})
+      expect(out).to start_with(%{Nothing new locally\nNothing new remotely\nNothing that differs\n})
       # Due to timestamp races, there might be modules or services in Changing.
-      expect(err).to eq('')
+      #expect(err).to eq('')
+      verify_err_missing_location(err)
       expect(status.exitstatus).to eq(0)
     end
   end
 
-
-
   # TODO: With ProjectFile
   # TODO: With Solutionfile 0.2.0
   # TODO: With Solutionfile 0.3.0
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_usage_spec.rb

@@ -7,30 +7,57 @@ RSpec.describe 'murano usage', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('usageTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'create', @project_name, '--save'))
+    # NOTE: The usage command works on one or more solutions of any type.
+    @product_name = rname('usageTest')
+
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    expect(err).to eq('')
+    expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
+    expect(status.exitstatus).to eq(0)
+
+    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
   end
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @project_name))
-    expect(out).to eq('')
+    out, err, status = Open3.capture3(capcmd('murano', 'solutions', 'expunge', '--yes'))
+    expect(out).to eq("Deleted 2 solutions\n")
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
 
+  def confirm_usage_table(olines, ix)
+    expect(olines[ix+0]).to match(/^(Product|Application): usage[tT]est[a-z0-9]+ <[a-z0-9]+> https:\/\/[.a-z0-9]+$/)
+    expect(olines[ix+1]).to match(/^(\+-+){5}\+$/)
+    expect(olines[ix+2]).to match(/^\|\s+\| Quota\s+\| Daily\s+\| Monthly\s+\| Total\s+\|$/)
+    # Beneath the header row is a splitter line.
+    expect(olines[ix+3]).to match(/^(\+-+){5}\+$/)
+    ix += 4
+    # Beneath the splitter line are 1 or more rows, one for each service.
+    loop do
+      if olines[ix].start_with? '+-'
+        # Closing table line.
+        break
+      end
+      expect(olines[ix]).to match(/^| [a-z0-9_]+\s+(|\s+[0-9]*\s+){4}|$/)
+      ix += 1
+    end
+    expect(olines[ix]).to match(/^(\+-+){5}\+$/)
+    ix += 1
+  end
+
   it "show usage" do
     out, err, status = Open3.capture3(capcmd('murano', 'usage'))
     expect(err).to eq('')
     olines = out.lines
-    expect(olines[0]).to match(/^(\+-+){5}\+$/)
-    expect(olines[1]).to match(/^\|\s+\| Quota\s+\| Daily\s+\| Monthly\s+\| Total\s+\|$/)
-    expect(olines[2]).to match(/^(\+-+){5}\+$/)
-    expect(olines[-1]).to match(/^(\+-+){5}\+$/)
+    ix = 0
+    ix = confirm_usage_table(olines, ix)
+    ix = confirm_usage_table(olines, ix)
     expect(status.exitstatus).to eq(0)
   end
 
 end
 
 #  vim: set ai et sw=2 ts=2 :
+

data/spec/fixtures/dumped_config

@@ -9,12 +9,12 @@ outformat = best
 host = bizapi.hosted.exosite.io
 
 [location]
-base = <%= File.realpath(@projectDir) %>
+base = <%= File.realpath(@project_dir) %>
 files = files
 endpoints = routes
 modules = modules
 eventhandlers = services
-specs = specs/resources.yaml
+resources = specs/resources.yaml
 cors = cors.yaml
 
 [sync]
@@ -32,11 +32,13 @@ ignoring = *_test.lua *_spec.lua .*
 [eventhandler]
 searchFor = *.lua */*.lua {../eventhandlers,../event_handler}/*.lua {../eventhandlers,../event_handler}/*/*.lua
 ignoring = *_test.lua *_spec.lua .*
-skiplist = websocket webservice device.service_call
+skiplist = device.service_call device2.event interface webservice websocket
+undeletable = *.event timer.timer tsdb.exportJob user.account
 
 [modules]
-searchFor = *.lua */*.lua
+searchFor = *.lua **/*.lua
 ignoring = *_test.lua *_spec.lua .*
+no-nesting = false
 
 [diff]
 cmd = <%= Gem.win_platform? ? 'fc' : 'diff -u' %>

data/spec/fixtures/gateway_resource_files/resources.notyaml

@@ -0,0 +1,12 @@
+[bob]
+format = string
+unit = c
+settable = true
+[fuzz]
+format = string
+unit = c
+settable = true
+[gruble]
+format = string
+unit = bits
+settable = true

data/spec/fixtures/gateway_resource_files/resources.yaml

@@ -0,0 +1,13 @@
+---
+bob:
+  format: string
+  unit: c
+  settable: true
+fuzz:
+  format: string
+  unit: c
+  settable: true
+gruble:
+  format: string
+  unit: bits
+  settable: true

data/spec/fixtures/gateway_resource_files/resources_invalid.yaml

@@ -0,0 +1,13 @@
+---
+bob:
+  format: string
+  unit: c
+  settable: true
+fuzz:
+  format: integer
+  unit: c
+  settable: true
+gruble:
+  format: string
+  unit: bits
+  settable: green

data/spec/fixtures/mrmuranorc_deleted_bob

@@ -1,8 +1,6 @@
 [solution]
 id = XXXXXXXXXX
 
-[doThisTest]
-
 [s-fDEADBEEFGAEG]
 spec = bobo.yaml
 

data/spec/fixtures/product_spec_files/lightbulb.yaml

@@ -1,14 +1,21 @@
 ---
-resources:
-- alias: state
-  format: integer
-  initial: 0
-- alias: temperature
-  format: float
-  initial: 0
-- alias: uptime
-  format: integer
-  initial: 0
-- alias: humidity
-  format: float
-  initial: 0
+state:
+  allowed: []
+  format: number
+  settable: true
+  unit: ''
+temperature:
+  allowed: []
+  format: number
+  settable: true
+  unit: ''
+uptime:
+  allowed: []
+  format: number
+  settable: true
+  unit: ''
+humidity:
+  allowed: []
+  format: number
+  settable: true
+  unit: ''

data/spec/fixtures/{syncable_content → syncable_conflict}/services/devdata.lua

@@ -1,4 +1,4 @@
---#EVENT device datapoint
+--#EVENT device2 data_in
 -- luacheck: globals data (magic variable from Murano)
 
 -- Get the timestamp for this data if a record action.

data/spec/spec_helper.rb

@@ -17,6 +17,11 @@
 #
 require 'simplecov'
 SimpleCov.start do
+  if ENV['CI_MR_EXE'].nil? then
+    coverage_dir "coverage/cov-#{RUBY_VERSION.gsub(/\./,'_')}"
+  else
+    coverage_dir "coverage/cov-#{RUBY_VERSION.gsub(/\./,'_')}-exe"
+  end
   add_group "Specs", "spec/.*"
   add_group "Solution", "lib/MrMurano/Solution.*"
   add_group "Product", "lib/MrMurano/Product.*"

metadata

@@ -1,255 +1,403 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: certified
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: certified
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.4.3
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: http-form_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: inflecto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mime-types-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2016.0521
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2016.0521
+- !ruby/object:Gem::Dependency
+  name: orderedhash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: vine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.6
 - !ruby/object:Gem::Dependency
-  name: ocra
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 9.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 9.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
-description: "Do more from the command line with Murano\n\n  Push and pull data from
-  Murano.\n  Get status on what things have changed.\n  See a diff of the changes
-  before you push.\n\n  and so much more.\n\n  This gem was formerly known as MrMurano.\n
-  \ "
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ocra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+description: |
+  Do more from the command line with Murano
+
+    Push and pull data from Murano.
+    Get status on what things have changed.
+    See a diff of the changes before you push.
+
+    and so much more.
+
+    This gem was formerly known as MrMurano.
 email:
 - miketilstra@exosite.com
 executables:
-- mr
 - murano
 extensions: []
 extra_rdoc_files: []
 files:
-- .agignore
-- .gitignore
-- .rspec
-- .travis.yml
+- ".agignore"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".trustme.sh"
+- ".trustme.vim"
 - Gemfile
 - LICENSE.txt
 - MuranoCLI.gemspec
@@ -257,67 +405,72 @@ files:
 - README.markdown
 - Rakefile
 - TODO.taskpaper
-- bin/mr
 - bin/murano
+- docs/basic_example.rst
+- docs/completions/murano_completion-bash
 - docs/demo.md
+- docs/develop.rst
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
+- lib/MrMurano/Business.rb
 - lib/MrMurano/Config-Migrate.rb
 - lib/MrMurano/Config.rb
+- lib/MrMurano/Content.rb
+- lib/MrMurano/Gateway.rb
+- lib/MrMurano/Keystore.rb
 - lib/MrMurano/Mock.rb
-- lib/MrMurano/Product-1P-Device.rb
-- lib/MrMurano/Product-Resources.rb
-- lib/MrMurano/Product.rb
+- lib/MrMurano/Passwords.rb
 - lib/MrMurano/ProjectFile.rb
 - lib/MrMurano/ReCommander.rb
-- lib/MrMurano/Solution-Cors.rb
-- lib/MrMurano/Solution-Endpoint.rb
-- lib/MrMurano/Solution-File.rb
+- lib/MrMurano/Setting.rb
 - lib/MrMurano/Solution-ServiceConfig.rb
 - lib/MrMurano/Solution-Services.rb
 - lib/MrMurano/Solution-Users.rb
 - lib/MrMurano/Solution.rb
+- lib/MrMurano/SolutionId.rb
 - lib/MrMurano/SubCmdGroupContext.rb
+- lib/MrMurano/SyncRoot.rb
 - lib/MrMurano/SyncUpDown.rb
+- lib/MrMurano/Webservice-Cors.rb
+- lib/MrMurano/Webservice-Endpoint.rb
+- lib/MrMurano/Webservice-File.rb
+- lib/MrMurano/Webservice.rb
 - lib/MrMurano/commands.rb
-- lib/MrMurano/commands/assign.rb
 - lib/MrMurano/commands/business.rb
-- lib/MrMurano/commands/businessList.rb
+- lib/MrMurano/commands/completion-bash.erb
+- lib/MrMurano/commands/completion-zsh.erb
 - lib/MrMurano/commands/completion.rb
 - lib/MrMurano/commands/config.rb
 - lib/MrMurano/commands/content.rb
 - lib/MrMurano/commands/cors.rb
+- lib/MrMurano/commands/devices.rb
 - lib/MrMurano/commands/domain.rb
 - lib/MrMurano/commands/gb.rb
+- lib/MrMurano/commands/globals.rb
 - lib/MrMurano/commands/init.rb
 - lib/MrMurano/commands/keystore.rb
+- lib/MrMurano/commands/link.rb
 - lib/MrMurano/commands/login.rb
 - lib/MrMurano/commands/logs.rb
 - lib/MrMurano/commands/mock.rb
 - lib/MrMurano/commands/password.rb
 - lib/MrMurano/commands/postgresql.rb
-- lib/MrMurano/commands/product.rb
-- lib/MrMurano/commands/productCreate.rb
-- lib/MrMurano/commands/productDelete.rb
-- lib/MrMurano/commands/productDevice.rb
-- lib/MrMurano/commands/productDeviceIdCmds.rb
-- lib/MrMurano/commands/productList.rb
-- lib/MrMurano/commands/productWrite.rb
+- lib/MrMurano/commands/settings.rb
 - lib/MrMurano/commands/show.rb
 - lib/MrMurano/commands/solution.rb
-- lib/MrMurano/commands/solutionCreate.rb
-- lib/MrMurano/commands/solutionDelete.rb
-- lib/MrMurano/commands/solutionList.rb
+- lib/MrMurano/commands/solution_picker.rb
 - lib/MrMurano/commands/status.rb
 - lib/MrMurano/commands/sync.rb
 - lib/MrMurano/commands/timeseries.rb
 - lib/MrMurano/commands/tsdb.rb
 - lib/MrMurano/commands/usage.rb
-- lib/MrMurano/commands/zshcomplete.erb
 - lib/MrMurano/hash.rb
 - lib/MrMurano/http.rb
 - lib/MrMurano/makePretty.rb
+- lib/MrMurano/optparse.rb
+- lib/MrMurano/progress.rb
 - lib/MrMurano/schema/pf-v1.0.0.yaml
+- lib/MrMurano/schema/resource-v1.0.0.yaml
 - lib/MrMurano/schema/sf-v0.2.0.yaml
 - lib/MrMurano/schema/sf-v0.3.0.yaml
 - lib/MrMurano/template/mock.erb
@@ -326,24 +479,21 @@ files:
 - 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/Http_spec.rb
 - spec/MakePretties_spec.rb
 - spec/Mock_spec.rb
-- spec/ProductBase_spec.rb
-- spec/ProductContent_spec.rb
-- spec/ProductResources_spec.rb
-- spec/Product_1P_Device_spec.rb
-- spec/Product_1P_RPC_spec.rb
-- spec/Product_spec.rb
 - spec/ProjectFile_spec.rb
-- spec/Solution-Cors_spec.rb
-- spec/Solution-Endpoint_spec.rb
-- spec/Solution-File_spec.rb
+- spec/Setting_spec.rb
 - spec/Solution-ServiceConfig_spec.rb
-- spec/Solution-ServiceDevice_spec.rb
 - spec/Solution-ServiceEventHandler_spec.rb
 - spec/Solution-ServiceModules_spec.rb
 - spec/Solution-UsersRoles_spec.rb
@@ -351,8 +501,11 @@ files:
 - 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_assign_spec.rb
 - spec/cmd_business_spec.rb
 - spec/cmd_common.rb
 - spec/cmd_config_spec.rb
@@ -363,7 +516,10 @@ files:
 - spec/cmd_help_spec.rb
 - spec/cmd_init_spec.rb
 - spec/cmd_keystore_spec.rb
+- spec/cmd_link_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_spec.rb
 - spec/cmd_syncup_spec.rb
@@ -382,6 +538,9 @@ files:
 - spec/fixtures/SolutionFiles/secret.json
 - spec/fixtures/configfile
 - spec/fixtures/dumped_config
+- 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
@@ -391,114 +550,46 @@ files:
 - spec/fixtures/product_spec_files/lightbulb-no-state.yaml
 - spec/fixtures/product_spec_files/lightbulb.yaml
 - spec/fixtures/roles-three.yaml
+- 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/syncable_content/services/devdata.lua
-- spec/fixtures/syncable_content/services/timers.lua
 - spec/spec_helper.rb
 homepage: https://github.com/exosite/MuranoCLI
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  MuranoCLI v3.0 introduces backwards-incompatible changes.
+
+  If your business was created with MuranoCLI v2.x, you will
+  want to continue using the old gem, which you can run by
+  explicitly specifying the version. For instance,
+
+    murano _2.2.4_ --version
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Do more from the command line with Murano
-test_files:
-- spec/Account-Passwords_spec.rb
-- spec/Account_spec.rb
-- spec/ConfigFile_spec.rb
-- spec/ConfigMigrate_spec.rb
-- spec/Config_spec.rb
-- spec/Http_spec.rb
-- spec/MakePretties_spec.rb
-- spec/Mock_spec.rb
-- spec/ProductBase_spec.rb
-- spec/ProductContent_spec.rb
-- spec/ProductResources_spec.rb
-- spec/Product_1P_Device_spec.rb
-- spec/Product_1P_RPC_spec.rb
-- spec/Product_spec.rb
-- spec/ProjectFile_spec.rb
-- spec/Solution-Cors_spec.rb
-- spec/Solution-Endpoint_spec.rb
-- spec/Solution-File_spec.rb
-- spec/Solution-ServiceConfig_spec.rb
-- spec/Solution-ServiceDevice_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/_workspace.rb
-- spec/cmd_assign_spec.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_help_spec.rb
-- spec/cmd_init_spec.rb
-- spec/cmd_keystore_spec.rb
-- spec/cmd_password_spec.rb
-- spec/cmd_status_spec.rb
-- spec/cmd_syncdown_spec.rb
-- spec/cmd_syncup_spec.rb
-- spec/cmd_usage_spec.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/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/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/syncable_content/services/devdata.lua
-- spec/fixtures/syncable_content/services/timers.lua
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []