Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- re-packaging

  • Loading branch information...
commit daa94f6016b368cd0169c89d9c61698b235812af 1 parent 71c46d3
Nickolay Platonov authored September 10, 2011
9  dist.ini
@@ -23,6 +23,7 @@ first_version   = 0.0.1
23 23
 
24 24
 [GatherDir]
25 25
 follow_symlinks = 1
  26
+follow_skip = 2
26 27
 [PruneCruft]
27 28
 [License]
28 29
 
@@ -41,18 +42,20 @@ static_dir          = static    ; default
41 42
 [JSAN::ReadmeFromMD]            ; should be after docs generation
42 43
 
43 44
 [JSAN::InstallInstructions]     ; add INSTALL file, describing the installation process
44  
-[NPM::Bundle]                  ; after docs generation to avoid docs for bundles
  45
+[Web::Bundle]                  ; after docs generation to avoid docs for bundles
45 46
 
46 47
 
47 48
 ;=========================================================================
48 49
 ; `npm` configuration - package.json generation
49 50
 
50  
-[NPM::Package]
  51
+[Web::NPM::Package]
51 52
 main                    = joosex-namespace-depended-all.js
52 53
 
53 54
 dependency              = joose                 >= 3.16.0
54 55
 ;dependency              = joosex-meta-lazy      >= 0.3.1
55  
-;dependency              = joosex-simplerequest  >= 0.2.1
  56
+dependency              = joosex-simplerequest  >= 0.2.1
  57
+
  58
+devDependency           = test-run
56 59
 
57 60
 
58 61
 ;=========================================================================
4  lib/JooseX/Namespace/Depended.js
@@ -132,12 +132,16 @@ Role('JooseX.Namespace.Depended', {
132 132
 
133 133
             //gathering resourses from own attributes
134 134
             if (extend.has) Joose.O.each(extend.has, function (attr, name) {
  135
+                // do not try to collect the dependencies when class is given as init value
  136
+                if (Joose.O.isClass(attr)) return 
135 137
                 
136 138
                 me.collectClassDeps(attr, summaredDeps)
137 139
             })
138 140
             
139 141
             //gathering resourses from attributes of `my`
140 142
             if (extendMy && extendMy.has) Joose.O.each(extendMy.has, function (attr, name) {
  143
+                // do not try to collect the dependencies when class is given as init value
  144
+                if (Joose.O.isClass(attr)) return
141 145
                 
142 146
                 me.collectClassDeps(attr, summaredDeps)
143 147
             })
2  lib/JooseX/Namespace/Depended/Manager.js
@@ -4,7 +4,7 @@ Class('JooseX.Namespace.Depended.Manager', {
4 4
     
5 5
         have : {
6 6
             
7  
-            INC                             : Joose.is_NodeJS ? require.paths : [ 'lib', '/jsan' ],
  7
+            INC                             : [ 'lib', '/jsan' ],
8 8
             
9 9
             disableCaching                  : true,
10 10
             
9  lib/JooseX/Namespace/Depended/Materialize/NodeJS.js
@@ -7,12 +7,15 @@ Role('JooseX.Namespace.Depended.Materialize.NodeJS', {
7 7
         materialize : function (resourceBlob, url) {
8 8
             
9 9
             if (global.__PROVIDER__)
10  
-                // running in Test.Run
11  
-                execScript(resourceBlob + '')
  10
+//                require('vm').runInThisContext(resourceBlob + '', url)    
  11
+            
  12
+//                // running in Test.Run
  13
+//                
  14
+                eval(resourceBlob + '')
12 15
             
13 16
             else
14 17
                 // global scope
15  
-                process.binding('evals').Script.runInThisContext('(function (exports, require, module, __filename, __dirname) {' + resourceBlob + '})', url)(exports, require, module, __filename, __dirname)
  18
+                require('vm').runInThisContext('(function (exports, require, module, __filename, __dirname) {' + resourceBlob + '})', url)(exports, require, module, __filename, __dirname)
16 19
         }
17 20
     }
18 21
 })
1  node_modules/joose
1  node_modules/joosex-simplerequest
1  node_modules/test-run
16  t/index.js
... ...
@@ -1,11 +1,10 @@
1 1
 var Harness
2 2
 
3  
-if (typeof process != 'undefined' && process.pid) {
4  
-    require('Task/Test/Run/NodeJSBundle')
5  
-    
6  
-    Harness = Test.Run.Harness.NodeJS
7  
-} else
8  
-    Harness = Test.Run.Harness.Browser.ExtJS
  3
+
  4
+if (typeof process != 'undefined' && process.pid)
  5
+    Harness = require('test-run')
  6
+else
  7
+    Harness = Test.Run.Harness.Browser
9 8
     
10 9
     
11 10
 Harness.configure({
@@ -64,6 +63,7 @@ Harness.start(
64 63
     '120_dep_from_static_files.t.js',
65 64
     '121_preloaded_dep_from_static_files.t.js',
66 65
     '130_dependencies_in_has.t.js',
67  
-    '140_deps_in_classes_from_modules.t.js',
68  
-    '150_indirect_eval.t.js'
  66
+    '140_deps_in_classes_from_modules.t.js'
  67
+//    ,
  68
+//    '150_indirect_eval.t.js'
69 69
 )

0 notes on commit daa94f6

Please sign in to comment.
Something went wrong with that request. Please try again.