packaging_rake_tasks 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 551fe57af0952ccedbdfcad534cb5cd7d0c3756a
-  data.tar.gz: edda594b1afe8b548569f8168f5877b580970db5
+  metadata.gz: 346137705217472517f434fc2743f4c4ebfc6bd6
+  data.tar.gz: e571834e78308e058423af5db92ae37e997da274
 SHA512:
-  metadata.gz: c74ad18923895451d82745f346f7949ed2bd304caf108da02f11690894fffc629e63f871ba57192cfb596a113e42cb394f8cbbac534f43392b29f1e8a423ad75
-  data.tar.gz: c8fccf7f16e2d5dffeaf4f4f6cf7cf5b8e76166d483cf9a0ed2add7a860ef697684886c3c6d5412bdbeb5cd12541da7bf4f790298e56dee77a38c3c0e2cd2ed5
+  metadata.gz: 423b879d5094d09cdf941aafb1dc618bf8942fdda011d51830b8a5a66e9436fdf69a7ef3e25b29adcb9e8829f447cda4e3b466c4b2be8cb50ae575d586e96b6b
+  data.tar.gz: 3a2417498b9518c14538970e0cbe2d6f78f3b3a75882b665e2910ebcb0b1cc6fda31974371e64d8a128897ebb82394853cfc0b30dabf278d5388ceeebf6646c4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/tasks/check_changelog.rake

@@ -0,0 +1,46 @@
+#--
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+#   This library is free software; you can redistribute it and/or modify
+# it only under the terms of version 2.1 of the GNU Lesser General Public
+# License as published by the Free Software Foundation.
+#
+#   This library 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 Lesser General Public License for more
+# details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#++
+
+require 'rake'
+
+namespace "check" do
+  desc "Checking for new IDs (bugzilla,fate,...)  in *.changes file"
+  task :changelog do
+    begin
+      checkout
+      copy_sources
+
+      puts "Checking IDs in *.changes file" if verbose
+      # Checking makes only sense if the version in the *.spec file has been changed
+      if version_changed?( "#{osc_checkout_dir}/#{package_name}.spec" )
+        Dir.chdir(osc_checkout_dir) do
+          # Tags described in https://github.com/openSUSE/osc-plugin-factory/blob/e12bc02e9817277335ce6adaa8e8d334d03fcc5d/check_tags_in_requests.py#L63
+          cmd = "osc -A '#{obs_api}' diff *.changes"
+          puts cmd if verbose
+          ret = `bash -c '#{cmd}'`
+          unless ret.match(/(bnc|fate|boo|bsc|bgo)#[0-9]+/i) || ret.match(/cve-[0-9]{4}-[0-9]+/i)
+            raise "Stopping, missing new bugzilla or fate entry in the *.changes file.\n"\
+              "e.g. bnc#<number>, fate#<number>, boo#<number>, bsc#<number>, bgo#<number>, cve-<number>"
+          end
+        end
+      else
+        puts "=> do not check for IDs in *.changes file"
+      end
+    ensure
+      cleaning
+    end
+  end
+end

data/lib/tasks/osc.rake

@@ -74,6 +74,26 @@ namespace :osc do
     end
   end
 
+  def version_changed? updated_spec_file
+    begin
+      file = Tempfile.new('yast-rake')
+      file.close
+      sh "osc -A '#{obs_api}' cat '#{obs_sr_project}' '#{package_name}' '#{package_name}.spec' > #{file.path}"
+      original_version = version_from_spec(file.path)
+      new_version      = version_from_spec(updated_spec_file)
+
+      if new_version == original_version
+        puts "Version has not been changed in *.spec file" if verbose
+        return false
+      else
+        puts "Version has been changed in *.spec file" if verbose
+        return true
+      end
+    ensure
+      file.unlink if file
+    end
+  end
+
   def version_from_spec spec_glob
     version = `grep '^Version:' #{spec_glob}`
     version.sub!(/^Version:\s*/, "")
@@ -189,21 +209,13 @@ namespace :osc do
   task :sr => "osc:commit" do
     begin
       checkout
-
-      file = Tempfile.new('yast-rake')
-      file.close
-      sh "osc -A '#{obs_api}' cat '#{obs_sr_project}' '#{package_name}' '#{package_name}.spec' > #{file.path}"
-      original_version = version_from_spec(file.path)
-      new_version      = version_from_spec("#{package_dir}/#{package_name}.spec")
-
-      if new_version == original_version
-        puts "No version change => no submit request" if verbose
+      unless version_changed?( "#{package_dir}/#{package_name}.spec" )
+        puts "=> no submit request" if verbose
       else
         Rake::Task["osc:sr:force"].execute
       end
     ensure
       cleaning
-      file.unlink if file
     end
   end
 

data/lib/tasks/package.rake

@@ -20,5 +20,5 @@ require 'rake'
 
 desc 'Prepare sources for rpm build'
 # just call the checks and then build the package
-task :package => ["check:syntax", "check:committed", :test, :tarball]
+task :package => ["check:syntax", "check:committed", "check:changelog", :test, :tarball]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,6 +36,7 @@ files:
 - lib/packaging.rb
 - lib/packaging/configuration.rb
 - lib/packaging/tasks.rb
+- lib/tasks/check_changelog.rake
 - lib/tasks/check_committed.rake
 - lib/tasks/check_license.rake
 - lib/tasks/check_osc.rake
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with