inqlude 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29975395e8bb39f24d4d623ae4b1ee12540143eb
-  data.tar.gz: 7619b8dc07af9e3cd89fdd8c35736c617112f761
+  metadata.gz: 22cfc11d35d7370be154aaba28a3ab99a61cb995
+  data.tar.gz: 1999fb6af69e6a227b3073037e341469e4762985
 SHA512:
-  metadata.gz: 9572cc4a485616494f4a475edd02e9b6bc41707047951a44c8870091b442dc33f27862ab298a8173963639942ef253a49238d43456a5afd33dd86cd9fba3e145
-  data.tar.gz: 95a40483eb41571935499b36892128d36b2ee76c6ed0646e58c093e828c3e2411bc6f83562b2fa449d83e3b88e0db4ae4211929e8ac0821209c5a3788e4d1d11
+  metadata.gz: 777ac33ca2a2e6ab9a6f10fe511c5b756396138e5812ca5065b18ce5c101b53d9bb7ab1ab579904041b3222d9e13cfa5da059ec2ed44c7895cd705235b774cd8
+  data.tar.gz: 245b3bb89c2ead317d28e16588ada4cc3fc3c6b1fe30d2927247c0623c01de1c8c9b272dc48662b85f03df517e833689082e143c399fc856d42d9cbfd90bf1f4

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log of Inqlude
 
+## Version 0.7.2
+
+* `create_kde_frameworks` command:
+
+    * Read summary for KDE Frameworks from metainfo.yml
+    * Use API docs as home page for KDE Frameworks
+    * Only parse actual checkouts of KDE Frameworks
+
+* `release_kde_frameworks` command:
+
+    * Support `--offline` option for
+
 ## Version 0.7.1
 
 * `create_kde_frameworks` command:

data/TODO

@@ -8,8 +8,6 @@
 * Split cli #23
 * Sort out client naming
 
-* Point KDE Frameworks homepages to http://api.kde.org
-
 * Release it
 
 

data/lib/cli.rb

@@ -241,6 +241,8 @@ actual domain."
   desc "release_kde_frameworks <release_date> <version>",
     "Create release manifests for KDE frameworks release"
   def release_kde_frameworks release_date, version
+    process_global_options options
+
     handler = ManifestHandler.new @@settings
     k = KdeFrameworksRelease.new handler
     k.read_generic_manifests

data/lib/kde_frameworks_creator.rb

@@ -20,6 +20,8 @@ class KdeFrameworksCreator
   
   def initialize
     @frameworks = Hash.new
+    @warnings = []
+    @errors = []
   end
   
   def parse_checkout dir_name, options = {}
@@ -29,9 +31,11 @@ class KdeFrameworksCreator
       next if entry =~ /^\./
       next if entry == "kapidox"
       next if entry == "kde4support"
+      next if !File.exist?(File.join(dir_name, entry, ".git"))
       
       @frameworks[entry] = {}
       parse_readme File.join(dir_name,entry), options
+      parse_metainfo File.join(dir_name,entry)
       parse_authors File.join(dir_name,entry)
     end
   end
@@ -52,7 +56,7 @@ class KdeFrameworksCreator
     name = extract_name( path )
     framework = @frameworks[name] || {}
 
-    framework["link_home_page"] = "https://projects.kde.org/projects/frameworks/#{name}"
+    framework["link_home_page"] = "http://api.kde.org/frameworks-api/frameworks5-apidocs/#{name}/html/index.html"
     framework["link_mailing_list"] = "https://mail.kde.org/mailman/listinfo/kde-frameworks-devel"
     framework["link_git_repository"] = "https://projects.kde.org/projects/frameworks/#{name}/repository"
 
@@ -108,7 +112,7 @@ class KdeFrameworksCreator
     end
     
     required_fields = []
-    [ "title", "summary", "introduction", "link_home_page" ].each do |field|
+    [ "title", "introduction", "link_home_page" ].each do |field|
       if !options[:ignore_errors] || !options[:ignore_errors].include?(field)
         required_fields.push field
       end
@@ -123,6 +127,25 @@ class KdeFrameworksCreator
     @frameworks[name] = framework
   end
   
+  def parse_metainfo path
+    name = extract_name( path )
+
+    metainfo_path = File.join(path,"metainfo.yaml")
+    if ( !File.exists?( metainfo_path ) )
+      @errors.push( { :name => name, :issue => "missing_file",
+                       :details => "metainfo.yaml" } )
+      return
+    end
+
+    metainfo = YAML.load_file(metainfo_path)
+
+    framework = @frameworks[name] || {}
+
+    framework["summary"] = metainfo["description"]
+
+    @frameworks[name] = framework
+  end
+
   def parse_authors path
     name = extract_name( path )
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Inqlude
 
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 
 end

data/spec/data/karchive.metainfo.yaml

@@ -0,0 +1,13 @@
+maintainer: dfaure
+description: File compression
+tier: 1
+type: functional
+platforms:
+    - name: All
+portingAid: false
+deprecated: false
+release: true
+libraries:
+ - qmake: KArchive
+   cmake: "KF5::Archive"
+cmakename: KF5Archive

data/spec/integration/cli_general_spec.rb

@@ -1,6 +1,7 @@
 require_relative "spec_helper"
 
 include CliTester
+include GivenFilesystemSpecHelpers
 
 describe "Command line interface" do
   describe "shows error" do
@@ -16,4 +17,24 @@ describe "Command line interface" do
       expect(run_command(args: ["list", "--abc"])).to exit_with_success("", /--abc/)
     end
   end
+
+  describe "global options" do
+    use_given_filesystem
+
+    it "recognizes --offline option" do
+      dir = given_directory do
+        given_directory_from_data("awesomelib")
+      end
+
+      # This doesn't make much sense to a user, but that's what it is right now.
+      # It will go away when we switched to GLI
+      expected_stderr = <<-EOT
+ERROR: "inqlude global" was called with arguments ["list"]
+Usage: "inqlude global"
+      EOT
+
+      expect(run_command(args: ["--offline", "list", "--manifest_dir=#{dir}"]))
+        .to exit_with_success("", expected_stderr)
+    end
+  end
 end

data/spec/unit/kde_frameworks_creator_spec.rb

@@ -38,14 +38,17 @@ describe KdeFrameworksCreator do
       before(:each) do
         @checkout_path = given_directory do
           given_directory "karchive" do
+            given_directory(".git")
             given_dummy_file "README.md"
             given_dummy_file "AUTHORS"
           end
           given_directory "threadweaver" do
+            given_directory(".git")
             given_dummy_file "README.md"
             given_dummy_file "AUTHORS"
           end
           given_directory "kconfig" do
+            given_directory(".git")
             given_dummy_file "README.md"
             given_dummy_file "AUTHORS"
           end
@@ -56,7 +59,7 @@ describe KdeFrameworksCreator do
         c = KdeFrameworksCreator.new
 
         c.parse_checkout @checkout_path
-        
+
         expect( c.frameworks.sort ).to eq ["karchive", "kconfig", "threadweaver"]
       end
 
@@ -78,10 +81,23 @@ describe KdeFrameworksCreator do
       end
     end
 
+    it "skips non checkout directories" do
+      c = KdeFrameworksCreator.new
+
+      checkout_path = given_directory do
+        given_directory("empty")
+      end
+
+      c.parse_checkout checkout_path
+
+      expect(c.frameworks.count).to eq 0
+    end
+
     it "parses README" do
       c = KdeFrameworksCreator.new
       
       framework_path = given_directory "karchive" do
+        given_directory(".git")
         given_file "README.md", :from => "karchive.readme"
       end
       
@@ -95,10 +111,26 @@ describe KdeFrameworksCreator do
       expect(karchive["introduction"]).to eq "KArchive provides classes for easy reading, creation and manipulation of\n\"archive\" formats like ZIP and TAR.\n\nIf also provides transparent compression and decompression of data, like the\nGZip format, via a subclass of QIODevice."
       expect(karchive["link_mailing_list"]).to eq "https://mail.kde.org/mailman/listinfo/kde-frameworks-devel"
       expect(karchive["link_git_repository"]).to eq "https://projects.kde.org/projects/frameworks/karchive/repository"
-      expect(karchive["link_home_page"]).to eq "https://projects.kde.org/projects/frameworks/karchive"
+      expect(karchive["link_home_page"]).to eq "http://api.kde.org/frameworks-api/frameworks5-apidocs/karchive/html/index.html"
       expect(karchive["summary"]).to eq "Reading, creation, and manipulation of file archives"
     end
 
+    it "parses metainfo.yaml" do
+      c = KdeFrameworksCreator.new
+
+      framework_path = given_directory "karchive" do
+        given_file "metainfo.yaml", from: "karchive.metainfo.yaml"
+      end
+
+      c.parse_metainfo framework_path
+
+      expect(c.errors.empty?).to be(true)
+
+      karchive = c.framework("karchive")
+
+      expect(karchive["summary"]).to eq "File compression"
+    end
+
     it "parses AUTHORS" do
       c = KdeFrameworksCreator.new
       
@@ -119,6 +151,8 @@ describe KdeFrameworksCreator do
 
       checkout_path = given_directory do
         given_directory "ki18n" do
+          given_directory(".git")
+          given_dummy_file "metainfo.yaml"
           given_dummy_file "README.md"
         end
       end
@@ -136,6 +170,7 @@ describe KdeFrameworksCreator do
 
       checkout_path = given_directory do
         given_directory "ki18n" do
+          given_directory(".git")
           given_dummy_file "README.md"
         end
       end
@@ -152,7 +187,6 @@ describe KdeFrameworksCreator do
       end
       
       expect( error_hash.has_key? "missing_title" ).to be true
-      expect( error_hash.has_key? "missing_summary" ).to be true
       expect( error_hash.has_key? "missing_introduction" ).to be true
     end
     
@@ -161,6 +195,7 @@ describe KdeFrameworksCreator do
 
       checkout_path = given_directory do
         given_directory "kservice" do
+          given_directory(".git")
           given_file "README.md", :from => "kservice.readme"
         end
       end
@@ -180,6 +215,7 @@ describe KdeFrameworksCreator do
 
       checkout_path = given_directory do
         given_directory "kservice" do
+          given_directory(".git")
           given_file "README.md", :from => "kservice.readme"
         end
       end
@@ -198,8 +234,10 @@ describe KdeFrameworksCreator do
       before(:each) do
         @checkout_path = given_directory do
           given_directory "karchive" do
+            given_directory(".git")
             given_file "README.md", :from => "karchive.readme"
             given_file "AUTHORS", :from => "karchive.authors"
+            given_file "metainfo.yaml", from: "karchive.metainfo.yaml"
           end
         end
       end
@@ -211,6 +249,7 @@ describe KdeFrameworksCreator do
         
         karchive = c.framework("karchive")
         expect(karchive["title"]).to eq "KArchive"
+        expect(karchive["summary"]).to eq "File compression"
         expect(karchive["link_git_repository"]).to eq "https://projects.kde.org/projects/frameworks/karchive/repository"
         expect(karchive["authors"]).to eq [ "Mario Bensi <mbensi@ipsquad.net>",
           "David Faure <faure@kde.org>" ]
@@ -234,10 +273,10 @@ describe KdeFrameworksCreator do
         expect( manifest.name ).to eq "karchive"
         expect( manifest.display_name ).to eq "KArchive"
         expect( manifest.urls.vcs ).to eq "https://projects.kde.org/projects/frameworks/karchive/repository"
-        expect( manifest.urls.homepage ).to eq "https://projects.kde.org/projects/frameworks/karchive"
+        expect( manifest.urls.homepage ).to eq "http://api.kde.org/frameworks-api/frameworks5-apidocs/karchive/html/index.html"
         expect( manifest.description ).to eq "KArchive provides classes for easy reading, creation and manipulation of\n\"archive\" formats like ZIP and TAR.\n\nIf also provides transparent compression and decompression of data, like the\nGZip format, via a subclass of QIODevice."
         expect( manifest.urls.mailing_list ).to eq "https://mail.kde.org/mailman/listinfo/kde-frameworks-devel"
-        expect( manifest.summary ).to eq "Reading, creation, and manipulation of file archives"
+        expect( manifest.summary ).to eq "File compression"
       end
       
       it "overwrites existing manifests" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inqlude
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -194,6 +194,7 @@ files:
 - spec/data/karchive-release.manifest
 - spec/data/karchive-release2.manifest
 - spec/data/karchive.authors
+- spec/data/karchive.metainfo.yaml
 - spec/data/karchive.readme
 - spec/data/kservice-generic.manifest
 - spec/data/kservice.readme