simp-metadata 0.4.4 → 0.5.2

data/spec/simp/metadata/release_spec.rb

@@ -1,101 +1,94 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'simp/metadata'
 require 'simp/metadata/commands/clone'
 
 describe Simp::Metadata::Release do
   describe '#puppetfile' do
-  context "when type == nil" do
-
-    it "should return a String" do
-      engine = Simp::Metadata::Engine.new
-      release = engine.releases['test-stub']
-      puppetfile = release.puppetfile()
-      expect(puppetfile.class.to_s).to eql("String")
-      engine.cleanup()
-      engine = nil
-    end
+    context 'when type == nil' do
+      it 'should return a String' do
+        engine = Simp::Metadata::Engine.new
+        release = engine.releases['test-stub']
+        puppetfile = release.puppetfile
+        expect(puppetfile.class.to_s).to eql('String')
+        engine.cleanup
+        engine = nil
+      end
 
-    it "should return a valid Puppetfile" do
-      engine = Simp::Metadata::Engine.new
-      release = engine.releases['test-stub']
-      puppetfile = release.puppetfile()
-      expect(puppetfile.split("\n").size).to be > 2
-      expect(puppetfile).to match(/^mod.*\'.*\',/)
-      expect(puppetfile).to match(/^  :git => .*\'.*\',/)
-      expect(puppetfile).to match(/^  :ref => .*\'.*\'/)
-      engine.cleanup()
-      engine = nil
+      it 'should return a valid Puppetfile' do
+        engine = Simp::Metadata::Engine.new
+        release = engine.releases['test-stub']
+        puppetfile = release.puppetfile
+        expect(puppetfile.split("\n").size).to be > 2
+        expect(puppetfile).to match(/^mod.*'.*',/)
+        expect(puppetfile).to match(/^\s{2}:git => 'https:\/\/github.com.*',/)
+        expect(puppetfile).to match(/^\s{2}:tag => '[0-9]+.[0-9]+.[0-9]+'/)
+        engine.cleanup
+        engine = nil
+      end
     end
-  end
-
-  context "when type == 'simp-core'" do
 
-    it "should return a String" do
-      engine = Simp::Metadata::Engine.new
-      release = engine.releases['test-stub']
-      puppetfile = release.puppetfile('simp-core')
-      expect(puppetfile.class.to_s).to eql("String")
-      engine.cleanup()
-      engine = nil
-    end
+    context "when type == 'simp-core'" do
+      it 'should return a String' do
+        engine = Simp::Metadata::Engine.new
+        release = engine.releases['test-stub']
+        puppetfile = release.puppetfile('simp-core')
+        expect(puppetfile.class.to_s).to eql('String')
+        engine.cleanup
+        engine = nil
+      end
 
-    it "should return a valid Puppetfile" do
-      engine = Simp::Metadata::Engine.new
-      release = engine.releases['test-stub']
-      puppetfile = release.puppetfile('simp-core')
-      expect(puppetfile.split("\n").size).to be > 2
-      expect(puppetfile).to match(/^mod.*\'.*\',/)
-      expect(puppetfile).to match(/^  :git => .*\'.*\',/)
-      expect(puppetfile).to match(/^  :ref => .*\'.*\'/)
-      engine.cleanup()
-      engine = nil
+      it 'should return a valid Puppetfile' do
+        engine = Simp::Metadata::Engine.new
+        release = engine.releases['test-stub']
+        puppetfile = release.puppetfile('simp-core')
+        expect(puppetfile.split("\n").size).to be > 2
+        expect(puppetfile).to match(/^mod.*'.*',/)
+        expect(puppetfile).to match(/^\s{2}:git => 'https:\/\/github.com.*',/)
+        expect(puppetfile).to match(/^\s{2}:tag => '[0-9]+.[0-9]+.[0-9]+'/)
+        engine.cleanup
+        engine = nil
+      end
     end
   end
-  end
-  describe "#diff" do
+  describe '#diff' do
     context 'when attribute is nil' do
-
-      it "should return all differences" do
-        release1 = 'test-stub'
-        release2 = 'test-diff'
+      it 'should return all differences' do
         attribute = nil
-        test = release_diff_instance(release1, release2, attribute)
+        test = release_diff_instance(attribute)
         expect(test).to eql(
-                            "pupmod-simp-activemq" => {
-                                "branch"=>{
-                                    "original" => "master",
-                                    "changed"=>"develop"
-                                },
-                                "tag"=>{
-                                    "original"=>"1.1.1",
-                                    "changed"=>"1.1.2"
-                                },
-                                "ref"=>{
-                                    "original"=>"488f5a0d5b53063c125b93a596626193b71aaa08",
-                                    "changed"=>"3987ra0d5b53063f493b93a596626193b71dddd4"
-                                },
-                                "version"=>{
-                                    "original"=>"1.1.1",
-                                    "changed"=>"1.1.2"
-                                }
-                            }
-                        )
+          'pupmod-simp-activemq' => {
+            'branch' => {
+              'original' => 'master',
+              'changed' => 'develop'
+            },
+            'tag' => {
+              'original' => '1.1.1',
+              'changed' => '1.1.2'
+            },
+            'ref' => {
+              'original' => '488f5a0d5b53063c125b93a596626193b71aaa08',
+              'changed' => '3987ra0d5b53063f493b93a596626193b71dddd4'
+            },
+            'version' => {
+              'original' => '1.1.1',
+              'changed' => '1.1.2'
+            }
+          }
+        )
       end
     end
     context 'when attribute is "version"' do
-      it "should return only version" do
-        release1 = 'test-stub'
-        release2 = 'test-diff'
+      it 'should return only version' do
         attribute = 'version'
-        test = release_diff_instance(release1, release2, attribute)
+        test = release_diff_instance(attribute)
         expect(test).to eql(
-                            "pupmod-simp-activemq" => {
-                                "version"=>{
-                                    "original"=>"1.1.1",
-                                    "changed"=>"1.1.2"
-                                }
-                            }
-                        )
+          'pupmod-simp-activemq' => {
+            'version' => {
+              'original' => '1.1.1',
+              'changed' => '1.1.2'
+            }
+          }
+        )
       end
     end
   end

data/spec/simp/metadata/source_spec.rb

@@ -1,10 +1,12 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'simp/metadata'
+
+# Need to fix test
 describe Simp::Metadata::Source do
-  it "should require a URL to be specified" do
-    expect {
-      source = Simp::Metadata::Source.new()
-    }.to raise_error(ArgumentError)
+  it 'should require a URL to be specified' do
+    expect do
+      source = Simp::Metadata::Source.new
+    end.to raise_error(ArgumentError)
   end
   # it "should instantiate when passed a valid metadata source" do
   #   expect {
@@ -22,4 +24,4 @@ describe Simp::Metadata::Source do
   #     FileUtils.rmtree(tempdir)
   #   }.not_to raise_error
   # end
-end
+end

data/spec/simp/metadata_spec.rb

@@ -1,174 +1,171 @@
- require 'spec_helper'
+require_relative '../spec_helper'
 require 'simp/metadata'
 
-shared_examples_for "log_wrapper" do |method_name|
-  it "should not throw an error" do
+shared_examples_for 'log_wrapper' do |method_name|
+  it 'should not throw an error' do
     $simp_metadata_debug_level = 'debug2'
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    expect { Simp::Metadata.send(method_name, "test")}.not_to raise_error
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    expect { Simp::Metadata.send(method_name, 'test') }.not_to raise_error
     FileUtils.rmtree(tempdir)
-    end
-  it "should not throw an error if logging is disabled" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
+  end
+  it 'should not throw an error if logging is disabled' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
     $simp_metadata_debug_level = 'disabled'
-    expect { Simp::Metadata.send(method_name, "test")}.not_to raise_error
+    expect { Simp::Metadata.send(method_name, 'test') }.not_to raise_error
     FileUtils.rmtree(tempdir)
     $simp_metadata_debug_level = 'debug2'
   end
-  it "should not throw an error if logging is left default" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    $simp_metadata_debug_level = 'ssss'
-    expect { Simp::Metadata.send(method_name, "test")}.not_to raise_error
+  it 'should not throw an error if logging is left default' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    $simp_metadata_debug_level = 'warning'
+    expect { Simp::Metadata.send(method_name, 'test') }.not_to raise_error
     FileUtils.rmtree(tempdir)
     $simp_metadata_debug_level = 'debug2'
   end
 end
 
-shared_examples_for "download_component" do |component|
-
-  it "should not throw an error" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    expect { Simp::Metadata.download_component(component, {"target" => tempdir})}.not_to raise_error
+shared_examples_for 'download_component' do |component|
+  it 'should not throw an error' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    expect { Simp::Metadata.download_component(component, 'target' => tempdir) }.not_to raise_error
     FileUtils.rmtree(tempdir)
   end
-  it "should return a hash" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    retval = Simp::Metadata.download_component(component, {"target" => tempdir})
-    expect(retval.class.to_s).to eql("Hash")
+  it 'should return a hash' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    retval = Simp::Metadata.download_component(component, 'target' => tempdir)
+    expect(retval.class.to_s).to eql('Hash')
     FileUtils.rmtree(tempdir)
   end
-  it "should return a path key" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    retval = Simp::Metadata.download_component(component, {"target" => tempdir})
-    expect(retval.key?("path")).to eql(true)
+  it 'should return a path key' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    retval = Simp::Metadata.download_component(component, 'target' => tempdir)
+    expect(retval.key?('path')).to eql(true)
     FileUtils.rmtree(tempdir)
   end
-  it "should return a path key that is within the tempdir" do
-    tempdir = Dir.mktmpdir("simp-media-rspec")
-    retval = Simp::Metadata.download_component(component, {"target" => tempdir})
-    expect(retval["path"]).to match(/^#{tempdir}/)
+  it 'should return a path key that is within the tempdir' do
+    tempdir = Dir.mktmpdir('simp-media-rspec')
+    retval = Simp::Metadata.download_component(component, 'target' => tempdir)
+    expect(retval['path']).to match(/^#{tempdir}/)
     FileUtils.rmtree(tempdir)
   end
 end
 describe Simp::Metadata do
-  describe "Simp::Metadata.debug2" do
-    it_should_behave_like "log_wrapper", :debug2
+  describe 'Simp::Metadata.debug2' do
+    it_should_behave_like 'log_wrapper', :debug2
   end
-  describe "Simp::Metadata.debug1" do
-    it_should_behave_like "log_wrapper", :debug1
+  describe 'Simp::Metadata.debug1' do
+    it_should_behave_like 'log_wrapper', :debug1
   end
-  describe "Simp::Metadata.info" do
-    it_should_behave_like "log_wrapper", :info
+  describe 'Simp::Metadata.info' do
+    it_should_behave_like 'log_wrapper', :info
   end
-  describe "Simp::Metadata.warning" do
-    it_should_behave_like "log_wrapper", :warning
+  describe 'Simp::Metadata.warning' do
+    it_should_behave_like 'log_wrapper', :warning
   end
-  describe "Simp::Metadata.error" do
-    it_should_behave_like "log_wrapper", :error
+  describe 'Simp::Metadata.error' do
+    it_should_behave_like 'log_wrapper', :error
   end
-  describe "Simp::Metadata.critical" do
-    it_should_behave_like "log_wrapper", :critical
+  describe 'Simp::Metadata.critical' do
+    it_should_behave_like 'log_wrapper', :critical
   end
-  describe "Simp::Metadata.run" do
-    it "should run a command with no errors" do
+  describe 'Simp::Metadata.run' do
+    it 'should run a command with no errors' do
       # Create an output capture system.
       errorcode = Simp::Metadata.run("echo 'successful'")
       expect(errorcode.success?).to eql(true)
     end
-    it "should return an error on a non-zero exit code" do
+    it 'should return an error on a non-zero exit code' do
       # Create an output capture system.
-      errorcode = Simp::Metadata.run("false")
+      errorcode = Simp::Metadata.run('false')
       expect(errorcode.success?).to eql(false)
     end
   end
-  describe "Simp::Metadata.get_license_data" do
-
-    it "should return a filename and a data stream" do
+  describe 'Simp::Metadata.get_license_data' do
+    it 'should return a filename and a data stream' do
       # Create an output capture system.
       filename, data = Simp::Metadata.get_license_data(nil)
-      expect(filename.class.to_s).to eql("String")
-      expect(data.class.to_s).to eql("String")
-      expect(File.exists?(filename)).to eql(true)
+      expect(filename.class.to_s).to eql('String')
+      expect(data.class.to_s).to eql('String')
+      expect(File.exist?(filename)).to eql(true)
     end
   end
-  describe "Simp::Metadata.download_component" do
-    it "should throw an error if target is not specified" do
-      expect { Simp::Metadata.download_component(nil, {})}.to raise_error(RuntimeError, "Must specify 'target'")
+  describe 'Simp::Metadata.download_component' do
+    it 'should throw an error if target is not specified' do
+      expect { Simp::Metadata.download_component(nil, {}) }.to raise_error(RuntimeError, "Must specify 'target'")
     end
-    it "should throw an error if component is nil" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.download_component(nil, {"target" => tempdir})}.to raise_error(RuntimeError, "component.class=NilClass, NilClass is not in ['String', 'Simp::Metadata::Component']")
+    it 'should throw an error if component is nil' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.download_component(nil, 'target' => tempdir) }.to raise_error(RuntimeError, "component.class=NilClass, NilClass is not in ['String', 'Simp::Metadata::Component']")
       FileUtils.rmtree(tempdir)
     end
-    it "should throw an error if component is not a string or Simp::Metadata::Component" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.download_component([], {"target" => tempdir})}.to raise_error(RuntimeError, "component.class=Array, Array is not in ['String', 'Simp::Metadata::Component']")
+    it 'should throw an error if component is not a string or Simp::Metadata::Component' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.download_component([], 'target' => tempdir) }.to raise_error(RuntimeError, "component.class=Array, Array is not in ['String', 'Simp::Metadata::Component']")
       FileUtils.rmtree(tempdir)
     end
     describe "when component == 'simp-metadata'" do
-      it_should_behave_like "download_component", 'simp-metadata'
+      it_should_behave_like 'download_component', 'simp-metadata'
     end
-    describe "when component is a Simp::Metadata::Component" do
-      engine = Simp::Metadata::Engine.new()
-      component = engine.components["pupmod-simp-activemq"]
-      it_should_behave_like "download_component", component
+    describe 'when component is a Simp::Metadata::Component' do
+      engine = Simp::Metadata::Engine.new
+      component = engine.components['pupmod-simp-activemq']
+      it_should_behave_like 'download_component', component
     end
-    if (ENV.fetch("SIMP_LICENSE_KEY", nil) != nil)
+    if ENV.fetch('SIMP_LICENSE_KEY', nil) != nil
       describe "when component == 'enterprise-metadata'" do
-        it_should_behave_like "download_component", 'enterprise-metadata'
+        it_should_behave_like 'download_component', 'enterprise-metadata'
       end
     end
   end
 
-  describe "Simp::Metadata.fetch_from_url" do
-
+  describe 'Simp::Metadata.fetch_from_url' do
     it "should throw an error when urlspec is a 'ftp' String" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url("ftp://github.com/simp/simp-metadata/archive/master.zip","#{tempdir}/master.zip",'simp-metadata', {"target" => tempdir})}.to raise_error(RuntimeError, "unsupported url type ftp")
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url('ftp://github.com/simp/simp-metadata/archive/master.zip', "#{tempdir}/master.zip", 'simp-metadata', 'target' => tempdir) }.to raise_error(RuntimeError, 'unsupported url type ftp')
       FileUtils.rmtree(tempdir)
     end
-    it "should not throw an error when urlspec is an https String" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url("https://github.com/simp/simp-metadata/archive/master.zip","#{tempdir}/master.zip",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+    it 'should not throw an error when urlspec is an https String' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url('https://github.com/simp/simp-metadata/archive/master.zip', "#{tempdir}/master.zip", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
-    it "should not throw an error when urlspec is an http String" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url("http://github.com/simp/simp-metadata/archive/master.zip","#{tempdir}/master.zip",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+    it 'should not throw an error when urlspec is an http String' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url('http://github.com/simp/simp-metadata/archive/master.zip', "#{tempdir}/master.zip", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
     it "should not throw an error when urlspec is a hash with just a 'url' element" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url({"url" => "https://github.com/simp/simp-metadata/archive/master.zip"},"#{tempdir}/master.zip",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url({ 'url' => 'https://github.com/simp/simp-metadata/archive/master.zip' }, "#{tempdir}/master.zip", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
-    it "should not throw an error when type == file" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url({"type" => "file", "url" => "https://github.com/simp/simp-metadata/archive/master.zip"},"#{tempdir}/master.zip",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+    it 'should not throw an error when type == file' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url({ 'type' => 'file', 'url' => 'https://github.com/simp/simp-metadata/archive/master.zip' }, "#{tempdir}/master.zip", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
-    it "should not throw an error when type == git" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      expect { Simp::Metadata.fetch_from_url({"type" => "git", "url" => "https://github.com/simp/simp-metadata"},"#{tempdir}/simp-metadata",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+    it 'should not throw an error when type == git' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      expect { Simp::Metadata.fetch_from_url({ 'type' => 'git', 'url' => 'https://github.com/simp/simp-metadata' }, "#{tempdir}/simp-metadata", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       # Test git pull origin code path as well
-      expect { Simp::Metadata.fetch_from_url({"type" => "git", "url" => "https://github.com/simp/simp-metadata"},"#{tempdir}/simp-metadata",'simp-metadata', {"target" => tempdir})}.not_to raise_error
+      expect { Simp::Metadata.fetch_from_url({ 'type' => 'git', 'url' => 'https://github.com/simp/simp-metadata' }, "#{tempdir}/simp-metadata", 'simp-metadata', 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
   end
 
-  describe "Simp::Metadata.fetch_simp_enterprise" do
-    it "should not throw an error when location is a location" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      engine = Simp::Metadata::Engine.new()
-      component = engine.components["pupmod-simp-activemq"]
-      expect { Simp::Metadata.fetch_simp_enterprise(component.primary.url,"#{tempdir}/simp-metadata",component, component.primary, {"target" => tempdir})}.not_to raise_error
+  describe 'Simp::Metadata.fetch_simp_enterprise' do
+    it 'should not throw an error when location is a location' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      engine = Simp::Metadata::Engine.new
+      component = engine.components['pupmod-simp-activemq']
+      expect { Simp::Metadata.fetch_simp_enterprise(component.primary.url, "#{tempdir}/simp-metadata", component, component.primary, 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
-    xit "should not throw an error when downloading a simp-metadata url" do
-      tempdir = Dir.mktmpdir("simp-media-rspec")
-      engine = Simp::Metadata::Engine.new(nil, nil, "enterprise")
-      component = engine.components["enterprise-metadata"]
-      expect { Simp::Metadata.fetch_simp_enterprise(component.primary.url,"#{tempdir}/simp-metadata",component, component.primary, {"target" => tempdir})}.not_to raise_error
+    xit 'should not throw an error when downloading a simp-metadata url' do
+      tempdir = Dir.mktmpdir('simp-media-rspec')
+      engine = Simp::Metadata::Engine.new(nil, nil, 'enterprise')
+      component = engine.components['enterprise-metadata']
+      expect { Simp::Metadata.fetch_simp_enterprise(component.primary.url, "#{tempdir}/simp-metadata", component, component.primary, 'target' => tempdir) }.not_to raise_error
       FileUtils.rmtree(tempdir)
     end
   end