inqlude 0.0.5 → 0.0.6

data/README

@@ -13,7 +13,7 @@ Libraries are described by manifest files, which are maintained in a separate
 git repository. Inqlude integrates with this git repository and uses it as the
 list of available gems. One way to contribute information about libraries to the
 archive is to simply provide patches to the manifest repository. The repository
-can be found at https://github.com/cornelius/inqlude_data.
+can be found at https://github.com/cornelius/inqlude-data.
 
 Inqlude also integrates with native package managers. If the meta information is
 available, the libraries are transparently handled by installing packages with

data/TODO

@@ -1,18 +1,42 @@
-* Correctly read manifests, if there are multiple versions
-* Smarter match for source RPMs, which contain more than one library
-* Show documentation of an library
-* Add "How to use" data
+# Alpha (first announcement, ready for early adopters)
+
+* Update get involved
+
+# Beta (ready for contributors of meta data)
+
+* Document manifest format
 * Define maturity scale
+* State policy for inclusion of libraries (at least one stable release, no qt3,
+  open source, provides a Qt API, published API docs)
+* Handle binding consistently (suffix -qt, common description, maybe special
+  tags in meta data for bound library)
+
+* Check validity of links
+* Add option to verify given manifest
+* Add show option for showing library details
+
+* Look for latest versions of libraries
+* Make sure all manifests have a download link
+* Add links to upstream source code repositories for all libraries
+
+* Add download section on library page with source code download and links to
+  packages e.g. openSUSE 1-click install
+* Show release date on library page
+* Add page with older versions of each library
+
+# 1.0 (ready for end users of the web site)
+
+* Add "How to use" data
+* Add tags for searching
+* Update manifest data to have complete package data
+* Check existence of packages
+
+# Later (ready for end users of the command line tool)
+
+* Smarter match for source RPMs, which contain more than one library
 * Retrieve data from qt-apps and kde-apps
 * "How to package libraries"
-* Add tags for searching
 * Look for local search
 * Get manifests from build service
-* Add option to verify given or all manifests
-* Add show option for showing library details
 * List libraries with available packages
-* Update manifest data to have complete package data
 * Properly identify repository (use vendor?)
-* One-click install for SUSE systems
-* Contribute back package description changes
-* Document manifest format

data/data/manifest.patch

@@ -8,7 +8,9 @@ index 90561d7..489d6f5 100644
    "version": "3.2.2",
 -  "summary": "KLatexFormula backend library (Qt4)",
 +  "summary": "KLatexFormula backend library (Qt3)",
-   "homepage": "http://klatexformula.sourceforge.net/",
+   "urls": {
+     "homepage": "http://klatexformula.sourceforge.net/"
+   },
    "licenses": ["GPLv2+"],
 -  "description": "A C++/Qt library to generate images (PNG, EPS, PDF, plus all Qt-supported image\nformats) from LaTeX equations.\n\nThis library implements the base functionality of KLatexFormula. This library\nis compiled for Qt 4.\n\nSee also packages klatexformula and libklfbackend-qt3.\n",
 +  "description": "A C++/Qt library to generate images (PNG, EPS, PDF, plus all Qt-supported image\nformats) from LaTeX equations.\n\nThis library implements the base functionality of KLatexFormula. This library\nis compiled for Qt 3.\n\nSee also packages klatexformula.\n",

data/data/manifest2.patch

@@ -0,0 +1,21 @@
+commit 75c93f7107d88f919df55dea05818c6d43ef6897
+Author: Cornelius Schumacher <schumacher@kde.org>
+Date:   Wed Sep 28 17:08:49 2011 +0200
+
+    Add API docs and source code link.
+
+diff --git a/qjson/qjson.1970-01-01.manifest b/qjson/qjson.1970-01-01.manifest
+index c1d5011..6c0eb9f 100644
+--- a/qjson/qjson.1970-01-01.manifest
++++ b/qjson/qjson.1970-01-01.manifest
+@@ -5,7 +5,9 @@
+   "version": "0.7.1",
+   "summary": "Development files for QJson",
+   "urls": {
+-    "homepage": "http://qjson.sourceforge.net/"
++    "homepage": "http://qjson.sourceforge.net/",
++    "api_docs": "http://qjson.sourceforge.net/docs/index.html",
++    "vcs": "https://gitorious.org/qjson"
+   },
+   "licenses": ["LGPL"],
+   "description": "JSON (JavaScript Object Notation) is a lightweight data-interchange format.\nIt can represent integer, real number, string, an ordered sequence of value,\nand a collection of name/value pairs. QJson is a qt-based library that maps\nJSON data to QVariant objects. JSON arrays will be mapped to QVariantList\ninstances, while JSON's objects will be mapped to QVariantMap.\n\nThis package contains files for developing applications using QJson.\n\n",

data/lib/cli.rb

@@ -52,12 +52,14 @@ class Cli < Thor
   method_option :remote, :type => :boolean, :aliases => "-r",
     :desc => "List remote libraries"
   def list
+    process_global_options options
+
     handler = ManifestHandler.new @@settings
     handler.read_remote
 
     if options[:remote]
-      handler.manifests.each do |manifest|
-        puts manifest["name"] + "-" + manifest["version"]
+      handler.libraries.each do |library|
+        puts library.name + " (" + library.versions.join(", ") + ")"
       end
     else
       manifests = @@distro.installed handler
@@ -71,12 +73,16 @@ class Cli < Thor
   method_option :output_dir, :type => :string, :aliases => "-o",
     :desc => "Output directory", :required => true
   method_option :enable_disqus, :type => :boolean,
-    :desc => "Enable Disqus based comments on generate web pages. Works only on actual domain."
+    :desc => "Enable Disqus based comments on generate web pages. Works only on
+actual domain."
+  method_option :disable_search, :type => :boolean,
+    :desc => "Disable Google based search."
   def view
     process_global_options options
   
     view = View.new ManifestHandler.new @@settings
     view.enable_disqus = options[:enable_disqus]
+    view.enable_search = !options[:disable_search]
     view.create options[:output_dir]
   end
 
@@ -87,7 +93,25 @@ class Cli < Thor
 
   desc "verify", "Verify manifests"
   def verify
-    Upstream.get_involved "Add command for verifying manifests", 2
+    process_global_options options
+
+    v = Verifier.new @@settings
+
+    handler = ManifestHandler.new @@settings
+    handler.read_remote
+    count_ok = 0
+    count_error = 0
+    handler.libraries.each do |library|
+      library.manifests.each do |manifest|
+        if v.verify manifest
+          count_ok += 1
+        else
+          count_error += 1
+        end
+      end
+    end
+    puts "#{handler.manifests.count} manifests checked. #{count_ok} ok, " +
+      "#{count_error} with error."
   end
 
   desc "create", "Create manifest"
@@ -129,13 +153,15 @@ class Cli < Thor
   end
 
   desc "install", "Install library"
+  method_option :dry_run, :type => :boolean,
+    :desc => "Only show what would happen, don't install anything."
   def install name
     handler = ManifestHandler.new @@settings
     manifest = handler.manifest name
     if !manifest
       STDERR.puts "Manifest for '#{name}' not found"
     else
-      @@distro.install manifest
+      @@distro.install manifest, :dry_run => options[:dry_run]
     end
   end
 

data/lib/distros/suse.rb

@@ -72,10 +72,14 @@ class Suse
     end
   end
 
-  def install manifest
+  def install manifest, options = {}
     package_name = get_package_name manifest
+    cmd_options = Array.new
+    if options[:dry_run]
+      cmd_options.push "--dry-run"
+    end
     if package_name
-      system "sudo zypper install #{package_name}"
+      system "sudo zypper install #{cmd_options.join(" ")} #{package_name}"
     end
   end
 

data/lib/inqlude.rb

@@ -13,3 +13,5 @@ require File.expand_path('../distro', __FILE__)
 require File.expand_path('../rpm_manifestizer', __FILE__)
 require File.expand_path('../settings', __FILE__)
 require File.expand_path('../upstream', __FILE__)
+require File.expand_path('../verifier', __FILE__)
+require File.expand_path('../library', __FILE__)

data/lib/library.rb

@@ -0,0 +1,10 @@
+class Library
+
+  attr_accessor :name
+  attr_accessor :manifests
+
+  def versions
+    versions = @manifests.map { |m| m["version"] }
+  end
+  
+end

data/lib/manifest_handler.rb

@@ -16,19 +16,20 @@
 
 class ManifestHandler
 
-  attr_reader :manifests
+  attr_reader :manifests, :libraries
   
   def initialize settings
     @settings = settings
-  
+
+    @libraries = Array.new
     @manifests = Array.new
   end
 
   def manifest name
     read_remote
-    @manifests.each do |manifest|
-      if manifest["name"] == name
-        return manifest
+    @libraries.each do |library|
+      if library.name == name
+        return library.manifests.last
       end
     end
     nil
@@ -38,11 +39,24 @@ class ManifestHandler
     if !@settings.offline
       fetch_remote
     end
-  
-    Dir.glob( "#{@settings.manifest_path}/*/*.manifest" ).sort.each do |filename|
-      File.open filename do |file|
-        manifests.push JSON file.read
+
+    Dir.glob( "#{@settings.manifest_path}/*" ).sort.each do |dirname|
+      next if !File.directory?( dirname )
+
+      library = Library.new
+      library.name = File.basename dirname
+      local_manifests = Array.new
+      Dir.glob( "#{dirname}/*.manifest" ).sort.each do |filename|
+        File.open filename do |file|
+          manifest = JSON file.read
+          manifest["filename"] = File.basename filename
+          manifest["libraryname"] = library.name
+          local_manifests.push manifest
+          manifests.push manifest
+        end
       end
+      library.manifests = local_manifests
+      libraries.push library
     end
   end
 

data/lib/rpm_manifestizer.rb

@@ -84,13 +84,16 @@ class RpmManifestizer
       f2.puts '  "schema_version": 1,'
       f2.puts "  \"name\": \"#{name}\","
       f2.puts "  \"release_date\": \"#{release_date}\","
-      [ "version", "summary", "homepage" ].each do |key|
-        f2.puts "  \"#{key}\": \"#{headers[key]}\","
-      end
+      f2.puts "  \"version\": \"#{headers["version"]}\","
+      f2.puts "  \"summary\": \"#{headers["summary"]}\","
+      f2.puts '  "urls": {'
+      f2.puts "    \"homepage\": \"#{headers["homepage"]}\""
+      f2.puts '  },'
       f2.puts "  \"licenses\": [#{licenses_string}],"
       f2.puts "  \"description\": \"#{description}\","
       f2.puts '  "authors": [' + authors.join(",") + '],'
       f2.puts '  "maturity": "stable",'
+      f2.puts '  "platforms": [ "Linux" ],'
       f2.puts '  "packages": {'
       f2.puts '    "openSUSE": {'
       f2.puts '      "11.4": {'
@@ -188,6 +191,11 @@ class RpmManifestizer
       cmd = "cd #{@settings.manifest_path}; patch -p1 <#{patch}";
       puts "Patching manifests with #{patch}"
       system cmd
+
+      patch = @settings.data_path + "/manifest2.patch"
+      cmd = "cd #{@settings.manifest_path}; patch -p1 <#{patch}";
+      puts "Patching manifests with #{patch}"
+      system cmd
     end
   end
 

data/lib/upstream.rb

@@ -32,7 +32,7 @@ class Upstream
     puts
     puts "If you would like to contribute information about a Qt based"
     puts "library, have a look at the git repository containing the library"
-    puts "meta data: https://github.com/cornelius/inqlude_data"
+    puts "meta data: https://github.com/cornelius/inqlude-data"
     puts
     puts "Your help is appreciated."
     puts

data/lib/verifier.rb

@@ -0,0 +1,62 @@
+# Copyright (C) 2011 Cornelius Schumacher <schumacher@kde.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+class Verifier
+
+  def initialize settings
+    @settings = settings
+
+    @allowed_keys = [ "schema_version", "name", "version", "release_date",
+      "summary", "urls", "licenses", "description", "authors", "maturity",
+      "platforms", "packages", "keywords", "dependencies", "filename",
+      "libraryname" ]
+  end
+
+  def verify manifest
+    @errors = Array.new
+
+    filename = manifest["filename"]
+    expected_filename = "#{manifest["libraryname"]}.#{manifest["release_date"]}.manifest"
+    
+    print "Verify manifest #{filename}..."
+    
+    if filename != expected_filename
+      @errors.push "Expected file name: #{expected_filename}"
+    end
+
+    if manifest["release_date"] == "1970-01-01"
+      @errors.push "Invalid release date: #{manifest["release_date"]}"
+    end
+    
+    manifest.keys.each do |key|
+      if !@allowed_keys.include? key
+        @errors.push "Illegal entry: #{key}"
+      end
+    end
+    
+    if @errors.empty?
+      puts "ok"
+      return true
+    else
+      puts "error"
+      @errors.each do |error|
+        puts "  #{error}"
+      end
+      return false
+    end
+  end
+  
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Inqlude
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
 end

data/lib/view.rb

@@ -17,7 +17,9 @@
 class View
 
   attr_accessor :enable_disqus
-
+  attr_accessor :enable_search
+  attr_reader :root
+  
   def initialize handler
     @manifest_handler = handler
   end
@@ -34,15 +36,17 @@ class View
     render_template "about", output_dir
     render_template "get", output_dir
     render_template "contribute", output_dir
+    render_template "search", output_dir
 
     library_path = "#{output_dir}/libraries/"
     assert_dir library_path
 
     @root = "../"
 
-    manifests.each do |manifest|
-      @manifest = manifest
-      file_name = "libraries/" + manifest["name"]
+    @manifest_handler.libraries.each do |library|
+      @library = library
+      @manifest = library.manifests.last
+      file_name = "libraries/" + library.name
       render_template "library", output_dir, file_name
     end
   end
@@ -74,8 +78,12 @@ class View
     "<link href='#{@root}public/inqlude.css' rel='stylesheet' type='text/css' />"
   end
 
-  def m attr
-    @manifest[ attr ]
+  def m attr, subattr = nil
+    if subattr
+      @manifest[ attr ][ subattr ]
+    else
+      @manifest[ attr ]
+    end
   end
 
   def link_to_manifest name
@@ -93,17 +101,101 @@ class View
     "<a href=\"#{url}\">#{title}</a>"
   end
 
-  def manifests
-    if @manifest_handler.manifests.empty?
+  def list_attribute attribute
+    attr = m attribute
+    return "" if !attr || attr.size == 0
+
+    # We assume attribute is plural formed by adding an 's'
+
+    label = attribute.capitalize
+
+    entries = Array.new
+    attr.each do |a|
+      entries.push markup_email( a )
+    end
+    
+    out = "<p>"
+    if attr.size > 1
+      out += label + ": " + entries.join(", ")
+    else
+      out += label[0..-2] + ": " + entries.first
+    end
+    out += "</p>"
+    
+    out
+  end
+  
+  def markup_email email
+    if email =~ /(.*) <(.*)>/
+      name = $1
+      email = $2
+      
+      return "<a href=\"mailto:#{email}\">#{name}</a>"
+    else
+      return email
+    end
+  end
+
+  def link_item key, label
+    if m( "urls", key )
+      out = "<li><a href=\""
+      out += m( "urls", key )
+      out += "\">#{label}</a>"
+      return out
+    else
+      return ""
+    end
+  end
+
+  def custom_urls
+    out = ""
+    urls = m "urls", "custom"
+    if urls && !urls.empty?
+      urls.each do |text,url|
+        out += "<li><a href=\"#{url}\">#{text}</a></li>"
+      end
+    end
+    out
+  end
+  
+  def libraries
+    if @manifest_handler.libraries.empty?
       @manifest_handler.read_remote
     end
-    @manifest_handler.manifests
+    @manifest_handler.libraries
   end
 
   def disqus_enabled?
     @enable_disqus
   end
 
+  def more_urls?
+    if @manifest["urls"]
+      @manifest["urls"].each do |name,url|
+        if name != "homepage" && name != "screenshots" && name != "logo" && name != "description_source"
+          return true
+        end
+      end
+    end
+    return false
+  end
+  
+  def editor_url
+    url = "https://github.com/cornelius/inqlude-data/blob/master/"
+    url += @manifest["name"]
+    url += "/#{@manifest["name"]}.#{@manifest["release_date"]}.manifest"
+    url
+  end
+
+  def old_versions
+    versions = Array.new
+    count = @library.manifests.count
+    if count > 1
+      versions = @library.manifests[0..count-2].map {|m| m["version"] }
+    end
+    versions.reverse
+  end
+
   private
   
   def assert_dir name

data/test/library_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class LibraryTest < Test::Unit::TestCase
+
+  def test_versions
+    versions = [ "1.0", "2.0" ]
+
+    manifests = Array.new
+    versions.each do |version|
+      manifests.push create_manifest "mylib", version
+    end
+
+    library = Library.new
+    library.manifests = manifests
+
+    assert_equal versions, library.versions
+  end
+
+end

data/test/test_helper.rb

@@ -1,3 +1,11 @@
 require File.expand_path('../../lib/inqlude',__FILE__)
 
 require 'test/unit'
+
+def create_manifest name, version
+  m = Hash.new
+  m["name"] = name
+  m["version"] = version
+  m["description"] = "#{name} is a nice library."
+  m
+end

data/view/about.html.haml

@@ -1,21 +1,28 @@
 %p
-  Inqlude is the independent archive of Qt based libraries. Its mission is
-  to make it as easy as possible for developers using Qt to find and use
-  libraries, in particular 3rd party ones.
+  The goal of Inqlude is to provide a comprehensive listing of all
+  existing libraries for developers of Qt applications. If you are creating
+  applications using the Qt toolkit, and are looking for libraries, components
+  or modules to use, Inqlude is the place where you find all information and
+  pointers to get started.
 %p
   Inqlude comes with a command line client for handling libraries. See the
   = link_to "instructions how to get libraries", "get"
   for more details.
 %p
-  Inqlude tries to be a complete archive of all available Qt based
+  Inqlude aims to be a complete archive of all available Qt based
   libraries. If you notice that there is some information missing, outdated
   or inaccurate, please consider contributing the missing data. See the
   = link_to "instructions how to contribute", "contribute"
   for more details.
 %p
   %em
-    Note that Inqlude is currently a proof-of-concept. It's not ready for
-    production use yet. Feedback and input is appreciated.
+    Note that Inqlude is currently in alpha state. It's not ready for full
+    production use yet. Data is still incomplete, and the tools are
+    limited. Feedback and input is appreciated.
 %p
-  If you have questions of comments please feel free to contact
-  = link_to( "Cornelius Schumacher", "mailto:schumacher@kde.org" ) + "."
+  If you have questions of comments please feel free to write to the Inqlude
+  mailing list #{link_to "inqlude@kde.org", "mailto:inqlude@kde.org"}.
+%p
+  Inqlude was created by
+  = link_to "Cornelius Schumacher", "mailto:schumacher@kde.org"
+  with the help of many others, and is a proud  member of the KDE family.

data/view/contribute.html.haml

@@ -7,12 +7,12 @@
   packages.
 %p
   The meta data used by Inqlude is collected in a git repository at
-  = link( "http://github.com/cornelius/inqlude_data" ) + "."
+  = link( "http://github.com/cornelius/inqlude-data" ) + "."
   It contains a manifest file in JSON format for each library, which has the
   meta data in a structured machine-readable form. JSON is easy enough for
   humans to read and edit as well.
 %p
-  You can contribute meta data by providing patches to the inqlude_data
+  You can contribute meta data by providing patches to the inqlude-data
   repository. Use the github mechanisms or just send patches by email.
   Contributions are welcome.
 
@@ -30,3 +30,9 @@
   package systems on the variety of Linux distributions and other systems
   out there.
 
+%h2 Mailing list
+
+%p
+  If you want to discuss any aspects of Inqlude, get in contact to us, have
+  questions, or want to contribute in any other way, the best way is to use the
+  mailing list #{link_to "inqlude@kde.org", "https://mail.kde.org/mailman/listinfo/inqlude"}.

data/view/get.html.haml

@@ -3,8 +3,9 @@
   based libraries in her projects.
 %p
   First you can just use the web site. Find the information about libraries
-  here, and get the libraries manually with the provided links. This works,
-  but there is a more convenient way.
+  here, and get the libraries using the provided links. This works and is the
+  recommended way for now, but there is an experimental, but more convenient
+  way.
 %p
   You can also use the command line client. This client makes it easy to get
   the libraries you need with just a few commands, without having to know
@@ -27,7 +28,7 @@
 
   install a library with 
   .code
-    inqlude install <library_name>
+    inqlude install &lt;library_name&gt;
 
   and get a list of installed libraries with
   .code

data/view/index.html.haml

@@ -1,7 +1,23 @@
+%p
+  The goal of Inqlude is to provide a comprehensive listing of all
+  existing libraries for developers of Qt applications. If you are creating
+  applications using the Qt toolkit, and are looking for libraries, components
+  or modules to use, Inqlude is the place where you find all information and
+  pointers to get started.
+%p
+  This is a young project, we are still collecting information, and are
+  building up the web site and the tools around it. If you would like to get
+  involved, read more about #{link_to "how to contribute", "contribute"}, or go
+  to the mailing list
+  = link_to "inqlude.kde.org", "https://mail.kde.org/mailman/listinfo/inqlude"
+  to directly talk to us. See you there.
+
+%h2 All libraries
+
 %table
-  - manifests.each do |manifest|
+  - libraries.each do |library|
     %tr
       %td.first
-        = link_to_manifest manifest["name"]
+        = link_to_manifest library.name
       %td.last
-        = manifest["summary"]
+        = library.manifests.last["summary"]

data/view/layout.html.haml

@@ -1,7 +1,13 @@
 %head
   = style_sheet
-  <link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
+  - if enable_search
+    <link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+    <script src="http://www.google.com/jsapi" type="text/javascript"></script>
 %body
+  .ribbon
+    = link_to "Alpha", "about"
+
   .header.center
     %h1
       %span.logo><
@@ -23,6 +29,10 @@
       |
       = link_to "About", "about"
 
+    - if enable_search
+      #cse-search-form Loading...
+
+      
   .content.center
     = yank
 
@@ -33,3 +43,20 @@
         Last updated on #{Date.today}
 
     %br{ :clear => "all" }
+
+  .legal
+    Inqlude is a
+    = link_to "KDE project", "http://kde.org"
+    = "|"
+    = link_to "Legal", "http://www.kde.org/community/whatiskde/impressum.php"
+
+  - if enable_search
+    :javascript
+      google.load('search', '1', {language : 'en'});
+      google.setOnLoadCallback(function() {
+        var customSearchControl = new google.search.CustomSearchControl('012526638842992167133:g7thmrlp2uw');
+        customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+        var options = new google.search.DrawOptions();
+        options.enableSearchboxOnly("#{root}search.html");
+        customSearchControl.draw('cse-search-form', options);
+      }, true);

data/view/library.html.haml

@@ -5,6 +5,10 @@
   %em
     Version
     = m "version"
+    = "(#{m "maturity"})"
+    - if !old_versions.empty?
+      %span{:class => "old-versions"}
+        = "(older versions: #{old_versions.join(", ")})"
 
 %p
   = m "summary"
@@ -12,8 +16,27 @@
 %p
   = m "description"
 
+= list_attribute "licenses"
+= list_attribute "platforms"
+= list_attribute "authors"
+
 %p
-  = link m( "homepage" )
+  = link m( "urls", "homepage" )
+
+- if more_urls?
+  %h3 Read more
+  %ul
+    = link_item "api_docs", "API documentation"
+    = link_item "readme", "README"
+    = link_item "tutorial", "Tutorial"
+    = link_item "download", "Download source"
+    = link_item "vcs", "Source code repository"
+    = custom_urls
+
+%p{:class => "edit-link"}
+  = link_to "[Edit]", editor_url
+
+%br{:clear => "all"}
 
 - if disqus_enabled?
   %hr

data/view/public/inqlude.css

@@ -4,6 +4,29 @@ body {
   font-family: 'Droid Sans', arial, serif;
 }
 
+.ribbon {
+  background-color: #a00;
+  overflow: hidden;
+  position: absolute;
+  left: -2em;
+  top: 1em;
+  -moz-transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+  -moz-box-shadow: 0 0 1em #888;
+  -webkit-box-shadow: 0 0 1em #888;
+}
+.ribbon a {
+  border: 1px solid #faa;
+  color: #fff;
+  display: block;
+  font: bold 81.25% 'Helvetiva Neue', Helvetica, Arial, sans-serif;
+  margin: 0.05em 0 0.075em 0;
+  padding: 0.5em 3.5em;
+  text-align: center;
+  text-decoration: none;
+  text-shadow: 0 0 0.5em #444;
+}
+
 .center {
   margin-left: auto;
   margin-right: auto;
@@ -32,6 +55,10 @@ h1 .subtitle {
   padding-left: 12px;
 }
 
+h2 {
+  text-align: center;
+}
+
 .header {
   width: 80%;
   background-color: white;
@@ -43,8 +70,16 @@ h1 .subtitle {
   background-color: green;
   padding-top: 4px;
   padding-bottom: 6px;
-  padding-right: 10px;
-  text-align: right;
+  padding-left: 10px;
+  text-align: left;
+}
+
+#cse-search-form {
+  float: right;
+  width: 250px;
+}
+#cse {
+  width: 90%;
 }
 
 .menu_items {
@@ -69,6 +104,10 @@ h1 .subtitle {
   margin: 6px;
 }  
 
+.old-versions {
+  font-size: 80%;
+}
+
 table {
   margin: auto;
 }
@@ -81,3 +120,14 @@ td {
 .footer {
   float: right;
 }
+
+.edit-link {
+  float: right;
+  font-size: 80%;
+}
+
+.legal {
+  margin: 4px;
+  text-align: center;
+  font-size: 70%;
+}

data/view/search.html.haml

@@ -0,0 +1,31 @@
+%h2
+  Search results
+
+#cse
+  Loading
+
+:javascript
+  function parseQueryFromUrl () {
+    var queryParamName = "q";
+    var search = window.location.search.substr(1);
+    var parts = search.split('&');
+    for (var i = 0; i < parts.length; i++) {
+      var keyvaluepair = parts[i].split('=');
+      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
+        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
+      }
+    }
+    return '';
+  }
+  google.load('search', '1', {language : 'en'});
+  google.setOnLoadCallback(function() {
+    var customSearchControl = new google.search.CustomSearchControl('012526638842992167133:g7thmrlp2uw');
+    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+    var options = new google.search.DrawOptions();
+    options.enableSearchResultsOnly(); 
+    customSearchControl.draw('cse',options);
+    var queryFromUrl = parseQueryFromUrl();
+    if (queryFromUrl) {
+      customSearchControl.execute(queryFromUrl);
+    }
+  }, true);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inqlude
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Cornelius Schumacher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-10-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,18 +99,22 @@ files:
 - TODO
 - bin/inqlude
 - data/manifest.patch
+- data/manifest2.patch
 - examples/qjson.manifest
 - inqlude.gemspec
 - lib/cli.rb
 - lib/distro.rb
 - lib/distros/suse.rb
 - lib/inqlude.rb
+- lib/library.rb
 - lib/manifest_handler.rb
 - lib/rpm_manifestizer.rb
 - lib/settings.rb
 - lib/upstream.rb
+- lib/verifier.rb
 - lib/version.rb
 - lib/view.rb
+- test/library_test.rb
 - test/rpm_manifestizer_test.rb
 - test/test_helper.rb
 - view/about.html.haml
@@ -120,6 +124,7 @@ files:
 - view/layout.html.haml
 - view/library.html.haml
 - view/public/inqlude.css
+- view/search.html.haml
 has_rdoc: true
 homepage: https://github.com/cornelius/inqlude
 licenses: []