dblugeon-rb-eyetv 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/eyetv.rb

@@ -66,9 +66,9 @@ module EyeTV
       @instance.is_recording.get
     end
 
-    #return channel list
+    #return the current channel
     def current_channel_number
-      @intance.current_channel.get
+      @instance.current_channel.get
     end
 
     #return an channel, program or recording with the id
@@ -96,10 +96,20 @@ module EyeTV
 
     def make_program(options = {})
         program = check_program(options)
+        #TODO : add more control
         if program != nil
           puts "program = #{program.to_s}"
           raise ConflictProgramException.new(program)
         end
+        if options.has_key?(:input_source)
+          options[:input_source] = options[:input_source].to_sym
+        end
+        if options.has_key?(:quality)
+          options[:quality] = options[:quality].to_sym
+        end
+        if options.has_key?(:repeats)
+            options[:repeats] = options[:repeats].to_sym
+        end
         record = Program.new(@instance.make(:new =>:program, :with_properties => options))
     end
 
@@ -116,7 +126,7 @@ module EyeTV
       end
       res = nil
       programs(true).each do |prog|
-        if(res == nil and prog.conflict?(options[:start_time], options[:duration]))
+        if(res == nil and prog.conflict?(options[:start_time], options[:duration], options[:uid]))
           res = prog
         end
       end
@@ -130,7 +140,7 @@ module EyeTV
     attr_reader :program_exist
 
     def initialize(program)
-      program_exist = program
+      @program_exist = program
     end
   end
 

data/lib/program.rb

@@ -38,12 +38,16 @@ module EyeTV
     end
 
     #test if the parameters enter in conflict with a program instance
-    def conflict?(test_start_time, nduration)
-      nend_time = test_start_time + nduration
+    def conflict?(test_start_time, nduration, uid = nil)
+      nend_time = test_start_time + nduration.to_f
       if nend_time < start_time or end_time < test_start_time
         conflict = false
       else
-        conflict = true
+        if (self.uid == uid)
+          conflict = false
+        else
+          conflict = true
+        end
       end
     end
 

data/rb-eyetv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rb-eyetv}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dblugeon"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-12}
   s.description = %q{
       This library provides ruby classes to control the EyeTV Application.
       You can launch the EyeTV apllication, explore recordings, channels or

data/test/eyetv_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
 include EyeTV
-
+include Appscript
 class RbEyetvTest < Test::Unit::TestCase
   context "EyeTV application" do
     setup do
       @instance = EyeTV::EyeTV.new
+      @instance_ref = app('EyeTV')
       if @instance.programs(true).empty?
         @program_test = @instance.make_program({:start_time => Time.now + 3600, :duration => 3600, :title => "program unit test"})
         @clean_program = true
@@ -12,8 +13,9 @@ class RbEyetvTest < Test::Unit::TestCase
         @program_test = @instance.programs(true)[0]
       end
     end
-    should "not recording" do
-      assert !(@instance.is_recording?)
+    
+    should "test is_recording? method" do
+      assert_equal @instance_ref.is_recording.get, @instance.is_recording?
     end
 
     should "find an channel or nil" do
@@ -45,17 +47,43 @@ class RbEyetvTest < Test::Unit::TestCase
     end
 
     should "check check_program method without conflict program" do
-      tmp_progs = @instance.programs(true).sort do |prog|
-        prog.start_time
+      tmp_progs = @instance.programs(true).sort do |progA, progB|
+        progA.start_time <=> progB.start_time
       end
       prog = tmp_progs.last
       assert_nil @instance.check_program({:start_time => prog.end_time + 200, :duration => prog.duration})
     end
 
+    should "test make_program method with conflict program" do
+      assert_raise ConflictProgramException do
+        @r2 = @instance.make_program({:start_time=>@program_test.start_time, :duration=>@program_test.duration})
+      end
+    end
+
+    should "test make_program 2 method with conflict program" do
+     begin
+        @r3 = @instance.make_program({:start_time=>@program_test.start_time, :duration=>@program_test.duration})
+      rescue ConflictProgramException =>e
+        assert_not_nil e.program_exist
+      end
+    end
+
+    should "test current_channel_number" do
+      assert_equal @instance_ref.current_channel.get, @instance.current_channel_number
+    end
+
     teardown do
       if @clean_program
         @program_test.delete
       end
+      
+      if @r2
+        @r2.delete
+      end
+      
+      if @r3
+        r3.delete
+      end
     end
   end
 end

data/test/program_test.rb

@@ -49,10 +49,18 @@ class RbProgramTest < Test::Unit::TestCase
       end
     end
 
+    should "test change channel_number= method with first channel" do
+      @program_test.channel_number = @instance.channels.first.channel_number
+      assert_equal @instance.channels.first.channel_number, @program_test.channel_number
+
+      @program_test.channel_number = @instance.channels.last.channel_number.to_s
+      assert_equal @instance.channels.last.channel_number, @program_test.channel_number
+    end
+
     should "end_time must be equals to start_time + duration" do
       assert_equal (@program_test.start_time + @program_test.duration), @program_test.end_time
     end
-    
+
     should "program must conflict" do
       test_start_time = @program_test.start_time + 200
       duration = 1000
@@ -71,10 +79,13 @@ class RbProgramTest < Test::Unit::TestCase
     should "program should not conflict" do
       test_start_time = @program_test.start_time - 1500
       duration = 1000
-      
+
       assert !@program_test.conflict?(test_start_time, duration)
-      
-      test_start_time = @program_test.end_time + 500
+
+      test_start_time = @program_test.start_time + 200
+      duration = 1000
+
+      assert !@program_test.conflict?(test_start_time, duration, @program_test.uid)
     end
     
     teardown do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dblugeon-rb-eyetv
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - dblugeon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency