- updated dist.ini

canonic-epicure · Nov 1, 2010 · dd4f510 · dd4f510
1 parent a798702
commit dd4f510
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 39 deletions.
diff --git a/dist.ini b/dist.ini
@@ -2,55 +2,79 @@ name                = KiokuJS
 abstract            = Persistent layer for Joose, mostly targeting NoSQL backends
 
 author              = Nickolay Platonov <nplatonov@cpan.org>
-
 license             = LGPL_3_0
-copyright_holder    = Nickolay Platonov <nplatonov@cpan.org>
-
-version             = 0.01
+copyright_holder    = Nickolay Platonov
 
+;=========================================================================
 ; version provider
-;[BumpVersionFromGit]
 
+[Git::NextVersion]
+first_version   = 0.0.1
+
+
+;=========================================================================
+; include the link to git repo and web page
+
+[GithubMeta]
 
+
+;=========================================================================
 ; choose/generate files to include
 
 [GatherDir]
 [PruneCruft]
-[ManifestSkip]
 [License]
 
-; build system
-
-[ExecDir]
-[ShareDir]
-
 
+;=========================================================================
 ; JSAN-specific configuration
-[JSAN]							; includes META.JSON generation
+
+[JSAN]                          ; generate docs
 docs_markup         = mmd       ; default
+
+[JSAN::StaticDir]
 static_dir          = static    ; default
 
-[JSAN::ReadmeFromMD]			; should be after docs generation
-[JSAN::InstallInstructions]     
+[JSAN::PkgVersion]
 
-[JSAN::Bundle]					; after docs generation to avoid docs for bundles
+[JSAN::ReadmeFromMD]            ; should be after docs generation
+[JSAN::InstallInstructions]     ; add INSTALL file, describing the installation process
+[JSAN::Bundle]                  ; after docs generation to avoid docs for bundles
 
-; manifest (after all generated files)
-[Manifest]
 
+;=========================================================================
+; `npm` configuration - package.json generation
 
+[JSAN::NPM]
+main = lib/Task/KiokuJS/Core
+
+dependency            = joose                       >= 3.14.0
+dependency            = joosex-attribute            >= 0.9.0
+dependency            = joosex-namespace-depended   >= 0.11.0
+dependency            = joosex-cps                  >= 0.13.0
+dependency            = json2                       >= 0.4.0
+dependency            = data-uuid                   >= 0.4.0
+dependency            = data-visitor                >= 0.2.0
+
+
+;=========================================================================
 ; before release
 
 [Git::Check]
 [CheckChangesHasContent]
-
-; [TestRelease] todo
 [ConfirmRelease]
 
-; releaser
-[JSAN::Upload]  ; just a no-op for now
+
+;=========================================================================
+; release
+
+[JSAN::NPM::Publish]        ; publish in `npm`
+sudo = 1
 
+
+;=========================================================================
 ; after release
+
 [Git::Commit / Commit_Dirty_Files]
 
 [Git::Tag]
@@ -63,20 +87,10 @@ format = %-9v %{yyyy-MM-dd HH:mm}d
 [Git::Push]
 push_to = origin
 
-[Twitter]
-tweet_url 	= http://openjsan.org/go/?l={{ my $dist = $DIST; $dist =~ s/-/./g; $dist; }}
-tweet 		= Released {{$DIST}}-{{$VERSION}} {{$URL}}
-hash_tags 	= #jsan
-
-; prerequisites
-
-[JSAN::Prereq]
-Joose                           = 3.013
-JooseX.Attribute                = 0.08
-JooseX.CPS                      = 0.12
-JooseX.Namespace.Depended       = 0.10
-
-JSON2                           = 0.02
-Data.UUID                       = 0.03
-Data.Visitor                    = 0.01
+[JSAN::GitHubDocs]          ; after all commits to have clean workspace
 
+[Twitter]
+tweet_url     = http://samuraijack.github.com/{{$DIST}}
+tweet         = Released {{$DIST}}-{{$VERSION}} {{$URL}}
+hash_tags     = #nodejs #npm
+
diff --git a/lib/KiokuJS/TypeMap/Joose.js b/lib/KiokuJS/TypeMap/Joose.js
@@ -119,9 +119,9 @@ Class('KiokuJS.TypeMap.Joose', {
 
             if (node.objTraits) {
                 var traits = Joose.A.map(node.objTraits, function (traitOrDesc) {
-                    if (typeof traitOrDesc == 'string') return eval(traitOrDesc)
+                    if (typeof traitOrDesc == 'string') return eval('(' + traitOrDesc + ')')
 
-                    return eval(traitOrDesc.token)
+                    return eval('(' + traitOrDesc.token + ')')
                 })
 
                 constructor = constructor.meta.subClass({