cosmos 3.9.2 → 4.0.0

data/lib/cosmos/utilities/logger.rb

@@ -125,9 +125,9 @@ module Cosmos
     def log_message(severity_string, message, &block)
       @mutex.synchronize do
         if block_given?
-          puts "#{Time.now.formatted} #{@detail_string ? "(#{@detail_string}):" : ''}#{severity_string} " << yield
+          puts "#{Time.now.sys.formatted} #{@detail_string ? "(#{@detail_string}):" : ''}#{severity_string} " << yield
         else
-          puts "#{Time.now.formatted} #{@detail_string ? "(#{@detail_string}):" : ''}#{severity_string} #{message}"
+          puts "#{Time.now.sys.formatted} #{@detail_string ? "(#{@detail_string}):" : ''}#{severity_string} #{message}"
         end
       end
     end

data/lib/cosmos/utilities/low_fragmentation_array.rb

@@ -8,4 +8,12 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-require 'cosmos/ext/low_fragmentation_array'
+if RUBY_ENGINE == 'ruby' and !ENV['COSMOS_NO_EXT']
+  require 'cosmos/ext/low_fragmentation_array'
+else
+  module Cosmos
+    class LowFragmentationArray < Array
+      # Can't implement low fragmention in native ruby easily
+    end
+  end
+end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.9.2'
+COSMOS_VERSION = '4.0.0'
 module Cosmos
   module Version
-    MAJOR = '3'
-    MINOR = '9'
-    PATCH = '2'
-    BUILD = '82298a42b756edd3783b51c2d7d17535b6ab8f1a'
+    MAJOR = '4'
+    MINOR = '0'
+    PATCH = '0'
+    BUILD = '5fd7539d1e07cb9a71388e9cd0ec60b97a0f625a'
   end
-  VERSION = '3.9.2'
+  VERSION = '4.0.0'
 end

data/lib/cosmos/win32/win32_main.rb

@@ -10,55 +10,59 @@
 
 module Cosmos
 
-  # Win32API is deprecated in 1.9.x so recreate it
-  require 'fiddle'
-  class Win32API
-    # Cache to hold already opened dll files
-    DLL_CACHE = {}
-
-    VALUE_TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
-
-    def initialize(dll_name, function_name, import, export = "0")
-      # Convert all input parameters into either 0, S, or I
-      @function_prototype = [import].join.tr("VPpNnLlIiCc", "0SSI")
-      params = []
-      @function_prototype.split('').each do |param|
-        params << VALUE_TYPEMAP[param]
-      end
+  if RUBY_ENGINE == 'ruby'
+    # Win32API is deprecated in 1.9.x so recreate it
+    require 'fiddle'
+    class Win32API
+      # Cache to hold already opened dll files
+      DLL_CACHE = {}
+
+      VALUE_TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
+
+      def initialize(dll_name, function_name, import, export = "0")
+        # Convert all input parameters into either 0, S, or I
+        @function_prototype = [import].join.tr("VPpNnLlIiCc", "0SSI")
+        params = []
+        @function_prototype.split('').each do |param|
+          params << VALUE_TYPEMAP[param]
+        end
 
-      # Get handle to dll file and add to cache if necessary
-      dll_handle = DLL_CACHE[dll_name] ||= Fiddle.dlopen(dll_name)
+        # Get handle to dll file and add to cache if necessary
+        dll_handle = DLL_CACHE[dll_name] ||= Fiddle.dlopen(dll_name)
 
-      # Create Fiddle::Function necessary to call a function with proper return type and name
-      @function = Fiddle::Function.new(dll_handle[function_name], params, VALUE_TYPEMAP[export.tr("VPpNnLlIi", "0SSI")])
-    end
+        # Create Fiddle::Function necessary to call a function with proper return type and name
+        @function = Fiddle::Function.new(dll_handle[function_name], params, VALUE_TYPEMAP[export.tr("VPpNnLlIi", "0SSI")])
+      end
 
-    def call(*args)
-      # Break up prototype into characters
-      import = @function_prototype.split('')
-
-      args.each_with_index do |arg, index|
-        case import[index]
-        when 'S'
-          # Handle NULL specified with 0 value
-          arg = nil if arg == 0
-
-          # Convert argument into array of longs
-          args[index], = [arg].pack("p").unpack("l!*")
-        when 'I'
-          # Handle intergers larger than 2^31 - 1
-          args[index], = [arg].pack("I").unpack("i")
+      def call(*args)
+        # Break up prototype into characters
+        import = @function_prototype.split('')
+
+        args.each_with_index do |arg, index|
+          case import[index]
+          when 'S'
+            # Handle NULL specified with 0 value
+            arg = nil if arg == 0
+
+            # Convert argument into array of longs
+            args[index], = [arg].pack("p").unpack("l!*")
+          when 'I'
+            # Handle intergers larger than 2^31 - 1
+            args[index], = [arg].pack("I").unpack("i")
+          end
         end
+
+        # Call the function and return its return value
+        return_value = @function.call(*args)
+        return_value ||= 0
+        return_value
       end
 
-      # Call the function and return its return value
-      return_value = @function.call(*args)
-      return_value ||= 0
-      return_value
+      # Make an equivalent capital C call method
+      alias Call call
     end
-
-    # Make an equivalent capital C call method
-    alias Call call
+  else
+    require 'Win32API'
   end
 
   # Win32 class
@@ -131,11 +135,11 @@ module Cosmos
     CBR_115200 = 115200
     CBR_128000 = 128000
     CBR_256000 = 256000
-	
+
     BAUD_RATES = [
-	  CBR_110, CBR_300, CBR_600, CBR_1200, CBR_2400, CBR_4800, CBR_9600, 
-	  CBR_14400, CBR_19200, CBR_38400, CBR_56000, CBR_57600, CBR_115200, 
-	  CBR_128000, CBR_256000, 230400, 460800, 500000, 576000, 921600, 
+	  CBR_110, CBR_300, CBR_600, CBR_1200, CBR_2400, CBR_4800, CBR_9600,
+	  CBR_14400, CBR_19200, CBR_38400, CBR_56000, CBR_57600, CBR_115200,
+	  CBR_128000, CBR_256000, 230400, 460800, 500000, 576000, 921600,
 	  1000000, 1152000, 1500000, 2000000, 3000000, 3500000, 4000000
 	]
 

data/run_gui_tests.bat

@@ -1,5 +1,7 @@
 call bundle exec ruby autohotkey\tools\CmdExtractorAHK --defaultsize
 call bundle exec ruby autohotkey\tools\CmdSenderAHK -w 650 -t 650
+call bundle exec ruby autohotkey\tools\CmdSequenceAHK -w 650 -t 650
+call bundle exec ruby autohotkey\tools\CmdSequenceAHK2 -w 650 -t 650 -r run_sequence.txt -o procedures
 call bundle exec ruby autohotkey\tools\CmdTlmServerAHK -x 50 -y 50 -w 900 -t 1000
 call bundle exec ruby autohotkey\tools\CmdTlmServerAHK2 -w 900 -t 1000 -p -n -c cmd_tlm_server.txt
 call bundle exec ruby autohotkey\tools\DataViewerAHK -w 600 -t 800
@@ -9,7 +11,7 @@ call bundle exec ruby autohotkey\tools\LimitsMonitorAHK
 call bundle exec ruby autohotkey\tools\OpenGLBuilderAHK -w 600 -t 600
 call bundle exec ruby autohotkey\tools\PacketViewerAHK -w 600 -t 800
 call bundle exec ruby autohotkey\tools\PacketViewerAHK2 --defaultsize -p "INST ADCS"
-call bundle exec ruby autohotkey\tools\ReplayAHK
+call bundle exec ruby autohotkey\tools\ReplayAHK -w 800
 call bundle exec ruby autohotkey\tools\ScriptRunnerAHK -w 600 -t 800
 call bundle exec ruby autohotkey\tools\ScriptRunnerAHK2 -w 600 -t 800
 call bundle exec ruby autohotkey\tools\TableManagerAHK -w 800 -t 800

data/spec/conversions/unix_time_formatted_conversion_spec.rb

@@ -61,12 +61,12 @@ module Cosmos
     describe "to_s" do
       it "returns the seconds conversion" do
         gc = UnixTimeFormattedConversion.new('TIME')
-        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), 0).formatted"
+        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), 0).sys.formatted"
       end
 
       it "returns the microseconds conversion" do
         gc = UnixTimeFormattedConversion.new('TIME','TIME_US')
-        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), packet.read('TIME_US', :RAW, buffer)).formatted"
+        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), packet.read('TIME_US', :RAW, buffer)).sys.formatted"
       end
     end
   end

data/spec/conversions/unix_time_seconds_conversion_spec.rb

@@ -63,12 +63,12 @@ module Cosmos
     describe "to_s" do
       it "returns the seconds conversion" do
         gc = UnixTimeSecondsConversion.new('TIME')
-        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), 0).to_f"
+        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), 0).sys.to_f"
       end
 
       it "returns the microseconds conversion" do
         gc = UnixTimeSecondsConversion.new('TIME','TIME_US')
-        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), packet.read('TIME_US', :RAW, buffer)).to_f"
+        expect(gc.to_s).to eql "Time.at(packet.read('TIME', :RAW, buffer), packet.read('TIME_US', :RAW, buffer)).sys.to_f"
       end
     end
   end

data/spec/core_ext/file_spec.rb

@@ -62,7 +62,7 @@ describe File do
 
   describe "find_in_search_path" do
     it "returns the path to the file" do
-      expect(File.find_in_search_path("cosmos.rb")).to match "/lib/cosmos.rb"
+      expect(File.find_in_search_path("cosmos.rb")).to match "lib/cosmos.rb"
     end
 
     it "returns nil if the file can't be found" do

data/spec/core_ext/objectspace_spec.rb

@@ -13,17 +13,20 @@ require 'cosmos/core_ext/objectspace'
 
 describe ObjectSpace do
 
-  describe "find" do
-    it "finds a class in the Ruby object space" do
-      expect(ObjectSpace.find(Class)).not_to be_nil
-      expect(ObjectSpace.find(Cosmos)).to be_nil
+  if RUBY_ENGINE == 'ruby'
+    describe "find" do
+      it "finds a class in the Ruby object space" do
+        expect(ObjectSpace.find(Class)).not_to be_nil
+        expect(ObjectSpace.find(Cosmos)).to be_nil
+      end
     end
-  end
 
-  describe "find_all" do
-    it "finds classes in the Ruby object space" do
-      expect(ObjectSpace.find_all(Class)).to be_a(Array)
-      expect(ObjectSpace.find_all(Cosmos)).to eql([])
+    describe "find_all" do
+      it "finds classes in the Ruby object space" do
+        expect(ObjectSpace.find_all(Class)).to be_a(Array)
+        expect(ObjectSpace.find_all(Cosmos)).to eql([])
+      end
     end
   end
+
 end

data/spec/core_ext/string_spec.rb

@@ -204,6 +204,12 @@ describe String do
       expect("5.123\n5.123".convert_to_value).to eql "5.123\n5.123"
       expect("[0,1,2,3]\n[0,1,2,3]".convert_to_value).to eql "[0,1,2,3]\n[0,1,2,3]"
     end
+
+    it "handles special float values" do
+      expect("Infinity".convert_to_value).to eql Float::INFINITY
+      expect("-Infinity".convert_to_value).to eql -Float::INFINITY
+      expect("NAN".convert_to_value.nan?).to eql true # Note Float::NAN != Float::NAN by definition
+    end
   end
 
   describe "hex_to_byte_string" do

data/spec/core_ext/time_spec.rb

@@ -207,4 +207,14 @@ describe Time do
       expect(Time.init_epoch_delta("1969/12/31 12:00:00")).to eql 60*60*12
     end
   end
+
+  describe "Time.sys" do
+    it "converts time to UTC or local" do
+      Time.use_utc
+      expect(Time.now.sys.utc?).to eql true
+      Time.use_local
+      expect(Time.now.sys.utc?).to eql false
+    end
+  end
+
 end

data/spec/gui/line_graph/line_clip_spec.rb

@@ -8,315 +8,317 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-require 'spec_helper'
-require 'cosmos/ext/line_graph'
+if RUBY_ENGINE == 'ruby'
+  require 'spec_helper'
+  require 'cosmos/ext/line_graph'
 
-module Cosmos
+  module Cosmos
 
-  describe LineClip do
+    describe LineClip do
 
-    shared_examples_for "line returned" do
-      it "is not nil" do
-        expect(@clipped_line).not_to be_nil
+      shared_examples_for "line returned" do
+        it "is not nil" do
+          expect(@clipped_line).not_to be_nil
+        end
       end
-    end
 
-    shared_examples_for "no line returned" do
-      it "is nil" do
-        expect(@clipped_line).to be_nil
+      shared_examples_for "no line returned" do
+        it "is nil" do
+          expect(@clipped_line).to be_nil
+        end
       end
-    end
 
-    shared_examples_for "not clipped" do
-      it "returns the same first point" do
-        expect(@clipped_line[0]).to eql(@x0)
-        expect(@clipped_line[1]).to eql(@y0)
-      end
+      shared_examples_for "not clipped" do
+        it "returns the same first point" do
+          expect(@clipped_line[0]).to eql(@x0)
+          expect(@clipped_line[1]).to eql(@y0)
+        end
 
-      it "returns the same second point" do
-        expect(@clipped_line[2]).to eql(@x1)
-        expect(@clipped_line[3]).to eql(@y1)
-      end
+        it "returns the same second point" do
+          expect(@clipped_line[2]).to eql(@x1)
+          expect(@clipped_line[3]).to eql(@y1)
+        end
 
-      it "indicates the first point was not clipped" do
-        expect(@clipped_line[4]).to be false
-      end
+        it "indicates the first point was not clipped" do
+          expect(@clipped_line[4]).to be false
+        end
 
-      it "indicates the second point was not clipped" do
-        expect(@clipped_line[5]).to be false
+        it "indicates the second point was not clipped" do
+          expect(@clipped_line[5]).to be false
+        end
       end
-    end
 
-    shared_examples_for "first point clipped" do
-      it "returns a clipped first point" do
-        expect(@xmin..@xmax).to include(@clipped_line[0])
-        expect(@ymin..@ymax).to include(@clipped_line[1])
-      end
+      shared_examples_for "first point clipped" do
+        it "returns a clipped first point" do
+          expect(@xmin..@xmax).to include(@clipped_line[0])
+          expect(@ymin..@ymax).to include(@clipped_line[1])
+        end
 
-      it "returns the same second point" do
-        expect(@clipped_line[2]).to eql(@x1)
-        expect(@clipped_line[3]).to eql(@y1)
-      end
+        it "returns the same second point" do
+          expect(@clipped_line[2]).to eql(@x1)
+          expect(@clipped_line[3]).to eql(@y1)
+        end
 
-      it "indicates the first point was clipped" do
-        expect(@clipped_line[4]).to be true
-      end
+        it "indicates the first point was clipped" do
+          expect(@clipped_line[4]).to be true
+        end
 
-      it "indicates the second point was not clipped" do
-        expect(@clipped_line[5]).to be false
+        it "indicates the second point was not clipped" do
+          expect(@clipped_line[5]).to be false
+        end
       end
-    end
 
-    shared_examples_for "second point clipped" do
-      it "returns the same first point" do
-        expect(@clipped_line[0]).to eql(@x0)
-        expect(@clipped_line[1]).to eql(@y0)
-      end
+      shared_examples_for "second point clipped" do
+        it "returns the same first point" do
+          expect(@clipped_line[0]).to eql(@x0)
+          expect(@clipped_line[1]).to eql(@y0)
+        end
 
-      it "returns a clipped second point" do
-        expect(@xmin..@xmax).to include(@clipped_line[2])
-        expect(@ymin..@ymax).to include(@clipped_line[3])
-      end
+        it "returns a clipped second point" do
+          expect(@xmin..@xmax).to include(@clipped_line[2])
+          expect(@ymin..@ymax).to include(@clipped_line[3])
+        end
 
-      it "indicates the first point was not clipped" do
-        expect(@clipped_line[4]).to be false
-      end
+        it "indicates the first point was not clipped" do
+          expect(@clipped_line[4]).to be false
+        end
 
-      it "indicates the second point was clipped" do
-        expect(@clipped_line[5]).to be true
+        it "indicates the second point was clipped" do
+          expect(@clipped_line[5]).to be true
+        end
       end
-    end
-
-    before(:all) do
-      @xmin = -10.0
-      @xmax =  10.0
-      @ymin = -10.0
-      @ymax =  10.0
-    end
 
-    describe "given a first point on the graph" do
       before(:all) do
-        @x0 = -3.0
-        @y0 =  5.0
+        @xmin = -10.0
+        @xmax =  10.0
+        @ymin = -10.0
+        @ymax =  10.0
       end
 
-      describe "and given a second point on the graph" do
+      describe "given a first point on the graph" do
         before(:all) do
-          @x1 = 3.6
-          @y1 = 9.9
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          @x0 = -3.0
+          @y0 =  5.0
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "not clipped"
-      end
+        describe "and given a second point on the graph" do
+          before(:all) do
+            @x1 = 3.6
+            @y1 = 9.9
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the upper left" do
-        before(:all) do
-          @x1 = -15.0
-          @y1 = 13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "not clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the upper left" do
+          before(:all) do
+            @x1 = -15.0
+            @y1 = 13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the top" do
-        before(:all) do
-          @x1 = 5.0
-          @y1 = 180.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the top" do
+          before(:all) do
+            @x1 = 5.0
+            @y1 = 180.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the upper right" do
-        before(:all) do
-          @x1 = 15.0
-          @y1 = 13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the upper right" do
+          before(:all) do
+            @x1 = 15.0
+            @y1 = 13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the right" do
-        before(:all) do
-          @x1 = 70.0
-          @y1 = -3.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the right" do
+          before(:all) do
+            @x1 = 70.0
+            @y1 = -3.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the bottom right" do
-        before(:all) do
-          @x1 = -15.0
-          @y1 = -13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the bottom right" do
+          before(:all) do
+            @x1 = -15.0
+            @y1 = -13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the bottom" do
-        before(:all) do
-          @x1 = 0.0
-          @y1 = 13.57
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the bottom" do
+          before(:all) do
+            @x1 = 0.0
+            @y1 = 13.57
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the bottom left" do
-        before(:all) do
-          @x1 = -150.0
-          @y1 = -150.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
+        describe "and given a second point off the graph to the bottom left" do
+          before(:all) do
+            @x1 = -150.0
+            @y1 = -150.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a second point off the graph to the left" do
-        before(:all) do
-          @x1 = -20.0
-          @y1 = 3.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "second point clipped"
-      end
-    end
+        describe "and given a second point off the graph to the left" do
+          before(:all) do
+            @x1 = -20.0
+            @y1 = 3.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-    describe "given a second point on the graph" do
-      before(:all) do
-        @x1 =  3.2
-        @y1 = -9.9
+          it_should_behave_like "line returned"
+          it_should_behave_like "second point clipped"
+        end
       end
 
-      describe "and given a first point on the graph" do
+      describe "given a second point on the graph" do
         before(:all) do
-          @x0 = 3.6
-          @y0 = 9.9
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          @x1 =  3.2
+          @y1 = -9.9
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "not clipped"
-      end
+        describe "and given a first point on the graph" do
+          before(:all) do
+            @x0 = 3.6
+            @y0 = 9.9
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the upper left" do
-        before(:all) do
-          @x0 = -15.0
-          @y0 = 13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "not clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the upper left" do
+          before(:all) do
+            @x0 = -15.0
+            @y0 = 13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the top" do
-        before(:all) do
-          @x0 = 5.0
-          @y0 = 180.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the top" do
+          before(:all) do
+            @x0 = 5.0
+            @y0 = 180.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the upper right" do
-        before(:all) do
-          @x0 = 15.0
-          @y0 = 13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the upper right" do
+          before(:all) do
+            @x0 = 15.0
+            @y0 = 13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the right" do
-        before(:all) do
-          @x0 = 70.0
-          @y0 = -3.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the right" do
+          before(:all) do
+            @x0 = 70.0
+            @y0 = -3.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the bottom right" do
-        before(:all) do
-          @x0 = -15.0
-          @y0 = -13.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the bottom right" do
+          before(:all) do
+            @x0 = -15.0
+            @y0 = -13.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the bottom" do
-        before(:all) do
-          @x0 = 0.0
-          @y0 = 13.57
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
-      end
+        describe "and given a first point off the graph to the bottom" do
+          before(:all) do
+            @x0 = 0.0
+            @y0 = 13.57
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
 
-      describe "and given a first point off the graph to the bottom left" do
-        before(:all) do
-          @x0 = -150.0
-          @y0 = -150.0
-          @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
+        end
+
+        describe "and given a first point off the graph to the bottom left" do
+          before(:all) do
+            @x0 = -150.0
+            @y0 = -150.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
+
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
+        describe "and given a first point off the graph to the left" do
+          before(:all) do
+            @x0 = -20.0
+            @y0 = 3.0
+            @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
+          end
+
+          it_should_behave_like "line returned"
+          it_should_behave_like "first point clipped"
+        end
       end
 
-      describe "and given a first point off the graph to the left" do
+      describe "given a both points off the graph" do
         before(:all) do
-          @x0 = -20.0
-          @y0 = 3.0
+          @x0 =  15.0
+          @y0 = -15.0
+          @x1 =  13.2
+          @y1 = -9.9
           @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
         end
 
-        it_should_behave_like "line returned"
-        it_should_behave_like "first point clipped"
+        it_should_behave_like "no line returned"
       end
     end
 
-    describe "given a both points off the graph" do
-      before(:all) do
-        @x0 =  15.0
-        @y0 = -15.0
-        @x1 =  13.2
-        @y1 = -9.9
-        @clipped_line = LineClip.line_clip(@x0, @y0, @x1, @y1, @xmin, @ymin, @xmax, @ymax)
-      end
-
-      it_should_behave_like "no line returned"
-    end
-  end
-
-end # module Cosmos
+  end # module Cosmos
+end