--- a/CypressAbstractReader.st	Mon Oct 05 18:09:30 2015 +0100
+++ b/CypressAbstractReader.st	Mon Oct 05 18:24:43 2015 +0100
@@ -1,5 +1,7 @@
 "{ Package: 'stx:goodies/cypress' }"
 
+"{ NameSpace: Smalltalk }"
+
 CypressAbstractReaderWriter subclass:#CypressAbstractReader
 	instanceVariableNames:'packageId'
 	classVariableNames:''
@@ -28,6 +30,21 @@
 "
 ! !
 
+!CypressAbstractReader class methodsFor:'reading'!
+
+readPackageFrom: aDirectory
+    | repository pkgName |
+
+    repository := CypressRepository on: aDirectory directory.
+    pkgName := aDirectory baseName.
+    (pkgName endsWith: '.package') ifTrue:[ 
+        pkgName := pkgName copyTo: (pkgName size - "'.package' size"8)
+    ].
+    ^ repository read: pkgName
+
+    "Created: / 05-10-2015 / 18:17:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CypressAbstractReader methodsFor:'reading'!
 
 readPackage: name as: packageIdOrNil from: directory
@@ -161,6 +178,12 @@
 
 !CypressAbstractReader class methodsFor:'documentation'!
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id::                                                                                                                        $'
 ! !
+

--- a/CypressClass.st	Mon Oct 05 18:09:30 2015 +0100
+++ b/CypressClass.st	Mon Oct 05 18:24:43 2015 +0100
@@ -1,5 +1,7 @@
 "{ Package: 'stx:goodies/cypress' }"
 
+"{ NameSpace: Smalltalk }"
+
 CypressModel subclass:#CypressClass
 	instanceVariableNames:'comment methods'
 	classVariableNames:''
@@ -140,14 +142,14 @@
         superClassName: self fullSuperName;
         category: self category;
 
-        instanceVariableNames: self instVarsAsString;
-        classVariableNames: self classVarsAsString;
-        classInstanceVariableNames: self classInstVarsAsString;
+        instanceVariableString: self instVarsAsString;
+        classVariableString: self classVarsAsString;
+        classInstanceVariableString: self classInstVarsAsString;
         poolDictionaries: self poolsAsString;
 
         yourself.
 
-    "Modified: / 18-09-2012 / 11:17:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-10-2015 / 18:19:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CypressClass methodsFor:'initialization'!
@@ -251,3 +253,4 @@
 version_SVN
     ^ '$Id::                                                                                                                        $'
 ! !
+