- re-packaging

canonic-epicure · Sep 10, 2011 · daa94f6 · daa94f6
1 parent 71c46d3
commit daa94f6
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/dist.ini b/dist.ini
@@ -23,6 +23,7 @@ first_version   = 0.0.1
 
 [GatherDir]
 follow_symlinks = 1
+follow_skip = 2
 [PruneCruft]
 [License]
 
@@ -41,18 +42,20 @@ static_dir          = static    ; default
 [JSAN::ReadmeFromMD]            ; should be after docs generation
 
 [JSAN::InstallInstructions]     ; add INSTALL file, describing the installation process
-[NPM::Bundle]                  ; after docs generation to avoid docs for bundles
+[Web::Bundle]                  ; after docs generation to avoid docs for bundles
 
 
 ;=========================================================================
 ; `npm` configuration - package.json generation
 
-[NPM::Package]
+[Web::NPM::Package]
 main                    = joosex-namespace-depended-all.js
 
 dependency              = joose                 >= 3.16.0
 ;dependency              = joosex-meta-lazy      >= 0.3.1
-;dependency              = joosex-simplerequest  >= 0.2.1
+dependency              = joosex-simplerequest  >= 0.2.1
+
+devDependency           = test-run
 
 
 ;=========================================================================

diff --git a/lib/JooseX/Namespace/Depended.js b/lib/JooseX/Namespace/Depended.js
@@ -132,12 +132,16 @@ Role('JooseX.Namespace.Depended', {
 
             //gathering resourses from own attributes
             if (extend.has) Joose.O.each(extend.has, function (attr, name) {
+                // do not try to collect the dependencies when class is given as init value
+                if (Joose.O.isClass(attr)) return 
 
                 me.collectClassDeps(attr, summaredDeps)
             })
 
             //gathering resourses from attributes of `my`
             if (extendMy && extendMy.has) Joose.O.each(extendMy.has, function (attr, name) {
+                // do not try to collect the dependencies when class is given as init value
+                if (Joose.O.isClass(attr)) return
 
                 me.collectClassDeps(attr, summaredDeps)
             })

diff --git a/lib/JooseX/Namespace/Depended/Manager.js b/lib/JooseX/Namespace/Depended/Manager.js
@@ -4,7 +4,7 @@ Class('JooseX.Namespace.Depended.Manager', {
 
         have : {
 
-            INC                             : Joose.is_NodeJS ? require.paths : [ 'lib', '/jsan' ],
+            INC                             : [ 'lib', '/jsan' ],
 
             disableCaching                  : true,
 

diff --git a/lib/JooseX/Namespace/Depended/Materialize/NodeJS.js b/lib/JooseX/Namespace/Depended/Materialize/NodeJS.js
@@ -7,12 +7,15 @@ Role('JooseX.Namespace.Depended.Materialize.NodeJS', {
         materialize : function (resourceBlob, url) {
 
             if (global.__PROVIDER__)
-                // running in Test.Run
-                execScript(resourceBlob + '')
+//                require('vm').runInThisContext(resourceBlob + '', url)    
+
+//                // running in Test.Run
+//                
+                eval(resourceBlob + '')
 
             else
                 // global scope
-                process.binding('evals').Script.runInThisContext('(function (exports, require, module, __filename, __dirname) {' + resourceBlob + '})', url)(exports, require, module, __filename, __dirname)
+                require('vm').runInThisContext('(function (exports, require, module, __filename, __dirname) {' + resourceBlob + '})', url)(exports, require, module, __filename, __dirname)
         }
     }
 })

diff --git a/node_modules/joose b/node_modules/joose
diff --git a/node_modules/joosex-simplerequest b/node_modules/joosex-simplerequest
diff --git a/node_modules/test-run b/node_modules/test-run
diff --git a/t/index.js b/t/index.js
@@ -1,11 +1,10 @@
 var Harness
 
-if (typeof process != 'undefined' && process.pid) {
-    require('Task/Test/Run/NodeJSBundle')
-
-    Harness = Test.Run.Harness.NodeJS
-} else
-    Harness = Test.Run.Harness.Browser.ExtJS
+
+if (typeof process != 'undefined' && process.pid)
+    Harness = require('test-run')
+else
+    Harness = Test.Run.Harness.Browser
 
 
 Harness.configure({
@@ -64,6 +63,7 @@ Harness.start(
     '120_dep_from_static_files.t.js',
     '121_preloaded_dep_from_static_files.t.js',
     '130_dependencies_in_has.t.js',
-    '140_deps_in_classes_from_modules.t.js',
-    '150_indirect_eval.t.js'
+    '140_deps_in_classes_from_modules.t.js'
+//    ,
+//    '150_indirect_eval.t.js'
 )