Moved Titan::Thread.pid_files and Titan::Thread.check_filesystem to T…

…itan::System

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 0.4.0.dev
 
+  * moved Titan::Thread.pid\_files and Titan::Thread.check\_filesystem
+    to Titan::System
+
 - Features
 
   * Added Titan::System that provides common methods

lib/titan.rb

@@ -1,6 +1,8 @@
 require "titan/version"
 
 module Titan
+  TITAN_DIRECTORY = File.expand_path('.titan_threads', '~')
+
   autoload :CLI,      "titan/cli"
   autoload :System,   "titan/system"
   autoload :Thread,   "titan/thread"

lib/titan/system.rb

@@ -17,6 +17,20 @@ def ps(command, pid)
           nil
         end
       end
+
+      #
+      # Checks the file system for neccessary directories and permissions
+      #
+      def check_filesystem
+        Dir.mkdir(Titan::TITAN_DIRECTORY) unless File.directory?(Titan::TITAN_DIRECTORY)
+      end
+
+      #
+      # Returns a list of all pid files available in the Titan::TITAN_DIRECTORY
+      #
+      def pid_files
+        Dir.entries(Titan::TITAN_DIRECTORY) - [".", ".."]
+      end
     end
   end
 end

lib/titan/thread.rb

@@ -5,8 +5,6 @@ module Titan
   # that gets created automatically.
   #
   class Thread
-    TITAN_DIRECTORY = File.expand_path('.titan_threads', '~')
-
     attr_accessor :id, :pid
 
     @@threads = {}
@@ -53,7 +51,7 @@ def id=(id)
     # Returns the file where its pid gets saved
     #
     def pid_file
-      File.expand_path(@id.to_s + ".pid", Titan::Thread::TITAN_DIRECTORY)
+      File.expand_path(@id.to_s + ".pid", TITAN_DIRECTORY)
     end
 
     #
@@ -76,7 +74,7 @@ def used_cpu
     # Opens the pid file and save its pid in it
     #
     def save
-      Titan::Thread.check_filesystem
+      Titan::System.check_filesystem
       File.open(pid_file, 'w') { |file| file.write(@pid) }
       @@threads[@id] = self
     end
@@ -123,8 +121,8 @@ def all
       # Loads threads from pid files inside the TITAN_DIRECTORY
       #
       def load_threads
-        check_filesystem
-        pid_files.each{ |pid_file|
+        Titan::System.check_filesystem
+        Titan::System.pid_files.each{ |pid_file|
           thread     = Titan::Thread.new(:id => File.basename(pid_file, ".pid"))
           thread.pid = File.read(File.expand_path(pid_file, TITAN_DIRECTORY)).to_i
           @@threads[thread.id] = thread
@@ -135,7 +133,7 @@ def load_threads
       # Saves threads to pid files inside the TITAN_DIRECTORY
       #
       def save_threads
-        pid_files.each { |pid_file| File.delete(File.expand_path(pid_file, TITAN_DIRECTORY)) }
+        Titan::System.pid_files.each { |pid_file| File.delete(File.expand_path(pid_file, TITAN_DIRECTORY)) }
         @@threads.each_value { |thread| thread.save }
       end
 
@@ -147,20 +145,6 @@ def remove_dead_threads
         save_threads
         @@threads
       end
-
-      #
-      # Checks the file system for neccessary directories and permissions
-      #
-      def check_filesystem
-        Dir.mkdir(TITAN_DIRECTORY) unless File.directory?(TITAN_DIRECTORY)
-      end
-
-      #
-      # Returns a list of all pid files available in the TITAN_DIRECTORY
-      #
-      def pid_files
-        Dir.entries(TITAN_DIRECTORY) - [".", ".."]
-      end
     end
   end
 end

spec/titan/system_spec.rb

@@ -14,4 +14,29 @@
       end
     end
   end
+
+  describe ".check_file_system" do
+    before(:each) do
+      File.stub!(:directory?).and_return(false)
+    end
+
+    it "should create the directory" do
+      Dir.should_receive(:mkdir).with(Titan::TITAN_DIRECTORY)
+      Titan::System.check_filesystem
+    end
+  end
+
+  describe ".pid_files" do
+    it "should return an Array" do
+      Titan::System.pid_files.should be_an(Array)
+    end
+
+    it "should not include ." do
+      Titan::System.pid_files.should_not include(".")
+    end
+
+    it "should not include .." do
+      Titan::System.pid_files.should_not include("..")
+    end
+  end
 end

spec/titan/thread_spec.rb

@@ -12,9 +12,9 @@ def new_thread(id=nil)
     Titan::Thread.__send__("class_variable_set", "@@threads", {})
   end
 
-  describe "TITAN_DIRECTORY" do
+  describe "Titan::TITAN_DIRECTORY" do
     it "should get stored in the home directory" do
-      File.dirname(Titan::Thread::TITAN_DIRECTORY).should eql(File.expand_path('~'))
+      File.dirname(Titan::TITAN_DIRECTORY).should eql(File.expand_path('~'))
     end
   end
 
@@ -98,7 +98,7 @@ def new_thread(id=nil)
     end
 
     it "should return a file named like its ids" do
-      @thread.pid_file.should eql(File.expand_path(@thread.id.to_s + ".pid", Titan::Thread::TITAN_DIRECTORY))
+      @thread.pid_file.should eql(File.expand_path(@thread.id.to_s + ".pid", Titan::TITAN_DIRECTORY))
     end
   end
 
@@ -161,6 +161,11 @@ def new_thread(id=nil)
       @thread = new_thread
     end
 
+    it "should check the file system" do
+      Titan::System.should_receive(:check_filesystem)
+      @thread.save
+    end
+
     it "should open its pid file" do
       File.should_receive(:open).with(@thread.pid_file, 'w')
       @thread.save
@@ -223,7 +228,7 @@ def new_thread(id=nil)
     end
 
     it "should check the file system" do
-      Titan::Thread.should_receive(:check_filesystem)
+      Titan::System.should_receive(:check_filesystem)
       Titan::Thread.load_threads
     end
 
@@ -263,29 +268,4 @@ def new_thread(id=nil)
       Titan::Thread.remove_dead_threads.should equal(Titan::Thread.all)
     end
   end
-
-  describe ".check_file_system" do
-    before(:each) do
-      File.stub!(:directory?).and_return(false)
-    end
-
-    it "should create the directory" do
-      Dir.should_receive(:mkdir).with(Titan::Thread::TITAN_DIRECTORY)
-      Titan::Thread.check_filesystem
-    end
-  end
-
-  describe ".pid_files" do
-    it "should return an Array" do
-      Titan::Thread.pid_files.should be_an(Array)
-    end
-
-    it "should not include ." do
-      Titan::Thread.pid_files.should_not include(".")
-    end
-
-    it "should not include .." do
-      Titan::Thread.pid_files.should_not include("..")
-    end
-  end
 end