MuranoCLI 3.0.2 → 3.0.4

data/spec/ConfigMigrate_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.09.12 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 #require 'erb'
 require 'highline/import'
 #require 'tempfile'
@@ -7,7 +14,7 @@ require 'MrMurano/ProjectFile'
 require '_workspace'
 
 RSpec.describe MrMurano::ConfigMigrate do
-  include_context "WORKSPACE"
+  include_context 'WORKSPACE'
   before(:example) do
     @saved_pwd = ENV['MURANO_PASSWORD']
     ENV['MURANO_PASSWORD'] = nil
@@ -22,12 +29,15 @@ RSpec.describe MrMurano::ConfigMigrate do
     $project.load
 
     @lry = Pathname.new(@project_dir) + '.Solutionfile.secret'
-    FileUtils.copy(File.join(@testdir, 'spec/fixtures/SolutionFiles/secret.json'), @lry.to_path)
+    FileUtils.copy(
+      File.join(@testdir, 'spec/fixtures/SolutionFiles/secret.json'), @lry.to_path
+    )
 
     @mrt = MrMurano::ConfigMigrate.new
 
     @stdsaved = [$stdout, $stderr]
-    $stdout, $stderr = [StringIO.new, StringIO.new]
+    $stdout = StringIO.new
+    $stderr = StringIO.new
   end
 
   after(:example) do
@@ -36,7 +46,7 @@ RSpec.describe MrMurano::ConfigMigrate do
     ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
-  it "imports all" do
+  it 'imports all' do
     @mrt.import_secret
 
     expect($cfg['application.id']).to eq('ABCDEFG')
@@ -45,12 +55,12 @@ RSpec.describe MrMurano::ConfigMigrate do
     pff = $cfg.file_at('passwords', :user)
     pwd = MrMurano::Passwords.new(pff)
     pwd.load
-    expect(pwd.get$cfg['net.host'], $cfg['user.name']).to eq('gibblygook')
+    expect(pwd.get($cfg['net.host'], $cfg['user.name'])).to eq('gibblygook')
     expect($stdout.string).to eq('')
     expect($stderr.string).to eq('')
   end
 
-  it "imports over" do
+  it 'imports over' do
     $cfg['application.id'] = '12'
     $cfg['product.id'] = 'awdfvs'
     $cfg['user.name'] = '3qrarvsa'
@@ -66,18 +76,20 @@ RSpec.describe MrMurano::ConfigMigrate do
     pff = $cfg.file_at('passwords', :user)
     pwd = MrMurano::Passwords.new(pff)
     pwd.load
-    expect(pwd.get$cfg['net.host'], $cfg['user.name']).to eq('gibblygook')
+    expect(pwd.get($cfg['net.host'], $cfg['user.name'])).to eq('gibblygook')
     expect($stdout.string).to eq('')
     expect($stderr.string).to eq('')
   end
 
-  it "Asks about password differences" do
+  it 'Asks about password differences' do
     pff = $cfg.file_at('passwords', :user)
     pwd = MrMurano::Passwords.new(pff)
     pwd.set($cfg['net.host'], 'test@user.account', 'bob')
     pwd.save
 
-    expect($terminal).to receive(:ask).with('A different password for this account already exists. Overwrite? N/y').and_return('y')
+    expect($terminal).to receive(:ask).with(
+      'A different password for this account already exists. Overwrite? N/y'
+    ).and_return('y')
 
     @mrt.import_secret
 
@@ -87,10 +99,9 @@ RSpec.describe MrMurano::ConfigMigrate do
     pff = $cfg.file_at('passwords', :user)
     pwd = MrMurano::Passwords.new(pff)
     pwd.load
-    expect(pwd.get$cfg['net.host'], $cfg['user.name']).to eq('gibblygook')
+    expect(pwd.get($cfg['net.host'], $cfg['user.name'])).to eq('gibblygook')
     expect($stdout.string).to eq('')
     expect($stderr.string).to eq('')
   end
-
 end
-#  vim: set ai et sw=2 ts=2 :
+

data/spec/Config_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.09.12 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'erb'
 require 'tempfile'
 require 'MrMurano/version'
@@ -5,10 +12,9 @@ require 'MrMurano/Config'
 require '_workspace'
 
 RSpec.describe MrMurano::Config do
