inqlude 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42eb2fbe7c0c0266ecd46ea548e2a53ed0a6fb44
-  data.tar.gz: 18931162bcdae27f83f037eb192c4a49edc31fb3
+  metadata.gz: 0224ffe44586e1ff0a7c20230442433a0143b087
+  data.tar.gz: e83375ed1990a411ac5229cd73bb390b029bfda2
 SHA512:
-  metadata.gz: 5bfe38ae4b20f8d64d1b6093048bd7d70f7ce6b3344f994b3ec79d33807b5b73f143d973c306090201837d885ef9a28a805bdd0e703c8b89001ec207eb7f3529
-  data.tar.gz: 7dee6e6df76dcf775e35027200439ad96455551940139e2db91c9f6ee72ce8263964ee23f3f138c7ddba944d19f5c6f9c2c383ca8214ae817c559831b065b649
+  metadata.gz: 69fd8daf47555415e889c364aa31465e26664aa8fef2a46a35791f504a721bab8799187f5ee169563130a321e29fec82989337d5a14a5f70f1638da1f5ff2620
+  data.tar.gz: 3ae968eb4d5a6d295cff30794cd46f5bc0b8a125d95a6fe20eba188b40421dab480087d6350b5c93caea1504d0fdae99467cf60012da8b7620b461332f58cf60

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log of Inqlude
 
+## Version 0.7.4
+
+* Support links to OS X packages in manifests
+* Fix search and comments on created web page
+
 ## Version 0.7.3
 
 * Fix exit code when `inqlude verify` exits with errors

data/README.md

@@ -9,7 +9,7 @@ libraries. A public version of the library runs at http://inqlude.org.
 Inqlude comes as a Ruby gem, which can easily be installed, and provides a
 command line interface to handle Qt libraries in a similar way as Ruby gems.
 There are commands to list available libraries and installed libraries, and
-more. 
+more.
 
 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
@@ -36,6 +36,8 @@ To checkout all frameworks from source, you can use
 kde-checkout-list.pl --component=frameworks --clone
 ```
 
+from the
+[kde-dev-scripts repository](https://quickgit.kde.org/?p=kde-dev-scripts.git).
 This creates a `frameworks` directory with a checkout of all git repositories
 part of [KDE Frameworks](https://projects.kde.org/projects/frameworks).
 

data/lib/manifest.rb

@@ -22,7 +22,7 @@ class Manifest < JsonObject
 
     manifest.from_hash(json)
   end
-  
+
   def self.parse_schema_version schema_id
     schema_id =~ /^http:\/\/inqlude\.org\/schema\/(.*)-manifest-v(.*)\#$/
     type = $1
@@ -60,6 +60,7 @@ class Manifest < JsonObject
     attribute :openSUSE
     attribute :windows
     attribute :ubuntu
+    attribute :osx
   end
   attribute :group
 
@@ -177,4 +178,3 @@ class ManifestProprietaryRelease < Manifest
     true
   end
 end
-

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Inqlude
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/view/layout.html.haml

@@ -3,9 +3,8 @@
   %meta{ :charset => 'utf-8' }
   = style_sheet
   - 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>
+    <link href='https://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://www.google.com/cse/style/look/default.css" type="text/css" />
 %body
   .ribbon
     = link_to "Alpha", "about"
@@ -35,7 +34,8 @@
             = link_to "About", "about"
         .search
           - if enable_search
-            #cse-search-form Loading...
+            %gcse:searchbox-only{ resultsUrl: "https://inqlude.org/search.html" }
+              Loading...
       %br{ :clear => "all" }
 
     .content
@@ -51,11 +51,13 @@
 
   - 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);
+      (function() {
+        var cx = '012526638842992167133:g7thmrlp2uw';
+        var gcse = document.createElement('script');
+        gcse.type = 'text/javascript';
+        gcse.async = true;
+        gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+            '//cse.google.com/cse.js?cx=' + cx;
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(gcse, s);
+      })();

data/view/library.html.haml

@@ -40,14 +40,15 @@
   #disqus_thread
 
   :javascript
-    var disqus_shortname = 'inqlude';
+    var disqus_config = function () {
+        this.page.url = 'http://inqlude.org/libraries/#{m.name}.html';
+        this.page.identifier = '#{m.name}';
+    };
+    (function() {
+        var d = document, s = d.createElement('script');
 
-    var disqus_identifier = '#{m.name}';
-    var disqus_url = 'http://inqlude.org/libraries/#{m.name}.html';
+        s.src = 'https://inqlude.disqus.com/embed.js';
 
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-      dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        s.setAttribute('data-timestamp', +new Date());
+        (d.head || d.body).appendChild(s);
     })();

data/view/public/inqlude.css

@@ -108,12 +108,9 @@ h1 .subtitle {
   list-style-type: none;
 }
 
-#cse-search-form {
+.search {
   width: 250px;
 }
-#cse {
-  width: 90%;
-}
 
 .menu_items {
   color: white;
@@ -133,7 +130,7 @@ h1 .subtitle {
   padding: 10px;
   font-family: monospace;
   margin: 6px;
-}  
+}
 
 .release-date {
   font-size: 80%;

data/view/search.html.haml

@@ -1,31 +1,15 @@
 %h2
   Search results
 
-#cse
-  Loading
-
+%gcse:searchresults-only
+  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);
+  (function() {
+    var cx = '012526638842992167133:g7thmrlp2uw';
+    var gcse = document.createElement('script');
+    gcse.type = 'text/javascript';
+    gcse.async = true;
+    gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(gcse, s);
+  })();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inqlude
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Cornelius Schumacher