inqlude 0.7.4 → 0.8.0

data/spec/integration/cli_view_spec.rb

@@ -10,8 +10,8 @@ describe "Command line interface" do
   describe "view" do
     it "generates view" do
       dir = given_directory do
-        given_directory_from_data("awesomelib")
-        given_directory_from_data("newlib")
+        given_directory_from_data("awesomelib", from: "manifests/awesomelib")
+        given_directory_from_data("newlib", from: "manifests/newlib")
       end
 
       output_dir = given_directory

data/spec/unit/creator_spec.rb

@@ -3,12 +3,12 @@ require File.expand_path('../spec_helper', __FILE__)
 describe Creator do
 
   include GivenFilesystemSpecHelpers
-  
+
   use_given_filesystem
 
   let(:settings) do
     s = Settings.new
-    s.manifest_path = File.expand_path('spec/data/')
+    s.manifest_path = File.expand_path('spec/data/manifests')
     s.offline = true
     s
   end
@@ -25,12 +25,12 @@ describe Creator do
     settings.manifest_path = given_directory do
       given_directory "awesomelib" do
         manifest_filename = given_file "awesomelib.2013-09-08.manifest",
-          :from => "awesomelib/awesomelib.2013-09-08.manifest"
+          :from => "manifests/awesomelib/awesomelib.2013-09-08.manifest"
       end
     end
     manifest_filename = File.join( settings.manifest_path, "awesomelib",
                                    "awesomelib.2013-10-01.manifest" )
-    
+
     c = Creator.new settings, "awesomelib"
 
     expect( File.exists?(manifest_filename) ).to be false
@@ -61,9 +61,9 @@ describe Creator do
 
     c = Creator.new settings, "newawesomelib"
     expect(File.exists?(manifest_filename)).to be false
-    
+
     c.create "edge", "2013-09-01"
-    
+
     expect(File.exists?(manifest_filename)).to be true
 
     m = Manifest.parse_file(manifest_filename)
@@ -82,19 +82,19 @@ describe Creator do
 
     c = Creator.new settings, "newawesomelib"
     expect(File.exists?(manifest_filename)).to be false
-    
+
     c.create_generic
-    
+
     expect(File.exists?(manifest_filename)).to be true
   end
-  
+
   describe "#create_dir" do
 
     before(:each) do
       @settings = Settings.new
       @settings.manifest_path = given_directory
     end
-    
+
     it "creates dir" do
       c = Creator.new( @settings, "one" )
       c.create_dir()
@@ -103,7 +103,7 @@ describe Creator do
       expect( File.directory? File.join( @settings.manifest_path, "one" ) )
         .to be true
     end
-    
+
     it "uses existing dir" do
       c = Creator.new( @settings, "one" )
       c.create_dir()
@@ -114,5 +114,5 @@ describe Creator do
         .to be true
     end
   end
-  
+
 end

data/spec/unit/kde_frameworks_release_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe KdeFrameworksRelease do
-  
+
   include GivenFilesystemSpecHelpers
 
   use_given_filesystem
-  
+
   context "given KDE generic manifests" do
     before(:each) do
       @manifest_dir = given_directory do
@@ -16,31 +16,31 @@ describe KdeFrameworksRelease do
           given_file("kservice.manifest", :from => "kservice-generic.manifest")
         end
         given_directory("newlib") do
-          given_file("newlib.manifest", :from => "newlib/newlib.manifest")
+          given_file("newlib.manifest", :from => "manifests/newlib/newlib.manifest")
         end
       end
-      
+
       s = Settings.new
       s.manifest_path = @manifest_dir
       s.offline = true
       @manifest_handler = ManifestHandler.new s
     end
-      
+
     it "reads generic manifests" do
       k = KdeFrameworksRelease.new @manifest_handler
       k.read_generic_manifests
-      
+
       expect( k.generic_manifests.count ).to eq 2
       expect( k.generic_manifests[0].name ).to eq "karchive"
       expect( k.generic_manifests[1].name ).to eq "kservice"
     end
