MrMurano 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ab13a9e2ec31727024cb8776e466d1764e592f
-  data.tar.gz: 7a1d7d1f1b6d135b89af5053d0277fa2917c62ea
+  metadata.gz: 2c82aba3bbc43dfbfaca479de9eb3387f7aa1e65
+  data.tar.gz: 485cb4bec0fbab31b06e00d6af5bc474c346fe8b
 SHA512:
-  metadata.gz: 8b51b475707e85b63490e8f547674651cd47666ddb1cade28ade86f3b08724dba7a6df65e850975f9a630161cb1bc0b7b3277ea8c2262a8f5f8315b47fb03e1b
-  data.tar.gz: 0c61906ec034c36d5551ac790042e4b3df6127c4f8075e5f9f70167f85eb11f6c6925e89d19497ca2d2186fd1f38d41ab19728b6dd16587efa083cc01bfb3cbe
+  metadata.gz: 79ba743c1656d07acf3871c7353b4f193be8b10bb2adc67ac377843a4152a0362966e6ab43594272bea3f429873f51c6331c34736d1081a5e8c6afca31c87df4
+  data.tar.gz: 644ff5cfcaa83e77384a44996f1e28758e681e19b6ed1491097f97f835c2d88b3ef3d224f01d27c231d30d4c8a675266297eaded396d3ddfbc0b5c45d43dae83

data/.gitignore

@@ -10,6 +10,7 @@ tags
 xcuserdata
 Pods/
 pkg/
+report/
 
 .mrmurano/
 .mrmuranorc

data/MrMurano.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Michael Conrad Tadpol Tilstra']
   s.email       = ['tadpol@tadpol.org']
   s.license     = 'MIT'
