inqlude 0.7.0 → 0.7.1

data/spec/{spec_helper.rb → unit/spec_helper.rb}

@@ -1,26 +1,24 @@
 require 'given_filesystem/spec_helpers'
 
-require File.expand_path('../../lib/inqlude', __FILE__)
+require_relative "../../lib/inqlude"
 
 def test_data_path file_name
-  File.expand_path(File.join('../data/', file_name), __FILE__)
+  File.expand_path(File.join('../../data/', file_name), __FILE__)
 end
 
 def create_manifest name, release_date, version
-  m = Hash.new
-  m["schema_type"] = "release"
-  m["name"] = name
-  m["version"] = version
-  m["release_date" ] = release_date
-  m["description"] = "#{name} is a nice library."
+  m = ManifestRelease.new
+  m.name = name
+  m.version = version
+  m.release_date = release_date
+  m.description = "#{name} is a nice library."
   m
 end
 
 def create_generic_manifest name
-  m = Hash.new
-  m["schema_type"] = "generic"
-  m["name"] = name
-  m["description"] = "#{name} is a nice library."
+  m = ManifestGeneric.new
+  m.name = name
+  m.description = "#{name} is a nice library."
   m
 end
 

data/spec/{verifier_spec.rb → unit/verifier_spec.rb}

@@ -6,7 +6,7 @@ describe Verifier do
   
   it "defines result class" do
     r = Verifier::Result.new
-    expect(r.valid?).to be false
+    expect(r.valid?).to be true
     expect(r.errors.class).to be Array
   end
   
@@ -22,7 +22,7 @@ describe Verifier do
   it "detects incomplete manifest" do
     verifier = Verifier.new settings
 
-    manifest = Hash.new
+    manifest = ManifestRelease.new
     expect(verifier.verify( manifest ).valid?).to be false
   end
       
@@ -34,9 +34,8 @@ describe Verifier do
     manifest = handler.manifest("awesomelib")
     expect(verifier.verify(manifest).valid?).to be true
 
-    manifest["invalidentry"] = "something"
-    expect(verifier.verify(manifest).valid?).to be false
-    expect(verifier.verify(manifest).errors.count).to eq 1
+    expect{ manifest.invalidentry }.to raise_error(NoMethodError)
+    expect{ manifest["invalidentry"] }.to raise_error(NoMethodError)
   end
 
   it "detects name mismatch" do
@@ -47,8 +46,12 @@ describe Verifier do
     manifest = handler.manifest("awesomelib")
     expect(verifier.verify(manifest).valid?).to be true
     
-    manifest["filename"] = "wrongname"
-    expect(verifier.verify(manifest).valid?).to be false
+    manifest.filename = "wrongname"
+
+    result = verifier.verify(manifest)
+
+    expect(result.valid?).to be false
+    expect(result.errors.first).to eq "Expected file name: awesomelib.2013-09-08.manifest"
   end
 
   it "verifies release manifest file" do
@@ -76,16 +79,22 @@ describe Verifier do
     verification_result = verifier.verify_file( filename )
     expect( verification_result.valid? ).to be true
   end
+
+  it "verifies invalid schema id" do
+    filename = test_data_path("invalid-schema.manifest")
+
+    verifier = Verifier.new settings
+
+    verification_result = verifier.verify_file( filename )
+    expect( verification_result.valid? ).to be false
+  end
   
   it "verifies schema" do
-    manifest = Hash.new
-    manifest["name"] = "mylib"
-    manifest["release_date"] = "2013-02-28"
-    manifest["filename"] = "mylib.2013-02-28.manifest"
-    manifest["libraryname"] = "mylib"
-    manifest["$schema"] = "http://inqlude.org/schema/release-manifest-v1#"
-    manifest["schema_type"] = "release"
-    manifest["schema_version"] = 1
+    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
     

data/spec/{view_spec.rb → unit/view_spec.rb}

@@ -24,7 +24,7 @@ describe View do
       v.library = mh.library "newlib"
       v.manifest = v.library.latest_manifest
       
-      expect{v.version_content}.to raise_error RuntimeError
+      expect{v.version_content}.to raise_error(InqludeError)
     end
 
     it "returns list of unreleased libraries" do
@@ -120,15 +120,31 @@ describe View do
       expect(v.version_content).to include "4.97.0"
       expect(v.version_content).to include( "older versions" )
     end
+
+    it "creates inqlude-all.json" do
+      v = View.new @manifest_handler
+      dir = given_directory
+
+      v.create_inqlude_all(dir)
+
+      all_path = File.join(dir, "inqlude-all.json")
+      expect(File.exists?(all_path)).to be true
+      expected_all_content = File.read(test_data_path("inqlude-all-karchive.json"))
+      expect(File.read(all_path)).to eq expected_all_content
+    end
     
   end
 
-  it "renders description as markdown" do
-    v = View.new double
-    v.manifest = Manifest.parse_file(test_data_path("rendertest-generic.manifest"))
-    rendered = v.render_description
+  context "rendertest" do
+    before(:each) do
+      @view = View.new double
+      @view.manifest = Manifest.parse_file(test_data_path("rendertest-generic.manifest"))
+    end
+
+    it "renders description as markdown" do
+      rendered = @view.render_description
 
-    expected = <<EOT
+      expected = <<EOT
 <p>This description tests rendering. It tests rendering markdown to HTML.</p>
 
 <p>This includes:</p>
@@ -139,7 +155,22 @@ describe View do
 </ul>
 EOT
 
-    expect(rendered).to eq expected
+      expect(rendered).to eq expected
+    end
+
+    it "generates link items" do
+      expected_html = "<li><a href=\"https://example.org/git\">Code</a></li>"
+      expect(@view.link_item("vcs", "Code")).to eq expected_html
+    end
+
+    it "generates custom URLs" do
+      expected_html = "<li><a href=\"http://special.example.org\">Special</a></li>"
+      expect(@view.custom_urls).to eq expected_html
+    end
+
+    it "returns if there are more URLs" do
+      expect(@view.more_urls?).to be true
+    end
   end
 
 end

data/view/all.html.haml

@@ -15,10 +15,10 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.latest_manifest["summary"]
+        = library.latest_manifest.summary
         %span{"class" => "library-short-meta-data"}
-          - if library.latest_manifest["schema_type"] == "generic"
+          - if !library.latest_manifest.is_released?
             (unreleased,
           - else
-            (#{library.latest_manifest["maturity"]},
-          #{library.latest_manifest["licenses"].join(", ")})
+            (#{library.latest_manifest.maturity},
+          #{library.latest_manifest.licenses.join(", ")})

data/view/commercial.html.haml

@@ -14,4 +14,4 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary

data/view/development.html.haml

@@ -13,7 +13,7 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary
 
 %h3 Alpha
 
@@ -23,7 +23,7 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary
 
 %h3 Bleeding edge
 
@@ -33,4 +33,4 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary

data/view/get.html.haml

@@ -11,8 +11,17 @@
   the libraries you need with just a few commands, without having to know
   URLs, or how libraries are packages.
 %p
-  First you need to get the command line client. It's available as a Ruby
-  gem, so when you have rubygems installed you can simply do a
+  First you need to get the command line client.
+  It's a Qt 5 application. If your distribution doesn't have a package for
+  inqlude-client, you can download its sources from
+  = link_to( "download.kde.org", "http://download.kde.org/devel/helpers/")
+  or using
+  .code
+    git clone git://anongit.kde.org/inqlude-client
+%p
+  There is a second command line client, written in Ruby. It can also
+  download libraries, but it is mostly aimed at maintaining the inqlude data.
+  It's available as a Ruby gem, so when you have rubygems installed you can simply do a
   .code
     sudo gem install inqlude
   (For instructions how to get rubygems, see

data/view/group.html.haml

@@ -7,13 +7,13 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.latest_manifest["summary"]
+        = library.latest_manifest.summary
         %span{"class" => "library-short-meta-data"}
-          - if library.latest_manifest["schema_type"] == "generic"
+          - if !library.latest_manifest.is_released?
             (unreleased,
           - else
-            (#{library.latest_manifest["maturity"]},
-          #{library.latest_manifest["licenses"].join(", ")})
+            (#{library.latest_manifest.maturity},
+          #{library.latest_manifest.licenses.join(", ")})
 
 %p
   #{group.count} libraries listed in group #{group_title}.

data/view/index.html.haml

@@ -26,7 +26,7 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary
 
 %hr
 

data/view/library.html.haml

@@ -1,15 +1,15 @@
 %h2
-  = m "name"
+  = m.name
 
 %p
-  = m "summary"
+  = m.summary
 
-- if m( "schema_type" ) == "release" || m( "schema_type" ) == "proprietary-release"
+- if m.has_version?
   = list_attribute_content "Version", version_content
 = list_attribute "licenses"
 = list_attribute "platforms"
 = list_attribute "authors"
-= list_attribute_content "Home page", link( m( "urls", "homepage" ) )
+= list_attribute_content "Home page", link( m.urls.homepage )
 
 = render_description
 
@@ -17,18 +17,17 @@
   %h3 Read more
   %ul
     = link_item "api_docs", "API documentation"
-    = link_item "readme", "README"
     = link_item "tutorial", "Tutorial"
     = link_item "download", "Download sources"
     = link_item "vcs", "Source code repository"
     = link_item "announcement", "Announcement"
     = custom_urls
 
-- if m("packages") && m( "packages", "source" )
+- if m.packages.source
   %h3 Packages
   %ul
     %li
-      = link_to "Source code", m( "packages", "source" )
+      = link_to "Source code", m.packages.source
 
 %p{:class => "edit-link"}
   = link_to "[Edit]", editor_url
@@ -43,8 +42,8 @@
   :javascript
     var disqus_shortname = 'inqlude';
 
-    var disqus_identifier = '#{m "name"}';
-    var disqus_url = 'http://inqlude.org/libraries/#{m "name"}.html';
+    var disqus_identifier = '#{m.name}';
+    var disqus_url = 'http://inqlude.org/libraries/#{m.name}.html';
 
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function() {

data/view/unreleased.html.haml

@@ -15,4 +15,4 @@
       %td.first
         = link_to_manifest library.name
       %td.last
-        = library.manifests.last["summary"]
+        = library.manifests.last.summary

data/yes_ship_it.conf

@@ -0,0 +1,3 @@
+# Experimental release automation. See https://github.com/cornelius/yes_ship_it.
+include:
+  ruby_gem

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: inqlude
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,17 +111,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: given_filesystem
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: cli_tester
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Inqlude is the command line interface for accessing the independent Qt
@@ -150,10 +147,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - COPYING
 - Gemfile
-- README
+- README.md
 - TODO
+- accessing-inqlude-data.md
 - bin/inqlude
 - data/manifest.patch
 - data/manifest2.patch
@@ -163,8 +162,11 @@ files:
 - lib/creator.rb
 - lib/distro.rb
 - lib/distros/suse.rb
+- lib/downloader.rb
+- lib/exceptions.rb
 - lib/git_hub_tool.rb
 - lib/inqlude.rb
+- lib/json_object.rb
 - lib/kde_frameworks_creator.rb
 - lib/kde_frameworks_release.rb
 - lib/library.rb
@@ -180,11 +182,14 @@ files:
 - schema/generic-manifest-v1
 - schema/proprietary-release-manifest-v1
 - schema/release-manifest-v1
-- spec/creator_spec.rb
 - spec/data/awesomelib/awesomelib.2013-09-08.manifest
 - spec/data/bleedingedge/bleedingedge.2012-01-01.manifest
 - spec/data/commercial/commercial.manifest
+- spec/data/inqlude-all-karchive.json
+- spec/data/inqlude-all.json
+- spec/data/invalid-schema.manifest
 - spec/data/karchive-generic.manifest
+- spec/data/karchive-release-5.4.manifest
 - spec/data/karchive-release-beta.manifest
 - spec/data/karchive-release.manifest
 - spec/data/karchive-release2.manifest
@@ -196,16 +201,27 @@ files:
 - spec/data/proprietarylib/proprietarylib.2013-12-22.manifest
 - spec/data/rendertest-generic.manifest
 - spec/data/testcontent
-- spec/kde_frameworks_creator_spec.rb
-- spec/kde_frameworks_release_spec.rb
-- spec/library_spec.rb
-- spec/manifest_handler_spec.rb
-- spec/manifest_spec.rb
-- spec/rpm_manifestizer_spec.rb
-- spec/settings_spec.rb
-- spec/spec_helper.rb
-- spec/verifier_spec.rb
-- spec/view_spec.rb
+- spec/integration/cli_create_spec.rb
+- spec/integration/cli_general_spec.rb
+- spec/integration/cli_get_involved_spec.rb
+- spec/integration/cli_help_spec.rb
+- spec/integration/cli_list_spec.rb
+- spec/integration/cli_verify_spec.rb
+- spec/integration/cli_view_spec.rb
+- spec/integration/spec_helper.rb
+- spec/unit/creator_spec.rb
+- spec/unit/downloader_spec.rb
+- spec/unit/json_object_spec.rb
+- spec/unit/kde_frameworks_creator_spec.rb
+- spec/unit/kde_frameworks_release_spec.rb
+- spec/unit/library_spec.rb
+- spec/unit/manifest_handler_spec.rb
+- spec/unit/manifest_spec.rb
+- spec/unit/rpm_manifestizer_spec.rb
+- spec/unit/settings_spec.rb
+- spec/unit/spec_helper.rb
+- spec/unit/verifier_spec.rb
+- spec/unit/view_spec.rb
 - view/about.html.haml
 - view/all.html.haml
 - view/commercial.html.haml
@@ -220,29 +236,29 @@ files:
 - view/public/inqlude.css
 - view/search.html.haml
 - view/unreleased.html.haml
+- yes_ship_it.conf
 homepage: http://inqlude.org
 licenses:
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: inqlude
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line tool for handling Qt based libraries
 test_files: []