MrMurano 1.5.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac31eaa1f880c2269de0ebf0b44af394c8c7d80
-  data.tar.gz: b060f57b1dc7ec60242408458a4541963a7b061b
+  metadata.gz: d0642fae83286309c41974774d6ec3fdc7bd974d
+  data.tar.gz: 103ad1f76094b609f67b720fa59c2c61cbea8f38
 SHA512:
-  metadata.gz: d711b5f10c54a489ffef3cf03584014516be2035db33b92434935ac485d53731faf95a53b20ddd648e7faf37d188b7da1f89563ef452b678ed2d48088f74bbcc
-  data.tar.gz: 79c236e485bf9fccf3c865a0bcfdcec932a1b786830af0e5443e068dada40928415d63d7872f4f20805ccdc7fe7fbdb60b9e2f09103beefa7de7d086e7eba8c7
+  metadata.gz: 1ae0f3fa923702d749407014c7379e8004789d893a82f2727c9a6e72834fe200036dbbc56bb8efa8f949b08b593d021826cde1085db7d31c536591eefaf4539a
+  data.tar.gz: 753a5a77d087f74d4eaf8680e58d87e2dfdf0b14ecaeed2c1faa01e2053d634f3df94f2742d61f4f192f7b681764f713d4834d4ad19bb8733f484f6802d786a4

data/README.markdown

@@ -7,7 +7,7 @@ Do more from the command line with [Murano](https://exosite.com/platform/)
 
 ## Usage
 
-To start from an existing project in Murano
+### To start from an existing project in Murano
 ```
 mkdir myproject
 cd myproject
@@ -18,6 +18,22 @@ mr syncdown -V
 Do stuff, see what changed: `mr status` or `mr diff`.
 Then deploy with `mr syncup`
 
+### To start a brand new project
+There are a few steps and pieces to getting a solution with a product up and
+running in Murano. Here is the list.
+
+- Pick a bussiness: `mr account --business`
+- Set it: `mr config business.id ZZZZZZZZZ`
+- Create a product: `mr product create myawesomeproduct`
+- Save the result: `mr config product.id YYYYYYYYY`
+- Define the product: `mr product spec push --file prd.spec`
+- Create a solution: `mr solution create myawesomesolution`
+- Save the result: `mr config solution.id XXXXXX`
+- Sync solution code up: `mr syncup -V`
+- Assign the prodcut to the solution: `mr assign set`
+
+Do stuff, see what changed: `mr status` or `mr diff`.
+Then deploy with `mr syncup`
 
 ## Install
 

data/lib/MrMurano/Account.rb

@@ -117,11 +117,33 @@ module MrMurano
       get('business/' + $cfg['business.id'] + '/product/')
     end
 
+    ## Create a new product in the current business
+    def new_product(name, type='onepModel')
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      post('business/' + $cfg['business.id'] + '/product/', {:label=>name, :type=>type})
+    end
+
+    def delete_product(modelId)
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      delete('business/' + $cfg['business.id'] + '/product/' + modelId)
+    end
+
     def solutions
       raise "Missing Bussiness ID" if $cfg['business.id'].nil?
       get('business/' + $cfg['business.id'] + '/solution/')
     end
 
+    ## Create a new solution
+    def new_solution(name, type='dataApi')
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      post('business/' + $cfg['business.id'] + '/solution/', {:label=>name, :type=>type})
+    end
+
+    def delete_solution(apiId)
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      delete('business/' + $cfg['business.id'] + '/solution/' + apiId)
+    end
+
   end
 end
 

data/lib/MrMurano/Config.rb

@@ -60,8 +60,10 @@ module MrMurano
         end
         @paths << ConfigFile.new(:private, @projectDir + CFG_PRVT_NAME)
         @paths << ConfigFile.new(:project, @projectDir + CFG_FILE_NAME)
+        fixModes(@projectDir + CFG_DIR_NAME)
       end
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
+      fixModes(Pathname.new(Dir.home) + CFG_DIR_NAME)
       @paths << ConfigFile.new(:system, Pathname.new(CFG_SYS_NAME))
       @paths << ConfigFile.new(:defaults, nil, IniFile.new())
 
@@ -135,6 +137,14 @@ module MrMurano
     end
     private :findProjectDir
 
+    def fixModes(path)
+      if path.directory? then
+        path.chmod(0700)
+      elsif path.file? then
+        path.chmod(0600)
+      end
+    end
+
     def file_at(name, scope=:project)
       case scope
       when :internal

data/lib/MrMurano/commands.rb

@@ -8,9 +8,15 @@ require 'MrMurano/commands/domain'
 require 'MrMurano/commands/exportImport'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
-require 'MrMurano/commands/productEnable'
+require 'MrMurano/commands/productCreate'
+require 'MrMurano/commands/productDelete'
+require 'MrMurano/commands/productList'
 require 'MrMurano/commands/productSpec'
 require 'MrMurano/commands/productWrite'
+require 'MrMurano/commands/serialNumberCmds'
+require 'MrMurano/commands/solutionCreate'
+require 'MrMurano/commands/solutionDelete'
+require 'MrMurano/commands/solutionList'
 require 'MrMurano/commands/status'
 require 'MrMurano/commands/sync'
 require 'MrMurano/commands/timeseries'

data/lib/MrMurano/commands/productCreate.rb

@@ -0,0 +1,26 @@
+
+command 'product create' do |c|
+  c.syntax = %{mr product create <name>}
+  c.description = %{Create a new product}
+
+  c.action do |args, options|
+    if args.count < 1 then
+      say_error "Name of product missing"
+      return
+    end
+    name = args[0]
+
+    acc = MrMurano::Account.new
+    ret = acc.new_product(name)
+    if not ret.kind_of?(Hash) and not ret.empty? then
+      say_error "Create failed: #{ret.to_s}"
+      return
+    end
+
+    # create doesn't return anything, so we need to go look for it.
+    ret = acc.products.select{|i| i[:label] == name}
+    say ret.first[:modelId]
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productDelete.rb

@@ -0,0 +1,35 @@
+require 'MrMurano/Account'
+
+command 'product delete' do |c|
+  c.syntax = %{mr product delete <product>}
+  c.summary = %{Delete a product}
+  c.description = %{Delete a product}
+
+  c.action do |args, options|
+    if args.count < 1 then
+      say_error "Product id or name missing"
+      return
+    end
+    name = args[0]
+
+    acc = MrMurano::Account.new
+
+    # Need to convert what we got into the internal PID.
+    ret = acc.products.select{|i| i.has_value? name }
+
+    if $cfg['tool.debug'] then
+      say "Matches found:"
+      pp ret
+    end
+
+    if ret.empty? then
+      say_error "No product matching '#{name}' found. Nothing to delete."
+    else
+      ret = acc.delete_product(ret.first[:pid])
+      if not ret.kind_of?(Hash) and not ret.empty? then
+        say_error "Delete failed: #{ret.to_s}"
+      end
+    end
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productList.rb

@@ -0,0 +1,23 @@
+require 'MrMurano/Account'
+require 'terminal-table'
+
+command 'product list' do |c|
+  c.syntax = %{mr product list [options]}
+  c.description = %{List products}
+  c.option '--idonly', 'Only return the ids'
+
+  c.action do |args, options|
+    acc = MrMurano::Account.new
+    data = acc.products
+    if options.idonly then
+      say data.map{|row| row[:pid]}.join(' ')
+    else
+      busy = data.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
+      table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
+      say table
+    end
+  end
+end
+alias_command :product, 'product list'
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productSpec.rb

@@ -37,8 +37,8 @@ command 'product spec convert' do |c|
   end
 end
 
-command 'product spec' do |c|
-  c.syntax = %{mr product spec [--file FILE]}
+command 'product spec push' do |c|
+  c.syntax = %{mr product spec push [--file FILE]}
   c.summary = %{Upload a new specification for a product}
 
   c.option '--file FILE', "The spec file to upload"
@@ -89,6 +89,7 @@ command 'product spec pull' do |c|
       puts spec.to_yaml
     end
   end
-
 end
+alias_command 'product spec', 'product spec pull'
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/serialNumberCmds.rb

@@ -0,0 +1,75 @@
+require 'MrMurano/Product'
+require 'terminal-table'
+
+command 'sn list' do |c|
+  c.syntax = %{mr sn list [options]}
+  c.summary = %{List serial numbers for a product}
+
+  c.option '--offset NUMBER', Integer, %{Offset to start listing at}
+  c.option '--limit NUMBER', Integer, %{How many devices to return}
+
+  c.action do |args,options|
+    options.default :offset=>0, :limit=>50
+
+    prd = MrMurano::Product.new
+    data = prd.list(options.offset, options.limit)
+    busy = data.map{|row| [row[:sn], row[:status], row[:rid]]}
+    table = Terminal::Table.new :rows => busy, :headings => ['SN', 'Status', 'RID']
+    say table
+  end
+end
+alias_command :sn, 'sn list'
+
+command 'sn enable' do |c|
+  c.syntax = %{mr sn enable [<sn>|--file <sns>]}
+  c.summary = %{Enable a serial number; Creates device in Murano}
+  c.description = %{Enables serial numbers, creating the digial shadow in Murano.
+
+NOTE: This opens the 24 hour activation window.  If the device does not make
+the activation call within this time, it will need to be enabled again.
+  }
+  c.option '-f', '--file FILE', %{A file of serial numbers, one per line}
+
+  c.action do |args,options|
+    prd = MrMurano::Product.new
+    if options.file then
+      File.open(options.file) do |io|
+        io.each_line do |line|
+          line.strip!
+          prd.enable(line) unless line.empty?
+        end
+      end
+    elsif args.count > 0 then
+      prd.enable(args[0])
+    else
+      say_error "Missing a serial number to enable"
+    end
+  end
+end
+
+command 'sn activate' do |c|
+  c.syntax = %{mr sn activate <sn>}
+  c.summary = %{Activate a serial number, retriving its CIK}
+  c.description = %{Activates a serial number.
+
+Generally you should not use this.  Instead the device should make the activation
+call itself and save the CIK token.  Its just that sometimes when building a
+proof-of-concept it is just easier to hardcode the CIK.
+
+Note that you can only activate a device once.  After that you cannot retrive the
+CIK again.
+}
+
+  c.action do |args,options|
+    if args.count < 1 then
+      say_error "Serial number missing"
+      return
+    end
+    sn = args.first
+
+    prd = MrMurano::ProductSerialNumber.new
+    pp prd.activate(sn)
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/solutionCreate.rb

@@ -0,0 +1,26 @@
+
+command 'solution create' do |c|
+  c.syntax = %{mr solution create <name>}
+  c.description = %{Create a new solution}
+
+  c.action do |args, options|
+    if args.count < 1 then
+      say_error "Name of solution missing"
+      return
+    end
+    name = args[0]
+
+    acc = MrMurano::Account.new
+    ret = acc.new_solution(name)
+    if not ret.kind_of?(Hash) and not ret.empty? then
+      say_error "Create failed: #{ret.to_s}"
+      return
+    end
+
+    # create doesn't return anything, so we need to go look for it.
+    ret = acc.solutions.select{|i| i[:domain] =~ /#{name}\./}
+    say ret.first[:apiId]
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/solutionDelete.rb

@@ -0,0 +1,34 @@
+require 'MrMurano/Account'
+
+command 'solution delete' do |c|
+  c.syntax = %{mr solution delete <solution id>}
+  c.description = %{Delete a solution}
+
+  c.action do |args, options|
+    if args.count < 1 then
+      say_error "Solution id or name missing"
+      return
+    end
+    name = args[0]
+
+    acc = MrMurano::Account.new
+
+    # Need to convert what we got into the internal PID.
+    ret = acc.solutions.select{|i| i.has_value?(name) or i[:domain] =~ /#{name}\./ }
+
+    if $cfg['tool.debug'] then
+      say "Matches found:"
+      pp ret
+    end
+
+    if ret.empty? then
+      say_error "No solution matching '#{name}' found. Nothing to delete."
+    else
+      ret = acc.delete_solution(ret.first[:sid])
+      if not ret.kind_of?(Hash) and not ret.empty? then
+        say_error "Delete failed: #{ret.to_s}"
+      end
+    end
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/solutionList.rb

@@ -0,0 +1,23 @@
+require 'MrMurano/Account'
+require 'terminal-table'
+
+command 'solution list' do |c|
+  c.syntax = %{mr solution list [options]}
+  c.description = %{List solutions}
+  c.option '--idonly', 'Only return the ids'
+
+  c.action do |args, options|
+    acc = MrMurano::Account.new
+    data = acc.solutions
+    if options.idonly then
+      say data.map{|row| row[:apiId]}.join(' ')
+    else
+      busy = data.map{|r| [r[:apiId], r[:domain], r[:type], r[:sid]]}
+      table = Terminal::Table.new :rows => busy, :headings => ['API ID', 'Domain', 'Type', 'SID']
+      say table
+    end
+  end
+end
+alias_command :solution, 'solution list'
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.5.5'.freeze
+  VERSION = '1.6.0'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -217,9 +217,15 @@ files:
 - lib/MrMurano/commands/exportImport.rb
 - lib/MrMurano/commands/keystore.rb
 - lib/MrMurano/commands/logs.rb
-- lib/MrMurano/commands/productEnable.rb
+- lib/MrMurano/commands/productCreate.rb
+- lib/MrMurano/commands/productDelete.rb
+- lib/MrMurano/commands/productList.rb
 - lib/MrMurano/commands/productSpec.rb
 - lib/MrMurano/commands/productWrite.rb
+- lib/MrMurano/commands/serialNumberCmds.rb
+- lib/MrMurano/commands/solutionCreate.rb
+- lib/MrMurano/commands/solutionDelete.rb
+- lib/MrMurano/commands/solutionList.rb
 - lib/MrMurano/commands/status.rb
 - lib/MrMurano/commands/sync.rb
 - lib/MrMurano/commands/timeseries.rb

data/lib/MrMurano/commands/productEnable.rb

@@ -1,30 +0,0 @@
-require 'MrMurano/Product'
-
-command 'product enable' do |c|
-  c.syntax = %{mr product enable [<sn>|--file <sns>]}
-  c.summary = %{Enable a serial number; Creates device in Murano}
-  c.description = %{Enables serial numbers, creating the digial shadow in Murano.
-
-NOTE: This opens the 24 hour activation window.  If the device does not make
-the activation call within this time, it will need to be enabled again.
-  }
-  c.option '-f', '--file FILE', %{A file of serial numbers, one per line}
-
-  c.action do |args,options|
-    prd = MrMurano::Product.new
-    if options.file then
-      File.open(options.file) do |io|
-        io.each_line do |line|
-          line.strip!
-          prd.enable(line) unless line.empty?
-        end
-      end
-    elsif args.count > 0 then
-      prd.enable(args[0])
-    else
-      say_error "Missing a serial number to enable"
-    end
-  end
-end
-
-#  vim: set ai et sw=2 ts=2 :