Hello community,
here is the log from the commit of package nodejs-packaging for
openSUSE:Factory checked in at 2016-03-31 13:03:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-packaging (Old)
and /work/SRC/openSUSE:Factory/.nodejs-packaging.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-packaging"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-packaging/nodejs-packaging.changes
2016-03-07 13:24:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.nodejs-packaging.new/nodejs-packaging.changes
2016-03-31 13:03:13.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 29 14:24:56 UTC 2016 - i...@marguerite.su
+
+- update version v10.beta10
+ * sometimes bower.json doesn't have dependencies tag
+ * fix encodings for nodejs-check.rb
+ * add --drop option to nodejs-fixdep.rb to drop dependency
+
+-------------------------------------------------------------------
Old:
----
nodejs-packaging-10.beta9.tar.gz
New:
----
nodejs-packaging-10.beta10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-packaging.spec ++++++
--- /var/tmp/diff_new_pack.TwaD6A/_old 2016-03-31 13:03:13.000000000 +0200
+++ /var/tmp/diff_new_pack.TwaD6A/_new 2016-03-31 13:03:13.000000000 +0200
@@ -18,7 +18,7 @@
%define _rpmconfigdir %{_prefix}/lib/rpm
Name: nodejs-packaging
-Version: 10.beta9
+Version: 10.beta10
Release: 0
Summary: Node.js Dependency generators for openSUSE
License: MIT
++++++ nodejs-packaging-10.beta9.tar.gz -> nodejs-packaging-10.beta10.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nodejs-packaging-10.beta9/TODO
new/nodejs-packaging-10.beta10/TODO
--- old/nodejs-packaging-10.beta9/TODO 2016-03-01 11:42:59.000000000 +0100
+++ new/nodejs-packaging-10.beta10/TODO 2016-03-28 11:45:24.000000000 +0200
@@ -2,3 +2,4 @@
+ nodejs.prov and nodejs.req. npkg don't need to
* support grunt auto tasks
* support node-nsp security check
+* support bower() in nodejs.prov
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nodejs-packaging-10.beta9/nodejs-check.rb
new/nodejs-packaging-10.beta10/nodejs-check.rb
--- old/nodejs-packaging-10.beta9/nodejs-check.rb 2016-03-01
11:42:59.000000000 +0100
+++ new/nodejs-packaging-10.beta10/nodejs-check.rb 2016-03-28
11:45:24.000000000 +0200
@@ -12,7 +12,7 @@
unless mod.nil?
Dir.glob(buildroot + sitelib + "/**/package.json") do |f|
- open(f) do |file|
+ open(f,"r:UTF-8") do |file|
json = JSON.parse(file.read)
unless json["dependencies"].nil?
puts f if json["dependencies"].include?(mod)
@@ -24,7 +24,7 @@
# check left-over bower.json dependencies
Dir.glob(buildroot + sitelib + "/**/*") do |f|
if f.end_with?("bower.json")
- open(f) do |file|
+ open(f,"r:UTF-8") do |file|
json = JSON.parse(file.read)
unless json["dependencies"].nil? || json["dependencies"].empty?
puts f.gsub(/^.*node_modules\//,'').gsub(/\/bower\.json/,'') + " has
dependencies in bower.json, please do something"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nodejs-packaging-10.beta9/nodejs-fixdep.rb
new/nodejs-packaging-10.beta10/nodejs-fixdep.rb
--- old/nodejs-packaging-10.beta9/nodejs-fixdep.rb 2016-03-01
11:42:59.000000000 +0100
+++ new/nodejs-packaging-10.beta10/nodejs-fixdep.rb 2016-03-28
11:45:24.000000000 +0200
@@ -14,19 +14,35 @@
files << f
end
-pkgname = ARGV[0]
-dep = ARGV[1]
+if ARGV[0] == "--drop"
+ pkgname = ARGV[1]
+ dep = nil
+else
+ pkgname = ARGV[0]
+ dep = ARGV[1]
+end
pkgjson = ""
json = {}
files.each do |f|
+ if ARGV[0] == "--drop"
+ # sometime the module needs to drop wasn't copyed to buildroot at all
+ File.open(f,'r:UTF-8') {|f| json = JSON.parse(f.read)}
+ unless json["dependencies"].nil?
+ unless json["dependencies"].keys.index(pkgname).nil?
+ json["dependencies"].delete_if {|i| i == pkgname}
+ File.open(f,'w:UTF-8') {|f1| f1.write JSON.pretty_generate(json) }
+ end
+ end
+ else
if f.index(pkgname + "/package.json")
# get its parent
pkgjson = f.gsub('node_modules/' + pkgname + '/package.json','') +
"package.json"
if File.exist? pkgjson
- File.open(pkgjson,'r:UTF-8') {|f| json = JSON.parse(f.read)}
+ File.open(pkgjson,'r:UTF-8') {|f1| json = JSON.parse(f1.read)}
json["dependencies"][pkgname] = dep
- File.open(pkgjson,'w:UTF-8') {|f| f.write JSON.pretty_generate(json) }
+ File.open(pkgjson,'w:UTF-8') {|f2| f2.write
JSON.pretty_generate(json) }
end
end
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nodejs-packaging-10.beta9/tool/plugins/bower.rb
new/nodejs-packaging-10.beta10/tool/plugins/bower.rb
--- old/nodejs-packaging-10.beta9/tool/plugins/bower.rb 2016-03-01
11:42:59.000000000 +0100
+++ new/nodejs-packaging-10.beta10/tool/plugins/bower.rb 2016-03-28
11:45:24.000000000 +0200
@@ -34,7 +34,8 @@
json = dependency(name)
jsonnew = {}
- json.each do |k,v|
+ unless json.nil? || json.empty?
+ json.each do |k,v|
url,j,version = "",{},""
file =
Download.get("http://bower.herokuapp.com/packages/"; + k)
if File.exist?(file)
@@ -84,6 +85,7 @@
end
jsonnew[k] = url
+ end
end
return jsonnew
@@ -93,7 +95,9 @@
def install(name="")
json = lookup(name)
- json.each do |k,v|
+
+ unless json.nil? || json.empty?
+ json.each do |k,v|
io = IO.popen("mkdir -p bower_components/#{k}")
io.close
io1 = IO.popen("wget #{v}")
@@ -102,6 +106,7 @@
if File.exist? tarball
FileUtils.mv tarball,"bower_components/#{k}/"
end
+ end
end
if File.exist? "bower_components"
