packaging_rake_tasks 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4946a93e20bfcd9ac3589cfab1e1ed5b068877b
-  data.tar.gz: 103987b00d03666aa2dcf173480d5c28bcc18425
+  metadata.gz: 6a6c2f335bedf85cca66fadb1412b1573c61b2a8
+  data.tar.gz: ec31791f04fbc8811acf023de7b21faae6857049
 SHA512:
-  metadata.gz: 38a1a7bd43d230bb661877247650b140c8fbaf93fe875092bcea286847b8e0b0ef72e2bcdd69a33fd19d76349eff878d60e749a3612bf1ce16e49c8f5e4fec75
-  data.tar.gz: d9dde8cf9bdeabcc34bca1019db99ae3086a125bb73ca2a1061cebca6d6c6e8565b8dbee4948daa6e399ac78716a6fad9ab89f4a5ff0c08f1380ecc409aff1f2
+  metadata.gz: 088613d225ff99c913058e471931fa0daab456f3c3916d8e0d92dfad33dc44c64143718fe16f65ccaaa20a581c3353a4e1d5fa87cded244a0440622685bebe7b
+  data.tar.gz: c5d0825bb4fb74382b68dffa8ca25d0860de8c15fcb55fca0eb23c7a72c7654798c322281724092695017505104bab7c5e7393e4299e71ee2de25d6d75416f6b

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/tasks/check_changelog.rake

@@ -18,9 +18,10 @@ require 'rake'
 
 namespace "check" do
   desc "Checking for new IDs (bugzilla,fate,...) in *.changes file"
-  task :changelog do
+  task :changelog => :package do
     if obs_sr_project.nil?
-      $stderr.puts "Skipping the changelog check because OBS submit request project "\
+      $stderr.puts "Skipping the changelog check because " \
+        "OBS submit request project " \
         "is not defined (obs_sr_project)." if verbose
       next
     end
@@ -29,17 +30,22 @@ namespace "check" do
       copy_sources
 
       puts "Checking IDs in *.changes file" if verbose
-      # Checking makes only sense if the version in the *.spec file has been changed
+      # 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}' cat '#{obs_sr_project}' '#{package_name}' "\
-            "'#{package_name}.changes' | diff - '#{package_name}.changes'"
+          cmd = "osc -A '#{obs_api}' cat " \
+            " '#{obs_sr_project}' '#{package_name}' '#{package_name}.changes' "\
+            "| diff - '#{package_name}.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>"
+          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

data/lib/tasks/osc.rake

@@ -206,7 +206,7 @@ namespace :osc do
   end
 
   desc "Create submit request from updated devel project to target project if version change."
-  task :sr => "osc:commit" do
+  task :sr => ["check:changelog", "osc:commit"] do
     begin
       checkout
       unless version_changed?( "#{package_dir}/#{package_name}.spec" )

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", "check:changelog", :test, :tarball]
+task :package => ["check:syntax", "check:committed", :test, :tarball]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with