-    
+
     it "writes release manifests" do
       k = KdeFrameworksRelease.new @manifest_handler
       k.read_generic_manifests
-      
+
       k.write_release_manifests( "2014-02-01", "4.9.90" )
-      
+
       manifest_path = File.join( @manifest_dir,
                                  "karchive/karchive.2014-02-01.manifest" )
       expect( File.exists? manifest_path ).to be true
@@ -48,7 +48,7 @@ describe KdeFrameworksRelease do
       manifest_path = File.join( @manifest_dir,
                                  "kservice/kservice.2014-02-01.manifest" )
       expect( File.exists? manifest_path ).to be true
-      
+
       manifest = Manifest.parse_file( manifest_path )
       expect(manifest.class).to be ManifestRelease
       expect( manifest.name ).to eq "kservice"
@@ -72,5 +72,5 @@ describe KdeFrameworksRelease do
   it "strips patch release" do
     expect(KdeFrameworksRelease.strip_patch_release("5.4.0")).to eq "5.4"
   end
-  
+
 end

data/spec/unit/manifest_handler_spec.rb

@@ -6,17 +6,17 @@ describe ManifestHandler do
 
   let(:settings) do
     s = Settings.new
-    s.manifest_path = File.expand_path('spec/data/')
+    s.manifest_path = File.expand_path('spec/data/manifests')
     s.offline = true
     s
   end
-  
+
   let(:mh) do
     mh = ManifestHandler.new settings
     mh.read_remote
     mh
   end
-  
+
   it "reads manifests" do
     expect(mh.manifests.count).to eq 5
     expect(mh.libraries.count).to eq 5
@@ -53,33 +53,33 @@ describe ManifestHandler do
         File.expand_path( "~/.local/share/inqlude/manifests/mylib/mylib.2014-02-01.manifest" ) )
     end
   end
-  
+
   describe "#libraries" do
 
     it "returns all libraries" do
       expect( mh.libraries.count ).to eq 5
     end
-    
+
     it "returns stable libraries" do
       libraries = mh.libraries :stable
       expect( libraries.count ).to eq 2
       expect( libraries.first.manifests.last.name ).to eq "awesomelib"
       expect( libraries.first.manifests.last.version ).to eq "0.2.0"
     end
-    
+
     it "returns development versions" do
       libraries = mh.libraries :edge
       expect( libraries.count ).to eq 1
       expect( libraries.first.manifests.last.name ).to eq "bleedingedge"
       expect( libraries.first.manifests.last.version ).to eq "edge"
     end
-    
+
     it "returns unreleased libraries" do
       libraries = mh.unreleased_libraries
       expect( libraries.count ).to eq 1
       expect( libraries.first.manifests.last.name ).to eq "newlib"
     end
-    
+
     it "returns commercial libraries" do
       libraries = mh.commercial_libraries
       expect( libraries.count ).to eq 3
@@ -88,7 +88,7 @@ describe ManifestHandler do
     end
 
   end
-  
+
   describe "#group" do
     it "returns all libraries of a group" do
       libraries = mh.group("kde-frameworks")
@@ -96,16 +96,16 @@ describe ManifestHandler do
       expect( libraries.first.manifests.last.name ).to eq "awesomelib"
     end
   end
-  
+
   describe "#library" do
-    
+
     it "returns one library" do
       library = mh.library "awesomelib"
       expect( library.name ).to eq "awesomelib"
     end
-    
+
   end
-  
+
   context "library with generic and release manifest" do
     use_given_filesystem
 
@@ -116,34 +116,34 @@ describe ManifestHandler do
           given_file "karchive.2014-02-01.manifest", :from => "karchive-release-beta.manifest"
         end
       end
-      
+
       s = Settings.new
       s.manifest_path = @manifest_path
       s.offline = true
       @manifest_handler = ManifestHandler.new s
       @manifest_handler.read_remote
     end
-    
+
     it "reads generic manifest" do
       expect( @manifest_handler.library("karchive").manifests.count ).to eq 2
       generic_manifest = @manifest_handler.library("karchive").generic_manifest
       expect( generic_manifest.name ).to eq "karchive"
       expect( generic_manifest.class ).to be ManifestGeneric
     end
-    
+
     it "lists development versions" do
       libraries = @manifest_handler.libraries :beta
       expect( libraries.count ).to eq 1
       expect( libraries.first.latest_manifest.name ).to eq "karchive"
       expect( libraries.first.latest_manifest.version ).to eq "4.9.90"
     end
-    
+
     it "lists unreleased libraries" do
       libraries = @manifest_handler.unreleased_libraries
       expect( libraries.count ).to eq 0
     end
   end
-  
+
   it "generates inqlude-all.json" do
     expected_json = File.read(test_data_path("inqlude-all.json"))
     expect(mh.generate_inqlude_all).to eq expected_json

data/spec/unit/spec_helper.rb

@@ -23,10 +23,9 @@ def create_generic_manifest name
 end
 
 shared_context "manifest_files" do
-
   let(:settings) do
     s = Settings.new
-    s.manifest_path = File.expand_path('spec/data/')
+    s.manifest_path = File.expand_path('spec/data/manifests')
     s.offline = true
     s
   end
@@ -42,5 +41,4 @@ shared_context "manifest_files" do
   let(:proprietarylib_manifest_file) do
     "proprietarylib/proprietarylib.2013-12-22.manifest"
   end
-
 end

data/spec/unit/verifier_spec.rb

@@ -3,13 +3,126 @@ require File.expand_path('../spec_helper', __FILE__)
 describe Verifier do
 
   include_context "manifest_files"
-  
-  it "defines result class" do
-    r = Verifier::Result.new
-    expect(r.valid?).to be true
-    expect(r.errors.class).to be Array
+
+  describe Verifier::Result do
+    it "defines result class" do
+      expect(subject.valid?).to be true
+      expect(subject.errors.class).to be Array
+    end
+
+    context "no errors" do
+      before do
+        subject.name = "abc"
+      end
+
+      it "is valid" do
+        expect(subject.valid?).to be true
+      end
+
+      it "prints result" do
+        expected_output = <<EOT
+Verify manifest abc...ok
+EOT
+
+        expect {
+          subject.print_result
+        }.to output(expected_output).to_stdout
+      end
+    end
+
+    context "one error" do
+      before do
+        subject.name = "abc"
+        subject.errors.push("an error")
+      end
+
+      it "is invalid" do
+        expect(subject.valid?).to be false
+      end
+
+      it "prints result" do
+        expected_output = <<EOT
+Verify manifest abc...error
+  an error
+EOT
+
+        expect {
+          subject.print_result
+        }.to output(expected_output).to_stdout
+      end
+    end
+
+    context "multiple errors" do
+      before do
+        subject.name = "abc"
+        subject.errors.push("an error")
+        subject.errors.push("another error")
+      end
+
+      it "is invalid" do
+        expect(subject.valid?).to be false
+      end
+
+      it "prints result" do
+        expected_output = <<EOT
+Verify manifest abc...error
+  an error
+  another error
+EOT
+
+        expect {
+          subject.print_result
+        }.to output(expected_output).to_stdout
+      end
+    end
+
+    context "one warning" do
+      before do
+        subject.name = "xyz"
+        subject.warnings.push("a warning")
+      end
+
+      it "has warning" do
+        expect(subject.has_warnings?).to be true
+      end
+
+      it "prints warning" do
+        expected_output = <<EOT
+Verify manifest xyz...ok
+  a warning
+EOT
+
+        expect {
+          subject.print_result
+        }.to output(expected_output).to_stdout
+      end
+    end
+
+    context "multiple warnings" do
+      before do
+        subject.name = "xyz"
+        subject.warnings.push("a warning")
+        subject.warnings.push("another warning")
+      end
+
+      it "has warning" do
+        expect(subject.has_warnings?).to be true
+      end
+
+      it "prints warning" do
+        expected_output = <<EOT
+Verify manifest xyz...ok
+  a warning
+  another warning
+EOT
+
+        expect {
+          subject.print_result
+        }.to output(expected_output).to_stdout
+      end
+    end
   end
-  
+
   it "verifies read manifests" do
     handler = ManifestHandler.new settings
     handler.read_remote
@@ -25,7 +138,7 @@ describe Verifier do
     manifest = ManifestRelease.new
     expect(verifier.verify( manifest ).valid?).to be false
   end
-      
+
   it "detects invalid entries" do
     handler = ManifestHandler.new settings
     handler.read_remote
@@ -45,7 +158,7 @@ describe Verifier do
 
     manifest = handler.manifest("awesomelib")
     expect(verifier.verify(manifest).valid?).to be true
-    
+
     manifest.filename = "wrongname"
 
     result = verifier.verify(manifest)
@@ -54,9 +167,45 @@ describe Verifier do
     expect(result.errors.first).to eq "Expected file name: awesomelib.2013-09-08.manifest"
   end
 
+  context "one invalid topic" do
+    it "detects invalid topics" do
+      handler = ManifestHandler.new settings
+      handler.read_remote
+      verifier = Verifier.new settings
+
+      manifest = handler.manifest("awesomelib")
+      expect(verifier.verify(manifest).valid?).to be true
+
+      manifest.topics = ["Invalid"]
+
+      result = verifier.verify(manifest)
+
+      expect(result.valid?).to be false
+      expect(result.errors).to include "Invalid topics 'Invalid'. Valid topics are 'API', 'Artwork', 'Bindings', 'Communication', 'Data', 'Desktop', 'Development', 'Graphics', 'Logging', 'Mobile', 'Multimedia', 'Printing', 'QML', 'Scripting', 'Security', 'Text', 'Web', 'Widgets'"
+    end
+  end
+
+  context "multiple invalid topics" do
+    it "detects invalid topics" do
+      handler = ManifestHandler.new settings
+      handler.read_remote
+      verifier = Verifier.new settings
+
+      manifest = handler.manifest("awesomelib")
+      expect(verifier.verify(manifest).valid?).to be true
+
+      manifest.topics = ["API","Invalid1","Invalid2"]
+
+      result = verifier.verify(manifest)
+
+      expect(result.valid?).to be false
+      expect(result.errors).to include "Invalid topics 'Invalid1', 'Invalid2'. Valid topics are 'API', 'Artwork', 'Bindings', 'Communication', 'Data', 'Desktop', 'Development', 'Graphics', 'Logging', 'Mobile', 'Multimedia', 'Printing', 'QML', 'Scripting', 'Security', 'Text', 'Web', 'Widgets'"
+    end
+  end
+
   it "verifies release manifest file" do
     filename = File.join settings.manifest_path, awesomelib_manifest_file
-    
+
     verifier = Verifier.new settings
 
     expect( verifier.verify_file( filename ).valid? ).to be true
@@ -64,16 +213,16 @@ describe Verifier do
 
   it "verifies generic manifest file" do
     filename = File.join settings.manifest_path, newlib_manifest_file
-    
+
     verifier = Verifier.new settings
 
     verification_result = verifier.verify_file( filename )
     expect( verification_result.valid? ).to be true
   end
-  
+
   it "verifies proprietary release manifest file" do
     filename = File.join settings.manifest_path, proprietarylib_manifest_file
-    
+
     verifier = Verifier.new settings
 
     verification_result = verifier.verify_file( filename )
@@ -88,21 +237,21 @@ describe Verifier do
     verification_result = verifier.verify_file( filename )
     expect( verification_result.valid? ).to be false
   end
-  
+
   it "verifies schema" do
     manifest = ManifestRelease.new
     manifest.name = "mylib"
     manifest.release_date = "2013-02-28"
     manifest.filename = "mylib.2013-02-28.manifest"
     manifest.libraryname = "mylib"
-    
+
     verifier = Verifier.new settings
-    
+
     errors = verifier.verify(manifest).errors
 
     expect( errors.class ).to be Array
     expect(errors[0]).to match /^Schema validation error/
     expect(errors.count).to eq 8
   end
-  
+
 end