MrMurano 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86450cabd85b63dc6f6db984acddfbb1571846ae
-  data.tar.gz: cdc772d246ed238d2ac11018a808c1b8721fda4a
+  metadata.gz: 582e59cb41974922ea200196ccdaa17f61791ca7
+  data.tar.gz: 6daed3f5cecd632b93fa95b335126efb84bb75bb
 SHA512:
-  metadata.gz: ac4278c5d0dbad4af322d9d37c416f989610fc4bde3ee9d634698bbd91101a65a9cea12383d0bcca9689f6e6f73d63c00c5bd6a515f17472b47e7eaa63e7214c
-  data.tar.gz: fcc89fbf8ea4f675b670960bfc39cb6b65cee7ec87fffddede8e72a160cab14d2ba775a516e47491c437c86f36d9971326e70195a19b8b8f2f87bdfe53adfb8e
+  metadata.gz: 723355b78007243ccdd74e4362969cbc7ce5dc27ecd1a722e267bb99ab795c872be7bb56da3e77b01ac3627239118676be1f7438f72eeba12ab8cd5dd3d9ac2f
+  data.tar.gz: 43df4f2518b7df9d1830b0fdc0aba4946c1871a107830e146378b5151e7b48486a8fff3cf16bd4b303cbec16212644e9f5593711de568e590fe746d3ee2573d6

data/.gitignore

@@ -12,6 +12,7 @@ xcuserdata
 Pods/
 pkg/
 
+.mrmurano/
 .mrmuranorc
 .mrmuranorc.private
 files/

data/Gemfile

@@ -9,6 +9,7 @@ gem 'mime-types-data', '~> 3.2016'
 gem 'inifile', '~> 3.0'
 gem 'http-form_data', '~> 1.0.1'
 gem 'rainbow', '~> 2.1.0'
+gem 'dotenv', '~> 2.1.1'
 
 group :test do
   gem 'rake', '~> 10.1.1'

data/MrMurano.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   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.
   }
 
   s.files         = `git ls-files`.split("\n")
@@ -29,11 +31,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('inifile', '~> 3.0')
   s.add_runtime_dependency('http-form_data', '~> 1.0.1')
   s.add_runtime_dependency('rainbow', '~> 2.1.0')
+  s.add_runtime_dependency('dotenv', '~> 2.1.1')
 
   s.add_development_dependency('bundler', '~> 1.7.6')
   s.add_development_dependency('rake', '~> 10.1.1')
   s.add_development_dependency('rspec', '~> 3.5')
   s.add_development_dependency('webmock', '~> 2.1.0')
+  # maybe? s.add_development_dependency('vcr', '~> ???')
 end
 
 

data/README.markdown

@@ -29,6 +29,17 @@ Or
 > gem update MrMurano
 ```
 
+You will likely need to be root for the above commands.  If you would rather not
+install as root, you can install gems in the user directory.
+
+```
+> gem install MrMurano --user-install
+```
+
+Your `PATH` may need to be updated to find the installed `mr` command.  See the
+[Ruby Gem FAQ](http://guides.rubygems.org/faqs/#user-install).  In short, you need
+to add the output of `ruby -rubygems -e 'puts Gem.user_dir'` to your `PATH`.
+
 ## Features
 
 ### Logs
@@ -43,6 +54,41 @@ MrMurano does a few things to make your log output easier to follow.
 
 All of these can be toggled with command line options.
 
+### MR_CONFIGFILE environment and Dotenv
+
+The environment variable `MR_CONFIGFILE` is checked for an additional config to
+load.  This in conjuction with dotenv support, allows for easily switching between
+development, staging, and production setups.
+
+To use this, write the three solution ids into `.mrmurano.dev`, `.mrmurano.stg`,
+and `.mrmurano.prod`. Then write the `.env` file to point at the system you're
+currently working on.
+
+The files for this are then:
+```
+cat >> .mrmurano.dev <<EOF
+[solution]
+id=AAAAAAAA
+EOF
+
+cat >> .mrmurano.stg <<EOF
+[solution]
+id=BBBBBBBB
+EOF
+
+cat >> .mrmurano.prod <<EOF
+[solution]
+id=CCCCCCCC
+EOF
+
+cat >> .env <<EOF
+MR_CONFIGFILE=.mrmurano.dev
+EOF
+```
+
+This also allows for keeping private things in a seperate config file and having
+the shared things checked into source control.
+
 ### Keystore
 
 To aid with debugging, MrMurano has direct access to a solution's Keystore service.
@@ -78,6 +124,44 @@ For the endpoints, modules, and eventhandlers directories. The can contain both
 files or a sub-directory of files.  This allows for keeping common things grouped
 together.  Or adding a git submodule in to manage reusable chunks.
 
+So, as an example, your project could be like:
+```
+endpoints
+endpoints/get_-v1-data-averaged.lua
+endpoints/get_-v1-data-cupsDrank.lua
+endpoints/get_-v1-data-latest.lua
+endpoints/statusboard-data.lua
+endpoints/users
+endpoints/users/get_-session.lua
+endpoints/users/get_-v1-verify-code.lua
+endpoints/users/patch_-v1-user.lua
+endpoints/users/post_-session.lua
+endpoints/users/post_-v1-pushtoken.lua
+endpoints/users/put_-v1-user-email.lua
+eventhandlers
+eventhandlers/product.lua
+eventhandlers/timer_timer.lua
+files
+files/batteryMeter.svg
+files/index.html
+files/meter.html
+modules
+modules/TSQ
+modules/TSQ/func_field_quote_test.lua
+modules/TSQ/isadate_test.lua
+modules/TSQ/README.md
+modules/TSQ/results_test.lua
+modules/TSQ/select_fields_test.lua
+modules/TSQ/tsq-1.2-2.rockspec
+modules/TSQ/tsq.lua
+modules/TSQ/tsq_test.lua
+modules/TSQ/tsw.lua
+modules/TSQ/tsw_test.lua
+modules/users.lua
+modules/util.lua
+spec
+spec/cico.murano.spec
+```
 
 
 ### Bundles

data/Rakefile

@@ -17,11 +17,12 @@ task :echo do
     puts "= #{Bundler::GemHelper.gemspec.version} ="
 end
 
-task :run do
-    sh %{ruby -Ilib bin/mr }
+desc "Prints a cmd to test this in another directory"
+task :testwith do
+    pwd=Dir.pwd.sub(Dir.home, '~')
+    puts "ruby -I#{pwd}/lib #{pwd}/bin/mr "
 end
 
-
 task :test do
     sh %{rspec}
 end

data/TODO.taskpaper

@@ -1,8 +1,9 @@
 Readme:
 	- Add more walk-thrus of common actions. (create new solution, …)
+	- Look into using VCR for testing.
 
 Commands:
-	- Status will show {modules,eventhandlers} have changes when they don’t.
+	- Status will show {modules,eventhandlers} have changes when they don’t. @done(2016-09-23)
 	- First time run needs to be smoothed out. @done(2016-08-09)
 	- Default for most commands should be -same @done(2016-08-02)
 	- Add Diff Command @done(2016-07-27)
@@ -12,12 +13,13 @@ Account:
 	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
-	- Add support for multiple endpoints in one file (maybe)
+	- Add support for multiple endpoints in one file (maybe) @pri(low)
 	- Add directory support like in modules @done(2016-07-26)
 
 Files:
 	- Add ignore patterns to config
 	- Switch to mime-types v3
+	- Figure out how to make the hexed-sha checksum faster. @done(2016-09-23)
 	- Fix upload. @done(2016-08-01)
 	- Files won't update, they always delete then add. @done(2016-07-28)
 
@@ -36,22 +38,20 @@ Timeseries:
 	- Add CSV output option. @done(2016-09-09)
 
 Product:
+	- Auto convert exoline spec files into murano spec files on upload?
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
 Service Device:
 	- When listing and bussiness.id is missing, gracefully fall back to --idonly @done(2016-09-12)
 
 Config:
-	- Think about adding dev,staging,prod system; how would that work?
-	Would it work ok to just use the --configfile option?
-	I'm thinking so.  To the point of dropping the :private scope.
-	- Add ENV support for some (or all?) options.
-	At least the --configfile option. (and --config option)
-	- Maybe add dotenv support.
+	- Add ENV['MR_CONFIGFILE'] path to file to load like --configfile @done(2016-09-22)
+	- Maybe add dotenv support. @done(2016-09-22)
+	- Think about adding dev,staging,prod system; how would that work? @done(2016-09-16)
 
 SolutionBase:
-	- Errors from the server should be displayed prettier.
 	- All network traffic is serialized. Make some parallel.
+	- Errors from the server should be displayed prettier. @done(2016-09-26)
 	- JSON parse should use symbols for keys. @done(2016-09-01)
 	- Add the --curl verbose option. @done(2016-08-12)
 	- Rebuild how local names and paths are computed from remote items. @done(2016-07-27)

data/bin/mr

@@ -5,6 +5,8 @@ require 'commander/import'
 require 'pathname'
 require 'MrMurano'
 require 'pp'
+require 'dotenv'
+Dotenv.load
 
 program :version, MrMurano::VERSION
 program :description, %{Manage a Solution and Product in Exosite's Murano}

data/lib/MrMurano/Account.rb

@@ -2,10 +2,10 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'date'
-require 'pp'
-require 'terminal-table'
 require 'pathname'
 require 'yaml'
+require 'MrMurano/Config'
+require 'MrMurano/http'
 
 module MrMurano
   class Passwords
@@ -65,7 +65,7 @@ module MrMurano
         user = ask("Account name: ")
         $cfg.set('user.name', user, :user)
       end
-      pff = Pathname.new(ENV['HOME']) + '.mrmurano/passwords'
+      pff = $cfg.file_at('passwords', :user)
       pf = Passwords.new(pff)
       pf.load
       pws = pf.get(host, user)
@@ -100,7 +100,7 @@ module MrMurano
           token = JSON.parse(response.body, json_opts)
           @@token = token[:token]
         else
-          say_error "No token! because: #{response}"
+          showHttpError(request, response)
           @@token = nil
           raise response
         end
@@ -125,55 +125,4 @@ module MrMurano
   end
 end
 
-command :account do |c|
-  c.syntax = %{mr account [options]}
-  c.description = %{Show things about your account.}
-  c.option '--businesses', 'Get businesses for user'
-  c.option '--products', 'Get products for user (needs a business)'
-  c.option '--solutions', 'Get solutions for user (needs a business)'
-  c.option '--idonly', 'Only return the ids'
-
-  c.example %{List all businesses}, 'mr account --businesses'
-  c.example %{List solutions}, 'mr account --solutions -c business.id=XXXXXXXX'
-
-  c.action do |args, options|
-
-    acc = MrMurano::Account.new
-
-    if options.businesses then
-      data = acc.businesses
-      if options.idonly then
-        say data.map{|row| row[:bizid]}.join(' ')
-      else
-        busy = data.map{|row| [row[:bizid], row[:role], row[:name]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['Biz ID', 'Role', 'Name']
-        say table
-      end
-
-    elsif options.products then
-      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
-
-    elsif options.solutions then
-      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
-
-    else
-      say acc.token
-    end
-
-  end
-end
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/{configFile.rb → Config.rb}

@@ -6,7 +6,7 @@ module MrMurano
     #
     #  internal    transient this-run-only things (also -c options)
     #  specified   from --configfile
-    #  private     .mrmuranorc.private at project dir (for things you don't want to commit)
+    #  env         from ENV['MR_CONFIGFILE']
     #  project     .mrmuranorc at project dir
     #  user        .mrmuranorc at $HOME
     #  system      .mrmuranorc at /etc
@@ -32,10 +32,11 @@ module MrMurano
     end
 
     attr :paths
+    attr_reader :projectDir
 
-    CFG_SCOPES=%w{internal specified project private user system defaults}.map{|i| i.to_sym}.freeze
+    CFG_SCOPES=%w{internal specified env project private user system defaults}.map{|i| i.to_sym}.freeze
     CFG_FILE_NAME = '.mrmuranorc'.freeze
-    CFG_PRVT_NAME = '.mrmuranorc.private'.freeze
+    CFG_PRVT_NAME = '.mrmuranorc.private'.freeze # Going away.
     CFG_DIR_NAME = '.mrmurano'.freeze
     CFG_ALTRC_NAME = '.mrmurano/config'.freeze
     CFG_SYS_NAME = '/etc/mrmuranorc'.freeze
@@ -44,10 +45,21 @@ module MrMurano
       @paths = []
       @paths << ConfigFile.new(:internal, nil, IniFile.new())
       # :specified --configfile FILE goes here. (see load_specific)
-      prjfile = findProjectDir()
-      unless prjfile.nil? then
-        @paths << ConfigFile.new(:private, prjfile + CFG_PRVT_NAME)
-        @paths << ConfigFile.new(:project, prjfile + CFG_FILE_NAME)
+      unless ENV['MR_CONFIGFILE'].nil? then
+        # if it exists, must be a file
+        # if it doesn't exist, that's ok
+        ep = Pathname.new(ENV['MR_CONFIGFILE'])
+        if ep.file? or not ep.exist? then
+          @paths << ConfigFile.new(:env, ep)
+        end
+      end
+      @projectDir = findProjectDir()
+      unless @projectDir.nil? then
+        if (@projectDir + CFG_PRVT_NAME).exist? then
+          say_warning "!!! Using .mrmuranorc.private is deprecated"
+        end
+        @paths << ConfigFile.new(:private, @projectDir + CFG_PRVT_NAME)
+        @paths << ConfigFile.new(:project, @projectDir + CFG_FILE_NAME)
       end
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
       @paths << ConfigFile.new(:system, Pathname.new(CFG_SYS_NAME))
@@ -60,7 +72,7 @@ module MrMurano
 
       set('net.host', 'bizapi.hosted.exosite.io', :defaults)
 
-      set('location.base', prjfile, :defaults) unless prjfile.nil?
+      set('location.base', @projectDir, :defaults) unless @projectDir.nil?
       set('location.files', 'files', :defaults)
       set('location.endpoints', 'endpoints', :defaults)
       set('location.modules', 'modules', :defaults)
@@ -87,7 +99,7 @@ module MrMurano
     def findProjectDir()
       result=nil
       fileNames=[CFG_FILE_NAME, CFG_PRVT_NAME, CFG_ALTRC_NAME]
-      dirNames=[CFG_DIR_NAME, '.git']
+      dirNames=[CFG_DIR_NAME]
       home = Pathname.new(Dir.home)
       pwd = Pathname.new(Dir.pwd)
       return nil if home == pwd
@@ -105,22 +117,59 @@ module MrMurano
           end
         end
       end
-      # if nothing found, assume it will live in pwd.
+
+      # If nothing found, do a last ditch try by looking for .git/
+      if result.nil? then
+        pwd.dirname.ascend do |i|
+          break unless result.nil?
+          break if i == home
+          if (i + '.git').directory? then
+            result = i
+          end
+        end
+      end
+
+      # Now if nothing found, assume it will live in pwd.
       result = Pathname.new(Dir.pwd) if result.nil?
       return result
     end
+    private :findProjectDir
+
+    def file_at(name, scope=:project)
+      case scope
+      when :internal
+        root = nil
+      when :specified
+        root = nil
+      when :project
+        root = @projectDir + CFG_DIR_NAME
+      when :user
+        root = Pathname.new(Dir.home) + CFG_DIR_NAME
+      when :system
+        root = nil
+      when :defaults
+        root = nil
+      end
+      return nil if root.nil?
+      root.mkpath
+      root + name
+    end
 
+    ## Load all of the potential config files
     def load()
       # - read/write config file in [Project, User, System] (all are optional)
       @paths.each { |cfg| cfg.load }
     end
 
+    ## Load specified file into the config stack
+    # This can be called multiple times and each will get loaded into the config
     def load_specific(file)
       spc = ConfigFile.new(:specified, Pathname.new(file))
       spc.load
       @paths.insert(1, spc)
     end
 
+    ## Get a value for key, looking at the specificed scopes
     # key is <section>.<key>
     def get(key, scope=CFG_SCOPES)
       scope = [scope] unless scope.kind_of? Array
@@ -139,6 +188,7 @@ module MrMurano
       return nil
     end
 
+    ## Dump out a combined config
     def dump()
       # have a fake, merge all into it, then dump it.
       base = IniFile.new()

data/lib/MrMurano/Product.rb

@@ -2,6 +2,8 @@ require 'uri'
 require 'mime/types'
 require 'csv'
 require 'pp'
+require 'MrMurano/http'
+require 'MrMurano/verbosing'
 
 module MrMurano
   class ProductBase
@@ -124,7 +126,7 @@ module MrMurano
               end
             end
           else
-            say_error "got #{resp.to_s} from #{request} #{request.uri.to_s}"
+            showHttpError(request, response)
             raise resp
           end
         end
@@ -216,8 +218,10 @@ module MrMurano
     end
 
     def activate(sn)
-      # TODO: Need to create a new @http for the different host. Fails otherwise
       uri = URI("https://#{@pid}.m2.exosite.com/provision/activate")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.start
       request = Net::HTTP::Post.new(uri)
       request.form_data = {
         :vendor => @pid,
@@ -225,9 +229,17 @@ module MrMurano
         :sn => sn
       }
       request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
-      request['authorization'] = nil
+      request['Authorization'] = nil
       request.content_type = 'application/x-www-form-urlencoded; charset=utf-8'
-      workit(request)
+      curldebug(request)
+      response = http.request(request)
+      case response
+      when Net::HTTPSuccess
+        return response.body
+      else
+        showHttpError(request, response)
+        raise response
+      end
     end
 
     def add_sn(sn, extra='')

data/lib/MrMurano/Solution-Endpoint.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'pp'
+require 'MrMurano/Solution'
 
 module MrMurano
   # …/endpoint
@@ -35,7 +36,7 @@ module MrMurano
     end
 
     ##
-    # Upload endpoint 
+    # Upload endpoint
     # :local path to file to push
     # :remote hash of method and endpoint path
     def upload(local, remote)
@@ -58,8 +59,7 @@ module MrMurano
             verbose "\tDoesn't exist, creating"
             post('/', remote)
           else
-            say_error "got #{response} from #{request} #{request.uri.to_s}"
-            say_error ":: #{response.body}"
+            showHttpError(request, response)
           end
         end
       else

data/lib/MrMurano/Solution-File.rb

@@ -4,6 +4,7 @@ require "http/form_data"
 require 'digest/sha1'
 require 'mime/types'
 require 'pp'
+require 'MrMurano/Solution'
 
 module MrMurano
   # …/file
@@ -36,7 +37,7 @@ module MrMurano
               end
             end
           else
-            say_error "got #{resp.to_s} from #{request} #{request.uri.to_s}"
+            showHttpError(request, response)
             raise resp
           end
         end
@@ -101,8 +102,7 @@ module MrMurano
         case response
         when Net::HTTPSuccess
         else
-          say_error "got #{response} from #{request} #{request.uri.to_s}"
-          say_error ":: #{response.body}"
+          showHttpError(request, response)
         end
       end
     end
@@ -124,16 +124,10 @@ module MrMurano
       # It does not actually take the SHA1 of the file.
       # It first converts the file to hex, then takes the SHA1 of that string
       #sha1 = Digest::SHA1.file(path.to_s).hexdigest
-      def hexit(str)
-        ret=''
-        # TODO: find a faster way to do this.
-        str.each_byte{|b| ret << "%02x" % b}
-        ret
-      end
       sha1 = Digest::SHA1.new
       path.open('rb:ASCII-8BIT') do |io|
         while chunk = io.read(1048576) do
-          sha1 << hexit(chunk)
+          sha1 << Digest.hexencode(chunk)
         end
       end
       debug "Checking #{name} (#{mime.simplified} #{sha1.hexdigest})"

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -1,4 +1,4 @@
-require 'terminal-table'
+require 'MrMurano/Solution'
 
 module MrMurano
   # …/serviceconfig
@@ -51,55 +51,4 @@ module MrMurano
   end
 end
 
-command 'assign list' do |c|
-  c.syntax = 'mr assign list [options]'
-  c.description = 'List the products that are assigned'
-  c.option '--idonly', 'Only return the ids'
-  c.action do |args, options|
-    sol = MrMurano::SC_Device.new
-
-    trigs = sol.showTriggers()
-    if options.idonly or $cfg['business.id'].nil? then
-      say trigs.join(' ')
-    else
-      acc = MrMurano::Account.new
-      products = acc.products
-      products.select!{|p| trigs.include? p[:modelId] }
-      if products.empty? then
-        say trigs.join(' ')
-      else
-        busy = products.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
-end
-alias_command :assign, 'assign list'
-
-command 'assign set' do |c|
-  c.syntax = 'mr assign set [product]'
-  c.description = 'Assign a product to a eventhandler'
-
-  c.action do |args, options|
-    sol = MrMurano::SC_Device.new
-
-    prname = args.shift
-    if prname.nil? then
-      prid = $cfg['product.id']
-    else
-      acc = MrMurano::Account.new
-      products = acc.products
-      products.select!{|p|
-        p[:label] == prname or p[:modelId] == prname or p[:pid] == prname
-      }
-      prid = products.map{|p| p[:modelId]}
-    end
-    raise "No product ID!" if prid.nil?
-    say "Assigning #{prid} to solution" if $cfg['tool.verbose']
-    sol.assignTriggers(prid) unless $cfg['tool.dry']
-  end
-
-end
-
 #  vim: set ai et sw=2 ts=2 :