-  s.homepage    = 'https://github.com/tadpol/MrMurano'
+  s.homepage    = 'https://github.com/exosite/MrMurano'
   s.summary     = 'Do more from the command line with Murano'
   s.description = %{Do more from the command line with Murano
 

data/README.markdown

@@ -208,7 +208,8 @@ spec/cico.murano.spec
 
 ## Developing
 
-MrMurano uses git flow for managing branches.
+MrMurano uses [git flow](https://github.com/nvie/gitflow#getting-started) for
+[managing branches](http://nvie.com/posts/a-successful-git-branching-model/).
 
 MrMurano also uses [bunder](http://bundler.io).
 

data/Rakefile

@@ -29,7 +29,7 @@ task :gempush do
     sh %{gem push pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
 end
 
-task :gemit do 
+task :gemit do
     mrt=Bundler::GemHelper.gemspec.version
     sh %{git checkout v#{mrt}}
     Rake::Task[:build].invoke
@@ -38,14 +38,23 @@ task :gemit do
     sh %{git checkout develop}
 end
 
+task :wexe do
+    # Need to find all dlls, because ocra isn't finding them for some reason.
+    gemdir = `gem env gemdir`.chomp  # XXX can we get that without running commands?
+    gemdlls = Dir[File.join(gemdir, 'extensions', '*')]
+    sh %{ocra bin/mr #{gemdlls.join(' ')}}
+end
+
 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
 
+desc 'Run RSpec'
 task :test do
-    sh %{rspec}
+    Dir.mkdir("report") unless File.directory?("report")
+    sh %{rspec --format html --out report/index.html --format progress}
 end
 
 #  vim: set sw=4 ts=4 :

data/lib/MrMurano/Account.rb

@@ -44,6 +44,7 @@ module MrMurano
       return
     end
     def get(host, user)
+      return ENV['MR_PASSWORD'] unless ENV['MR_PASSWORD'].nil?
       return nil unless @data.kind_of? Hash
       return nil unless @data.has_key? host
       return nil unless @data[host].kind_of? Hash
@@ -105,6 +106,7 @@ module MrMurano
           @@token = token[:token]
         else
           showHttpError(request, response)
+          error "Check to see if username and password are correct."
           @@token = nil
           raise response
         end

data/lib/MrMurano/Product-1P-Device.rb

@@ -80,6 +80,33 @@ module MrMurano
       end
     end
 
+    ## Completely remove an identifier from the product
+    # +sn+:: Identifier for a device
+    def remove(sn)
+      # First drop it from the 1P database
+      do_rpc({:id=>1, :procedure=>:drop, :arguments=>[sn_rid(sn)]})
+      # Then remove it from the provisioning databases
+      psn = ProductSerialNumber.new
+      psn.remove_sn(sn)
+    end
+
+    ## Rename a device
+    # +sn+:: Identifier for a device
+    # +newname+:: The new name of the device
+    def rename(sn, newname, rid=nil)
+      newname = sn if newname.nil?
+      rid = sn_rid(sn) if rid.nil?
+      verbose "Setting name of #{sn} to #{newname}"
+      debug "  Via RID: #{rid}"
+      do_rpc({
+        :procedure=>:update,
+        :arguments=>[
+          rid,
+          {:name=>newname}
+        ]
+      })
+    end
+
     ## Get a tree of info for a device and its resources.
     # +sn+:: Identifier for a device
     def twee(sn)

data/lib/MrMurano/Product.rb

@@ -50,10 +50,7 @@ module MrMurano
     # dropped.
     def do_rpc(calls, cid=model_rid)
       calls = [calls] unless calls.kind_of?(Array)
-      r = post('', {
-        :auth=>{:client_id=>cid},
-        :calls=>calls
-      })
+      r = do_mrpc(calls, cid)
       return r if not r.kind_of?(Array) or r.count < 1
       r = r[0]
       return r if not r.kind_of?(Hash) or r[:status] != 'ok'
@@ -283,7 +280,6 @@ module MrMurano
     end
   end
 
-  ## TODO: Determine which of these are expected to be used.
   class ProductSerialNumber < ProductBase
     def initialize
       super
@@ -345,7 +341,8 @@ module MrMurano
     end
 
     def remove_sn(sn)
-      postf('/', {:sn=>sn, :delete=>true})
+      #postf('/', {:sn=>sn, :delete=>true})
+      delete("/#{sn}")
     end
 
     def ranges

data/lib/MrMurano/Solution-Cors.rb

@@ -65,6 +65,7 @@ module MrMurano
       return [] if here == false
 
       here[:id] = 'cors'
+      here[:local_path] = from
       [ Hash.transform_keys_to_symbols(here) ]
     end
 

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -36,6 +36,7 @@ module MrMurano
     end
 
     def call(opid, meth=:get, data=nil, id=scid, &block)
+      raise "Service '#{@serviceName}' not enabled for this Solution" if id.nil?
       call = "/#{id.to_s}/call/#{opid.to_s}"
       debug "Will call: #{call}"
       case meth

data/lib/MrMurano/Solution-Services.rb

@@ -100,7 +100,7 @@ module MrMurano
         :sha1=>Digest::SHA1.file(local_path.to_s).hexdigest,
         :updated_at=>time.to_datetime.iso8601(3)
       }
-      cacheFile = $cfg.file_at("cache.#{self.class.to_s}.yaml")
+      cacheFile = $cfg.file_at("cache.#{self.class.to_s.gsub(/\W+/,'_')}.yaml")
       if cacheFile.file? then
         cacheFile.open('r+') do |io|
           cache = YAML.load(io)
@@ -120,7 +120,7 @@ module MrMurano
 
     def cachedUpdateTimeFor(local_path)
       cksm = Digest::SHA1.file(local_path.to_s).hexdigest
-      cacheFile = $cfg.file_at("cache.#{self.class.to_s}.yaml")
+      cacheFile = $cfg.file_at("cache.#{self.class.to_s.gsub(/\W+/,'_')}.yaml")
       return nil unless cacheFile.file?
       ret = nil
       cacheFile.open('r') do |io|

data/lib/MrMurano/SubCmdGroupContext.rb

@@ -33,6 +33,10 @@ module MrMurano
       @aliases.include? name.to_s
     end
 
+    def command(name)
+      @commands[name.to_s]
+    end
+
     def get_help
       hf = @runner.program(:help_formatter).new(self)
       pc = Commander::HelpFormatter::ProgramContext.new(self).get_binding

data/lib/MrMurano/commands/businessList.rb

@@ -0,0 +1,45 @@
+require 'MrMurano/Account'
+
+command 'business list' do |c|
+  c.syntax = %{mr business list [options]}
+  c.description = %{List businesses}
+  c.option '--idonly', 'Only return the ids'
+  c.option '--[no-]all', 'Show all fields'
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
+
+  c.action do |args, options|
+    acc = MrMurano::Account.new
+    data = acc.businesses
+
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+
+    if options.idonly then
+      headers = [:bizid]
+      data = data.map{|row| [row[:modelId]]}
+    elsif not options.all then
+      headers = [:bizid, :role, :name]
+      data = data.map{|r| [r[:bizid], r[:role], r[:name]]}
+    else
+      headers = data[0].keys
+      data = data.map{|r| headers.map{|h| r[h]}}
+    end
+
+    acc.outf(data, io) do |dd, ios|
+      if options.idonly then
+        ios.puts dd.join(' ')
+      else
+        acc.tabularize({
+          :headers=>headers.map{|h| h.to_s},
+          :rows=>dd
+        }, ios)
+      end
+    end
+    io.close unless io.nil?
+
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/config.rb

@@ -47,7 +47,7 @@ command :config do |c|
       say $cfg.get(args[0], scopes)
     else
 
-      options.default :system=>false, :user=>false, :project=>true,
+      options.default :system=>false, :user=>false, :project=>false,
         :specified=>false, :env=>false
       # For write, if scope is specified, only write to that scope.
       scope = :project

data/lib/MrMurano/commands/init.rb

@@ -11,6 +11,12 @@ command :init do |c|
 
   c.action do |args, options|
     options.default :force=>false, :mkdirs=>true
+    acc = MrMurano::Account.new
+
+    if Pathname.new(Dir.pwd).realpath == Pathname.new(Dir.home).realpath then
+      acc.error "Cannot init a project in your HOME directory."
+      exit 2
+    end
 
     if not options.force and ($cfg['location.base'] + 'Solutionfile.json').exist? then
       y=ask("A Solutionfile.json exists, Do you want exit and run `mr config import` instead? [yN]")
@@ -20,8 +26,6 @@ command :init do |c|
 
     # If they have never logged in, then asking for the business.id will also ask
     # for their username and password.
-    acc = MrMurano::Account.new
-
 
     # 1. Get business id
     if not options.force and not $cfg['business.id'].nil? then

data/lib/MrMurano/commands/keystore.rb

@@ -33,6 +33,10 @@ module MrMurano
       call(:command, :post, {:key=>key, :command=>cmd, :args=>args})
     end
 
+    def clearall()
+      call(:clear, :post, {})
+    end
+
   end
 end
 
@@ -48,6 +52,15 @@ set data.  As well as calling any of the other supported REDIS commands.}
   end
 end
 
+command 'keystore clearAll' do |c|
+  c.syntax = %{mr keystore clearAll}
+  c.description = %{Delete all keys in the keystore}
+  c.action do |args,options|
+    sol = MrMurano::Keystore.new
+    sol.clearall
+  end
+end
+
 command 'keystore info' do |c|
   c.syntax = %{mr keystore info}
   c.description = %{Show info about the Keystore}

data/lib/MrMurano/commands/postgresql.rb

@@ -0,0 +1,41 @@
+require 'MrMurano/Solution-ServiceConfig'
+
+module MrMurano
+  class Postgresql < ServiceConfig
+    def initialize
+      super
+      @serviceName = 'postgresql'
+    end
+
+    def query(query)
+      call(:query, :post, {:sql=>query})
+    end
+  end
+end
+
+command :postgresql do |c|
+  c.syntax = %{mr postgresql <SQL Commands>}
+  c.summary = %{Query the relational database}
+
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
+
+  c.action do |args,options|
+    pg = MrMurano::Postgresql.new
+    ret = pg.query args.join(' ')
+
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+
+    pg.outf(ret, io) do |dd, ios|
+      pg.tabularize({
+        :headers=>dd[:columns],
+        :rows=>dd[:rows]
+      }, ios)
+    end
+    io.close unless io.nil?
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productDevice.rb

@@ -64,4 +64,20 @@ command 'product device twee' do |c|
   end
 end
 
+command 'product device delete' do |c|
+  c.syntax = %{mr product device delete <identifier>}
+  c.summary = %{Delete a device}
+
+  c.action do |args,options|
+    snid = args.shift
+    prd = MrMurano::Product1PDevice.new
+
+    ret = prd.remove(snid)
+    prd.outf ret unless ret.empty?
+  end
+end
+
+# XXX cannot call this here, since 'sn list' doesn't exist yet.
+#alias_command 'product device list', 'sn list'
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/{serialNumberCmds.rb → productDeviceIdCmds.rb}

@@ -1,20 +1,8 @@
 require 'MrMurano/Product'
 require 'terminal-table'
 
-command :sn do |c|
-  c.syntax = %{mr sn}
-  c.summary = %{About Serial Numbers}
-  c.description = %{The sn sub-commands allow for managing the identifiers (or Serial Numbers) on
-a product.}
-
-  c.action do |args, options|
-    ::Commander::UI.enable_paging
-    say MrMurano::SubCmdGroupHelp.new(c).get_help
-  end
-end
-
-command 'sn list' do |c|
-  c.syntax = %{mr sn list [options]}
+command 'product device list' do |c|
+  c.syntax = %{mr product device list [options]}
   c.summary = %{List serial numbers for a product}
 
   c.option '--offset NUMBER', Integer, %{Offset to start listing at}
@@ -31,8 +19,8 @@ command 'sn list' do |c|
   end
 end
 
-command 'sn enable' do |c|
-  c.syntax = %{mr sn enable [<sn>|--file <sns>]}
+command 'product device enable' do |c|
+  c.syntax = %{mr product device 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.
 
@@ -58,8 +46,8 @@ the activation call within this time, it will need to be enabled again.
   end
 end
 
-command 'sn activate' do |c|
-  c.syntax = %{mr sn activate <sn>}
+command 'product device activate' do |c|
+  c.syntax = %{mr product device activate <sn>}
   c.summary = %{Activate a serial number, retriving its CIK}
   c.description = %{Activates a serial number.
 
@@ -83,4 +71,9 @@ CIK again.
 
   end
 end
+
+alias_command 'sn list', 'product device list'
+alias_command 'sn enable', 'product device enable'
+alias_command 'sn activate', 'product device activate'
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productList.rb

@@ -1,5 +1,4 @@
 require 'MrMurano/Account'
-require 'terminal-table'
 
 command 'product list' do |c|
   c.syntax = %{mr product list [options]}

data/lib/MrMurano/commands/timeseries.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'MrMurano/Solution-ServiceConfig'
 
 module MrMurano
   class Timeseries < ServiceConfig

data/lib/MrMurano/commands.rb

@@ -1,5 +1,6 @@
 require 'MrMurano/commands/account'
 require 'MrMurano/commands/assign'
+require 'MrMurano/commands/businessList'
 require 'MrMurano/commands/config'
 require 'MrMurano/commands/content'
 require 'MrMurano/commands/cors'
@@ -8,14 +9,15 @@ require 'MrMurano/commands/exportImport'
 require 'MrMurano/commands/init'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
+require 'MrMurano/commands/postgresql'
 require 'MrMurano/commands/product'
 require 'MrMurano/commands/productCreate'
 require 'MrMurano/commands/productDelete'
 require 'MrMurano/commands/productDevice'
+require 'MrMurano/commands/productDeviceIdCmds'
 require 'MrMurano/commands/productList'
 require 'MrMurano/commands/productSpec'
 require 'MrMurano/commands/productWrite'
-require 'MrMurano/commands/serialNumberCmds'
 require 'MrMurano/commands/solution'
 require 'MrMurano/commands/solutionCreate'
 require 'MrMurano/commands/solutionDelete'

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.10.0'.freeze
 end
 

data/spec/Account-Passwords_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe MrMurano::Passwords, "#pwd" do
       pwd = MrMurano::Passwords.new( tmpfile )
       pwd.save
 
-      expect( FileTest.exists?(tmpfile) )
+      expect( FileTest.exist?(tmpfile) )
     ensure
-      File.unlink(tmpfile) if File.exists? tmpfile
+      File.unlink(tmpfile) if File.exist? tmpfile
     end
   end
 
@@ -21,9 +21,9 @@ RSpec.describe MrMurano::Passwords, "#pwd" do
       pwd = MrMurano::Passwords.new( tmpfile )
       pwd.save
 
-      expect( FileTest.exists?(tmpfile) )
+      expect( FileTest.exist?(tmpfile) )
     ensure
-      File.unlink(tmpfile) if File.exists? tmpfile
+      File.unlink(tmpfile) if File.exist? tmpfile
     end
   end
 
@@ -118,6 +118,39 @@ this.is.a.host:
     end
   end
 
+  it "Uses ENV instead" do
+    Tempfile.open('test') do |tf|
+      tf << %{---
+this.is.a.host:
+  user: password
+}
+      tf.close
+
+      ENV['MR_PASSWORD'] = 'a test!'
+      pwd = MrMurano::Passwords.new( tf.path )
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user')
+      expect(ps).to eq('a test!')
+      ENV['MR_PASSWORD'] = nil
+    end
+  end
+
+  it "Uses ENV instead, even with empty file" do
+    Tempfile.open('test') do |tf|
+      tf.close
+
+      ENV['MR_PASSWORD'] = 'a test!'
+      pwd = MrMurano::Passwords.new( tf.path )
+      pwd.load
+      ps = pwd.get('this.is.a.host', 'user')
+      expect(ps).to eq('a test!')
+      ENV['MR_PASSWORD'] = nil
+
+      data = IO.read(tf.path)
+      expect(data).to eq('')
+
+    end
+  end
 
 end
 

data/spec/ConfigFile_spec.rb

@@ -9,9 +9,11 @@ RSpec.describe MrMurano::Config::ConfigFile do
       cf = MrMurano::Config::ConfigFile.new(:user, tmpfile)
       cf.write
 
-      expect( FileTest.exist?(tmpfile) )
-      expect(FileTest.world_readable?(tmpfile)).to be(nil)
-      expect(FileTest.world_writable?(tmpfile)).to be(nil)
+      expect(FileTest.exist?(tmpfile))
+      unless Gem.win_platform? then
+        expect(FileTest.world_readable?(tmpfile)).to be(nil)
+        expect(FileTest.world_writable?(tmpfile)).to be(nil)
+      end
     ensure
       File.unlink(tmpfile) unless tmpfile.nil?
     end

data/spec/ProductContent_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe MrMurano::ProductContent, "#product_content" do
     size = FileTest.size('spec/fixtures/product_spec_files/lightbulb.yaml')
     stub_request(:post, @urlroot + "/testFor").
       with(headers: {'Authorization'=>'token TTTTTTTTTT',
-                      'Content-Type'=>'text/yaml',
+                      'Content-Type'=>/text\/(x-)?yaml/,
                       'Content-Length' => size
     }).
       to_return(status: 205)

data/spec/Solution-Cors_spec.rb

@@ -119,7 +119,7 @@ RSpec.describe MrMurano::Cors do
         tio.close
 
         ret = @srv.localitems(tio.path)
-        expect(ret).to eq([cors.merge({:id=>'cors'})])
+        expect(ret).to eq([cors.merge({:id=>'cors', :local_path=>Pathname.new(tio.path)})])
       end
     end
 

data/spec/cmd_config_spec.rb

@@ -1,51 +1,88 @@
-require 'tmpdir'
-require 'open3'
 require 'fileutils'
+require 'open3'
+require 'pathname'
+require 'shellwords'
+require 'tmpdir'
 
 RSpec.describe 'mr config' do
 
-  pref = "ruby -Ilib bin/"
+  def capcmd(*args)
+    args = [args] unless args.kind_of? Array
+    args.flatten!
+    args[0] = @testdir + 'bin' + args[0]
+    args.unshift("ruby", "-I#{(@testdir+'lib').to_s}")
+    cmd = Shellwords.join(args)
+    #pp cmd
+    cmd
+  end
+
   around(:example) do |ex|
-    Dir.mktmpdir do |dir|
-      @tmpdir = dir
-      ex.run
+    @testdir = Pathname.new(Dir.pwd).realpath
+    Dir.mktmpdir do |hdir|
+      ENV['HOME'] = hdir
+      Dir.chdir(hdir) do
+        @tmpdir = File.join(hdir, 'project')
+        Dir.mkdir(@tmpdir)
+        Dir.chdir(@tmpdir) do
+          ex.run
+        end
+      end
     end
   end
 
   it "Needs a key" do
-    out, err, status = Open3.capture3("#{pref}mr config")
+    out, err, status = Open3.capture3(capcmd('mr', "config"))
     expect(status).to eq(0)
     expect(out).to eq("\e[31mNeed a config key\e[0m\n")
     expect(err).to eq('')
   end
 
   it "Sets a key" do
-    out, err, status = Open3.capture3("#{pref}mr config bob build")
+    out, err, status = Open3.capture3(capcmd(%w{mr config bob build}))
     expect(status).to eq(0)
     expect(out).to eq('')
     expect(err).to eq('')
+
+    afile = IO.read(File.join(@tmpdir, '.mrmuranorc'))
+    bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_tool_bob').read
+    expect(afile).to eq(bfile)
   end
 
-  it "Reads a key" do
-    FileUtils.copy_file 'spec/fixtures/.mrmuranorc', File.join(@tmpdir, '.mrmuranorc'), :verbose => true
-    out, err, status = Open3.capture3("#{pref}mr config --project doThisTest.bob")
+  it "Sets a user key" do
+    out, err, status = Open3.capture3(capcmd(%w{mr config bob build --user}))
     expect(status).to eq(0)
     expect(out).to eq('')
     expect(err).to eq('')
+
+    afile = IO.read(File.join(ENV['HOME'], '.mrmuranorc'))
+    bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_tool_bob').read
+    expect(afile).to eq(bfile)
+  end
+
+  it "Reads a key" do
+    FileUtils.copy_file((@testdir+'spec'+'fixtures'+'.mrmuranorc').to_s,
+                        File.join(@tmpdir, '.mrmuranorc'),
+                        :verbose => true)
+    out, err, status = Open3.capture3(capcmd(%w{mr config --project doThisTest.bob}))
+    expect(status).to eq(0)
+    expect(out).to eq("build\n")
+    expect(err).to eq('')
   end
 
   it "Removes a key" do
     rcf = File.join(@tmpdir, '.mrmuranorc')
-    FileUtils.copy_file 'spec/fixtures/.mrmuranorc', rcf, :verbose => true
-    out, err, status = Open3.capture3(%{#{pref}mr config --project --unset doThisTest.bob})
+    FileUtils.copy_file((@testdir+'spec'+'fixtures'+'.mrmuranorc').to_s,
+                        rcf, :verbose => true)
+    out, err, status = Open3.capture3(capcmd(%w{mr config --project --unset doThisTest.bob}))
     expect(status).to eq(0)
     expect(out).to eq('')
     expect(err).to eq('')
 
     afile = IO.read(rcf)
-    bfile = IO.read('spec/fixtures/.mrmuranorc')
+    bfile = (@testdir + 'spec' + 'fixtures' + 'mrmuranorc_deleted_bob').read
     expect(afile).to eq(bfile)
   end
+
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/spec/cmd_init_spec.rb

@@ -0,0 +1,52 @@
+require 'fileutils'
+require 'open3'
+require 'pathname'
+require 'shellwords'
+require 'tmpdir'
+
+RSpec.describe 'mr init' do
+
+  def capcmd(*args)
+    args = [args] unless args.kind_of? Array
+    args.flatten!
+    args[0] = @testdir + 'bin' + args[0]
+    args.unshift("ruby", "-I#{(@testdir+'lib').to_s}")
+    cmd = Shellwords.join(args)
+    #pp cmd
+    cmd
+  end
+
+  around(:example) do |ex|
+    @testdir = Pathname.new(Dir.pwd).realpath
+    Dir.mktmpdir do |hdir|
+      ENV['HOME'] = hdir
+      Dir.chdir(hdir) do
+        @tmpdir = File.join(hdir, 'project')
+        Dir.mkdir(@tmpdir)
+        Dir.chdir(@tmpdir) do
+          ex.run
+        end
+      end
+    end
+  end
+
+  it "Won't init in HOME (gracefully)" do
+    # this is in the project dir. Want to be in HOME
+    Dir.chdir(ENV['HOME']) do
+      out, err, status = Open3.capture3(capcmd('mr', 'init', '--trace'))
+      expect(out).to eq("")
+      expect(err).to eq("\e[31mCannot init a project in your HOME directory.\e[0m\n")
+      expect(status.exitstatus).to eq(2)
+    end
+  end
+
+  it "Asks to import if Solutionfile exists" do
+    FileUtils.touch('Solutionfile.json')
+    out, err, status = Open3.capture3(capcmd('mr', 'init', '--trace'), :stdin_data=>'y')
+    expect(out).to eq("A Solutionfile.json exists, Do you want exit and run `mr config import` instead? [yN]\n")
+    expect(err).to eq("")
+    expect(status.exitstatus).to eq(0)
+  end
+
+end
+#  vim: set ai et sw=2 ts=2 :

data/spec/fixtures/mrmuranorc_tool_bob

@@ -0,0 +1,3 @@
+[tool]
+bob = build
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -215,6 +215,7 @@ files:
 - lib/MrMurano/commands.rb
 - lib/MrMurano/commands/account.rb
 - lib/MrMurano/commands/assign.rb
+- lib/MrMurano/commands/businessList.rb
 - lib/MrMurano/commands/completion.rb
 - lib/MrMurano/commands/config.rb
 - lib/MrMurano/commands/content.rb
@@ -224,14 +225,15 @@ files:
 - lib/MrMurano/commands/init.rb
 - lib/MrMurano/commands/keystore.rb
 - lib/MrMurano/commands/logs.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/productSpec.rb
 - lib/MrMurano/commands/productWrite.rb
-- lib/MrMurano/commands/serialNumberCmds.rb
 - lib/MrMurano/commands/solution.rb
 - lib/MrMurano/commands/solutionCreate.rb
 - lib/MrMurano/commands/solutionDelete.rb
@@ -264,16 +266,18 @@ files:
 - spec/Solution-ServiceModules_spec.rb
 - spec/SyncRoot_spec.rb
 - spec/cmd_config_spec.rb
+- spec/cmd_init_spec.rb
 - spec/fixtures/.mrmuranorc
 - spec/fixtures/configfile
 - 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.yaml
 - spec/spec_helper.rb
-homepage: https://github.com/tadpol/MrMurano
+homepage: https://github.com/exosite/MrMurano
 licenses:
 - MIT
 metadata: {}
@@ -315,9 +319,11 @@ test_files:
 - spec/Solution-ServiceModules_spec.rb
 - spec/SyncRoot_spec.rb
 - spec/cmd_config_spec.rb
+- spec/cmd_init_spec.rb
 - spec/fixtures/.mrmuranorc
 - spec/fixtures/configfile
 - 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