packaging_rake_tasks 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2720c7b02ce51ba6de5843ff0aa418ea73a1c60b
-  data.tar.gz: dbb09cb7c3d24afa892a491604240b07a67e3e87
+  metadata.gz: f21352aecaca7fcf53c1d5b606f1e745e59ed1e3
+  data.tar.gz: 7d548772d712cff1f02c6100dd6bb44b993997ea
 SHA512:
-  metadata.gz: 76e78d31e447f145ca3ff789f2ee7c97f0f2baec10c123d964425987e00cf62e3b33febd0b534f539c57f1b8fab4e18445bc7646f4b0a08e2347a7e57ddc69f5
-  data.tar.gz: 359ddd0f6dc08a092c6ba0678fff25bf2509f6b39126c3e5b3c7ade704df44ab9c5b7e8860b7e2fedd2f4a306c4a3e5e7756a721901486c86dfd0397a771bc37
+  metadata.gz: 6b9b804876a8733a867b93ce29f973f071d9cd494a6a07219fc345afcd6ea793989c1d698d477bc95674fd339343571e576e0745b27c768928af1bd5c8e53abf
+  data.tar.gz: 5daf1375ba0c6ec2f38537881fb60b337fb08906aeaf9229ffeccee3f3f2a6dad94f862e4028edd876755e0b8582dfff21d4dc911bfab8c81536075aab6d09f2

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.2

data/lib/tasks/check_syntax.rake

@@ -33,7 +33,7 @@ namespace :check do
         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

data/lib/tasks/osc.rake

@@ -18,6 +18,7 @@
 
 require 'rake'
 require "tempfile"
+require "tmpdir"
 
 namespace :osc do
 
@@ -68,7 +69,7 @@ namespace :osc do
       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,41 @@ namespace :osc do
     version
   end
 
+  def different_tarballs?(source1, 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 +155,8 @@ namespace :osc do
   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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-05-06 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 @@ executables: []
 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 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with