MrMurano 1.12.6 → 1.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d648032c78a076df907fc5df4e7c34fc132bdf
-  data.tar.gz: 8427da53825f267b4e359e4cd487231b2c76e73f
+  metadata.gz: e591da051dc929f8d3102ad5d5e4e509cfc8f615
+  data.tar.gz: bcc33ba440e43735cccf0ecfd533cfaed7de6c5f
 SHA512:
-  metadata.gz: eaf548e3a9ca3f760e777258657475f6184dac842db66dc36e069c19904f0d4b70380e48c87d6eede8cfa2c0a2ab9a34266e73b88d3ea6844ab1d1a11f0b4d5f
-  data.tar.gz: 44fc4db071c247b69551dcf466c60fa0eca3dd4d8c3b0a6678d93a9e131c1f2688f64969e10d94c32c80afea8081686913bc276cf4c986f843213687de23f3f2
+  metadata.gz: bc03f582fa7ef39dc93448f4ad3a01285bfb2758e89e959f2bc8aec4d7ad8088b7a1b4bf04822165afd7960329ea4612a07c371e3377bdc4d5c2bf9224692cae
+  data.tar.gz: 1dedb31aca67f814643b11bb29715708f3d857b7e4e0ae7ed242a084aac9418e2520c085d69acadce0c2b3cd84d72367ce6bc7701cc969c75ef472178a3ca963

data/lib/MrMurano/Config.rb

@@ -120,8 +120,8 @@ module MrMurano
       dirNames=[CFG_DIR_NAME]
       home = Pathname.new(Dir.home).realpath
       pwd = Pathname.new(Dir.pwd).realpath
-      return nil if home == pwd
-      pwd.dirname.ascend do |i|
+      return home if home == pwd
+      pwd.ascend do |i|
         break unless result.nil?
         break if i == home
         fileNames.each do |f|
@@ -136,17 +136,6 @@ module MrMurano
         end
       end
 
-      # 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

data/lib/MrMurano/Solution-Services.rb

@@ -33,10 +33,12 @@ module MrMurano
       raise "Missing name!" if name.nil?
       raise "Empty name!" if name.empty?
       ret = get('/'+CGI.escape(name))
+      error "Unexpected result type, assuming empty instead: #{ret}" unless ret.kind_of? Hash
+      ret = {} unless ret.kind_of? Hash
       if block_given? then
-        yield ret[:script]
+        yield (ret[:script] or '')
       else
-        ret[:script]
+        ret[:script] or ''
       end
     end
 

data/lib/MrMurano/commands.rb

@@ -19,6 +19,7 @@ require 'MrMurano/commands/productDeviceIdCmds'
 require 'MrMurano/commands/productList'
 require 'MrMurano/commands/productSpec'
 require 'MrMurano/commands/productWrite'
+require 'MrMurano/commands/show'
 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.12.6'.freeze
+  VERSION = '1.12.8'.freeze
 end
 

data/spec/Config_spec.rb

@@ -280,134 +280,6 @@ RSpec.describe MrMurano::Config do
     end
   end
 
-  context "Can find the project directory by .git/" do
-    before(:example) do
-      @tmpdir = Dir.tmpdir
-      path = '/home/work/project/some/where'
-      @projectDir = @tmpdir + '/home/work/project'
-      FileUtils.mkpath(@tmpdir + path)
-      FileUtils.mkpath(@projectDir + '/.git')
-
-      # Set ENV to override output of Dir.home
-      ENV['HOME'] = @tmpdir + '/home'
-    end
-
-    after(:example) do
-      FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
-    end
-
-    it "when in project directory" do
-      Dir.chdir(@projectDir) do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
-        expect(locbase).to eq(wkd)
-      end
-    end
-
-    it "when in sub directory" do
-      Dir.chdir(@projectDir + '/some/where') do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
-        expect(locbase).to eq(wkd)
-      end
-    end
-  end
-
-  context "Can find the project directory by .mrmuranorc but not sub .git/" do
-    #
-    # /home/work/project/
-    # /home/work/project/.mrmuranorc
-    # /home/work/project/some/.git
-    before(:example) do
-      @tmpdir = Dir.tmpdir
-      path = '/home/work/project/some/where'
-      @projectDir = @tmpdir + '/home/work/project'
-      FileUtils.mkpath(@tmpdir + path)
-      FileUtils.touch(@projectDir + '/.mrmuranorc')
-      FileUtils.mkpath(@projectDir + '/some/.git')
-
-      # Set ENV to override output of Dir.home
-      ENV['HOME'] = @tmpdir + '/home'
-    end
-
-    after(:example) do
-      FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
-    end
-
-    it "when in project directory" do
-      Dir.chdir(@projectDir) do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
-        expect(locbase).to eq(wkd)
-      end
-    end
-
-    it "when in sub directory" do
-      Dir.chdir(@projectDir + '/some/where') do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
-        expect(locbase).to eq(wkd)
-      end
-    end
-  end
-
-  context "Can find the project directory by .mrmuranorc but not parent .git/" do
-    # /home/work/project/
-    # /home/work/project/.git
-    # /home/work/project/some/.mrmuranorc
-    before(:example) do
-      @tmpdir = Dir.tmpdir
-      path = '/home/work/project/some/where'
-      @projectDir = @tmpdir + '/home/work/project'
-      FileUtils.mkpath(@tmpdir + path)
-      FileUtils.touch(@projectDir + '/some/.mrmuranorc')
-      FileUtils.mkpath(@projectDir + '/.git')
-
-      # Set ENV to override output of Dir.home
-      ENV['HOME'] = @tmpdir + '/home'
-    end
-
-    after(:example) do
-      FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
-    end
-
-    it "when in project directory" do
-      Dir.chdir(@projectDir) do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir).realdirpath
-        # This will correctly assume that this project dir with .git is the
-        # location.base
-        expect(locbase).to eq(wkd)
-      end
-    end
-
-    it "when in sub directory" do
-      Dir.chdir(@projectDir + '/some/where') do
-        cfg = MrMurano::Config.new
-        cfg.load
-        # Follow symlinks to get the paths comparable.
-        locbase = cfg.get('location.base', :defaults).realdirpath
-        wkd = Pathname.new(@projectDir+'/some').realdirpath
-        expect(locbase).to eq(wkd)
-      end
-    end
-  end
-
   context "When pwd is $HOME:" do
     before(:example) do
       @tmpdir = Dir.tmpdir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.12.6
+  version: 1.12.8
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander