MrMurano 1.3.2 → 1.4.0

data/lib/MrMurano/contentCommand.rb

@@ -0,0 +1,113 @@
+
+command 'content list' do |c|
+  c.syntax = %{mr content list}
+  c.summary = %{List downloadable content for a product}
+  c.description = %{List downloadable content for a product
+
+  Data uploaded to a product's content area can be downloaded by devices using the
+  HTTP Device API. (http://docs.exosite.com/http/#list-available-content)
+  }
+  c.action do |args, options|
+    prd = MrMurano::ProductContent.new
+    prd.list.each{|item| say item}
+  end
+end
+alias_command :content, 'content list'
+
+command 'content info' do |c|
+  c.syntax = %{mr content info <content id>}
+  c.summary = %{Show more info for a content item}
+  c.description = %{Show more info for a content item
+
+  Data uploaded to a product's content area can be downloaded by devices using the
+  HTTP Device API. (http://docs.exosite.com/http/#list-available-content)
+  }
+  c.action do |args, options|
+    if args[0].nil? then
+      say_error "Missing <content id>"
+    else
+      prd = MrMurano::ProductContent.new
+      prd.info(args[0]).each{|line| say "#{args[0]} #{line.join(' ')}"}
+    end
+  end
+end
+
+command 'content delete' do |c|
+  c.syntax = %{mr content delete <content id>}
+  c.summary = %{Delete a content item}
+  c.description = %{Delete a content item
+
+  Data uploaded to a product's content area can be downloaded by devices using the
+  HTTP Device API. (http://docs.exosite.com/http/#list-available-content)
+  }
+  c.action do |args, options|
+    if args[0].nil? then
+      say_error "Missing <content id>"
+    else
+      prd = MrMurano::ProductContent.new
+      pp prd.remove(args[0])
+    end
+  end
+end
+
+command 'content upload' do |c|
+  c.syntax = %{mr content upload <content id> <file>}
+  c.summary = %{Upload content}
+  c.description = %{Upload a content item
+
+  Data uploaded to a product's content area can be downloaded by devices using the
+  HTTP Device API. (http://docs.exosite.com/http/#list-available-content)
+  }
+  c.option '--meta STRING', %{Add extra meta info to the content item}
+
+  c.action do |args, options|
+    options.defaults :meta=>' '
+
+    if args[0].nil? then
+      say_error "Missing <content id>"
+    elsif args[1].nil? then
+      say_error "Missing <file>"
+    else
+      prd = MrMurano::ProductContent.new
+
+      ret = prd.info(args[0])
+      if ret.nil? then
+        pp prd.create(args[0], options.meta)
+      end
+
+      pp prd.upload(args[0], args[1])
+    end
+  end
+end
+
+command 'content download' do |c|
+  c.syntax = %{mr content download <content id>}
+  c.summary = %{Download a content item}
+  c.description = %{Download a content item
+
+  Data uploaded to a product's content area can be downloaded by devices using the
+  HTTP Device API. (http://docs.exosite.com/http/#list-available-content)
+  }
+  c.option '-o','--output FILE',%{save to this file}
+  c.action do |args, options|
+    if args[0].nil? then
+      say_error "Missing <content id>"
+    else
+      prd = MrMurano::ProductContent.new
+
+      if options.output.nil? then
+        prd.download(args[0]) # to stdout
+      else
+        outFile = Pathname.new(options.output)
+        outFile.open('w') do |io|
+          prd.download(args[0]) do |chunk|
+            io << chunk
+          end
+        end
+      end
+    end
+  end
+end
+
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/exportImport.rb

@@ -0,0 +1,123 @@
+require 'pathname'
+require 'json'
+require 'fileutils'
+
+command 'config export' do |c|
+  c.syntax = %{mr config export}
+  c.summary = %{Export data to a Solutionfile.json and .Solutionfile.secret}
+
+  c.option '--force', "Overwrite existing files."
+
+  c.action do |args, options|
+    solfile = Pathname.new($cfg['location.base'] + 'Solutionfile.json')
+    solsecret = Pathname.new($cfg['location.base'] + '.Solutionfile.secret')
+
+    if not options.force and (solfile.exist? or solsecret.exist?) then
+      say_error "Solutionfile.json or .Solutionfile.secret already exist."
+      say "Use --force to overwrite"
+    end
+
+    epf = 'routes.lua'
+      File.open(epf, 'w') do |dst|
+      MrMurano::Endpoint.new.locallist.each do |ed|
+        ed[:local_path].open do |fin|
+          FileUtils.copy_stream(fin, dst)
+        end
+        dst << "\n\n"
+      end
+    end
+
+    solf = {
+      :routes => 'epf',
+      :assets => $cfg['location.files'],
+      :default_page => $cfg['files.default_page'],
+      :services => {},
+      :modules => {}
+    }
+
+    dpwd = Pathname.new(Dir.pwd)
+    MrMurano::EventHandler.new.locallist.each do |ev|
+      rp = ev[:local_path].relative_path_from(dpwd).to_s
+      if solf[:services].has_key?(ev[:service]) then
+        solf[:services][ev[:service]][ev[:event]] = rp
+      else
+        solf[:services][ev[:service]] = {ev[:event] => rp}
+      end
+    end
+
+    MrMurano::Library.new.locallist.each do |lb|
+      solf[:modules][lb[:name]] = lb[:local_path].relative_path_from(dpwd).to_s
+    end
+
+    solfile.open('w') do |io|
+      io << JSON.pretty_generate(solf)
+    end
+
+    solsecret.open('w') do |io|
+        pff = Pathname.new(ENV['HOME']) + '.mrmurano/passwords'
+        pwd = MrMurano::Passwords.new(pff)
+        pwd.load
+        ps = pwd.get($cfg['net.host'], $cfg['user.name'])
+      io << {
+        :email => $cfg['user.name'],
+        :password => ps,
+        :solution_id => $cfg['solution.id'],
+        :product_id => $cfg['product.id']
+      }.to_json
+    end
+
+  end
+end
+
+command 'config import' do |c|
+  c.syntax = %{mr config import}
+  c.summary = %{Import data from a Solutionfile.json and .Solutionfile.secret}
+
+  c.action do |args, options|
+    solfile = ($cfg['location.base'] + 'Solutionfile.json')
+    solsecret = ($cfg['location.base'] + '.Solutionfile.secret')
+
+    if solfile.exist? then
+      # Is in JSON, which as a subset of YAML, so use YAML parser
+      solfile.open do |io|
+        sf = YAML.load(io)
+        $cfg.set('location.files', sf['assets']) if sf.has_key? 'assets'
+        $cfg.set('location.files', sf['file_dir']) if sf.has_key? 'file_dir'
+        $cfg.set('files.default_page', sf['default_page']) if sf.has_key? 'default_page'
+      end
+    end
+
+    if solsecret.exist? then
+      # Is in JSON, which as a subset of YAML, so use YAML parser
+      solsecret.open do |io|
+        ss = YAML.load(io)
+
+        pff = Pathname.new(ENV['HOME']) + '.mrmurano/passwords'
+        pwd = MrMurano::Passwords.new(pff)
+        pwd.load
+        ps = pwd.get($cfg['net.host'], ss['email'])
+        if ps.nil? then
+          pwd.set($cfg['net.host'], ss['email'], ss['password'])
+          pwd.save
+        elsif ps != ss['password'] then
+          y = ask("A different password for this account already exists. Overwrite? N/y")
+          if y =~ /^y/i then
+            pwd.set($cfg['net.host'], ss['email'], ss['password'])
+            pwd.save
+          end
+        else
+          # already set, nothing to do.
+        end
+
+        $cfg.set('solution.id', ss['solution_id']) if ss.has_key? 'solution_id'
+        $cfg.set('solution.id', ss['product_id']) if ss.has_key? 'product_id'
+      end
+    end
+
+    say "Configuration items have been imported."
+    say "Use `mr syncdown` get get all endpoints, modules, and event handlers"
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/http.rb

@@ -23,7 +23,10 @@ module MrMurano
     def curldebug(request)
       if $cfg['tool.curldebug'] then
         a = []
-        a << %{curl -s -H 'Authorization: #{request['authorization']}'}
+        a << %{curl -s }
+        if request.key?('Authorization') then
+          a << %{-H 'Authorization: #{request['Authorization']}'}
+        end
         a << %{-H 'User-Agent: #{request['User-Agent']}'}
         a << %{-H 'Content-Type: #{request.content_type}'}
         a << %{-X #{request.method}}
@@ -42,19 +45,21 @@ module MrMurano
       end
       @http
     end
+    def http_reset
+      @http = nil
+    end
 
-    def set_req_defaults(request)
+    def set_def_headers(request)
       request.content_type = 'application/json'
-      request['authorization'] = 'token ' + token
+      request['Authorization'] = 'token ' + token
       request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
       request
     end
 
     def workit(request, &block)
-      set_req_defaults(request)
       curldebug(request)
       if block_given? then
-        yield request, http()
+        return yield request, http()
       else
         response = http().request(request)
         case response
@@ -76,26 +81,37 @@ module MrMurano
 
     def get(path='', &block)
       uri = endPoint(path)
-      workit(Net::HTTP::Get.new(uri), &block)
+      workit(set_def_headers(Net::HTTP::Get.new(uri)), &block)
     end
 
     def post(path='', body={}, &block)
       uri = endPoint(path)
       req = Net::HTTP::Post.new(uri)
+      set_def_headers(req)
       req.body = JSON.generate(body)
       workit(req, &block)
     end
 
+    def postf(path='', form={}, &block)
+      uri = endPoint(path)
+      req = Net::HTTP::Post.new(uri)
+      set_def_headers(req)
+      req.content_type = 'application/x-www-form-urlencoded; charset=utf-8'
+      req.form_data = form
+      workit(req, &block)
+    end
+
     def put(path='', body={}, &block)
       uri = endPoint(path)
       req = Net::HTTP::Put.new(uri)
+      set_def_headers(req)
       req.body = JSON.generate(body)
       workit(req, &block)
     end
 
     def delete(path='', &block)
       uri = endPoint(path)
-      workit(Net::HTTP::Delete.new(uri), &block)
+      workit(set_def_headers(Net::HTTP::Delete.new(uri)), &block)
     end
 
   end

data/lib/MrMurano/keystore.rb

@@ -68,7 +68,7 @@ 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.description = %{Set the value of a key in the Keystore}
   c.action do |args,options|
     sol = MrMurano::Keystore.new
     sol.setkey(args[0], args[1..-1].join(' '))

data/lib/MrMurano/verbosing.rb

@@ -0,0 +1,17 @@
+require 'pp'
+
+module MrMurano
+  module Verbose
+    def verbose(msg)
+      if $cfg['tool.verbose'] then
+        say msg
+      end
+    end
+    def debug(msg)
+      if $cfg['tool.debug'] then
+        say msg
+      end
+    end
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.3.2'.freeze
+	VERSION = '1.4.0'.freeze
 end
 

data/lib/MrMurano.rb

@@ -1,4 +1,5 @@
 require 'MrMurano/version'
+require 'MrMurano/verbosing'
 require 'MrMurano/hash.rb'
 require 'MrMurano/http'
 require 'MrMurano/configFile'
@@ -9,8 +10,12 @@ require 'MrMurano/Solution-File.rb'
 require 'MrMurano/Solution-Services.rb'
 require 'MrMurano/Solution-Users.rb'
 require 'MrMurano/Solution-ServiceConfig.rb'
+require 'MrMurano/Product'
 
+require 'MrMurano/configCommand'
+require 'MrMurano/contentCommand'
 require 'MrMurano/cors'
+require 'MrMurano/exportImport'
 require 'MrMurano/keystore.rb'
 require 'MrMurano/logs.rb'
 require 'MrMurano/sync.rb'

data/spec/Account-Passwords_spec.rb

@@ -0,0 +1,121 @@
+require 'rubygems'
+require 'commander/import'
+require 'MrMurano'
+require 'tempfile'
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Some kludgery to work around commander.  Likely a better way to do this.
+program :version, MrMurano::VERSION
+program :description, %{Manage a Solution in Exosite's Murano}
+command(:nop){ |c| c.action {|a,o|} }
+default_command :nop
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+RSpec.describe MrMurano::Passwords, "#pwd" do
+  it "Creates a file " do
+    tmpfile = Dir.tmpdir + '/pwtest' # This way because Tempfile.new creates.
+    begin
+      pwd = MrMurano::Passwords.new( tmpfile )
+      pwd.save
+
+      expect( FileTest.exists?(tmpfile) )
+    ensure
+      File.unlink(tmpfile) if File.exists? tmpfile
+    end
+  end
+
+  it "Loads a file" do
+    Tempfile.open('test') do |tf|
+      tf << %{---
+this.is.a.host:
+  user: password
+}
+      tf.close
+
+      pwd = MrMurano::Passwords.new( tf.path )
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user')
+      expect(ps).to eq('password')
+    end
+  end
+
+  it "Saves a file" do
+    Tempfile.open('pstest') do |tf|
+      tf.close
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.set('this.is.a.host', 'user3', 'passwords4')
+      pwd.save
+
+      File.open(tf.path) do |io|
+        data = io.read
+        expect(data).to eq(%{---
+this.is.a.host:
+  user3: passwords4
+})
+      end
+    end
+  end
+
+  it "Writes multiple hosts" do
+    Tempfile.open('pwtest') do |tf|
+      tf.close
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.set('this.is.a.host', 'user3', 'passwords4')
+      pwd.save
+      pwd = nil
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user3')
+      expect(ps).to eq('passwords4')
+      pwd = nil
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.load
+      pwd.set('another.host', 'user9', 'passwords2')
+      pwd.save
+      pwd = nil
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user3')
+      expect(ps).to eq('passwords4')
+      ps = pwd.get('another.host', 'user9')
+      expect(ps).to eq('passwords2')
+      pwd = nil
+
+    end
+  end
+
+  it "Write multiple users to same host" do
+    Tempfile.open('pwstest') do |tf|
+      tf.close
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.set('this.is.a.host', 'user3', 'passwords4')
+      pwd.save
+      pwd = nil
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.load
+      pwd.set('this.is.a.host', 'user9', 'passwords2')
+      pwd.save
+      pwd = nil
+
+      pwd = MrMurano::Passwords.new(tf.path)
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user3')
+      expect(ps).to eq('passwords4')
+      ps = pwd.get('this.is.a.host', 'user9')
+      expect(ps).to eq('passwords2')
+      pwd = nil
+
+    end
+  end
+
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/spec/ProductBase_spec.rb

@@ -0,0 +1,112 @@
+require 'MrMurano/version'
+require 'MrMurano/verbosing'
+require 'MrMurano/http'
+require 'MrMurano/Product'
+require 'MrMurano/configFile'
+
+RSpec.describe MrMurano::ProductBase, "#product_base" do
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['product.id'] = 'XYZ'
+
+    @prd = MrMurano::ProductBase.new
+    allow(@prd).to receive(:token).and_return("TTTTTTTTTT")
+  end
+
+  it "initializes" do
+    uri = @prd.endPoint('/')
+    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/product/XYZ/")
+  end
+
+  it "can get" do
+    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "Fooo")
+
+    ret = @prd.get('/')
+    expect(ret).to eq("Fooo")
+  end
+
+  it "returns hash when getting empty body" do
+    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+
+    ret = @prd.get('/')
+    expect(ret).to eq({})
+  end
+
+  it "auto parses JSON responses" do
+    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: %{{"first": "str", "sec":[1,2,3], "third":{"a":"b"}}})
+
+    ret = @prd.get('/')
+    expect(ret).to eq({:sec=>[1,2,3],:third=>{:a=>'b'},:first=>'str'})
+  end
+
+  it "can post nothing" do
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+    ret = @prd.post('/')
+    expect(ret).to eq({})
+  end
+
+  it "can post json" do
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(headers: {'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'},
+          body: {:this=>"is", :a=>'test'}).
+      to_return(body: "")
+    ret = @prd.post('/', {:this=>"is", :a=>'test'})
+    expect(ret).to eq({})
+  end
+
+  it "can post form data" do
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(headers: {'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/x-www-form-urlencoded'},
+          body: "this=is&a=test").
+      to_return(body: "")
+    ret = @prd.postf('/', {:this=>"is", :a=>'test'})
+    expect(ret).to eq({})
+  end
+
+  it "can put nothing" do
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+    ret = @prd.put('/')
+    expect(ret).to eq({})
+  end
+
+  it "can put json" do
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(headers: {'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'},
+          body: {:this=>"is", :a=>'test'}).
+      to_return(body: "")
+    ret = @prd.put('/', {:this=>"is", :a=>'test'})
+    expect(ret).to eq({})
+  end
+
+  it "can delete" do
+    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/").
+      with(headers: {'Authorization'=>'token TTTTTTTTTT',
+                      'Content-Type'=>'application/json'}).
+      to_return(body: "")
+    ret = @prd.delete('/')
+    expect(ret).to eq({})
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :