Hello community,

here is the log from the commit of package rubygem-packaging_rake_tasks for 
openSUSE:Factory checked in at 2015-10-03 20:28:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-packaging_rake_tasks (Old)
 and      /work/SRC/openSUSE:Factory/.rubygem-packaging_rake_tasks.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rubygem-packaging_rake_tasks"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/rubygem-packaging_rake_tasks/rubygem-packaging_rake_tasks.changes
        2014-10-20 07:26:45.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.rubygem-packaging_rake_tasks.new/rubygem-packaging_rake_tasks.changes
   2015-10-03 20:29:24.000000000 +0200
@@ -2 +2 @@
-Mon Oct 13 14:28:25 UTC 2014 - co...@suse.com
+Thu May 14 14:28:25 UTC 2015 - co...@suse.com
@@ -4,0 +5,18 @@
+
+-------------------------------------------------------------------
+Thu May 14 12:06:01 UTC 2015 - jreidin...@suse.com
+
+- Do not crash if tarball have different name in devel project
+- 1.1.3
+
+-------------------------------------------------------------------
+Tue Apr 28 15:51:40 UTC 2015 - jreidin...@suse.com
+
+- stop osc commit if there is no change
+- 1.1.2
+
+-------------------------------------------------------------------
+Thu Nov 13 16:22:40 UTC 2014 - lsle...@suse.cz
+
+- additionally report warnings in the "check:syntax" task
+- 1.1.1

Old:
----
  packaging_rake_tasks-1.1.0.gem

New:
----
  packaging_rake_tasks-1.1.3.gem

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rubygem-packaging_rake_tasks.spec ++++++
--- /var/tmp/diff_new_pack.lzcq0f/_old  2015-10-03 20:29:24.000000000 +0200
+++ /var/tmp/diff_new_pack.lzcq0f/_new  2015-10-03 20:29:24.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rubygem-packaging_rake_tasks
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           rubygem-packaging_rake_tasks
-Version:        1.1.0
+Version:        1.1.3
 Release:        0
 %define mod_name packaging_rake_tasks
 %define mod_full_name %{mod_name}-%{version}

++++++ packaging_rake_tasks-1.1.0.gem -> packaging_rake_tasks-1.1.3.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/VERSION new/VERSION
--- old/VERSION 1970-01-01 01:00:00.000000000 +0100
+++ new/VERSION 2015-05-06 10:39:43.000000000 +0200
@@ -1 +1 @@
-1.1.0
+1.1.3
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/tasks/check_syntax.rake 
new/lib/tasks/check_syntax.rake
--- old/lib/tasks/check_syntax.rake     1970-01-01 01:00:00.000000000 +0100
+++ new/lib/tasks/check_syntax.rake     2015-05-06 10:39:43.000000000 +0200
@@ -33,7 +33,7 @@
         raise
       end
 
-      res = `ruby -c #{file}`
+      res = `ruby -c -w #{file}`
       puts "#{file}: #{res}" if verbose
       raise "Syntax error found in file '#{file}'" unless $?.exitstatus.zero?
     end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/tasks/osc.rake new/lib/tasks/osc.rake
--- old/lib/tasks/osc.rake      1970-01-01 01:00:00.000000000 +0100
+++ new/lib/tasks/osc.rake      2015-05-06 10:39:43.000000000 +0200
@@ -18,6 +18,7 @@
 
 require 'rake'
 require "tempfile"
+require "tmpdir"
 
 namespace :osc do
 
@@ -68,7 +69,7 @@
       cp f, osc_checkout_dir
     end
 
-    Dir.chdir(osc_checkout_dir) do 
+    Dir.chdir(osc_checkout_dir) do
       sh "osc -A '#{obs_api}' addremove"
     end
   end
@@ -81,6 +82,43 @@
     version
   end
 
+  def different_tarballs?(source1, source2)
+    return true if !File.exist?(source1) || !File.exist?(source2)
+
+    Dir.mktmpdir("unpacked_tarball") do |d1|
+      sh "tar xvf #{source1} -C #{d1}"
+
+      Dir.mktmpdir("unpacked_tarball") do |d2|
+        sh "tar xvf #{source2} -C #{d2}"
+
+        res = `diff -ur #{d1} #{d2}`
+        puts res if verbose
+
+        return !$?.success?
+      end
+    end
+  end
+
+  def check_changes!
+    # run spec file service to ensure that just formatting changes is not 
detected
+    Dir.chdir(package_dir) { sh "/usr/lib/obs/service/format_spec_file 
--outdir ." }
+    Dir["#{package_dir}/*"].each do |f|
+      orig = f.sub(/#{package_dir}\//, "")
+      if orig =~ /\.(tar|tbz2|tgz|tlz)/ # tar archive, so ignore archive 
creation time otherwise it always looks like new one
+        return if different_tarballs?(f, File.join(osc_checkout_dir, orig))
+      else
+        cmd = "diff -u #{f} #{osc_checkout_dir}/#{orig}"
+        puts cmd if verbose
+        puts `bash -c '#{cmd}'`
+
+        return unless $?.success? # there is something new
+      end
+    end
+
+    puts "Stop commiting, no difference from devel project"
+    exit 0
+  end
+
   desc "Build package locally"
   task :build, [:osc_options] => ["check:osc", "package"] do |t, args|
     args.with_defaults = { :osc_options => "" }
@@ -119,6 +157,8 @@
   task :commit => "osc:build" do
     begin
       checkout
+      # check that there is some changes, otherwise it exit
+      check_changes!
       copy_sources
 
       Dir.chdir osc_checkout_dir do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata        1970-01-01 01:00:00.000000000 +0100
+++ new/metadata        2015-05-14 14:32:04.000000000 +0200
@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: Rake tasks to allow easy packaging ruby projects in git for Build 
Service
@@ -31,18 +31,18 @@
 extensions: []
 extra_rdoc_files: []
 files:
+- COPYING
+- VERSION
+- lib/packaging.rb
 - lib/packaging/configuration.rb
 - lib/packaging/tasks.rb
-- lib/packaging.rb
-- lib/tasks/package.rake
-- lib/tasks/check_syntax.rake
-- lib/tasks/check_osc.rake
-- lib/tasks/tarball.rake
 - lib/tasks/check_committed.rake
-- lib/tasks/osc.rake
 - lib/tasks/check_license.rake
-- COPYING
-- VERSION
+- lib/tasks/check_osc.rake
+- lib/tasks/check_syntax.rake
+- lib/tasks/osc.rake
+- lib/tasks/package.rake
+- lib/tasks/tarball.rake
 homepage: http://github.org/openSUSE/packaging_tasks
 licenses:
 - LGPL v2.1
@@ -53,17 +53,17 @@
 - 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration 
with


Reply via email to