-
-  context "Basics " do
-    include_context "WORKSPACE"
-    it "Sets defaults" do
+  context 'Basics ' do
+    include_context 'WORKSPACE'
+    it 'Sets defaults' do
       cfg = MrMurano::Config.new
       cfg.load
       # Don't check for all of them, just a few.
@@ -18,7 +24,7 @@ RSpec.describe MrMurano::Config do
       expect(cfg.get('tool.debug', :defaults)).to eq(false)
     end
 
-    it "Sets internal values" do
+    it 'Sets internal values' do
       cfg = MrMurano::Config.new
       cfg.load
 
@@ -28,7 +34,7 @@ RSpec.describe MrMurano::Config do
       expect(cfg.get('bob.test', :internal)).to eq('twelve')
     end
 
-    it "Sets tool values" do
+    it 'Sets tool values' do
       cfg = MrMurano::Config.new
       cfg.load
 
@@ -38,7 +44,7 @@ RSpec.describe MrMurano::Config do
       expect(cfg.get('tool.test', :internal)).to eq('twelve')
     end
 
-    it "Sets project values" do # This should write
+    it 'Sets project values' do # This should write
       cfg = MrMurano::Config.new
       cfg.load
 
@@ -55,7 +61,7 @@ RSpec.describe MrMurano::Config do
       expect(cfg.get('bob.test', :project)).to eq('twelve')
     end
 
-    it "Sets a user value" do
+    it 'Sets a user value' do
       cfg = MrMurano::Config.new
       cfg.load
 
@@ -72,11 +78,11 @@ RSpec.describe MrMurano::Config do
       expect(cfg.get('bob.test', :user)).to eq('twelve')
     end
 
-    it "loads from a specific file" do
+    it 'loads from a specific file' do
       File.open(@project_dir + '/foo.cfg', 'w') do |io|
-        io << %{[test]
+        io << %([test]
             bob = test
-        }.gsub(/^\s\+/,'')
+        ).gsub(/^\s\+/, '')
       end
 
       cfg = MrMurano::Config.new
@@ -86,8 +92,8 @@ RSpec.describe MrMurano::Config do
       expect(cfg['test.bob']).to eq('test')
     end
 
-    context "returns a path to a file in" do
-      it "project mrmurano dir" do
+    context 'returns a path to a file in' do
+      it 'project mrmurano dir' do
         cfg = MrMurano::Config.new
         cfg.load
         path = cfg.file_at('testfile').realdirpath
@@ -96,7 +102,7 @@ RSpec.describe MrMurano::Config do
         expect(path).to eq(want)
       end
 
-      it "user mrmurano dir" do
+      it 'user mrmurano dir' do
         cfg = MrMurano::Config.new
         cfg.load
         path = cfg.file_at('testfile', :user).realdirpath
@@ -105,7 +111,7 @@ RSpec.describe MrMurano::Config do
         expect(path).to eq(want)
       end
 
-      it "internal" do
+      it 'internal' do
         cfg = MrMurano::Config.new
         cfg.load
         path = cfg.file_at('testfile', :internal)
@@ -113,7 +119,7 @@ RSpec.describe MrMurano::Config do
         expect(path).to eq(nil)
       end
 
-      it "specified" do
+      it 'specified' do
         cfg = MrMurano::Config.new
         cfg.load
         path = cfg.file_at('testfile', :specified)
@@ -121,7 +127,7 @@ RSpec.describe MrMurano::Config do
         expect(path).to eq(nil)
       end
 
-      it "defaults" do
+      it 'defaults' do
         cfg = MrMurano::Config.new
         cfg.load
         path = cfg.file_at('testfile', :defaults)
@@ -139,12 +145,12 @@ RSpec.describe MrMurano::Config do
         ENV['MR_CONFIGFILE'] = nil
       end
 
-      it "loads file in env" do
+      it 'loads file in env' do
         ENV['MURANO_CONFIGFILE'] = @tmpdir + '/home/test.config'
         File.open(@tmpdir + '/home/test.config', 'w') do |io|
-          io << %{[test]
+          io << %([test]
             bob = test
-          }.gsub(/^\s\+/,'')
+          ).gsub(/^\s\+/, '')
         end
 
         cfg = MrMurano::Config.new
@@ -152,7 +158,7 @@ RSpec.describe MrMurano::Config do
         expect(cfg['test.bob']).to eq('test')
       end
 
-      it "will create file at env" do
+      it 'will create file at env' do
         ENV['MURANO_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         cfg = MrMurano::Config.new
         cfg.load
@@ -167,14 +173,14 @@ RSpec.describe MrMurano::Config do
         expect(cfg.get('coffee.hot', :env)).to eq('yes')
       end
 
-      it "warns about migrating old ENV name" do
+      it 'warns about migrating old ENV name' do
         ENV['MURANO_CONFIGFILE'] = nil
         ENV['MR_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         expect_any_instance_of(MrMurano::Config).to receive(:warning).once
         MrMurano::Config.new
       end
 
-      it "errors if both are defined" do
+      it 'errors if both are defined' do
         ENV['MURANO_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         ENV['MR_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         # 2 warnings:
@@ -187,7 +193,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "dumps" do
+    it 'dumps' do
       @saved_cfg = ENV['MURANO_CONFIGFILE']
       ENV['MURANO_CONFIGFILE'] = nil
       cfg = MrMurano::Config.new
@@ -203,36 +209,34 @@ RSpec.describe MrMurano::Config do
       ENV['MURANO_CONFIGFILE'] = @saved_cfg
     end
 
-    context "fixing permissions" do
-      it "fixes a directory" do
+    context 'fixing permissions' do
+      it 'fixes a directory' do
         Dir.mkdir('test')
         cfg = MrMurano::Config.new
         cfg.fix_modes(Pathname.new('test'))
-        if Gem.win_platform? then
-          expect(FileTest.world_readable? 'test').to eq(493)
-          expect(FileTest.world_writable? 'test').to be_nil
+        if Gem.win_platform?
+          expect(FileTest.world_readable?('test')).to eq(493)
         else
-          expect(FileTest.world_readable? 'test').to be_nil
-          expect(FileTest.world_writable? 'test').to be_nil
+          expect(FileTest.world_readable?('test')).to be_nil
         end
+        expect(FileTest.world_writable?('test')).to be_nil
       end
 
-      it "fixes a file" do
+      it 'fixes a file' do
         FileUtils.touch('test')
         cfg = MrMurano::Config.new
         cfg.fix_modes(Pathname.new('test'))
-        if Gem.win_platform? then
-          expect(FileTest.world_readable? 'test').to eq(420)
-          expect(FileTest.world_writable? 'test').to be_nil
+        if Gem.win_platform?
+          expect(FileTest.world_readable?('test')).to eq(420)
         else
-          expect(FileTest.world_readable? 'test').to be_nil
-          expect(FileTest.world_writable? 'test').to be_nil
+          expect(FileTest.world_readable?('test')).to be_nil
         end
+        expect(FileTest.world_writable?('test')).to be_nil
       end
     end
   end
 
-  context "Can find the project directory by .murano/config" do
+  context 'Can find the project directory by .murano/config' do
     before(:example) do
       @tmpdir = Dir.tmpdir
       path = '/home/work/project/some/where'
@@ -249,7 +253,7 @@ RSpec.describe MrMurano::Config do
       FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
     end
 
-    it "when in project directory" do
+    it 'when in project directory' do
       Dir.chdir(@project_dir) do
         cfg = MrMurano::Config.new
         cfg.load
@@ -260,7 +264,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "when in sub directory" do
+    it 'when in sub directory' do
       Dir.chdir(@project_dir + '/some/where') do
         cfg = MrMurano::Config.new
         cfg.load
@@ -271,7 +275,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "when .murano is in both PWD and parent dir" do
+    it 'when .murano is in both PWD and parent dir' do
       Dir.chdir(@project_dir + '/some') do
         FileUtils.mkpath('.murano')
         FileUtils.touch('.murano/config')
@@ -285,7 +289,7 @@ RSpec.describe MrMurano::Config do
     end
   end
 
-  context "Can find the project directory by .murano/" do
+  context 'Can find the project directory by .murano/' do
     before(:example) do
       @tmpdir = Dir.tmpdir
       path = '/home/work/project/some/where'
@@ -301,7 +305,7 @@ RSpec.describe MrMurano::Config do
       FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
     end
 
-    it "when in project directory" do
+    it 'when in project directory' do
       Dir.chdir(@project_dir) do
         cfg = MrMurano::Config.new
         cfg.load
@@ -312,7 +316,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "when in sub directory" do
+    it 'when in sub directory' do
       Dir.chdir(@project_dir + '/some/where') do
         cfg = MrMurano::Config.new
         cfg.load
@@ -323,7 +327,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "when .murano is in both PWD and parent dir" do
+    it 'when .murano is in both PWD and parent dir' do
       Dir.chdir(@project_dir + '/some') do
         FileUtils.mkpath('.murano')
         cfg = MrMurano::Config.new
@@ -336,7 +340,7 @@ RSpec.describe MrMurano::Config do
     end
   end
 
-  context "When pwd is $HOME:" do
+  context 'When pwd is $HOME:' do
     before(:example) do
       @tmpdir = Dir.tmpdir
       @project_dir = @tmpdir + '/home/work/project'
@@ -349,7 +353,7 @@ RSpec.describe MrMurano::Config do
       FileUtils.remove_dir(@tmpdir + '/home', true) if FileTest.exist? @tmpdir
     end
 
-    it "Sets a user value" do
+    it 'Sets a user value' do
       Dir.chdir(ENV['HOME']) do
         cfg = MrMurano::Config.new
         cfg.load
@@ -368,7 +372,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "Sets project values" do # This should write
+    it 'Sets project values' do # This should write
       Dir.chdir(ENV['HOME']) do
         cfg = MrMurano::Config.new
         cfg.load
@@ -387,7 +391,7 @@ RSpec.describe MrMurano::Config do
       end
     end
 
-    it "write a project value and reads it as a user value" do
+    it 'write a project value and reads it as a user value' do
       Dir.chdir(ENV['HOME']) do
         cfg = MrMurano::Config.new
         cfg.load
@@ -408,17 +412,17 @@ RSpec.describe MrMurano::Config do
     end
   end
 
-  context "Warns about migrating old" do
-    include_context "WORKSPACE"
+  context 'Warns about migrating old' do
+    include_context 'WORKSPACE'
 
-    it "config file name" do
+    it 'config file name' do
       FileUtils.touch(@project_dir + '/.mrmuranorc')
       expect_any_instance_of(MrMurano::Config).to receive(:warning).once
       cfg = MrMurano::Config.new
       cfg.validate_cmd
     end
 
-    it "config directory name" do
+    it 'config directory name' do
       FileUtils.mkpath(@project_dir + '/.mrmurano')
       expect_any_instance_of(MrMurano::Config).to receive(:warning).once
       cfg = MrMurano::Config.new
@@ -427,4 +431,3 @@ RSpec.describe MrMurano::Config do
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/Content_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.09.13 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
 require 'MrMurano/version'
 require 'MrMurano/Content'
@@ -5,7 +12,7 @@ require 'MrMurano/SyncRoot'
 require '_workspace'
 
 RSpec.describe MrMurano::Content::Base do
-  include_context "WORKSPACE"
+  include_context 'WORKSPACE'
   before(:example) do
     MrMurano::SyncRoot.instance.reset
     $cfg = MrMurano::Config.new
@@ -14,163 +21,175 @@ RSpec.describe MrMurano::Content::Base do
     $cfg['product.id'] = 'XYZ'
 
     @ct = MrMurano::Content::Base.new
-    allow(@ct).to receive(:token).and_return("TTTTTTTTTT")
+    allow(@ct).to receive(:token).and_return('TTTTTTTTTT')
   end
 
-  it "initializes" do
+  it 'initializes' do
     uri = @ct.endpoint('/')
-    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/")
+    expect(uri.to_s).to eq('https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/')
   end
 
-  it "lists" do
+  it 'lists' do
     body = [{
-      :type=> "binary/octet-stream",
-      :length=> 5622,
-      :last_modified=> "2017-02-10T17:43:45.000Z",
-      :id=> "TODO.taskpaper"
-    }]
+      type: 'binary/octet-stream',
+      length: 5622,
+      last_modified: '2017-02-10T17:43:45.000Z',
+      id: 'TODO.taskpaper',
+    },]
 
-    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item?full=true").
-      to_return(:body => body.to_json)
+    stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item?full=true')
+      .to_return(body: body.to_json)
 
     ret = @ct.list
     expect(ret).to eq(body)
   end
 
-  it "clears all" do
-    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item")
+  it 'clears all' do
+    stub_request(:delete, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item')
     ret = @ct.clear_all
     expect(ret).to eq({})
   end
 
-  it "fetches info for one" do
+  it 'fetches info for one' do
     body = {
-      :type=> "binary/octet-stream",
-      :length=> 5622,
-      :last_modified=> "2017-02-10T17:43:45.000Z",
-      :id=> "TODO.taskpaper"
+      type: 'binary/octet-stream',
+      length: 5622,
+      last_modified: '2017-02-10T17:43:45.000Z',
+      id: 'TODO.taskpaper',
     }
 
-    stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper").
-      to_return(:body => body.to_json)
+    stub_request(
+      :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper'
+    ).to_return(body: body.to_json)
 
     ret = @ct.fetch('TODO.taskpaper')
     expect(ret).to eq(body)
   end
 
-  it "removes one" do
-    stub_request(:delete, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper")
+  it 'removes one' do
+    stub_request(
+      :delete, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper'
+    )
 
     ret = @ct.remove('TODO.taskpaper')
     expect(ret).to eq({})
   end
 
-  context "uploads" do
+  context 'uploads' do
     before(:example) do
       @tup = Pathname.new(@project_dir) + 'Solutionfile.json'
       FileUtils.copy(File.join(@testdir, 'spec/fixtures/SolutionFiles/basic.json'), @tup.to_path)
     end
 
-    it "uploads file" do
+    it 'uploads file' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging",
-        :method=>"POST",
-        :inputs=>{
-          :"x-amz-meta-name"=>"Solutionfile.json",
-          :"x-amz-signature"=>"Bunch of Hex",
-          :"x-amz-date"=>"20170214T200752Z",
-          :"x-amz-credential"=>"AAA/BBB/us-west-1/s3/aws4_request",
-          :"x-amz-algorithm"=>"AWS4-HMAC-SHA256",
-          :policy=>"something base64 encoded.",
-          :key=>"XXX/ZZZ",
-          :acl=>"authenticated-read"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging',
+        method: 'POST',
+        inputs: {
+          :'x-amz-meta-name' => 'Solutionfile.json',
+          :'x-amz-signature' => 'Bunch of Hex',
+          :'x-amz-date' => '20170214T200752Z',
+          :'x-amz-credential' => 'AAA/BBB/us-west-1/s3/aws4_request',
+          :'x-amz-algorithm' => 'AWS4-HMAC-SHA256',
+          policy: 'something base64 encoded.',
+          key: 'XXX/ZZZ',
+          acl: 'authenticated-read',
         },
-        :id=>"more Hex",
-        :field=>"file",
-        :enctype=>"multipart/form-data"
+        id: 'more Hex',
+        field: 'file',
+        enctype: 'multipart/form-data',
       }
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload").
-        with(:query=>{
-          :expires_in=>30,
-          :sha256=>'018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
-          :type=>'application/json'}).
-        to_return(:body => body.to_json)
-
-      stub_request(:post, "https://s3-us-west-1.amazonaws.com/murano-content-service-staging").
-        with(:headers=>{"Content-Type"=>%r|\Amultipart/form-data|}) do |request|
-          request.body =~ /something base64 encoded/
-        end.
-        to_return(:status=>200)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload'
+      ).with(
+        query: {
+          expires_in: 30,
+          sha256: '018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
+          type: 'application/json',
+        }
+      ).to_return(body: body.to_json)
+
+      stub_request(
+        :post, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging'
+      ).with(headers: { 'Content-Type' => %r{\Amultipart/form-data} }) do |request|
+        request.body =~ /something base64 encoded/
+      end.to_return(status: 200)
 
       @ct.upload('Solutionfile.json', @tup.to_path)
     end
 
-    it "uploads with tags" do
+    it 'uploads with tags' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging",
-        :method=>"POST",
-        :inputs=>{
-          :"x-amz-meta-name"=>"Solutionfile.json",
-          :"x-amz-signature"=>"Bunch of Hex",
-          :"x-amz-date"=>"20170214T200752Z",
-          :"x-amz-credential"=>"AAA/BBB/us-west-1/s3/aws4_request",
-          :"x-amz-algorithm"=>"AWS4-HMAC-SHA256",
-          :policy=>"something base64 encoded.",
-          :key=>"XXX/ZZZ",
-          :acl=>"authenticated-read"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging',
+        method: 'POST',
+        inputs: {
+          :'x-amz-meta-name' => 'Solutionfile.json',
+          :'x-amz-signature' => 'Bunch of Hex',
+          :'x-amz-date' => '20170214T200752Z',
+          :'x-amz-credential' => 'AAA/BBB/us-west-1/s3/aws4_request',
+          :'x-amz-algorithm' => 'AWS4-HMAC-SHA256',
+          policy: 'something base64 encoded.',
+          key: 'XXX/ZZZ',
+          acl: 'authenticated-read',
         },
-        :id=>"more Hex",
-        :field=>"file",
-        :enctype=>"multipart/form-data"
+        id: 'more Hex',
+        field: 'file',
+        enctype: 'multipart/form-data',
       }
-      tags = {:one=>12, :four=>'bob'}
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload").
-        with(:query=>{
-          :expires_in=>30,
-          :sha256=>'018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
-          :type=>'application/json',
-          :tags => tags.to_json}).
-        to_return(:body => body.to_json)
-
-      stub_request(:post, "https://s3-us-west-1.amazonaws.com/murano-content-service-staging").
-        with(:headers=>{"Content-Type"=>%r|\Amultipart/form-data|}) do |request|
-          request.body =~ /something base64 encoded/
-        end.
-        to_return(:status=>200)
+      tags = { one: 12, four: 'bob' }
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload'
+      ).with(
+        query: {
+          expires_in: 30,
+          sha256: '018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
+          type: 'application/json',
+          tags: tags.to_json,
+        }
+      ).to_return(body: body.to_json)
+
+      stub_request(
+        :post, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging'
+      ).with(headers: { 'Content-Type' => %r{\Amultipart/form-data} }) do |request|
+        request.body =~ /something base64 encoded/
+      end.to_return(status: 200)
 
       @ct.upload('Solutionfile.json', @tup.to_path, tags)
     end
 
-    it "uploads fail at S3" do
+    it 'uploads fail at S3' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging",
-        :method=>"POST",
-        :inputs=>{
-          :"x-amz-meta-name"=>"Solutionfile.json",
-          :"x-amz-signature"=>"Bunch of Hex",
-          :"x-amz-date"=>"20170214T200752Z",
-          :"x-amz-credential"=>"AAA/BBB/us-west-1/s3/aws4_request",
-          :"x-amz-algorithm"=>"AWS4-HMAC-SHA256",
-          :policy=>"something base64 encoded.",
-          :key=>"XXX/ZZZ",
-          :acl=>"authenticated-read"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging',
+        method: 'POST',
+        inputs: {
+          :'x-amz-meta-name' => 'Solutionfile.json',
+          :'x-amz-signature' => 'Bunch of Hex',
+          :'x-amz-date' => '20170214T200752Z',
+          :'x-amz-credential' => 'AAA/BBB/us-west-1/s3/aws4_request',
+          :'x-amz-algorithm' => 'AWS4-HMAC-SHA256',
+          policy: 'something base64 encoded.',
+          key: 'XXX/ZZZ',
+          acl: 'authenticated-read',
         },
-        :id=>"more Hex",
-        :field=>"file",
-        :enctype=>"multipart/form-data"
+        id: 'more Hex',
+        field: 'file',
+        enctype: 'multipart/form-data',
       }
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload").
-        with(:query=>{
-          :expires_in=>30,
-          :sha256=>'018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
-          :type=>'application/json'}).
-        to_return(:body => body.to_json)
-
-      stub_request(:post, "https://s3-us-west-1.amazonaws.com/murano-content-service-staging").
-        with(:headers=>{"Content-Type"=>%r|\Amultipart/form-data|}) do |request|
-          request.body =~ /something base64 encoded/
-        end.
-        to_return(:status=>500)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload'
+      ).with(
+        query: {
+          expires_in: 30,
+          sha256: '018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
+          type: 'application/json',
+        }
+      ).to_return(body: body.to_json)
+
+      stub_request(
+        :post, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging'
+      ).with(headers: { 'Content-Type' => %r{\Amultipart/form-data} }) do |request|
+        request.body =~ /something base64 encoded/
+      end.to_return(status: 500)
 
       saved = $stderr
       $stderr = StringIO.new
@@ -180,65 +199,71 @@ RSpec.describe MrMurano::Content::Base do
       $stderr = saved
     end
 
-    it "uploads with --dry" do
+    it 'uploads with --dry' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging",
-        :method=>"POST",
-        :inputs=>{
-          :"x-amz-meta-name"=>"resources.yaml",
-          :"x-amz-signature"=>"Bunch of Hex",
-          :"x-amz-date"=>"20170214T200752Z",
-          :"x-amz-credential"=>"AAA/BBB/us-west-1/s3/aws4_request",
-          :"x-amz-algorithm"=>"AWS4-HMAC-SHA256",
-          :policy=>"something base64 encoded.",
-          :key=>"XXX/ZZZ",
-          :acl=>"authenticated-read"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging',
+        method: 'POST',
+        inputs: {
+          :'x-amz-meta-name' => 'resources.yaml',
+          :'x-amz-signature' => 'Bunch of Hex',
+          :'x-amz-date' => '20170214T200752Z',
+          :'x-amz-credential' => 'AAA/BBB/us-west-1/s3/aws4_request',
+          :'x-amz-algorithm' => 'AWS4-HMAC-SHA256',
+          policy: 'something base64 encoded.',
+          key: 'XXX/ZZZ',
+          acl: 'authenticated-read',
         },
-        :id=>"more Hex",
-        :field=>"file",
-        :enctype=>"multipart/form-data"
+        id: 'more Hex',
+        field: 'file',
+        enctype: 'multipart/form-data',
       }
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload").
-        with(:query=>{
-          :expires_in=>30,
-          :sha256=>'018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
-          :type=>'application/json'}).
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload'
+      ).with(
+        query: {
+          expires_in: 30,
+          sha256: '018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
+          type: 'application/json',
+        }
+      ).to_return(body: body.to_json)
 
       $cfg['tool.dry'] = true
       @ct.upload('Solutionfile.json', @tup.to_path)
     end
 
-    it "uploads with --curl" do
+    it 'uploads with --curl' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging",
-        :method=>"POST",
-        :inputs=>{
-          :"x-amz-meta-name"=>"Solutionfile.json",
-          :"x-amz-signature"=>"Bunch of Hex",
-          :"x-amz-date"=>"20170214T200752Z",
-          :"x-amz-credential"=>"AAA/BBB/us-west-1/s3/aws4_request",
-          :"x-amz-algorithm"=>"AWS4-HMAC-SHA256",
-          :policy=>"something base64 encoded.",
-          :key=>"XXX/ZZZ",
-          :acl=>"authenticated-read"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging',
+        method: 'POST',
+        inputs: {
+          :'x-amz-meta-name' => 'Solutionfile.json',
+          :'x-amz-signature' => 'Bunch of Hex',
+          :'x-amz-date' => '20170214T200752Z',
+          :'x-amz-credential' => 'AAA/BBB/us-west-1/s3/aws4_request',
+          :'x-amz-algorithm' => 'AWS4-HMAC-SHA256',
+          policy: 'something base64 encoded.',
+          key: 'XXX/ZZZ',
+          acl: 'authenticated-read',
         },
-        :id=>"more Hex",
-        :field=>"file",
-        :enctype=>"multipart/form-data"
+        id: 'more Hex',
+        field: 'file',
+        enctype: 'multipart/form-data',
       }
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload").
-        with(:query=>{
-          :expires_in=>30,
-          :sha256=>'018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
-          :type=>'application/json'}).
-        to_return(:body => body.to_json)
-
-      stub_request(:post, "https://s3-us-west-1.amazonaws.com/murano-content-service-staging").
-        with(:headers=>{"Content-Type"=>%r|\Amultipart/form-data|}) do |request|
-          request.body =~ /something base64 encoded/
-        end.
-        to_return(:status=>200)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Solutionfile.json/upload'
+      ).with(
+        query: {
+          expires_in: 30,
+          sha256: '018d1e072e1e9734cbc804c27121d00a2912fe14bcc11244e3fc20c5b72ab136',
+          type: 'application/json',
+        }
+      ).to_return(body: body.to_json)
+
+      stub_request(
+        :post, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging'
+      ).with(headers: { 'Content-Type' => %r{\Amultipart/form-data} }) do |request|
+        request.body =~ /something base64 encoded/
+      end.to_return(status: 200)
 
       saved = $stdout
       $stdout = StringIO.new
@@ -251,19 +276,21 @@ RSpec.describe MrMurano::Content::Base do
     end
   end
 
-  context "downloads" do
-    it "something to stdout" do
+  context 'downloads' do
+    it 'something to stdout' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ",
-        :method=>"GET",
-        :id=>"8076e5d091844814d7f5cd97a1a730aa"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ',
+        method: 'GET',
+        id: '8076e5d091844814d7f5cd97a1a730aa',
       }
 
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download").
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download'
+      ).to_return(body: body.to_json)
 
-      stub_request(:get , "https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ").
-        to_return(:body => "FOOOOOOOOOOOO")
+      stub_request(
+        :get, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ'
+      ).to_return(body: 'FOOOOOOOOOOOO')
 
       # This test does not work with curldebug enabled.
       $cfg['tool.curldebug'] = false
@@ -273,43 +300,47 @@ RSpec.describe MrMurano::Content::Base do
       $stdout = StringIO.new
 
       @ct.download('TODO.taskpaper')
-      expect($stdout.string).to eq("FOOOOOOOOOOOO")
+      expect($stdout.string).to eq('FOOOOOOOOOOOO')
       $stdout = saved
     end
 
-    it "something to block" do
+    it 'something to block' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ",
-        :method=>"GET",
-        :id=>"8076e5d091844814d7f5cd97a1a730aa"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ',
+        method: 'GET',
+        id: '8076e5d091844814d7f5cd97a1a730aa',
       }
 
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download").
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download'
+      ).to_return(body: body.to_json)
 
-      stub_request(:get , "https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ").
-        to_return(:body => "FOOOOOOOOOOOO")
+      stub_request(
+        :get, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ'
+      ).to_return(body: 'FOOOOOOOOOOOO')
 
-      expect{|b| @ct.download('TODO.taskpaper', &b) }.to yield_with_args("FOOOOOOOOOOOO")
+      expect { |b| @ct.download('TODO.taskpaper', &b) }.to yield_with_args('FOOOOOOOOOOOO')
     end
 
     it "something that isn't there" do
       # bizapi/content/download always returns GET instructions? yes.
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ",
-        :method=>"GET",
-        :id=>"8076e5d091844814d7f5cd97a1a730aa"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ',
+        method: 'GET',
+        id: '8076e5d091844814d7f5cd97a1a730aa',
       }
 
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Notthere/download").
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/Notthere/download'
+      ).to_return(body: body.to_json)
 
-      resp = %{
-        <?xml version="1.0" encoding="UTF-8"?>
+      resp = %(
+        <?xml version='1.0' encoding='UTF-8'?>
         <Error><Code>NoSuchKey</Code><Message>The specified key does not exist.</Message><Key>XXX/ZZZ</Key><RequestId>12</RequestId><HostId>=</HostId></Error>
-      }
-      stub_request(:get , "https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ").
-        to_return(:status=>404, :body => resp)
+      )
+      stub_request(
+        :get, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ'
+      ).to_return(status: 404, body: resp)
 
       saved = $stderr
       $stderr = StringIO.new
@@ -320,18 +351,20 @@ RSpec.describe MrMurano::Content::Base do
       $stderr = saved
     end
 
-    it "something to block with --curl" do
+    it 'something to block with --curl' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ",
-        :method=>"GET",
-        :id=>"8076e5d091844814d7f5cd97a1a730aa"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ',
+        method: 'GET',
+        id: '8076e5d091844814d7f5cd97a1a730aa',
       }
 
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download").
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download'
+      ).to_return(body: body.to_json)
 
-      stub_request(:get , "https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ").
-        to_return(:body => "FOOOOOOOOOOOO")
+      stub_request(
+        :get, 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ'
+      ).to_return(body: 'FOOOOOOOOOOOO')
 
       saved = $stdout
       $stdout = StringIO.new
@@ -343,21 +376,20 @@ RSpec.describe MrMurano::Content::Base do
       $stdout = saved
     end
 
-    it "something to block with --dry" do
+    it 'something to block with --dry' do
       body = {
-        :url=>"https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ",
-        :method=>"GET",
-        :id=>"8076e5d091844814d7f5cd97a1a730aa"
+        url: 'https://s3-us-west-1.amazonaws.com/murano-content-service-staging/XXX/ZZZ',
+        method: 'GET',
+        id: '8076e5d091844814d7f5cd97a1a730aa',
       }
 
-      stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download").
-        to_return(:body => body.to_json)
+      stub_request(
+        :get, 'https://bizapi.hosted.exosite.io/api:1/service/XYZ/content/item/TODO.taskpaper/download'
+      ).to_return(body: body.to_json)
 
       $cfg['tool.dry'] = true
       @ct.download('TODO.taskpaper')
-
     end
   end
-
 end
-#  vim: set ai et sw=2 ts=2 :
+