Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (807475a84e18a6bb5f7ab0316bb7ed69c4e0dd41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (807475a84e18a6bb5f7ab0316bb7ed69c4e0dd41)
  • Date: Thu, 3 Dec 2015 13:19:19 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 4 ++++
ruby-raa/ruby-json/BUILD | 1 +
ruby-raa/ruby-json/CONFLICTS | 1 +
ruby-raa/ruby-json/DEPENDS | 5 +++++
ruby-raa/ruby-json/DETAILS | 15 +++++++++++++++
ruby-raa/ruby-json/HISTORY | 3 +++
ruby-raa/ruby-json/INSTALL | 1 +
ruby-raa/rubygem-json/DETAILS | 6 +++---
ruby-raa/rubygem-json/HISTORY | 4 ++++
ruby-raa/rubygem-json/INSTALL | 2 +-
ruby-raa/rubygem-json/PRE_BUILD | 2 +-
ruby-raa/rubygem-json/UP_TRIGGERS | 2 ++
utils/puppet/DEPENDS | 5 +++--
utils/puppet/HISTORY | 3 +++
14 files changed, 47 insertions(+), 7 deletions(-)

New commits:
commit 807475a84e18a6bb5f7ab0316bb7ed69c4e0dd41
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

puppet: rubygem-json -> ruby-json

commit 86aee6f304a1fc0b7d0f235776a4c4d5974ecaa7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rubygem-json: deprecate the spell in favour of ruby-json

commit d0073555cb96208917f1776b0f80129096f3a093
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-json: new spell, Ruby extension for JSON

diff --git a/ChangeLog b/ChangeLog
index 00ee46d..c7692e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * ruby-raa/ruby-json: new spell, Ruby extension for JSON
+ * ruby-raa/rubygem-json: deprecate the spell in favour of ruby-json
+
2015-11-25 Vlad Glagolev <stealth AT sourcemage.org>
* accounts, groups: added account data for upcoming varnish spell
* http/varnish: new spell, high-performance HTTP accelerator
diff --git a/ruby-raa/ruby-json/BUILD b/ruby-raa/ruby-json/BUILD
new file mode 100755
index 0000000..0925c18
--- /dev/null
+++ b/ruby-raa/ruby-json/BUILD
@@ -0,0 +1 @@
+rake compile
diff --git a/ruby-raa/ruby-json/CONFLICTS b/ruby-raa/ruby-json/CONFLICTS
new file mode 100755
index 0000000..601833e
--- /dev/null
+++ b/ruby-raa/ruby-json/CONFLICTS
@@ -0,0 +1 @@
+conflicts rubygem-json y
diff --git a/ruby-raa/ruby-json/DEPENDS b/ruby-raa/ruby-json/DEPENDS
new file mode 100755
index 0000000..71e54fe
--- /dev/null
+++ b/ruby-raa/ruby-json/DEPENDS
@@ -0,0 +1,5 @@
+depends RUBY &&
+
+if [[ $(get_spell_provider $SPELL RUBY) == "ruby-1.8" ]]; then
+ depends rake
+fi
diff --git a/ruby-raa/ruby-json/DETAILS b/ruby-raa/ruby-json/DETAILS
new file mode 100755
index 0000000..109ed5d
--- /dev/null
+++ b/ruby-raa/ruby-json/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=ruby-json
+ SPELLX=${SPELL/ruby-/}
+ VERSION=1.8.3
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=https://github.com/flori/json/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:147ce1834a1a0f02596386969c6e95c14237cc4d5303be974b9293d349d61a074cf9cc99d2f6bc434aa6da8aac9ddc35cfdeb7b9f77b14c112f8be70ff0846f7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=http://flori.github.io/json/
+ ENTERED=20151203
+ LICENSE[0]=RUBY
+ KEYWORDS="ruby devel"
+ SHORT="Ruby extension for JSON"
+cat << EOF
+This is a JSON implementation as a Ruby extension in C.
+EOF
diff --git a/ruby-raa/ruby-json/HISTORY b/ruby-raa/ruby-json/HISTORY
new file mode 100644
index 0000000..8058842
--- /dev/null
+++ b/ruby-raa/ruby-json/HISTORY
@@ -0,0 +1,3 @@
+2015-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, CONFLICTS: created spell, version
+ 1.8.3
diff --git a/ruby-raa/ruby-json/INSTALL b/ruby-raa/ruby-json/INSTALL
new file mode 100755
index 0000000..eb28b89
--- /dev/null
+++ b/ruby-raa/ruby-json/INSTALL
@@ -0,0 +1 @@
+rake install
diff --git a/ruby-raa/rubygem-json/DETAILS b/ruby-raa/rubygem-json/DETAILS
index 8b78bfd..a86334e 100755
--- a/ruby-raa/rubygem-json/DETAILS
+++ b/ruby-raa/rubygem-json/DETAILS
@@ -1,9 +1,9 @@
SPELL=rubygem-json
VERSION=1.8.2
-
SOURCE_HASH=sha512:5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1
- SOURCE=json-$VERSION.gem
- SOURCE_URL[0]="https://rubygems.org/downloads/json-1.8.2.gem";
+ PATCHLEVEL=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ ARCHIVE=off
+ GATHER_DOCS=off
WEB_SITE="https://rubygems.org/gems/json";
ENTERED=20150224
LICENSE[0]=RUBY
diff --git a/ruby-raa/rubygem-json/HISTORY b/ruby-raa/rubygem-json/HISTORY
index e528d52..52c3bff 100644
--- a/ruby-raa/rubygem-json/HISTORY
+++ b/ruby-raa/rubygem-json/HISTORY
@@ -1,3 +1,7 @@
+2015-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, INSTALL: deprecate the spell in favour of
+ ruby-json
+
2015-02-24 Eric Sandall <sandalle AT sourcemage.org>
* Created

diff --git a/ruby-raa/rubygem-json/INSTALL b/ruby-raa/rubygem-json/INSTALL
index 2bc652e..27ba77d 100755
--- a/ruby-raa/rubygem-json/INSTALL
+++ b/ruby-raa/rubygem-json/INSTALL
@@ -1 +1 @@
-gem install "${SOURCE_CACHE}/${SOURCE}"
+true
diff --git a/ruby-raa/rubygem-json/PRE_BUILD b/ruby-raa/rubygem-json/PRE_BUILD
index 2443474..27ba77d 100755
--- a/ruby-raa/rubygem-json/PRE_BUILD
+++ b/ruby-raa/rubygem-json/PRE_BUILD
@@ -1 +1 @@
-verify_source ''
+true
diff --git a/ruby-raa/rubygem-json/UP_TRIGGERS
b/ruby-raa/rubygem-json/UP_TRIGGERS
new file mode 100755
index 0000000..68ac8bc
--- /dev/null
+++ b/ruby-raa/rubygem-json/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger rubygem-json dispel_self &&
+up_trigger ruby-json cast_self
diff --git a/utils/puppet/DEPENDS b/utils/puppet/DEPENDS
index 0ed0686..f8ab302 100755
--- a/utils/puppet/DEPENDS
+++ b/utils/puppet/DEPENDS
@@ -1,7 +1,8 @@
+depends RUBY &&
depends facter &&
depends hiera &&
-depends RUBY &&
-runtime_depends rubygem-json &&
+
+runtime_depends ruby-json &&

suggest_depends shadow "" "" "for shadow file support" &&
suggest_depends augeas "" "" "for automated editing of configuration files"
&&
diff --git a/utils/puppet/HISTORY b/utils/puppet/HISTORY
index cbd44f9..25a0c31 100644
--- a/utils/puppet/HISTORY
+++ b/utils/puppet/HISTORY
@@ -1,3 +1,6 @@
+2015-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: rubygem-json -> ruby-json
+
2015-02-24 Eric Sandall <sandalle AT sourcemage.org>
* puppet-3.7.3.tar.gz.sig: Fixed to match renamed tarball
* init.d/puppet-master: Add init script for puppet master



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (807475a84e18a6bb5f7ab0316bb7ed69c4e0dd41), Vlad Glagolev, 12/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page