Refactor static_library_task.rb

.ruby-version

@@ -0,0 +1 @@
+2.0.0

lib/paper_house/library_task.rb

@@ -23,9 +23,12 @@ module PaperHouse
   # Common base class for static, shared, and ruby library tasks.
   class LibraryTask < BuildTask
     # Find a LibraryTask by name
-    def self.find_by name
+    def self.find_named name
       ObjectSpace.each_object( self ) do | each |
-        return each if each.name == name.to_s
+        obj_name = each.name
+        if Rake::Task.task_defined?( obj_name ) and obj_name == name.to_s
+          return each
+        end
       end
       nil
     end

lib/paper_house/linker_options.rb

@@ -61,7 +61,7 @@ def find_prerequisites task, klass_list
 
 
     def maybe_enhance name, klass
-      task = klass.find_by( name )
+      task = klass.find_named( name )
       enhance task if task
     end
 

spec/paper_house/shared_library_task_spec.rb

@@ -24,9 +24,9 @@ module PaperHouse
     it "should find registered tasks by name" do
       task = SharedLibraryTask.new( :libtest, "0.1.0" )
 
-      SharedLibraryTask.find_by( :libtest ).should eq task
-      SharedLibraryTask.find_by( "libtest" ).should eq task
-      SharedLibraryTask.find_by( :no_such_task ).should be_nil
+      SharedLibraryTask.find_named( :libtest ).should eq task
+      SharedLibraryTask.find_named( "libtest" ).should eq task
+      SharedLibraryTask.find_named( :no_such_task ).should be_nil
     end
   end
 

spec/paper_house/static_library_task_spec.rb

@@ -19,41 +19,90 @@
 require "paper_house/static_library_task"
 
 
+describe "Rake::Task" do
+  before { Rake::Task.clear }
+
+  describe ".[]" do
+    subject { Rake::Task[ task ] }
+
+    context "with :libtest" do
+      let( :task ) { :libtest }
+
+      context "when StaticLibraryTask named :libtest is defined" do
+        before { PaperHouse::StaticLibraryTask.new :libtest }
+
+        describe "#invoke" do
+          it { expect { subject.invoke }.to raise_error( "Cannot find sources (*.c)." ) }
+        end
+      end
+
+      context "when StaticLibraryTask named :libtest is not defined" do
+        it { expect { subject }.to raise_error }
+      end
+    end
+  end
+end
+
+
 module PaperHouse
   describe StaticLibraryTask do
-    it "should find registered tasks by name" do
-      task = StaticLibraryTask.new( :libtest )
+    before { Rake::Task.clear }
+
+    describe ".find_named" do
+      subject { StaticLibraryTask.find_named name }
+
+      context "with :libtest" do
+        let( :name ) { :libtest }
 
-      StaticLibraryTask.find_by( :libtest ).should eq task
-      StaticLibraryTask.find_by( "libtest" ).should eq task
-      StaticLibraryTask.find_by( :no_such_task ).should be_nil
+        context "when StaticLibraryTask named :libtest is defined" do
+          before { StaticLibraryTask.new :libtest }
+
+          it { expect( subject ).to be_a StaticLibraryTask }
+        end
+
+        context "when StaticLibraryTask named :libtest is not defined" do
+          it { expect( subject ).to be_nil }
+        end
+      end
+
+      context %{with "libtest"} do
+        context "when StaticLibraryTask named :libtest is defined" do
+          before { StaticLibraryTask.new :libtest }
+          let( :name ) { "libtest" }
+
+          it { expect( subject ).to be_a StaticLibraryTask }
+        end
+      end
+
+      context "with :NO_SUCH_TASK" do
+        let( :name ) { :NO_SUCH_TASK }
+
+        it { expect( subject ).to be_nil }
+      end
     end
-  end
 
 
-  describe StaticLibraryTask, ".new( :libtest )" do
-    subject { StaticLibraryTask.new :libtest }
-
-    its( :cc ) { should eq "gcc" }
-    its( :cflags ) { should be_empty }
-    its( :includes ) { should be_empty }
-    its( :name ) { should eq "libtest" }
-    its( :sources ) { should eq "*.c"  }
-    its( :target_directory ) { should eq "." }
-    its( :library_name ) { should eq "libtest" }
-    its( :lname ) { should eq "test" }
-    its( :target_file_name ) { should eq "libtest.a" }
-    its( :target_path ) { should eq "./libtest.a" }
-
-    it {
-      expect {
-        Rake::Task[ subject.name ].invoke
-      }.to raise_error( "Cannot find sources (*.c)." )
-    }
+    describe ".new" do
+      subject { StaticLibraryTask.new task }
+
+      context "with :libtest" do
+        let( :task ) { :libtest }
+
+        its( :cc ) { should eq "gcc" }
+        its( :cflags ) { should be_empty }
+        its( :includes ) { should be_empty }
+        its( :name ) { should eq "libtest" }
+        its( :sources ) { should eq "*.c"  }
+        its( :target_directory ) { should eq "." }
+        its( :library_name ) { should eq "libtest" }
+        its( :lname ) { should eq "test" }
+        its( :target_file_name ) { should eq "libtest.a" }
+        its( :target_path ) { should eq "./libtest.a" }
+      end
+    end
   end
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix