inqlude 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22cfc11d35d7370be154aaba28a3ab99a61cb995
-  data.tar.gz: 1999fb6af69e6a227b3073037e341469e4762985
+  metadata.gz: 42eb2fbe7c0c0266ecd46ea548e2a53ed0a6fb44
+  data.tar.gz: 18931162bcdae27f83f037eb192c4a49edc31fb3
 SHA512:
-  metadata.gz: 777ac33ca2a2e6ab9a6f10fe511c5b756396138e5812ca5065b18ce5c101b53d9bb7ab1ab579904041b3222d9e13cfa5da059ec2ed44c7895cd705235b774cd8
-  data.tar.gz: 245b3bb89c2ead317d28e16588ada4cc3fc3c6b1fe30d2927247c0623c01de1c8c9b272dc48662b85f03df517e833689082e143c399fc856d42d9cbfd90bf1f4
+  metadata.gz: 5bfe38ae4b20f8d64d1b6093048bd7d70f7ce6b3344f994b3ec79d33807b5b73f143d973c306090201837d885ef9a28a805bdd0e703c8b89001ec207eb7f3529
+  data.tar.gz: 7dee6e6df76dcf775e35027200439ad96455551940139e2db91c9f6ee72ce8263964ee23f3f138c7ddba944d19f5c6f9c2c383ca8214ae817c559831b065b649

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log of Inqlude
 
+## Version 0.7.3
+
+* Fix exit code when `inqlude verify` exits with errors
+* Fix checking for branches in `inqlude review` command
+* Settle on "OS X" as the canonical name
+
 ## Version 0.7.2
 
 * `create_kde_frameworks` command:

data/lib/cli.rb

@@ -86,7 +86,7 @@ actual domain."
     if options[:manifest_dir]
       @@settings.manifest_path = options[:manifest_dir]
     end
-    
+
     manifest_handler = ManifestHandler.new(@@settings)
     manifest_handler.read_remote
 
@@ -113,7 +113,7 @@ actual domain."
       Upstream.get_involved "Implement --check-links option", 11
       exit 1
     end
-    
+
     errors = []
 
     if filename
@@ -146,6 +146,8 @@ actual domain."
             puts "    #{e}"
           end
         end
+
+        exit 1
       end
     end
   end
@@ -161,7 +163,7 @@ actual domain."
       exit 1
     end
   end
-  
+
   desc "system_scan", "Scan system for installed Qt libraries and create manifests"
   method_option :dry_run, :type => :boolean,
     :desc => "Dry run. Don't write files."
@@ -176,11 +178,11 @@ actual domain."
     if options[:recreate_source_cache]
       m.create_source_cache
     end
-    
+
     if options[:recreate_qt_source_cache]
       m.create_qt_source_cache
     end
-    
+
     m.process_all_rpms
   end
 
@@ -237,7 +239,7 @@ actual domain."
       end
     end
   end
-  
+
   desc "release_kde_frameworks <release_date> <version>",
     "Create release manifests for KDE frameworks release"
   def release_kde_frameworks release_date, version
@@ -248,7 +250,7 @@ actual domain."
     k.read_generic_manifests
     k.write_release_manifests release_date, version
   end
-  
+
   desc "get_involved", "Information about how to get involved"
   def get_involved
     Upstream.print_info
@@ -292,7 +294,7 @@ actual domain."
   end
 
   private
-  
+
   def process_global_options options
     @@settings.offline = options[:offline]
     if options[:manifest_dir]

data/lib/git_hub_tool.rb

@@ -15,18 +15,18 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 class GitHubTool
-  
+
   def self.review repo
     puts "Reviewing repo '#{repo}'"
-    
+
     check_directory
-    if `git status` !~ /^# On branch master/
+    if `git status` !~ /On branch master/
       STDERR.puts "You need to be on the master branch"
       exit 1
     end
 
     user,branch = parse_repo repo
-    
+
     run "git checkout -b #{user}-#{branch} master"
     begin
       run "git pull git@github.com:#{user}/inqlude-data.git #{branch}"
@@ -42,18 +42,18 @@ class GitHubTool
     user,branch = parse_repo repo
 
     branchname = "#{user}-#{branch}"
-    
-    if `git status` !~ /^# On branch #{branchname}/
+
+    if `git status` !~ /On branch #{branchname}/
       STDERR.puts "You need to be on the #{branchname} branch"
       exit 1
     end
-    
+
     run "git checkout master"
     run "git merge #{branchname}"
     run "git push origin master"
     run "git branch -d #{branchname}"
   end
-  
+
   def self.check_directory
     current_dir = File.basename Dir.pwd
     if current_dir != "inqlude-data"
@@ -69,7 +69,7 @@ class GitHubTool
   def self.parse_repo repo
     user = repo.split(":")[0]
     branch = repo.split(":")[1]
-    
+
     if !user
       STDERR.puts "Unable to extract user from repo parameter"
       exit 1
@@ -78,15 +78,15 @@ class GitHubTool
       STDERR.puts "Unable to extract branch from repo parameter"
       exit 1
     end
-    
+
     return user,branch
   end
-  
+
   def self.run cmd
     puts "Running: #{cmd}"
     if !system cmd
       raise "Command failed"
     end
   end
-  
+
 end

data/lib/version.rb

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

data/manifest-format.md

@@ -190,7 +190,7 @@ Supported values are:
 
 * "Linux"
 * "Windows"
-* "Mac"
+* "OS X"
 
 *there must be at least one platform*
 

data/spec/data/broken/broken.manifest

@@ -0,0 +1,3 @@
+{
+  "$schema": "http://inqlude.org/schema/generic-manifest-v1#"
+}

data/spec/integration/cli_verify_spec.rb

@@ -33,5 +33,50 @@ Verify manifest newlib.manifest...ok
 EOT
       expect(result).to exit_with_success(expected_output)
     end
+
+    it "verifies all manifests with syntax error" do
+      dir = given_directory do
+        given_directory_from_data("awesomelib")
+        given_directory("newlib") do
+          given_dummy_file("newlib.manifest")
+        end
+      end
+
+      result = run_command(args: ["verify", "--offline", "--manifest_dir=#{dir}"])
+      expect(result).to exit_with_error(1,//)
+    end
+
+    it "verifies all manifests with schema error" do
+      dir = given_directory do
+        given_directory_from_data("awesomelib")
+        given_directory_from_data("broken")
+      end
+
+      result = run_command(args: ["verify", "--offline", "--manifest_dir=#{dir}"])
+      expected_output = <<EOT
+Verify manifest awesomelib.2013-09-08.manifest...ok
+Verify manifest broken.manifest...error
+  Expected file name: .manifest
+  Schema validation error: The property '#/' did not contain a required property of 'name' in schema http://inqlude.org/schema/generic-manifest-v1#
+  Schema validation error: The property '#/' did not contain a required property of 'summary' in schema http://inqlude.org/schema/generic-manifest-v1#
+  Schema validation error: The property '#/' did not contain a required property of 'urls' in schema http://inqlude.org/schema/generic-manifest-v1#
+  Schema validation error: The property '#/' did not contain a required property of 'licenses' in schema http://inqlude.org/schema/generic-manifest-v1#
+  Schema validation error: The property '#/' did not contain a required property of 'description' in schema http://inqlude.org/schema/generic-manifest-v1#
+  Schema validation error: The property '#/' did not contain a required property of 'platforms' in schema http://inqlude.org/schema/generic-manifest-v1#
+
+2 manifests checked. 1 ok, 1 with error.
+
+Errors:
+  broken.manifest
+    Expected file name: .manifest
+    Schema validation error: The property '#/' did not contain a required property of 'name' in schema http://inqlude.org/schema/generic-manifest-v1#
+    Schema validation error: The property '#/' did not contain a required property of 'summary' in schema http://inqlude.org/schema/generic-manifest-v1#
+    Schema validation error: The property '#/' did not contain a required property of 'urls' in schema http://inqlude.org/schema/generic-manifest-v1#
+    Schema validation error: The property '#/' did not contain a required property of 'licenses' in schema http://inqlude.org/schema/generic-manifest-v1#
+    Schema validation error: The property '#/' did not contain a required property of 'description' in schema http://inqlude.org/schema/generic-manifest-v1#
+    Schema validation error: The property '#/' did not contain a required property of 'platforms' in schema http://inqlude.org/schema/generic-manifest-v1#
+EOT
+      expect(result).to exit_with_error(1,"",expected_output)
+    end
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: inqlude
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: given_filesystem
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Inqlude is the command line interface for accessing the independent Qt
@@ -145,8 +145,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - COPYING
 - Gemfile
@@ -184,6 +184,7 @@ files:
 - schema/release-manifest-v1
 - spec/data/awesomelib/awesomelib.2013-09-08.manifest
 - spec/data/bleedingedge/bleedingedge.2012-01-01.manifest
+- spec/data/broken/broken.manifest
 - spec/data/commercial/commercial.manifest
 - spec/data/inqlude-all-karchive.json
 - spec/data/inqlude-all.json
@@ -248,18 +249,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: inqlude
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line tool for handling Qt based libraries
 test_files: []
+has_rdoc: