MrMurano 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf6540edd42b5a6cac68bb92b3f18f69cf0e90e
-  data.tar.gz: 311ff88459a51b3af06604d89d5c9b58f32b849f
+  metadata.gz: 64252dab4d9f4551bfffef5723875d8aab4c2964
+  data.tar.gz: a24ed29a6a1726b9b54d75e9b34cdd6e5ef596f1
 SHA512:
-  metadata.gz: d01eaf47965c58e51cd502e5a6268d799a5cc96d4eca6bc4930a4dbe555519114ecae0c8483c1876bfbf3bc29cde1ead1cb5a91ccf307d5580c86f0fec7df5ba
-  data.tar.gz: 8b2b715ba8955ad9ea54c02ad9a5acbc8781f7f70129929f7a295d6b17a5bd53893934f190ef79d1803f633e679a2ccfafbd3d201bde83174ff183ec7af60dcf
+  metadata.gz: 85dfd850d6f21f917350de746cb94e57674346fa3d06ac21ef96243491fd7e59cec4e789809a2b8834c0b4549cd71a1802a8d0d143f12fa9b366fad9944fcd20
+  data.tar.gz: 5021da7e66050a1bed213c504bf7405632e5b2a3f5238b1810fb43104c66b7f658d81c42eafcfd3a52fd459dd9bc7a40bd77f9486a72c37469b7d3e67429f56a

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+    - 2.0
+    - 2.2
+

data/Gemfile

@@ -10,3 +10,7 @@ gem 'inifile', '~> 3.0'
 gem 'http-form_data', '~> 1.0.1'
 gem 'rainbow', '~> 2.1.0'
 
+group :test do
+  gem 'rake'
+end
+

data/MrMurano.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'mrmurano/version'
+require_relative 'lib/MrMurano/version.rb'
 
 Gem::Specification.new do |s|
   s.name        = 'MrMurano'
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('bundler', '~> 1.7.6')
   s.add_development_dependency('rspec', '~> 3.2')
-  s.add_development_dependency('rake')
+  s.add_development_dependency('rake', '~> 10.1.1')
 end
 
 

data/README.markdown

@@ -1,6 +1,7 @@
 # MrMurano
 
 [![Gem Version](https://badge.fury.io/rb/MrMurano.svg)](https://badge.fury.io/rb/MrMurano)
+[![Build Status](https://travis-ci.org/tadpol/MrMurano.svg?branch=master)](https://travis-ci.org/tadpol/MrMurano)
 
 Do more from the command line with [Murano](https://exosite.com/platform/)
 
@@ -11,15 +12,13 @@ To start from an existing project in Murano
 mkdir myproject
 cd myproject
 mr config solution.id XXXXXX
-mr syncdown
+mr syncdown -V
 ```
 
 Do stuff, see what changed: `mr status` or `mr diff`.
 Then deploy with `mr syncup`
 
 
-
-
 ## Install
 
 ```
@@ -32,6 +31,29 @@ Or
 
 ## Features
 
+### Logs
+
+You can monitor the log messages from your solution with the `mr logs --follow`.
+Or quickly get the last few with `mr logs`
+
+MrMurano does a few things to make your log output easier to follow.
+- Adds color to easily see where each log message starts.
+- Reformats the timestamps to be in local time.
+- Finds JSON blobs and pretty prints them.
+
+All of these can be toggled with command line options.
+
+### Keystore
+
+To aid with debugging, MrMurano has direct access to a solution's Keystore service.
+
+To see all of the keys in the current solution: `mr keystore` 
+
+### Timeseries
+
+To aid with debugging, MrMurano has direct access to a solution's Timeseries service.
+
+
 ### Sub-directories
 
 For the endpoints, modules, and eventhandlers directories. The can contain both

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 
-#task :default => []
+task :default => [:test]
 
 # TODO: figure out better way to test.
 desc "Install gem in user dir"
@@ -21,5 +21,9 @@ task :run do
 	sh %{ruby -Ilib bin/mr }
 end
 
+
+task :test do
+end
+
 #  vim: set sw=4 ts=4 :
 

data/TODO.taskpaper

@@ -1,3 +1,5 @@
+Readme:
+	- Add more walk-thrus of common actions. (create new solution, …)
 
 Commands:
 	- Status will show things have changes when they don’t.
@@ -11,28 +13,38 @@ Account:
 Endpoints:
 	- Add support for multiple endpoints in one file (maybe)
 	- Add directory support like in modules @done(2016-07-26)
-  
+
 Files:
+	- Add ignore patterns to config
 	- Switch to mime-types v3
 	- Fix upload. @done(2016-08-01)
 	- Files won't update, they always delete then add. @done(2016-07-28)
 
-Users:
+Users and Roles:
 	Much of this is stuck until we get more docs on the User/Role management
 	- Figure out how to upload (create and update) user info.
 	- Figure out how to add Roles to Users in the local data and upload it.
 	- Fix diff for Users and Roles.
 	- Have hash keys in the yaml be strings not symbols. (don't start with colon) @done(2016-07-27)
 
+CORS:
+	- Get working with sync up/down.
+	- GET&PUT /cors data @done(2016-09-08)
+
 Product:
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
 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.
 
 SolutionBase:
 	- All network traffic is serialized. Make some parallel.
+	- 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)
 
@@ -41,7 +53,7 @@ Bundles:
 	- Work on design @done(2016-08-09)
 	Thinking of something like VIM bundles.  A directory of directories. Each with a
 	manafest file? (maybe)  A Bundle is a group of modules, endpoints, static files
-	and the other things.  
+	and the other things.
 
 	There needs to be some layering logic added, where the bundles are stacked and
 	then the top-level files are stack on top of that. This builds the final map of

data/bin/mr

@@ -40,7 +40,7 @@ $cfg.load
 # Basic command support is:
 # - read/write config file in [Project, User, System] (all are optional)
 # - Introspection for tab completion.
-# - Look for tools in PATH that are +x and "mr-foo..." 
+# - Look for tools in PATH that are +x and "mr-foo..."
 
 
 # Look for plug-ins

data/lib/MrMurano.rb

@@ -8,7 +8,11 @@ require 'MrMurano/Solution-File.rb'
 require 'MrMurano/Solution-Services.rb'
 require 'MrMurano/Solution-Users.rb'
 require 'MrMurano/Solution-ServiceConfig.rb'
+
+require 'MrMurano/cors'
+require 'MrMurano/keystore.rb'
 require 'MrMurano/logs.rb'
 require 'MrMurano/sync.rb'
 require 'MrMurano/status.rb'
+require 'MrMurano/timeseries.rb'
 #require 'MrMurano/shelledCommand'

data/lib/MrMurano/Account.rb

@@ -51,6 +51,13 @@ module MrMurano
   end
 
   class Account
+    def initialize
+      @json_opts = {
+        :allow_nan => true,
+        :symbolize_names => true,
+        :create_additions => false
+      }
+    end
 
 
     def endPoint(path)
@@ -91,8 +98,8 @@ module MrMurano
           response = http.request(request)
           case response
           when Net::HTTPSuccess
-            token = JSON.parse(response.body)
-            @token = token['token']
+            token = JSON.parse(response.body, @json_opts)
+            @token = token[:token]
           else
             say_error "No token! because: #{response}"
             @token = nil
@@ -113,7 +120,7 @@ module MrMurano
         response = http.request(request)
         case response
         when Net::HTTPSuccess
-          busy = JSON.parse(response.body)
+          busy = JSON.parse(response.body, @json_opts)
           return busy
         else
           raise response
@@ -132,7 +139,7 @@ module MrMurano
         response = http.request(request)
         case response
         when Net::HTTPSuccess
-          busy = JSON.parse(response.body)
+          busy = JSON.parse(response.body, @json_opts)
           return busy
         else
           raise response
@@ -151,7 +158,7 @@ module MrMurano
         response = http.request(request)
         case response
         when Net::HTTPSuccess
-          busy = JSON.parse(response.body)
+          busy = JSON.parse(response.body, @json_opts)
           return busy
         else
           raise response
@@ -180,9 +187,9 @@ command :account do |c|
     if options.businesses then
       data = acc.businesses
       if options.idonly then
-        say data.map{|row| row['bizid']}.join(' ')
+        say data.map{|row| row[:bizid]}.join(' ')
       else
-        busy = data.map{|row| [row['bizid'], row['role'], row['name']]}
+        busy = data.map{|row| [row[:bizid], row[:role], row[:name]]}
         table = Terminal::Table.new :rows => busy, :headings => ['Biz ID', 'Role', 'Name']
         say table
       end
@@ -190,9 +197,9 @@ command :account do |c|
     elsif options.products then
       data = acc.products
       if options.idonly then
-        say data.map{|row| row['pid']}.join(' ')
+        say data.map{|row| row[:pid]}.join(' ')
       else
-        busy = data.map{|r| [r['label'], r['type'], r['pid'], r['modelId']]}
+        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
@@ -200,9 +207,9 @@ command :account do |c|
     elsif options.solutions then
       data = acc.solutions
       if options.idonly then
-        say data.map{|row| row['apiId']}.join(' ')
+        say data.map{|row| row[:apiId]}.join(' ')
       else
-        busy = data.map{|r| [r['apiId'], r['domain'], r['type'], r['sid']]}
+        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

data/lib/MrMurano/Solution-Endpoint.rb

@@ -20,16 +20,16 @@ module MrMurano
 
     def fetch(id)
       ret = get('/' + id.to_s)
-      aheader = ret['script'].lines.first.chomp
-      dheader = /^--#ENDPOINT (?i:#{ret['method']}) #{ret['path']}$/
-      rheader = %{--#ENDPOINT #{ret['method']} #{ret['path']}\n}
+      aheader = ret[:script].lines.first.chomp
+      dheader = /^--#ENDPOINT (?i:#{ret[:method]}) #{ret[:path]}$/
+      rheader = %{--#ENDPOINT #{ret[:method]} #{ret[:path]}\n}
       if block_given? then
         yield rheader unless dheader =~ aheader
-        yield ret['script']
+        yield ret[:script]
       else
         res = ''
         res << rheader unless dheader =~ aheader
-        res << ret['script']
+        res << ret[:script]
         res
       end
     end

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -9,30 +9,40 @@ module MrMurano
     end
 
     def list
-      get()['items']
+      get()[:items]
     end
     def fetch(id)
       get('/' + id.to_s)
     end
 
+    def scid_for_name(name)
+      name = name.to_s unless name.kind_of? String
+      scr = list().select{|i| i[:service] == name}.first
+      scid = scr[:id]
+    end
+
+    def scid
+      return @scid unless @scid.nil?
+      @scid = scid_for_name(@serviceName)
+    end
+
+    #  Below is Device ServiceConfig Specific.  Should it be in its own class?
 
     def assignTriggers(products)
-      scr = list().select{|i| i['service'] == 'device' or i[:service] == 'device'}.first
-      scid = scr['id'] or scr[:id]
+      scid = scid_for_name('device')
 
-      details = Hash.transform_keys_to_symbols(fetch(scid))
+      details = fetch(scid)
       products = [products] unless products.kind_of? Array
       details[:triggers] = {:pid=>products}
 
       put('/'+scid, details)
-      
+
     end
 
     def showTriggers
-      scr = list().select{|i| i['service'] == 'device' or i[:service] == 'device'}.first
-      scid = scr['id'] or scr[:id]
+      scid = scid_for_name('device')
 
-      details = Hash.transform_keys_to_symbols(fetch(scid))
+      details = fetch(scid)
 
       return [] if details[:triggers].nil?
       details[:triggers][:pid]
@@ -57,7 +67,7 @@ command :assign do |c|
         say trigs.join(' ')
       else
         acc = MrMurano::Account.new
-        products = acc.products.map{|p| Hash.transform_keys_to_symbols(p)}
+        products = acc.products
         products.select!{|p| trigs.include? p[:pid] }
         busy = products.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
         table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
@@ -70,7 +80,7 @@ command :assign do |c|
         prid = $cfg['product.id']
       else
         acc = MrMurano::Account.new
-        products = acc.products.map{|p| Hash.transform_keys_to_symbols(p)}
+        products = acc.products
         products.select!{|p| p[:label] == prname or p[:pid] == prname }
         prid = products.map{|p| p[:pid]}
       end

data/lib/MrMurano/Solution-Services.rb

@@ -27,15 +27,15 @@ module MrMurano
 
     def list
       ret = get()
-      ret['items']
+      ret[:items]
     end
 
     def fetch(name)
       ret = get('/'+name)
       if block_given? then
-        yield ret['script']
+        yield ret[:script]
       else
-        ret['script']
+        ret[:script]
       end
     end
 
@@ -127,20 +127,20 @@ module MrMurano
     def list
       ret = get()
       skiplist = ($cfg['eventhandler.skiplist'] or '').split
-      ret['items'].reject{|i| i.has_key?('service') and skiplist.include? i['service'] }
+      ret[:items].reject{|i| i.has_key?(:service) and skiplist.include? i[:service] }
     end
 
     def fetch(name)
       ret = get('/'+name)
-      aheader = (ret['script'].lines.first or "").chomp
-      dheader = "--#EVENT #{ret['service']} #{ret['event']}"
+      aheader = (ret[:script].lines.first or "").chomp
+      dheader = "--#EVENT #{ret[:service]} #{ret[:event]}"
       if block_given? then
         yield dheader + "\n" if aheader != dheader
-        yield ret['script']
+        yield ret[:script]
       else
         res = ''
         res << dheader + "\n" if aheader != dheader
-        res << ret['script']
+        res << ret[:script]
         res
       end
     end

data/lib/MrMurano/Solution.rb

@@ -10,12 +10,18 @@ module MrMurano
     # This might also be a valid ProductBase.
     def initialize
       @token = Account.new.token
+      raise "Not logged in!" if @token.nil?
       @sid = $cfg['solution.id']
       raise "No solution!" if @sid.nil?
       @uriparts = [:solution, @sid]
       @itemkey = :id
       @locationbase = $cfg['location.base']
       @location = nil
+      @json_opts = {
+        :allow_nan => true,
+        :symbolize_names => true,
+        :create_additions => false
+      }
     end
 
     def verbose(msg)
@@ -70,7 +76,7 @@ module MrMurano
         when Net::HTTPSuccess
           return {} if response.body.nil?
           begin
-            return JSON.parse(response.body)
+            return JSON.parse(response.body, @json_opts)
           rescue
             return response.body
           end
@@ -276,7 +282,7 @@ module MrMurano
     def syncdown(options=Commander::Command::Options.new)
       options.asdown = true
       dt = status(options)
-      into = @locationbase + @location
+      into = @locationbase + @location ###
       toadd = dt[:toadd]
       todel = dt[:todel]
       tomod = dt[:tomod]
@@ -396,21 +402,6 @@ module MrMurano
 
   end
 
-  # …/serviceconfig
-  class ServiceConfig < SolutionBase
-    def initialize
-      super
-      @uriparts << 'serviceconfig'
-    end
-
-    def list
-      get()['items']
-    end
-    def fetch(id)
-      get('/' + id.to_s)
-    end
-  end
-
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/cors.rb

@@ -0,0 +1,57 @@
+
+module MrMurano
+  class Cors < SolutionBase
+    def initialize
+      super
+      @uriparts << 'cors'
+      @location = $cfg['location.cors']
+    end
+
+    def fetch()
+      ret = get()
+      ret[:cors]
+    end
+
+    # TODO: fill out other metheds so this could be part of sync up/down.
+
+    ##
+    # Upload CORS
+    # :local path to file to push
+    # :remote hash of method and endpoint path (ignored for now)
+    def upload(local, remote)
+      local = Pathname.new(local) unless local.kind_of? Pathname
+      raise "no file" unless local.exist?
+
+      local.open do |io|
+        data = YAML.load(io)
+        put('', data)
+      end
+    end
+
+    def tolocalpath(into, item)
+      into
+    end
+  end
+end
+
+command :cors do |c|
+  c.syntax = %{mr cors [options]}
+  c.description = %{Get or set the CORS for the solution.}
+  c.option '-f','--file FILE', String, %{File to set CORS from}
+
+  c.action do |args,options|
+    sol = MrMurano::Cors.new
+
+    if options.file then
+      #set
+      pp sol.upload(options.file, {})
+    else
+      # get
+      ret = sol.fetch()
+      puts ret
+    end
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/keystore.rb

@@ -0,0 +1,105 @@
+
+module MrMurano
+  class Keystore < ServiceConfig
+    def initialize
+      super
+      @serviceName = 'keystore'
+    end
+
+    def keyinfo
+      ret = get("/#{scid}/call/info")
+    end
+
+    def listkeys
+      ret = get("/#{scid}/call/list")
+      ret[:keys]
+    end
+
+    def getkey(key)
+      ret = post("/#{scid}/call/get", {:key=>key})
+      ret[:value]
+    end
+
+    def setkey(key, value)
+      post("/#{scid}/call/set", { :key=>key, :value=>value })
+    end
+
+    def delkey(key)
+      post("/#{scid}/call/delete", { :key=>key})
+    end
+
+    def command(key, cmd, args)
+      post("/#{scid}/call/command", {:key=>key, :command=>cmd, :args=>args})
+    end
+
+  end
+end
+
+command 'keystore info' do |c|
+  c.syntax = %{mr keystore info}
+  c.description = %{Show info about the Keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    pp sol.keyinfo
+  end
+end
+
+command 'keystore list' do |c|
+  c.syntax = %{mr keystore list}
+  c.description = %{List all of the keys in the Keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    sol.listkeys.each do |key|
+      puts key
+    end
+  end
+end
+alias_command :keystore, 'keystore list'
+
+command 'keystore get' do |c|
+  c.syntax = %{mr keystore get <key>}
+  c.description = %{Get the value of a key in the Keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    ret = sol.getkey(args[0])
+    puts ret
+  end
+end
+
+command 'keystore set' do |c|
+  c.syntax = %{mr keystore set <key> <value...>}
+  c.description = %{Set teh value of a key in the Keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    sol.setkey(args[0], args[1..-1].join(' '))
+  end
+end
+
+command 'keystore delete' do |c|
+  c.syntax = %{mr keystore delete <key>}
+  c.description = %{Delete a key from the Keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    sol.delkey(args[0])
+  end
+end
+alias_command 'keystore rm', 'keystore delete'
+
+command 'keystore command' do |c|
+  c.syntax = %{mr keystore command <key> <command> <args...>}
+  c.description = %{Call some Redis commands in the Keystore.
+
+Only a subset of all Redis commands is supported.
+See http://docs.exosite.com/murano/services/keystore/#command for current list.
+  }
+  c.example %{mr keystore command mykey lpush myvalue}, %{Push a value onto list}
+  c.example %{mr keystore command mykey lpush A B C}, %{Push three values onto list}
+  c.example %{mr keystore command mykey lrem 0 B}, %{Remove all B values from list}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    pp sol.command(args[0], args[1], args[2..-1])
+  end
+end
+alias_command 'keystore cmd', 'keystore command'
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/logs.rb

@@ -22,8 +22,8 @@ command :logs do |c|
     begin
       ret = sol.get('/logs') # TODO: ('/logs?polling=true') Currently ignored.
 
-      if ret.kind_of?(Hash) and ret.has_key?('items') then
-        ret['items'].reverse.each do |line|
+      if ret.kind_of?(Hash) and ret.has_key?(:items) then
+        ret[:items].reverse.each do |line|
           curtime = ""
           if line.kind_of?(String) then
 
@@ -53,7 +53,6 @@ command :logs do |c|
             out = line
 
           elsif line.kind_of?(Hash) then
-            line = Hash.transform_keys_to_symbols(line)
             out=""
 
             out << "[#{line[:subject]}]".color(:red).background(:aliceblue)

data/lib/MrMurano/timeseries.rb

@@ -0,0 +1,84 @@
+
+module MrMurano
+  class Timeseries < ServiceConfig
+    def initialize
+      super
+      @serviceName = 'timeseries'
+    end
+
+    def query(query)
+      post("/#{scid}/call/query", {:q=>query})
+    end
+
+    def write(writestr)
+      post("/#{scid}/call/write", { :q=>writestr })
+    end
+
+    def command(cmd)
+      post("/#{scid}/call/command", { :q=>cmd})
+    end
+
+  end
+end
+
+command 'timeseries query' do |c|
+  c.syntax = %{mr timeseries query <query string>}
+  c.description = %{Query the timeseries database}
+  c.option '--[no-]json', %{Display results as raw json}
+  #c.option '--csv', %{Display results as csv}
+  # Should get a CSV formatter to make sure cells are properly escapped.
+  c.action do |args,options|
+    options.defalts :json=>false
+    sol = MrMurano::Timeseries.new
+    ret = sol.query args.join(' ')
+    if options.json then
+      puts ret.to_json
+    else
+      (ret[:results] or []).each do |res|
+        (res[:series] or []).each do |ser|
+          cols = ser[:columns]
+          table = Terminal::Table.new :title=>ser[:name], :headings=>cols, :rows=>ser[:values]
+          puts table
+        end
+      end
+      # If nothing displayed, Format wasn't what we expected, so do what?
+    end
+  end
+end
+alias_command :tsq, 'timeseries query'
+
+command 'timeseries write' do |c|
+  c.syntax = %{mr timeseries <write string>}
+  c.description = %{Write data into the timeseries database}
+  c.option '--[no-]json', %{Display results as raw json}
+  c.action do |args,options|
+    options.defalts :json=>false
+    sol = MrMurano::Timeseries.new
+    ret = sol.write args.join(' ')
+    if options.json then
+      puts ret.to_json
+    else
+      pp ret
+    end
+  end
+end
+alias_command :tsw, 'timeseries write'
+
+command 'timeseries command' do |c|
+  c.syntax = %{mr timeseries command <db command>}
+  c.description = %{Execute a non-query command in the database}
+  c.option '--[no-]json', %{Display results as raw json}
+  c.action do |args,options|
+    options.defalts :json=>false
+    sol = MrMurano::Timeseries.new
+    ret = sol.command args.join(' ')
+    if options.json then
+      puts ret.to_json
+    else
+      pp ret
+    end
+  end
+end
+
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.2.1'.freeze
+	VERSION = '1.3.0'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -140,16 +140,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
 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  "
@@ -161,6 +161,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - MrMurano.gemspec
 - README.markdown
@@ -176,11 +177,14 @@ files:
 - lib/MrMurano/Solution-Users.rb
 - lib/MrMurano/Solution.rb
 - lib/MrMurano/configFile.rb
+- lib/MrMurano/cors.rb
 - lib/MrMurano/hash.rb
+- lib/MrMurano/keystore.rb
 - lib/MrMurano/logs.rb
 - lib/MrMurano/shelledCommand.rb
 - lib/MrMurano/status.rb
 - lib/MrMurano/sync.rb
+- lib/MrMurano/timeseries.rb
 - lib/MrMurano/version.rb
 homepage: https://github.com/tadpol/MrMurano
 licenses: