moving state.rb to types/

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@159 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 20 insertions, 10 deletions

diff --git a/lib/blink.rb b/lib/blink.rb
index 433e7d896..ff3e470dd 100644
--- a/lib/blink.rb
+++ b/lib/blink.rb
@@ -3,13 +3,14 @@
 # $Id$
 
 require 'singleton'
-require 'blink/component'
-require 'blink/interface'
-require 'blink/selector'
-require 'blink/types'
-require 'blink/types/service'
-require 'blink/types/file'
-require 'blink/types/symlink'
+#require 'blink/component'
+#require 'blink/interface'
+#require 'blink/selector'
+#require 'blink/types/service'
+#require 'blink/types/file'
+#require 'blink/types/symlink'
+
+# XXX see the bottom of the file for further inclusions
 
 PINK=""
 GREEN=""
@@ -258,3 +259,5 @@ module Blink
     end
     #------------------------------------------------------------
 end
+
+require 'blink/types'
diff --git a/lib/blink/types.rb b/lib/blink/types.rb
index 4d3325ef7..be6c8cf23 100644
--- a/lib/blink/types.rb
+++ b/lib/blink/types.rb
@@ -3,11 +3,13 @@
 # $Id$
 
 # included so we can test object types
-require 'blink/state'
+require 'blink/types/state'
 
 # this is our base class
 require 'blink/interface'
 
+# XXX see the bottom of the file for the rest of the inclusions
+
 #---------------------------------------------------------------
 # This class is the abstract base class for the mechanism for organizing
 # work.  No work is actually done by this class or its subclasses; rather,
@@ -475,3 +477,8 @@ module Blink
 		#---------------------------------------------------------------
 	end # Blink::Types
 end
+require 'blink/types/service'
+require 'blink/types/file'
+require 'blink/types/symlink'
+require 'blink/types/package'
+require 'blink/component'
diff --git a/lib/blink/types/file.rb b/lib/blink/types/file.rb
index e8b9c797c..492f11c60 100644
--- a/lib/blink/types/file.rb
+++ b/lib/blink/types/file.rb
@@ -4,7 +4,7 @@
 
 require 'digest/md5'
 require 'etc'
-require 'blink/state'
+require 'blink/types/state'
 
 module Blink
     # we first define all of the state that our file will use
diff --git a/lib/blink/state.rb b/lib/blink/types/state.rb
index 983913b13..983913b13 100644
--- a/lib/blink/state.rb
+++ b/lib/blink/types/state.rb
diff --git a/lib/blink/types/symlink.rb b/lib/blink/types/symlink.rb
index 8b862cdc3..e030eddef 100644
--- a/lib/blink/types/symlink.rb
+++ b/lib/blink/types/symlink.rb
@@ -3,7 +3,7 @@
 # $Id$
 
 require 'etc'
-require 'blink/state'
+require 'blink/types/state'
 require 'blink/types/file'
 
 module Blink