diff --git a/.gitignore b/.gitignore index e69de29..344b005 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/underscore.logger-0.3.1.tgz diff --git a/nodejs-underscore-dot-logger-0.3.1-Add-devDependencies.patch b/nodejs-underscore-dot-logger-0.3.1-Add-devDependencies.patch new file mode 100644 index 0000000..145f661 --- /dev/null +++ b/nodejs-underscore-dot-logger-0.3.1-Add-devDependencies.patch @@ -0,0 +1,27 @@ +From 8d102c0e96aea149138ad7cb01e07ad013ea016a Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 12 Jul 2013 09:34:42 +0100 +Subject: [PATCH] Add devDependencies to package.json + +--- + package.json | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/package.json b/package.json +index e18da43..79fa755 100644 +--- a/package.json ++++ b/package.json +@@ -25,5 +25,10 @@ + }, + "directories": { + "test": "spec" ++ }, ++ "devDependencies": { ++ "coffee-script": "*", ++ "jasmine-node": "*", ++ "underscore": "1.x" + } + } +-- +1.8.3.1 + diff --git a/nodejs-underscore-dot-logger-0.3.1-Do-not-watch.patch b/nodejs-underscore-dot-logger-0.3.1-Do-not-watch.patch new file mode 100644 index 0000000..c6cfbea --- /dev/null +++ b/nodejs-underscore-dot-logger-0.3.1-Do-not-watch.patch @@ -0,0 +1,25 @@ +From 864bb283098391e70f89ba83a11ad7a7cb83c69c Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 12 Jul 2013 10:18:11 +0100 +Subject: [PATCH] Don't use --watch option when running 'cake coffee' + +--- + Cakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cakefile b/Cakefile +index 5d1fee9..a5dc9e0 100644 +--- a/Cakefile ++++ b/Cakefile +@@ -3,7 +3,7 @@ fs = require 'fs' + sys = require 'util' + + task 'coffee', -> +- coffee = spawn './node_modules/coffee-script/bin/coffee', ['-o', 'lib', '-w', 'src'] ++ coffee = spawn './node_modules/coffee-script/bin/coffee', ['-o', 'lib', 'src'] + coffee.stdout.on 'data', (data) -> console.log data.toString().trim() + + task 'spec', 'Run jasmine specs', -> +-- +1.8.3.1 + diff --git a/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance-part-2.patch b/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance-part-2.patch new file mode 100644 index 0000000..7aeb344 --- /dev/null +++ b/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance-part-2.patch @@ -0,0 +1,28 @@ +From 80deb27c46e1b0dd3011e3cad048f989cf65b72b Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 12 Jul 2013 10:43:27 +0100 +Subject: [PATCH] Fix hexadecimal string to actually be hexadecimal + +--- + src/underscore.logger.coffee | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/underscore.logger.coffee b/src/underscore.logger.coffee +index a727b68..935c5c4 100644 +--- a/src/underscore.logger.coffee ++++ b/src/underscore.logger.coffee +@@ -50,9 +50,9 @@ class Logger + result = "" + i = 0 + while color = colors[i] +- result += "\x33[#{color}m" ++ result += "\x1B[#{color}m" + i++ +- result += "#{string}\x33[#{Logger.ANSI.OFF}m" ++ result += "#{string}\x1B[#{Logger.ANSI.OFF}m" + result + + format: (date, level, message) -> +-- +1.8.3.1 + diff --git a/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance.patch b/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance.patch new file mode 100644 index 0000000..fe49d91 --- /dev/null +++ b/nodejs-underscore-dot-logger-0.3.1-strict-JS-compliance.patch @@ -0,0 +1,28 @@ +From ac2c73acdcaedcad4d88b180de3cac16ed95f257 Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 12 Jul 2013 10:04:47 +0100 +Subject: [PATCH] Recent coffee-script enforces strict JS compliance + +--- + src/underscore.logger.coffee | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/underscore.logger.coffee b/src/underscore.logger.coffee +index 8e77371..a727b68 100644 +--- a/src/underscore.logger.coffee ++++ b/src/underscore.logger.coffee +@@ -50,9 +50,9 @@ class Logger + result = "" + i = 0 + while color = colors[i] +- result += "\033[#{color}m" ++ result += "\x33[#{color}m" + i++ +- result += "#{string}\033[#{Logger.ANSI.OFF}m" ++ result += "#{string}\x33[#{Logger.ANSI.OFF}m" + result + + format: (date, level, message) -> +-- +1.8.3.1 + diff --git a/nodejs-underscore-dot-logger.spec b/nodejs-underscore-dot-logger.spec new file mode 100644 index 0000000..615b4a2 --- /dev/null +++ b/nodejs-underscore-dot-logger.spec @@ -0,0 +1,97 @@ +%{?nodejs_find_provides_and_requires} + +%global enable_tests 1 + +Name: nodejs-underscore-dot-logger +Version: 0.3.1 +Release: 5%{?dist} +Summary: Cross-browser and Node.js empowered logging +# License text is included in README.md +License: MIT +Group: System Environment/Libraries +URL: https://npmjs.org/package/underscore.logger +Source0: http://registry.npmjs.org/underscore.logger/-/underscore.logger-%{version}.tgz + +# package.json is missing devDependencies section. +# Pull request sent: https://github.com/viatropos/underscore.logger/pull/3 +Patch0: %{name}-0.3.1-Add-devDependencies.patch +# Recent versions of coffee-script enforce strict JS compliance. +# Pull request sent: https://github.com/viatropos/underscore.logger/pull/4 +Patch1: %{name}-0.3.1-strict-JS-compliance.patch +Patch2: %{name}-0.3.1-strict-JS-compliance-part-2.patch +# The author uses the "--watch" option in Cakefile, which obviously hangs the +# build. +Patch3: %{name}-0.3.1-Do-not-watch.patch + +BuildArch: noarch +%if 0%{?fedora} >= 19 +ExclusiveArch: %{nodejs_arches} noarch +%else +ExclusiveArch: %{ix86} x86_64 %{arm} noarch +%endif + +BuildRequires: nodejs-packaging +BuildRequires: coffee-script + +%if 0%{?enable_tests} +BuildRequires: npm(jasmine-node) +BuildRequires: npm(underscore) +%endif + +%description +%{summary}. + + +%prep +%setup -q -n package +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +# Compile from .coffee source instead. +rm -rf lib/*.js + + +%build +%nodejs_symlink_deps --check +/usr/bin/cake coffee + + +%install +mkdir -p %{buildroot}%{nodejs_sitelib}/underscore.logger +cp -pr package.json lib/ \ + %{buildroot}%{nodejs_sitelib}/underscore.logger + +%nodejs_symlink_deps + + +%if 0%{?enable_tests} +%check +/usr/bin/cake spec +%endif + + +%files +%doc README.md +%{nodejs_sitelib}/underscore.logger + + +%changelog +* Fri Jul 12 2013 Jamie Nguyen - 0.3.1-5 +- fix rm -rf command in %%prep + +* Fri Jul 12 2013 Jamie Nguyen - 0.3.1-4 +- fix patch for JS compliance +- fix BR + +* Fri Jul 12 2013 Jamie Nguyen - 0.3.1-3 +- rename to nodejs-underscore-dot-logger +- add patch for missing devDependencies +- add patch for newer coffee-script version JS compliance requirements +- add patch for building using the Cakefile + +* Sun Feb 17 2013 Jamie Nguyen - 0.3.1-2 +- add coffee-script to BuildRequires + +* Wed Feb 13 2013 Jamie Nguyen - 0.3.1-1 +- initial package diff --git a/sources b/sources index e69de29..957c270 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a9e91ac1b200aa93d76ba3e141757cdf underscore.logger-0.3.1.tgz